From 973f27babf71a2734e5eb07751562ac7f755812a Mon Sep 17 00:00:00 2001 From: RubyLiu Date: Tue, 12 Sep 2023 19:26:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=89=80=E6=9C=89=E7=9A=84=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?column?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/enums/tableEnum.ts | 1 - .../fileManagement/components/rightBox.vue | 1 + frontend/src/views/setting/organization/member/index.vue | 6 ++++-- .../src/views/setting/organization/project/orgProject.vue | 4 ++-- .../views/setting/system/config/components/authConfig.vue | 1 + .../components/systemOrganization.vue | 3 +++ frontend/src/views/setting/system/resourcePool/index.vue | 1 + frontend/src/views/setting/system/user/index.vue | 5 +++++ 8 files changed, 17 insertions(+), 5 deletions(-) diff --git a/frontend/src/enums/tableEnum.ts b/frontend/src/enums/tableEnum.ts index 1bb256cf06..75b848b5ed 100644 --- a/frontend/src/enums/tableEnum.ts +++ b/frontend/src/enums/tableEnum.ts @@ -11,7 +11,6 @@ export enum TableKeyEnum { SYSTEM_USER = 'systemUser', SYSTEM_RESOURCEPOOL = 'systemResourcePool', SYSTEM_AUTH = 'systemAuth', - ORGANNATIONMEMBER = 'member', SYSTEM_ORGANIZATION = 'systemOrganization', SYSTEM_PROJECT = 'systemProject', SYSTEM_LOG = 'systemLog', diff --git a/frontend/src/views/project-management/fileManagement/components/rightBox.vue b/frontend/src/views/project-management/fileManagement/components/rightBox.vue index 3a47fbebc4..71ac64c7e5 100644 --- a/frontend/src/views/project-management/fileManagement/components/rightBox.vue +++ b/frontend/src/views/project-management/fileManagement/components/rightBox.vue @@ -220,6 +220,7 @@ { title: 'system.config.auth.action', slotName: 'action', + dataIndex: 'operation', fixed: 'right', width: 120, showInTable: true, diff --git a/frontend/src/views/setting/organization/member/index.vue b/frontend/src/views/setting/organization/member/index.vue index db2b1040b7..3c7b62df37 100644 --- a/frontend/src/views/setting/organization/member/index.vue +++ b/frontend/src/views/setting/organization/member/index.vue @@ -145,6 +145,7 @@ showInTable: true, showTooltip: true, ellipsis: true, + sortIndex: 0, }, { title: 'organization.member.tableColunmName', @@ -185,12 +186,13 @@ { title: 'organization.member.tableColunmActions', slotName: 'action', + dataIndex: 'operation', fixed: 'right', width: 140, showInTable: true, }, ]; - tableStore.initColumn(TableKeyEnum.ORGANNATIONMEMBER, columns, 'drawer'); + tableStore.initColumn(TableKeyEnum.ORGANIZATION_MEMBER, columns, 'drawer'); const tableBatchActions = { baseAction: [ @@ -205,7 +207,7 @@ ], }; const { propsRes, propsEvent, loadList, setLoadListParams } = useTable(getMemberList, { - tableKey: TableKeyEnum.ORGANNATIONMEMBER, + tableKey: TableKeyEnum.ORGANIZATION_MEMBER, scroll: { x: 2000 }, selectable: true, showSetting: true, diff --git a/frontend/src/views/setting/organization/project/orgProject.vue b/frontend/src/views/setting/organization/project/orgProject.vue index f5a6b3c873..f1a5bd3a52 100644 --- a/frontend/src/views/setting/organization/project/orgProject.vue +++ b/frontend/src/views/setting/organization/project/orgProject.vue @@ -162,12 +162,12 @@ } }; - tableStore.initColumn(TableKeyEnum.SYSTEM_PROJECT, organizationColumns, 'drawer'); + tableStore.initColumn(TableKeyEnum.ORGANIZATION_PROJECT, organizationColumns, 'drawer'); const { propsRes, propsEvent, loadList, setKeyword, setLoadListParams } = useTable( postProjectTableByOrg, { - tableKey: TableKeyEnum.SYSTEM_PROJECT, + tableKey: TableKeyEnum.ORGANIZATION_PROJECT, selectable: false, noDisable: false, size: 'default', diff --git a/frontend/src/views/setting/system/config/components/authConfig.vue b/frontend/src/views/setting/system/config/components/authConfig.vue index e4d9e9dab8..1b44fbe71a 100644 --- a/frontend/src/views/setting/system/config/components/authConfig.vue +++ b/frontend/src/views/setting/system/config/components/authConfig.vue @@ -600,6 +600,7 @@ slotName: 'action', fixed: 'right', width: 120, + dataIndex: 'operation', showInTable: true, }, ]; diff --git a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue index f30daddf67..13c3b90ee4 100644 --- a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue +++ b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue @@ -109,10 +109,12 @@ { title: 'system.organization.member', slotName: 'memberCount', + dataIndex: 'memberCount', }, { title: 'system.organization.project', slotName: 'projectCount', + dataIndex: 'projectCount', }, { title: 'system.organization.status', @@ -137,6 +139,7 @@ { title: 'system.organization.operation', slotName: 'operation', + dataIndex: 'operation', fixed: 'right', width: 230, }, diff --git a/frontend/src/views/setting/system/resourcePool/index.vue b/frontend/src/views/setting/system/resourcePool/index.vue index 6494fb250e..8e044650fe 100644 --- a/frontend/src/views/setting/system/resourcePool/index.vue +++ b/frontend/src/views/setting/system/resourcePool/index.vue @@ -113,6 +113,7 @@ { title: 'system.resourcePool.tableColumnActions', slotName: 'action', + dataIndex: 'operation', fixed: 'right', width: 140, }, diff --git a/frontend/src/views/setting/system/user/index.vue b/frontend/src/views/setting/system/user/index.vue index ee7c449c3e..4ceaa538e0 100644 --- a/frontend/src/views/setting/system/user/index.vue +++ b/frontend/src/views/setting/system/user/index.vue @@ -223,11 +223,13 @@ title: 'system.user.tableColumnEmail', dataIndex: 'email', showTooltip: true, + sortIndex: 0, }, { title: 'system.user.tableColumnName', dataIndex: 'name', showTooltip: true, + sortIndex: 1, }, { title: 'system.user.tableColumnPhone', @@ -236,12 +238,14 @@ { title: 'system.user.tableColumnOrg', slotName: 'organization', + dataIndex: 'organization', isTag: true, }, { title: 'system.user.tableColumnUserGroup', slotName: 'userRole', isTag: true, + dataIndex: 'userRole', }, { title: 'system.user.tableColumnStatus', @@ -251,6 +255,7 @@ { title: 'system.user.tableColumnActions', slotName: 'action', + dataIndex: 'operation', fixed: 'right', width: 90, },