From 3002e7ca364f9b3041081bd955d412548fbfe9ab Mon Sep 17 00:00:00 2001 From: RubyLiu Date: Tue, 15 Aug 2023 16:27:04 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?= =?UTF-8?q?=20=E6=92=A4=E9=94=80=E6=93=8D=E4=BD=9C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=A1=A8=E6=A0=BCloading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organizationAndProject/components/systemOrganization.vue | 5 ++++- .../system/organizationAndProject/components/userDrawer.vue | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue index 216c638f21..b67133a5fb 100644 --- a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue +++ b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue @@ -135,7 +135,7 @@ tableStore.initColumn(TableKeyEnum.SYSTEM_ORGANIZATION, organizationColumns, 'drawer'); - const { propsRes, propsEvent, loadList, setKeyword } = useTable(postOrgTable, { + const { propsRes, propsEvent, loadList, setKeyword, setLoading } = useTable(postOrgTable, { tableKey: TableKeyEnum.SYSTEM_ORGANIZATION, scroll: { y: 'auto', x: '1300px' }, selectable: false, @@ -264,12 +264,15 @@ const handleRevokeDelete = async (record: TableData) => { try { + setLoading(true); await revokeDeleteOrg(record.id); Message.success(t('common.revokeDeleteSuccess')); fetchData(); } catch (error) { // eslint-disable-next-line no-console console.error(error); + } finally { + setLoading(false); } }; diff --git a/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue b/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue index ecb52caccd..187acd1e7b 100644 --- a/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue +++ b/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue @@ -79,6 +79,7 @@ { title: 'system.organization.email', dataIndex: 'email', + width: 200, }, { title: 'system.organization.phone',