diff --git a/src/components/Form/DataForm/index.vue b/src/components/Form/DataForm/index.vue index ff1a3fcaa..306fa5e15 100644 --- a/src/components/Form/DataForm/index.vue +++ b/src/components/Form/DataForm/index.vue @@ -2,7 +2,7 @@ - - + + - {{ $t('SaveAndAddAnother') }} + {{ $t("SaveAndAddAnother") }} - - {{ $t('Reset') }} + + {{ $t("Reset") }} 0) { - const dialog = dialogs.find((d) => d.innerHTML.indexOf(this.id) !== -1) + const dialog = dialogs.find(d => d.innerHTML.indexOf(this.id) !== -1) if (dialog) { this.iSubmitBtnText = this.$t('Confirm') return @@ -144,10 +156,14 @@ export default { } this.iSubmitBtnText = this.$t('Submit') }, - // 获取表单数据 + /** + * 提交表单数据 + * @param {string} formName - 表单的引用名称 + * @param {boolean} [addContinue] - 是否继续添加 + */ submitForm(formName, addContinue) { const form = this.$refs[formName] - form.validate((valid) => { + form.validate(valid => { if (valid) { this.$emit('submit', form.getFormValue(), form, addContinue) } else { @@ -162,9 +178,11 @@ export default { this.$refs['form'].resetFields() }, handleClick(button) { - const callback = button.callback || function(values, form) { - // debug('Click ', button.title, ': ', values) - } + const callback = + button.callback || + function(values, form) { + // debug('Click ', button.title, ': ', values) + } const form = this.$refs['form'] const values = form.getFormValue() callback(values, form, button) diff --git a/src/components/Table/DataTable/compenents/el-data-table/el-data-table.vue b/src/components/Table/DataTable/compenents/el-data-table/el-data-table.vue index 998695809..eead98412 100644 --- a/src/components/Table/DataTable/compenents/el-data-table/el-data-table.vue +++ b/src/components/Table/DataTable/compenents/el-data-table/el-data-table.vue @@ -867,7 +867,8 @@ export default { if (query) { this.page = parseInt(query[this.pageKey]) this.size = parseInt(query[this.pageSizeKey]) - // 恢复查询条件,但对slot=search无效 + + // 恢复查询条件,但对 slot = search 无效 if (this.$refs.searchForm) { delete query[this.pageKey] delete query[this.pageSizeKey] @@ -879,6 +880,9 @@ export default { this.getList() } }, + created() { + this.debouncedGetListFromRemote = _.debounce(this.getListFromRemote, 300) + }, methods: { getQuery() { // 构造query对象 @@ -927,7 +931,7 @@ export default { getList({ loading = true } = {}) { const { url } = this if (url) { - return this.getListFromRemote({ loading: loading }) + return this.debouncedGetListFromRemote({ loading }) } if (this.totalData) { return this.getListFromStaticData({ loading: true }) diff --git a/src/components/Table/ListTable/index.vue b/src/components/Table/ListTable/index.vue index 48df17043..ff96ff5d8 100644 --- a/src/components/Table/ListTable/index.vue +++ b/src/components/Table/ListTable/index.vue @@ -78,7 +78,6 @@ export default { isDeactivated: false } }, - computed: { ...mapGetters(['currentOrgIsRoot']), dataTable() { diff --git a/src/layout/components/GenericListPage/index.vue b/src/layout/components/GenericListPage/index.vue index 4a3447d4d..6e56973a6 100644 --- a/src/layout/components/GenericListPage/index.vue +++ b/src/layout/components/GenericListPage/index.vue @@ -13,14 +13,9 @@ export default { components: { Page, GenericListTable }, - activated() { - this.reloadTable() - }, methods: { reloadTable() { - setTimeout(() => { - this.$refs.ListTable.reloadTable() - }, 300) + this.$refs.ListTable.reloadTable() } } } diff --git a/src/layout/components/GenericListTable/index.vue b/src/layout/components/GenericListTable/index.vue index 8e698fcbc..b672b2b30 100644 --- a/src/layout/components/GenericListTable/index.vue +++ b/src/layout/components/GenericListTable/index.vue @@ -12,6 +12,7 @@ export default { }, activated() { setTimeout(() => { + console.log('actived') this.reloadTable() }, 300) }, diff --git a/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue b/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue index 6168e7a68..aa2206f5d 100644 --- a/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue +++ b/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionList.vue @@ -116,7 +116,3 @@ export default { } } - - diff --git a/src/views/accounts/AccountBackup/AccountBackupList.vue b/src/views/accounts/AccountBackup/AccountBackupList.vue index be5482639..9c7b1f57b 100644 --- a/src/views/accounts/AccountBackup/AccountBackupList.vue +++ b/src/views/accounts/AccountBackup/AccountBackupList.vue @@ -104,7 +104,3 @@ export default { } } - - diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue index 714487ba5..48b3164ba 100644 --- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue +++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue @@ -131,7 +131,3 @@ export default { } } - - diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue index e4d3ebb20..5e9e9253a 100644 --- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue +++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue @@ -116,7 +116,3 @@ export default { } } - - diff --git a/src/views/accounts/AccountChangeSecret/index.vue b/src/views/accounts/AccountChangeSecret/index.vue index 894fb307b..5a5744141 100644 --- a/src/views/accounts/AccountChangeSecret/index.vue +++ b/src/views/accounts/AccountChangeSecret/index.vue @@ -35,6 +35,3 @@ export default { } } - - diff --git a/src/views/accounts/AccountGather/AccountGatherList.vue b/src/views/accounts/AccountGather/AccountGatherList.vue index 4445999d5..43036ff3d 100644 --- a/src/views/accounts/AccountGather/AccountGatherList.vue +++ b/src/views/accounts/AccountGather/AccountGatherList.vue @@ -174,10 +174,11 @@ export default { ] } } + }, + activated() { + setTimeout(() => { + this.$refs.AssetTreeTable.$refs.TreeList.reloadTable() + }, 300) } } - - diff --git a/src/views/accounts/AccountGather/TaskDetail/TaskExecutionList.vue b/src/views/accounts/AccountGather/TaskDetail/TaskExecutionList.vue index b53fcbe82..2fe356eca 100644 --- a/src/views/accounts/AccountGather/TaskDetail/TaskExecutionList.vue +++ b/src/views/accounts/AccountGather/TaskDetail/TaskExecutionList.vue @@ -112,7 +112,3 @@ export default { } } - - diff --git a/src/views/accounts/AccountPush/AccountPushExecutionList.vue b/src/views/accounts/AccountPush/AccountPushExecutionList.vue index b5f15424a..38322c1d3 100644 --- a/src/views/accounts/AccountPush/AccountPushExecutionList.vue +++ b/src/views/accounts/AccountPush/AccountPushExecutionList.vue @@ -1,5 +1,5 @@ - - diff --git a/src/views/accounts/AccountPush/AccountPushList.vue b/src/views/accounts/AccountPush/AccountPushList.vue index 79038ef92..575b585a6 100644 --- a/src/views/accounts/AccountPush/AccountPushList.vue +++ b/src/views/accounts/AccountPush/AccountPushList.vue @@ -1,5 +1,5 @@ - - diff --git a/src/views/accounts/VirtualAccount/VirtualList.vue b/src/views/accounts/VirtualAccount/VirtualList.vue index c25096983..eddb7c31f 100644 --- a/src/views/accounts/VirtualAccount/VirtualList.vue +++ b/src/views/accounts/VirtualAccount/VirtualList.vue @@ -1,6 +1,6 @@ @@ -44,10 +44,11 @@ export default { } } } + }, + activated() { + setTimeout(() => { + this.$refs.listTable.reloadTable() + }, 300) } } - - diff --git a/src/views/users/Group/UserGroupList.vue b/src/views/users/Group/UserGroupList.vue index ebee8a919..cbceb9bf9 100644 --- a/src/views/users/Group/UserGroupList.vue +++ b/src/views/users/Group/UserGroupList.vue @@ -51,11 +51,6 @@ export default { createRoute: 'UserGroupCreate' } } - }, - activated() { - setTimeout(() => { - this.$refs.listPage.reloadTable() - }) } } diff --git a/src/views/users/Role/RoleList/BaseRoleList.vue b/src/views/users/Role/RoleList/BaseRoleList.vue index a509c8a25..b85e8c93f 100644 --- a/src/views/users/Role/RoleList/BaseRoleList.vue +++ b/src/views/users/Role/RoleList/BaseRoleList.vue @@ -126,9 +126,7 @@ export default { return !row['builtin'] && this.$hasPerm(perm) }, reloadTable() { - setTimeout(() => { - this.$refs.ListTable.reloadTable() - }, 300) + this.$refs.ListTable.reloadTable() } } } diff --git a/src/views/users/Role/RoleList/OrgRoleList.vue b/src/views/users/Role/RoleList/OrgRoleList.vue index d3d5dc963..83717243c 100644 --- a/src/views/users/Role/RoleList/OrgRoleList.vue +++ b/src/views/users/Role/RoleList/OrgRoleList.vue @@ -13,7 +13,9 @@ export default { BaseRoleList }, activated() { - this.$refs.roleList.reloadTable() + setTimeout(() => { + this.$refs.roleList.reloadTable() + }, 300) } } diff --git a/src/views/users/Role/RoleList/SysRoleList.vue b/src/views/users/Role/RoleList/SysRoleList.vue index 24830cfd3..39b1b25d1 100644 --- a/src/views/users/Role/RoleList/SysRoleList.vue +++ b/src/views/users/Role/RoleList/SysRoleList.vue @@ -13,7 +13,9 @@ export default { BaseRoleList }, activated() { - this.$refs.roleList.reloadTable() + setTimeout(() => { + this.$refs.roleList.reloadTable() + }) } } diff --git a/src/views/users/User/UserList.vue b/src/views/users/User/UserList.vue index 020ee1ad0..7f74909e8 100644 --- a/src/views/users/User/UserList.vue +++ b/src/views/users/User/UserList.vue @@ -277,9 +277,6 @@ export default { mounted() { this.setRolesFilter() }, - activated() { - this.reloadTable() - }, methods: { setRolesFilter() { const roleTypes = [{ name: 'system-roles', perm: 'systemrole' }, { name: 'org-roles', perm: 'orgrole' }]