From 9404db0222034f4fa6f6598da8ab4ebefb860263 Mon Sep 17 00:00:00 2001
From: RubyLiu <liulubingjava@163.com>
Date: Thu, 28 Sep 2023 16:17:16 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=E5=89=8D=E7=AB=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ms-user-group-comp/addUserModal.vue       |  2 +-
 .../components/pure/ms-table/base-table.vue   | 17 +++++++---
 .../src/components/pure/ms-table/useTable.ts  |  1 -
 frontend/src/locale/en-US/index.ts            |  3 ++
 frontend/src/locale/zh-CN/index.ts            |  3 ++
 .../projectManagement/menuManagement.ts       |  2 ++
 .../menuManagement/index.vue                  | 32 ++++++++++++-------
 .../userGroup/addUserModal.vue                |  2 +-
 .../project/components/addUserModal.vue       |  2 +-
 .../pluginManager/components/tableExpand.vue  | 15 ++++++---
 10 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/frontend/src/components/business/ms-user-group-comp/addUserModal.vue b/frontend/src/components/business/ms-user-group-comp/addUserModal.vue
index cebb9541f3..d3d83ebc50 100644
--- a/frontend/src/components/business/ms-user-group-comp/addUserModal.vue
+++ b/frontend/src/components/business/ms-user-group-comp/addUserModal.vue
@@ -2,7 +2,7 @@
   <a-modal
     v-model:visible="currentVisible"
     class="ms-modal-form ms-modal-medium"
-    text-align="start"
+    title-align="start"
     :ok-text="t('system.userGroup.add')"
     unmount-on-close
     @cancel="handleCancel(false)"
diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue
index 30e5e3f879..f35a83a57f 100644
--- a/frontend/src/components/pure/ms-table/base-table.vue
+++ b/frontend/src/components/pure/ms-table/base-table.vue
@@ -144,13 +144,13 @@
         </slot>
       </template>
       <template #expand-icon="{ expanded }">
-        <icon-down-circle v-if="expanded" />
-        <icon-right-circle v-else />
+        <MsIcon v-if="!expanded" :size="8" type="icon-icon_right_outlined" class="text-[rgb(var(--primary-6))]" />
+        <MsIcon v-else :size="8" class="text-[var(--color-text-4)]" type="icon-icon_down_outlined" />
       </template>
     </a-table>
     <div
-      class="mt-[16px] flex h-[32px] w-[100%] min-w-[952px] flex-row flex-nowrap items-center justify-end px-0"
-      :class="{ 'justify-between': showBatchAction }"
+      class="mt-[16px] flex h-[32px] w-[100%] flex-row flex-nowrap items-center justify-end px-0"
+      :class="{ 'justify-between': showBatchAction, 'min-w-[952px]': attrs.selectable }"
     >
       <batch-action
         v-if="showBatchAction"
@@ -226,7 +226,11 @@
   const selectTotal = computed(() => {
     const { selectorStatus } = props;
     if (selectorStatus === SelectAllEnum.CURRENT) {
-      return (attrs.msPagination as MsPaginationI)?.pageSize || appStore.pageSize;
+      const { pageSize, total } = attrs.msPagination as MsPaginationI;
+      if (pageSize > total) {
+        return total;
+      }
+      return pageSize;
     }
     return (attrs.msPagination as MsPaginationI)?.total || appStore.pageSize;
   });
@@ -456,4 +460,7 @@
   :deep(.arco-checkbox:hover .arco-checkbox-icon-hover::before) {
     background: none !important;
   }
+  :deep(.arco-table .arco-table-expand-btn) {
+    border-color: transparent;
+  }
 </style>
diff --git a/frontend/src/components/pure/ms-table/useTable.ts b/frontend/src/components/pure/ms-table/useTable.ts
index 6ab3879308..5d0e6abe00 100644
--- a/frontend/src/components/pure/ms-table/useTable.ts
+++ b/frontend/src/components/pure/ms-table/useTable.ts
@@ -8,7 +8,6 @@ import type { TableData } from '@arco-design/web-vue';
 import type { TableQueryParams, CommonList } from '@/models/common';
 import { SelectAllEnum } from '@/enums/tableEnum';
 import type { MsTableProps, MsTableDataItem, MsTableColumn, MsTableErrorStatus, SetPaginationPrams } from './type';
