diff --git a/ui/src/components/CloudMonkey/Resource.vue b/ui/src/components/CloudMonkey/Resource.vue index 4f5c379c627..726566c424a 100644 --- a/ui/src/components/CloudMonkey/Resource.vue +++ b/ui/src/components/CloudMonkey/Resource.vue @@ -1,26 +1,6 @@ @@ -192,10 +189,10 @@ import { api } from '@/api' import { mixinDevice } from '@/utils/mixin.js' import store from '@/store' +import Breadcrumb from '@/components/widgets/Breadcrumb' import CardView from '@/components/widgets/CardView' import ChartCard from '@/components/chart/ChartCard' import DataView from '@/components/widgets/DataView' -import FormView from '@/components/widgets/FormView' import InstanceView from '@/components/widgets/InstanceView' import ListView from '@/components/widgets/ListView' import Status from '@/components/widgets/Status' @@ -203,10 +200,10 @@ import Status from '@/components/widgets/Status' export default { name: 'Resource', components: { + Breadcrumb, CardView, ChartCard, DataView, - FormView, InstanceView, ListView, Status @@ -225,7 +222,6 @@ export default { showAction: false, dataView: false, actions: [], - breadList: [], tableView: true } }, @@ -253,15 +249,7 @@ export default { this.form = this.$form.createForm(this) }, methods: { - getBreadcrumb () { - this.breadList = [] - this.name = this.$route.name - this.$route.matched.forEach((item) => { - this.breadList.push(item) - }) - }, fetchData (search = '') { - this.getBreadcrumb() this.routeName = this.$route.name if (!this.routeName) { this.routeName = this.$route.matched[this.$route.matched.length - 1].parent.name diff --git a/ui/src/components/page/GlobalHeader.vue b/ui/src/components/page/GlobalHeader.vue index 30e746f5e44..a92189d2a28 100644 --- a/ui/src/components/page/GlobalHeader.vue +++ b/ui/src/components/page/GlobalHeader.vue @@ -73,7 +73,6 @@ import UserMenu from '../tools/UserMenu' import SMenu from '../menu/' import Logo from '../tools/Logo' -import Breadcrumb from '@/components/tools/Breadcrumb' import { mixin } from '@/utils/mixin.js' @@ -82,8 +81,7 @@ export default { components: { SMenu, Logo, - UserMenu, - Breadcrumb + UserMenu }, mixins: [mixin], props: { diff --git a/ui/src/components/page/PageHeader.vue b/ui/src/components/page/PageHeader.vue index 951603de8e1..9caaccbbee2 100644 --- a/ui/src/components/page/PageHeader.vue +++ b/ui/src/components/page/PageHeader.vue @@ -34,7 +34,7 @@ - - diff --git a/ui/src/components/widgets/Breadcrumb.vue b/ui/src/components/widgets/Breadcrumb.vue new file mode 100644 index 00000000000..d8a74d2bfdc --- /dev/null +++ b/ui/src/components/widgets/Breadcrumb.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/ui/src/components/widgets/FormView.vue b/ui/src/components/widgets/FormView.vue index 5407330e8bb..c1fadb1e712 100644 --- a/ui/src/components/widgets/FormView.vue +++ b/ui/src/components/widgets/FormView.vue @@ -1,12 +1,12 @@