diff --git a/src/components/Table/CardTable/index.vue b/src/components/Table/CardTable/index.vue index fcc47d9ca..7f5d745f9 100644 --- a/src/components/Table/CardTable/index.vue +++ b/src/components/Table/CardTable/index.vue @@ -131,7 +131,7 @@ export default { }, methods: { isDisabled(item) { - return item.edition === 'enterprise' && !this.hasValidLicense + return item.edition.value === 'enterprise' && !this.hasValidLicense }, capitalize(str) { return str.charAt(0).toUpperCase() + str.slice(1) @@ -188,15 +188,19 @@ export default { this.getList() }, defaultPerformView(obj) { + console.log(this.$route.name) const defaultRoute = this.$route.name.replace('List', 'Detail') const route = this.headerActions.detailRoute || defaultRoute let detailRoute = { replace: true } + console.log(route) if (typeof route === 'string') { detailRoute.name = route detailRoute.params = { id: obj.id } } else { detailRoute = route } + + console.log(defaultRoute) this.$router.push(detailRoute) }, defaultPerformDelete(obj) { diff --git a/src/router/settings/index.js b/src/router/settings/index.js index 02b817e57..71df71835 100644 --- a/src/router/settings/index.js +++ b/src/router/settings/index.js @@ -273,7 +273,7 @@ export default { }, { path: '/settings/applets', - component: () => import('@/views/settings/Applet'), + component: empty, redirect: '', meta: { title: i18n.t('Applets'),