-import { set } from 'nprogress';
 
 export interface Pagination {
   current: number;
diff --git a/frontend/src/locale/en-US/index.ts b/frontend/src/locale/en-US/index.ts
index 4d3fd085b2..55bfcf7ad4 100644
--- a/frontend/src/locale/en-US/index.ts
+++ b/frontend/src/locale/en-US/index.ts
@@ -29,6 +29,9 @@ export default {
     'menu.projectManagement': 'Project',
     'menu.projectManagement.fileManagement': 'File Management',
     'menu.featureTest.featureCase': 'Feature Case',
+    'meun.workstation': 'Workstation',
+    'menu.loadTest': 'Performance Test',
+    'menu.caseManagement': 'Feature Test',
     'menu.projectManagement.projectPermission': 'Project Permission',
     'menu.projectManagement.log': 'Log',
     'menu.settings': 'Settings',
diff --git a/frontend/src/locale/zh-CN/index.ts b/frontend/src/locale/zh-CN/index.ts
index 8abbc67d22..341a6c6edb 100644
--- a/frontend/src/locale/zh-CN/index.ts
+++ b/frontend/src/locale/zh-CN/index.ts
@@ -24,6 +24,9 @@ export default {
     'menu.featureTest': '功能测试',
     'menu.apiTest': '接口测试',
     'menu.uiTest': 'UI测试',
+    'meun.workstation': '工作台',
+    'menu.loadTest': '性能测试',
+    'menu.caseManagement': '功能测试',
     'menu.performanceTest': '性能测试',
     'menu.projectManagement': '项目管理',
     'menu.projectManagement.log': '日志',
diff --git a/frontend/src/models/projectManagement/menuManagement.ts b/frontend/src/models/projectManagement/menuManagement.ts
index 18b3526814..5f60f148cf 100644
--- a/frontend/src/models/projectManagement/menuManagement.ts
+++ b/frontend/src/models/projectManagement/menuManagement.ts
@@ -4,6 +4,8 @@ export interface MenuTableListItem {
   module: string;
   moduleEnable: boolean;
   moduleDesc?: string;
+  children?: MenuTableListItem[];
+  isLeaf?: boolean;
 }
 
 export interface MenuTableListParams {
diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/index.vue b/frontend/src/views/project-management/projectAndPermission/menuManagement/index.vue
index caecc4724d..af2a2d07c2 100644
--- a/frontend/src/views/project-management/projectAndPermission/menuManagement/index.vue
+++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/index.vue
@@ -7,8 +7,8 @@
   </div>
   <MsBaseTable class="mt-[16px]" v-bind="propsRes" v-on="propsEvent">
     <template #module="{ record }">
-      <MsIcon :type="getMenuIcon(record.module)" />
-      <span class="ml-[4px]">{{ record.module }}</span>
+      <MsIcon class="text-[var(--color-text-4)]" :type="getMenuIcon(record.module)" />
+      <span class="ml-[4px]">{{ t(`menu.${record.module}`) }}</span>
     </template>
     <template #moduleEnable="{ record }">
       <a-switch v-model="record.moduleEnable" @change="handleMenuStatusChange(record)" />
@@ -57,30 +57,38 @@
       width: 150,
     },
   ];
-  const { propsRes, propsEvent, loadList, setLoadListParams } = useTable(postTabletList, {
-    showPagination: false,
-    columns,
-    selectable: false,
-    scroll: { x: '100%' },
-    noDisable: true,
-  });
+  const { propsRes, propsEvent, loadList, setLoadListParams } = useTable(
+    postTabletList,
+    {
+      showPagination: false,
+      columns,
+      selectable: false,
+      scroll: { x: '100%' },
+      noDisable: true,
+      rowKey: 'module',
+    },
+    (item) => {
+      item = { ...item, children: [], isLeaf: false };
+      return item;
+    }
+  );
 
   const getMenuIcon = (type: MenuEnum) => {
     switch (type) {
       case MenuEnum.workstation:
         return 'icon-icon_pc_filled';
       case MenuEnum.testPlan:
-        return 'icon-icon_test_plan_filled';
+        return 'icon-icon_test-tracking_filled';
       case MenuEnum.bugManagement:
         return 'icon-icon_defect';
       case MenuEnum.caseManagement:
-        return 'icon_functional_testing';
+        return 'icon-icon_functional_testing';
       case MenuEnum.apiTest:
         return 'icon-icon_api-test-filled';
       case MenuEnum.uiTest:
         return 'icon-icon_ui-test-filled';
       default:
-        return 'icon_performance-test-filled';
+        return 'icon-icon_performance-test-filled';
     }
   };
 
diff --git a/frontend/src/views/project-management/projectAndPermission/userGroup/addUserModal.vue b/frontend/src/views/project-management/projectAndPermission/userGroup/addUserModal.vue
index e599996031..83b3f1d300 100644
--- a/frontend/src/views/project-management/projectAndPermission/userGroup/addUserModal.vue
+++ b/frontend/src/views/project-management/projectAndPermission/userGroup/addUserModal.vue
@@ -9,7 +9,7 @@
   >
     <template #title> {{ t('system.organization.addMember') }} </template>
     <div class="form">
-      <a-form ref="formRef" :model="form" size="large" :style="{ width: '600px' }" layout="vertical">
+      <a-form ref="formRef" :model="form" layout="vertical">
         <a-form-item
           field="name"
           :label="t('system.organization.member')"
diff --git a/frontend/src/views/setting/organization/project/components/addUserModal.vue b/frontend/src/views/setting/organization/project/components/addUserModal.vue
index 04b1a05f2f..e23208f8c8 100644
--- a/frontend/src/views/setting/organization/project/components/addUserModal.vue
+++ b/frontend/src/views/setting/organization/project/components/addUserModal.vue
@@ -9,7 +9,7 @@
   >
     <template #title> {{ t('system.organization.addMember') }} </template>
     <div class="form">
-      <a-form ref="formRef" :model="form" size="large" :style="{ width: '600px' }" layout="vertical">
+      <a-form ref="formRef" class="rounded-[4px]" :model="form" layout="vertical">
         <a-form-item
           field="name"
           :label="t('system.organization.member')"
diff --git a/frontend/src/views/setting/system/pluginManager/components/tableExpand.vue b/frontend/src/views/setting/system/pluginManager/components/tableExpand.vue
index dcd67b44c8..5bed9a8715 100644
--- a/frontend/src/views/setting/system/pluginManager/components/tableExpand.vue
+++ b/frontend/src/views/setting/system/pluginManager/components/tableExpand.vue
@@ -7,12 +7,17 @@
     }"
   >
     <div class="ms-scroll">
-      <div v-for="(item, index) in record.pluginForms" :key="item.id" class="ms-self"
-        ><span class="circle text-xs leading-[16px]"> {{ index + 1 }} </span
-        ><span class="cursor-pointer text-[rgb(var(--primary-5))]" @click="emit('MessageEvent', record, item)">{{
+      <div v-for="(item, index) in record.pluginForms" :key="item.id" class="ms-self">
+        <span class="circle text-xs leading-[16px]"> {{ index + 1 }} </span>
+        <span class="cursor-pointer text-[rgb(var(--primary-5))]" @click="emit('MessageEvent', record, item)">{{
           item.name
-        }}</span></div
-      >
+        }}</span>
+        <span
+          class="ml-[150px] cursor-pointer text-[rgb(var(--primary-5))]"
+          @click="emit('MessageEvent', record, item)"
+          >{{ item.name }}</span
+        >
+      </div>
     </div>
   </a-scrollbar>
 </template>