diff --git a/src/components/Apps/AssetTreeTable/index.vue b/src/components/Apps/AssetTreeTable/index.vue index eaed2bd1e..7c6e3f936 100644 --- a/src/components/Apps/AssetTreeTable/index.vue +++ b/src/components/Apps/AssetTreeTable/index.vue @@ -186,7 +186,3 @@ export default { } } - - diff --git a/src/views/accounts/const.js b/src/views/accounts/const.js index 6fac54b8e..4d9a94b54 100644 --- a/src/views/accounts/const.js +++ b/src/views/accounts/const.js @@ -1,6 +1,7 @@ import { CronTab } from '@/components' import i18n from '@/i18n/i18n' import InputWithUnit from '@/components/Form/FormFields/InputWithUnit.vue' +import store from '@/store' const validatorInterval = (rule, value, callback) => { if (parseInt(value) < 1) { @@ -35,7 +36,10 @@ export const interval = { } export const is_periodic = { - type: 'switch' + type: 'switch', + hidden: (formValue) => { + return !store.getters.hasValidLicense + } } export default { diff --git a/src/views/acl/CommandAcl/index.vue b/src/views/acl/CommandAcl/index.vue index 8da8d201b..85d6ec10a 100644 --- a/src/views/acl/CommandAcl/index.vue +++ b/src/views/acl/CommandAcl/index.vue @@ -52,7 +52,3 @@ export default { } } - - diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue index f99dce40a..94f6c118a 100644 --- a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue +++ b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue @@ -98,6 +98,3 @@ export default { } } - - diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionUser.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionUser.vue index dd36979ea..7666b9064 100644 --- a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionUser.vue +++ b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionUser.vue @@ -104,6 +104,7 @@ export default { this.$log.debug('Select value', that.select2.value) that.iHasObjects = [...that.iHasObjects, ...objects] this.$store.commit('common/reload') + // this.$refs.ListTable.reloadTable() } }, groupRelationConfig: { diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue index e54c64985..7ff707424 100644 --- a/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue +++ b/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue @@ -63,21 +63,11 @@ export default { }, methods: { handleTabClick(tab) { - const query = _.cloneDeep(this.$route.query) - const newQuery = { - ...query, - tab: tab.name - } - if (tab.name !== 'AssetPermissionDetail') { this.$set(this.config, 'hasRightSide', false) } else { this.$set(this.config, 'hasRightSide', true) } - - this.$nextTick(() => { - this.$router.replace({ query: newQuery }) - }) } } } diff --git a/src/views/perms/AssetPermission/AssetPermissionList.vue b/src/views/perms/AssetPermission/AssetPermissionList.vue index 89886faf4..083621b9b 100644 --- a/src/views/perms/AssetPermission/AssetPermissionList.vue +++ b/src/views/perms/AssetPermission/AssetPermissionList.vue @@ -108,6 +108,11 @@ export default { computed: { ...mapGetters(['currentOrgIsRoot']) }, + activated() { + setTimeout(() => { + this.$refs.AssetTreeTable.$refs.TreeList.reloadTable() + }, 300) + }, methods: { handlePermBulkUpdate() { this.updateSelectedDialogSetting.visible = false diff --git a/src/views/perms/const.js b/src/views/perms/const.js index 7cd02f6dc..d9da20175 100644 --- a/src/views/perms/const.js +++ b/src/views/perms/const.js @@ -35,10 +35,7 @@ export const AssetPermissionTableMeta = { name: { minWidth: '120px', formatterArgs: { - route: 'AssetPermissionDetail', - routeQuery: { - tab: 'AssetPermissionDetail' - } + route: 'AssetPermissionDetail' } }, action: { diff --git a/src/views/users/Role/RoleDetail/RoleUsers.vue b/src/views/users/Role/RoleDetail/RoleUsers.vue index 38933d5a1..5162fb7a8 100644 --- a/src/views/users/Role/RoleDetail/RoleUsers.vue +++ b/src/views/users/Role/RoleDetail/RoleUsers.vue @@ -91,7 +91,7 @@ export default { reload() }).catch(error => { this.$message.error({ - message: error.response.data.error, + message: error.response.data.detail, duration: 3000 }) }) diff --git a/src/views/users/Role/RoleList/SysRoleList.vue b/src/views/users/Role/RoleList/SysRoleList.vue index 0038de2ad..24830cfd3 100644 --- a/src/views/users/Role/RoleList/SysRoleList.vue +++ b/src/views/users/Role/RoleList/SysRoleList.vue @@ -13,9 +13,7 @@ export default { BaseRoleList }, activated() { - setTimeout(() => { - this.$refs.roleList.reloadTable() - }, 300) + this.$refs.roleList.reloadTable() } } diff --git a/src/views/users/User/UserList.vue b/src/views/users/User/UserList.vue index bcb05c546..408649555 100644 --- a/src/views/users/User/UserList.vue +++ b/src/views/users/User/UserList.vue @@ -61,10 +61,7 @@ export default { columnsMeta: { name: { formatterArgs: { - route: 'UserDetail', - routeQuery: { - tab: 'UserInfo' - } + route: 'UserDetail' } }, mfa_level: {