From 7fb94f09779eba4f4b83d4fc4dc79984c9322439 Mon Sep 17 00:00:00 2001
From: RubyLiu <liulubingjava@163.com>
Date: Thu, 17 Aug 2023 18:44:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=A1=B9=E7=9B=AE=E5=90=AF=E7=94=A8=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98&=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/system/organizationAndProject.ts  | 12 +++-
 .../setting/system/organizationAndProject.ts  |  4 ++
 frontend/src/router/routes/modules/apiTest.ts |  2 +-
 .../router/routes/modules/bugManagement.ts    |  2 +-
 .../src/router/routes/modules/featureTest.ts  |  2 +-
 .../router/routes/modules/performanceTest.ts  |  2 +-
 .../routes/modules/projectManagement.ts       |  2 +-
 .../src/router/routes/modules/testPlan.ts     |  2 +-
 frontend/src/router/routes/modules/uiTest.ts  |  2 +-
 .../src/router/routes/modules/workplace.ts    |  2 +-
 frontend/src/store/modules/setting/types.ts   |  2 +
 .../src/store/modules/setting/usergroup.ts    |  5 ++
 .../components/addUserModal.vue               |  2 +-
 .../components/projectDrawer.vue              |  1 +
 .../components/systemOrganization.vue         |  4 +-
 .../components/systemProject.vue              | 70 +++++++++++--------
 .../components/userDrawer.vue                 | 18 ++++-
 .../organizationAndProject/locale/en-US.ts    |  5 ++
 .../organizationAndProject/locale/zh-CN.ts    |  5 ++
 .../usergroup/components/addUserModal.vue     | 12 +++-
 .../system/usergroup/components/authTable.vue | 12 ++--
 .../system/usergroup/components/userTable.vue | 16 ++---
 .../views/setting/system/usergroup/index.vue  | 62 +++++++++++++---
 .../setting/system/usergroup/locale/en-US.ts  |  2 +
 .../setting/system/usergroup/locale/zh-CN.ts  |  2 +
 25 files changed, 179 insertions(+), 71 deletions(-)

diff --git a/frontend/src/api/modules/setting/system/organizationAndProject.ts b/frontend/src/api/modules/setting/system/organizationAndProject.ts
index 17f5c26573..5476fdaa8c 100644
--- a/frontend/src/api/modules/setting/system/organizationAndProject.ts
+++ b/frontend/src/api/modules/setting/system/organizationAndProject.ts
@@ -19,11 +19,21 @@ export function deleteOrg(id: string) {
   return MSR.get({ url: `${orgUrl.getDeleteOrgUrl}${id}` });
 }
 
+// 删除项目
+export function deleteProject(id: string) {
+  return MSR.get({ url: `${orgUrl.getDeleteProjectUrl}${id}` });
+}
+
 // 撤销删除组织
 export function revokeDeleteOrg(id: string) {
   return MSR.get({ url: `${orgUrl.getRecoverOrgUrl}${id}` });
 }
 
+// 撤销删除项目
+export function revokeDeleteProject(id: string) {
+  return MSR.get({ url: `${orgUrl.getRevokeProjectUrl}${id}` });
+}
+
 // 启用或禁用组织
 export function enableOrDisableOrg(id: string, isEnable = true) {
   return MSR.get({ url: `${isEnable ? orgUrl.getEnableOrgUrl : orgUrl.getDisableOrgUrl}${id}` });
@@ -60,5 +70,5 @@ export function deleteUserFromOrgOrProject(sourceId: string, userId: string, isO
 
 // TODO: 等待后端同学的接口 启用或禁用项目
 export function enableOrDisableProject(id: string, isEnable = true) {
-  return MSR.get({ url: `${isEnable ? orgUrl.getEnableOrgUrl : orgUrl.getDisableOrgUrl}${id}` });
+  return MSR.get({ url: `${isEnable ? orgUrl.getEnableProjectUrl : orgUrl.getDisableProjectUrl}${id}` });
 }
diff --git a/frontend/src/api/requrls/setting/system/organizationAndProject.ts b/frontend/src/api/requrls/setting/system/organizationAndProject.ts
index d35e63f74e..0bf4e3619c 100644
--- a/frontend/src/api/requrls/setting/system/organizationAndProject.ts
+++ b/frontend/src/api/requrls/setting/system/organizationAndProject.ts
@@ -46,3 +46,7 @@ export const getProjectInfoUrl = '/system/project/get/';
 export const getDeleteProjectUrl = '/system/project/delete/';
 // 系统-组织及项目，获取用户下拉选项
 export const getUserByOrgOrProjectUrl = '/system/user/get-option/';
+// 启用项目
+export const getEnableProjectUrl = '/system/project/enable/';
+// 禁用项目
+export const getDisableProjectUrl = '/system/project/disable/';
diff --git a/frontend/src/router/routes/modules/apiTest.ts b/frontend/src/router/routes/modules/apiTest.ts
index 0d3195f8a2..9c23a06c5d 100644
--- a/frontend/src/router/routes/modules/apiTest.ts
+++ b/frontend/src/router/routes/modules/apiTest.ts
@@ -9,7 +9,7 @@ const ApiTest: AppRouteRecordRaw = {
   component: DEFAULT_LAYOUT,
   meta: {
     locale: 'menu.apiTest',
-    icon: 'icon_api-test-filled',
+    icon: 'icon-icon_api-test-filled',
     order: 4,
     hideChildrenInMenu: true,
   },
diff --git a/frontend/src/router/routes/modules/bugManagement.ts b/frontend/src/router/routes/modules/bugManagement.ts
index 4f4300186e..62c681804f 100644
--- a/frontend/src/router/routes/modules/bugManagement.ts
+++ b/frontend/src/router/routes/modules/bugManagement.ts
@@ -9,7 +9,7 @@ const BugManagement: AppRouteRecordRaw = {
   component: DEFAULT_LAYOUT,
   meta: {
     locale: 'menu.bugManagement',
-    icon: 'icon_defect',
+    icon: 'icon-icon_defect',
     order: 2,
     hideChildrenInMenu: true,
   },
diff --git a/frontend/src/router/routes/modules/featureTest.ts b/frontend/src/router/routes/modules/featureTest.ts
index a27721eb27..ed2dea9e40 100644
--- a/frontend/src/router/routes/modules/featureTest.ts
+++ b/frontend/src/router/routes/modules/featureTest.ts
@@ -9,7 +9,7 @@ const FeatureTest: AppRouteRecordRaw = {
   component: DEFAULT_LAYOUT,
   meta: {
     locale: 'menu.featureTest',
-    icon: 'icon_functional_testing',
+    icon: 'icon-icon_functional_testing',
     order: 3,
     hideChildrenInMenu: true,
   },
diff --git a/frontend/src/router/routes/modules/performanceTest.ts b/frontend/src/router/routes/modules/performanceTest.ts
index eb792666b9..d009b40709 100644
--- a/frontend/src/router/routes/modules/performanceTest.ts
+++ b/frontend/src/router/routes/modules/performanceTest.ts
@@ -9,7 +9,7 @@ const PerformanceTest: AppRouteRecordRaw = {
   component: DEFAULT_LAYOUT,
   meta: {
     locale: 'menu.performanceTest',
-    icon: 'icon_performance-test-filled',
+    icon: 'icon-icon_performance-test-filled',
     order: 6,
     hideChildrenInMenu: true,
   },
diff --git a/frontend/src/router/routes/modules/projectManagement.ts b/frontend/src/router/routes/modules/projectManagement.ts
index 1d44b8b50a..6c33e5509e 100644
--- a/frontend/src/router/routes/modules/projectManagement.ts
+++ b/frontend/src/router/routes/modules/projectManagement.ts
@@ -9,7 +9,7 @@ const ProjectManagement: AppRouteRecordRaw = {
   component: DEFAULT_LAYOUT,
   meta: {
     locale: 'menu.projectManagement',
-    icon: 'icon_project-settings-filled',
+    icon: 'icon-icon_project-settings-filled',
     order: 7,
     hideChildrenInMenu: true,
   },
diff --git a/frontend/src/router/routes/modules/testPlan.ts b/frontend/src/router/routes/modules/testPlan.ts
index d67694f127..47d5c572d7 100644
--- a/frontend/src/router/routes/modules/testPlan.ts
+++ b/frontend/src/router/routes/modules/testPlan.ts
@@ -9,7 +9,7 @@ const TestPlan: AppRouteRecordRaw = {
   component: DEFAULT_LAYOUT,
   meta: {
     locale: 'menu.testPlan',
-    icon: 'icon_test-tracking_filled',
+    icon: 'icon-icon_test-tracking_filled',
     order: 1,
     hideChildrenInMenu: true,
   },
diff --git a/frontend/src/router/routes/modules/uiTest.ts b/frontend/src/router/routes/modules/uiTest.ts
index 2df0255bff..bb8ab541fc 100644
--- a/frontend/src/router/routes/modules/uiTest.ts
+++ b/frontend/src/router/routes/modules/uiTest.ts
@@ -9,7 +9,7 @@ const UiTest: AppRouteRecordRaw = {
   component: DEFAULT_LAYOUT,
   meta: {
     locale: 'menu.uiTest',
-    icon: 'icon_ui-test-filled',
+    icon: 'icon-icon_ui-test-filled',
     order: 5,
     hideChildrenInMenu: true,
   },
diff --git a/frontend/src/router/routes/modules/workplace.ts b/frontend/src/router/routes/modules/workplace.ts
index e2ffad9bbc..97d9222783 100644
--- a/frontend/src/router/routes/modules/workplace.ts
+++ b/frontend/src/router/routes/modules/workplace.ts
@@ -9,7 +9,7 @@ const WorkPlace: AppRouteRecordRaw = {
   component: DEFAULT_LAYOUT,
   meta: {
     locale: 'menu.workplace',
-    icon: 'icon_pc_filled',
+    icon: 'icon-icon_pc_filled',
     order: 0,
     hideChildrenInMenu: true,
   },
diff --git a/frontend/src/store/modules/setting/types.ts b/frontend/src/store/modules/setting/types.ts
index 383893ab70..0a2dcaf20b 100644
--- a/frontend/src/store/modules/setting/types.ts
+++ b/frontend/src/store/modules/setting/types.ts
@@ -5,4 +5,6 @@ export interface UserGroupState {
   currentId: string;
   // 当前用户类型
   currentType: string;
+  // 菜单开启关闭
+  collapse: boolean;
 }
diff --git a/frontend/src/store/modules/setting/usergroup.ts b/frontend/src/store/modules/setting/usergroup.ts
index a90a11c50d..6c01bc7e05 100644
--- a/frontend/src/store/modules/setting/usergroup.ts
+++ b/frontend/src/store/modules/setting/usergroup.ts
@@ -7,6 +7,7 @@ const useUserGroupStore = defineStore('userGroup', {
     currentTitle: '',
     currentId: '',
     currentType: '',
+    collapse: true,
   }),
   getters: {
     userGroupInfo(state: UserGroupState): UserGroupState {
@@ -18,6 +19,10 @@ const useUserGroupStore = defineStore('userGroup', {
     setInfo(partial: Partial<UserGroupState>) {
       this.$patch(partial);
     },
+    // 设置用户组菜单开启关闭
+    setCollapse(collapse: boolean) {
+      this.collapse = collapse;
+    },
   },
 });
 
diff --git a/frontend/src/views/setting/system/organizationAndProject/components/addUserModal.vue b/frontend/src/views/setting/system/organizationAndProject/components/addUserModal.vue
index 9bc63e242f..d4686c4f70 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/addUserModal.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/addUserModal.vue
@@ -75,7 +75,7 @@
       const { organizationId, projectId } = props;
       try {
         loading.value = true;
-        await addUserToOrgOrProject({ memberIds: form.name, organizationId, projectId });
+        await addUserToOrgOrProject({ userIds: form.name, organizationId, projectId });
         Message.success(t('system.organization.addSuccess'));
         handleCancel();
       } catch (error) {
diff --git a/frontend/src/views/setting/system/organizationAndProject/components/projectDrawer.vue b/frontend/src/views/setting/system/organizationAndProject/components/projectDrawer.vue
index 80770de9c2..b1ce467ca8 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/projectDrawer.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/projectDrawer.vue
@@ -1,5 +1,6 @@
 <template>
   <MsDrawer
+    :mask="false"
     :width="680"
     :visible="currentVisible"
     unmount-on-close
diff --git a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
index 41e173317e..aa59d3279d 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
@@ -12,8 +12,8 @@
     </template>
     <template #creator="{ record }">
       <span>{{ record.createUser }}</span>
-      <span v-if="record.orgAdmins.length > 0" class="text-[var(--color-text-4)]">{{
-        `&nbsp;(${t('common.admin')})`
+      <span v-if="record.orgCreateUserIsAdmin" class="ml-[8px] text-[var(--color-text-4)]">{{
+        `(${t('common.admin')})`
       }}</span>
     </template>
     <template #memberCount="{ record }">
diff --git a/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue b/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
index beee923e08..55cae8b737 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
@@ -12,7 +12,9 @@
     </template>
     <template #creator="{ record }">
       <span>{{ record.createUser }}</span>
-      <span v-if="record.creatorAdmin" class="text-[var(--color-text-4)]">{{ `&nbsp;(${t('common.admin')})` }}</span>
+      <span v-if="record.projectCreateUserIsAdmin" class="ml-[8px] text-[var(--color-text-4)]">{{
+        `(${t('common.admin')})`
+      }}</span>
     </template>
     <template #memberCount="{ record }">
       <span class="primary-color" @click="showUserDrawer(record)">{{ record.memberCount }}</span>
@@ -22,25 +24,30 @@
         <MsButton @click="handleRevokeDelete(record)">{{ t('common.revokeDelete') }}</MsButton>
       </template>
       <template v-else-if="!record.enable">
-        <MsButton @click="handleEnableOrDisableOrg(record)">{{ t('common.enable') }}</MsButton>
+        <MsButton @click="handleEnableOrDisableProject(record)">{{ t('common.enable') }}</MsButton>
         <MsButton @click="handleDelete(record)">{{ t('common.delete') }}</MsButton>
       </template>
       <template v-else>
         <MsButton @click="showOrganizationModal(record)">{{ t('common.edit') }}</MsButton>
         <MsButton @click="showAddUserModal(record)">{{ t('system.organization.addMember') }}</MsButton>
-        <MsButton @click="handleEnableOrDisableOrg(record, false)">{{ t('common.end') }}</MsButton>
+        <MsButton @click="handleEnableOrDisableProject(record, false)">{{ t('common.end') }}</MsButton>
         <MsTableMoreAction :list="tableActions" @select="handleMoreAction($event, record)"></MsTableMoreAction>
       </template>
     </template>
   </MsBaseTable>
-  <AddOrganizationModal
+  <AddProjectModal
     type="edit"
     :current-organization="currentUpdateOrganization"
     :visible="orgVisible"
     @cancel="handleAddOrgModalCancel"
   />
-  <AddUserModal :organization-id="currentOrganizationId" :visible="userVisible" @cancel="handleAddUserModalCancel" />
-  <UserDrawer v-bind="currentUserDrawer" @cancel="handleUserDrawerCancel" />
+  <AddUserModal :project-id="currentProjectId" :visible="userVisible" @cancel="handleAddUserModalCancel" />
+  <UserDrawer
+    :project-id="currentProjectId"
+    type="project"
+    v-bind="currentUserDrawer"
+    @cancel="handleUserDrawerCancel"
+  />
 </template>
 
 <script lang="ts" setup>
@@ -52,20 +59,20 @@
   import type { ActionsItem } from '@/components/pure/ms-table-more-action/types';
   import {
     postProjectTable,
-    deleteOrg,
+    deleteProject,
     enableOrDisableProject,
-    revokeDeleteOrg,
+    revokeDeleteProject,
   } from '@/api/modules/setting/system/organizationAndProject';
   import { TableKeyEnum } from '@/enums/tableEnum';
   import { MsTableColumn } from '@/components/pure/ms-table/type';
   import MsTableMoreAction from '@/components/pure/ms-table-more-action/index.vue';
   import MsButton from '@/components/pure/ms-button/index.vue';
-  import AddOrganizationModal from './addOrganizationModal.vue';
   import { Message, TableData } from '@arco-design/web-vue';
   import UserDrawer from './userDrawer.vue';
   import AddUserModal from './addUserModal.vue';
   import useModal from '@/hooks/useModal';
   import { CreateOrUpdateSystemOrgParams } from '@/models/setting/system/orgAndProject';
+  import AddProjectModal from './addProjectModal.vue';
 
   export interface SystemOrganizationProps {
     keyword: string;
@@ -77,7 +84,7 @@
   const tableStore = useTableStore();
   const userVisible = ref(false);
   const orgVisible = ref(false);
-  const currentOrganizationId = ref('');
+  const currentProjectId = ref('');
   const currentUpdateOrganization = ref<CreateOrUpdateSystemOrgParams>();
   const { openDeleteModal, openModal } = useModal();
 
@@ -133,7 +140,7 @@
 
   tableStore.initColumn(TableKeyEnum.SYSTEM_PROJECT, organizationColumns, 'drawer');
 
-  const { propsRes, propsEvent, loadList, setKeyword, setLoading } = useTable(postProjectTable, {
+  const { propsRes, propsEvent, loadList, setKeyword } = useTable(postProjectTable, {
     tableKey: TableKeyEnum.SYSTEM_PROJECT,
     scroll: { y: 'auto', x: '1300px' },
     selectable: false,
@@ -167,7 +174,7 @@
       content: t('system.organization.deleteTip'),
       onBeforeOk: async () => {
         try {
-          await deleteOrg(record.id);
+          await deleteProject(record.id);
           Message.success(t('common.deleteSuccess'));
           fetchData();
         } catch (error) {
@@ -184,9 +191,9 @@
     }
   };
 
-  const handleEnableOrDisableOrg = async (record: any, isEnable = true) => {
-    const title = isEnable ? t('system.organization.enableTitle') : t('system.organization.enableTitle');
-    const content = isEnable ? t('system.organization.enableContent') : t('system.organization.endContent');
+  const handleEnableOrDisableProject = async (record: any, isEnable = true) => {
+    const title = isEnable ? t('system.project.enableTitle') : t('system.project.endTitle');
+    const content = isEnable ? t('system.project.enableContent') : t('system.project.endContent');
     const okText = isEnable ? t('common.confirmEnable') : t('common.confirmClose');
     openModal({
       type: 'error',
@@ -209,7 +216,7 @@
   };
 
   const showOrganizationModal = (record: any) => {
-    currentOrganizationId.value = record.id;
+    currentProjectId.value = record.id;
     orgVisible.value = true;
     currentUpdateOrganization.value = {
       id: record.id,
@@ -220,7 +227,7 @@
   };
 
   const showAddUserModal = (record: any) => {
-    currentOrganizationId.value = record.id;
+    currentProjectId.value = record.id;
     userVisible.value = true;
   };
 
@@ -244,17 +251,24 @@
   };
 
   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);
-    }
+    openModal({
+      type: 'error',
+      cancelText: t('common.cancel'),
+      title: t('system.project.revokeDeleteTitle', { name: record.name }),
+      content: t('system.organization.enableContent'),
+      okText: t('common.revokeDelete'),
+      onBeforeOk: async () => {
+        try {
+          await revokeDeleteProject(record.id);
+          Message.success(t('common.revokeDeleteSuccess'));
+          fetchData();
+        } catch (error) {
+          // eslint-disable-next-line no-console
+          console.error(error);
+        }
+      },
+      hideCancel: false,
+    });
   };
 
   watch(
diff --git a/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue b/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue
index 187acd1e7b..021f8ebba5 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue
@@ -1,5 +1,6 @@
 <template>
   <MsDrawer
+    :mask="false"
     :width="680"
     :visible="currentVisible"
     unmount-on-close
@@ -37,7 +38,12 @@
       </ms-base-table>
     </div>
   </MsDrawer>
-  <AddUserModal :organization-id="props.organizationId" :visible="userVisible" @cancel="handleHideUserModal" />
+  <AddUserModal
+    :project-id="props.projectId"
+    :organization-id="props.organizationId"
+    :visible="userVisible"
+    @cancel="handleHideUserModal"
+  />
 </template>
 
 <script lang="ts" setup>
@@ -57,7 +63,8 @@
 
   export interface projectDrawerProps {
     visible: boolean;
-    organizationId: string;
+    organizationId?: string;
+    projectId?: string;
   }
   const { t } = useI18n();
   const props = defineProps<projectDrawerProps>();
@@ -121,7 +128,12 @@
 
   const handleRemove = async (record: TableData) => {
     try {
-      await deleteUserFromOrgOrProject(props.organizationId, record.id);
+      if (props.organizationId) {
+        await deleteUserFromOrgOrProject(props.organizationId, record.id);
+      }
+      if (props.projectId) {
+        await deleteUserFromOrgOrProject(props.projectId, record.id, true);
+      }
       Message.success(t('common.removeSuccess'));
       fetchData();
     } catch (error) {
diff --git a/frontend/src/views/setting/system/organizationAndProject/locale/en-US.ts b/frontend/src/views/setting/system/organizationAndProject/locale/en-US.ts
index bee337d676..230e05cd6c 100644
--- a/frontend/src/views/setting/system/organizationAndProject/locale/en-US.ts
+++ b/frontend/src/views/setting/system/organizationAndProject/locale/en-US.ts
@@ -54,4 +54,9 @@ export default {
   'system.organization.updateOrganizationSuccess': 'Update organization success',
   'system.organization.createProject': 'Create project',
   'system.organization.subordinateOrg': 'Subordinate organization',
+  'system.project.revokeDeleteTitle': 'Confirm revoke {name} ?',
+  'system.project.enableTitle': 'Start project',
+  'system.project.endTitle': 'Close project',
+  'system.project.enableContent': 'The project after opening is displayed in the organization switching list',
+  'system.project.endContent': 'The project after closing is not displayed in the project switching list',
 };
diff --git a/frontend/src/views/setting/system/organizationAndProject/locale/zh-CN.ts b/frontend/src/views/setting/system/organizationAndProject/locale/zh-CN.ts
index 6f7ca1159a..850584af9b 100644
--- a/frontend/src/views/setting/system/organizationAndProject/locale/zh-CN.ts
+++ b/frontend/src/views/setting/system/organizationAndProject/locale/zh-CN.ts
@@ -50,4 +50,9 @@ export default {
   'system.organization.updateOrganizationSuccess': '更新组织成功',
   'system.organization.createProject': '创建项目',
   'system.organization.subordinateOrg': '所属组织',
+  'system.project.revokeDeleteTitle': '确认恢复 {name} 这个项目吗？',
+  'system.project.enableTitle': '开启项目',
+  'system.project.endTitle': '关闭项目',
+  'system.project.enableContent': '开启后的项目展示在项目切换列表',
+  'system.project.endContent': '关闭后的项目不展示在项目切换列表',
 };
diff --git a/frontend/src/views/setting/system/usergroup/components/addUserModal.vue b/frontend/src/views/setting/system/usergroup/components/addUserModal.vue
index 48f13e9746..c3fbf0dcef 100644
--- a/frontend/src/views/setting/system/usergroup/components/addUserModal.vue
+++ b/frontend/src/views/setting/system/usergroup/components/addUserModal.vue
@@ -1,13 +1,11 @@
 <template>
   <a-modal
-    v-model="currentVisible"
+    v-model:visible="currentVisible"
     class="ms-modal-form ms-modal-medium"
     width="680px"
     text-align="start"
     :ok-text="t('system.userGroup.add')"
     unmount-on-close
-    :ok-loading="loading"
-    :on-before-ok="handleBeforeOk"
     @cancel="handleCancel"
   >
     <template #title> {{ t('system.userGroup.addUser') }} </template>
@@ -22,6 +20,14 @@
         </a-form-item>
       </a-form>
     </div>
+    <template #footer>
+      <a-button type="secondary" :loading="loading" @click="handleCancel">
+        {{ t('common.cancel') }}
+      </a-button>
+      <a-button type="primary" :loading="loading" :disabled="form.name.length === 0" @click="handleBeforeOk">
+        {{ t('common.add') }}
+      </a-button>
+    </template>
   </a-modal>
 </template>
 
diff --git a/frontend/src/views/setting/system/usergroup/components/authTable.vue b/frontend/src/views/setting/system/usergroup/components/authTable.vue
index 7737d076a8..372be029d4 100644
--- a/frontend/src/views/setting/system/usergroup/components/authTable.vue
+++ b/frontend/src/views/setting/system/usergroup/components/authTable.vue
@@ -40,12 +40,6 @@
         </a-table-column>
       </template>
     </a-table>
-    <div class="action">
-      <ms-button class="btn" @click="handleReset">{{ t('system.userGroup.reset') }}</ms-button>
-      <a-button class="btn" :disabled="!canSave" type="primary" @click="handleSave">{{
-        t('system.userGroup.save')
-      }}</a-button>
-    </div>
   </div>
 </template>
 
@@ -56,7 +50,6 @@
   import useUserGroupStore from '@/store/modules/setting/usergroup';
   import { getGlobalUSetting, saveGlobalUSetting } from '@/api/modules/setting/usergroup';
   import { UserGroupAuthSetting, AuthTableItem, type AuthScopeType, SavePermissions } from '@/models/setting/usergroup';
-  import MsButton from '@/components/pure/ms-button/index.vue';
 
   export declare type OperationName = 'selection-checkbox' | 'selection-radio' | 'expand' | 'drag-handle';
 
@@ -281,6 +274,11 @@
       initData(store.currentId);
     }
   });
+  defineExpose({
+    handleReset,
+    handleSave,
+    canSave,
+  });
 </script>
 
 <style scoped lang="less">
diff --git a/frontend/src/views/setting/system/usergroup/components/userTable.vue b/frontend/src/views/setting/system/usergroup/components/userTable.vue
index 595aab50a8..d2abb988dd 100644
--- a/frontend/src/views/setting/system/usergroup/components/userTable.vue
+++ b/frontend/src/views/setting/system/usergroup/components/userTable.vue
@@ -2,7 +2,11 @@
   <a-button type="primary" @click="handleAddUser">{{ t('system.userGroup.quickAddUser') }}</a-button>
   <MsBaseTable class="mt-[16px]" v-bind="propsRes" v-on="propsEvent">
     <template #action="{ record }">
-      <ms-button @click="handleRemove(record)">{{ t('system.userGroup.remove') }}</ms-button>
+      <MsRemoveButton
+        :title="t('system.userGroup.removeName', { name: record.name })"
+        :sub-title-tip="t('system.userGroup.removeTip')"
+        @ok="handleRemove(record)"
+      />
     </template>
   </MsBaseTable>
   <AddUserModal :visible="userVisible" @cancel="handleAddUserModalCancel" />
@@ -17,9 +21,9 @@
   import { postUserByUserGroup, deleteUserFromUserGroup } from '@/api/modules/setting/usergroup';
   import { UserTableItem } from '@/models/setting/usergroup';
   import { TableKeyEnum } from '@/enums/tableEnum';
-  import MsButton from '@/components/pure/ms-button/index.vue';
   import { MsTableColumn } from '@/components/pure/ms-table/type';
   import AddUserModal from './addUserModal.vue';
+  import MsRemoveButton from '@/components/bussiness/ms-remove-button/MsRemoveButton.vue';
 
   const { t } = useI18n();
   const store = useUserGroupStore();
@@ -33,28 +37,20 @@
     {
       title: 'system.userGroup.name',
       dataIndex: 'name',
-      showDrag: false,
-      showInTable: true,
     },
     {
       title: 'system.userGroup.email',
       dataIndex: 'email',
-      showDrag: false,
-      showInTable: true,
     },
     {
       title: 'system.userGroup.phone',
       dataIndex: 'email',
-      showDrag: true,
-      showInTable: true,
     },
     {
       title: 'system.userGroup.operation',
       slotName: 'action',
       fixed: 'right',
       width: 200,
-      showDrag: true,
-      showInTable: true,
     },
   ];
 
diff --git a/frontend/src/views/setting/system/usergroup/index.vue b/frontend/src/views/setting/system/usergroup/index.vue
index 01eb04662f..81a088ef3f 100644
--- a/frontend/src/views/setting/system/usergroup/index.vue
+++ b/frontend/src/views/setting/system/usergroup/index.vue
@@ -1,14 +1,14 @@
 <template>
   <MsCard simple>
     <div class="flex flex-row">
-      <div class="user-group-left">
+      <div class="user-group-left" :style="{ padding: collapse ? '24px 24px 24px 0' : 0 }">
         <user-group-left v-if="collapse" />
-        <div class="usergroup-collapse">
-          <icon-double-left v-if="collapse" class="icon" @click="collapse = false" />
-          <icon-double-right v-else class="icon" @click="collapse = true" />
+        <div class="usergroup-collapse" @click="handleCollapse">
+          <MsIcon v-if="collapse" type="icon-icon_up-left_outlined" class="icon" />
+          <MsIcon v-else type="icon-icon_down-right_outlined" class="icon" />
         </div>
       </div>
-      <div class="w-[100%] overflow-x-scroll p-[24px]">
+      <div class="relative w-[100%] overflow-x-scroll p-[24px]">
         <div class="flex flex-row items-center justify-between">
           <div class="title">{{ store.userGroupInfo.currentName }}</div>
           <div class="flex items-center">
@@ -27,11 +27,21 @@
         </div>
         <div class="mt-[16px]">
           <user-table v-if="currentTable === 'user'" :keyword="currentKeyword" />
-          <auth-table v-if="currentTable === 'auth'" />
+          <auth-table v-if="currentTable === 'auth'" ref="authRef" />
         </div>
       </div>
     </div>
   </MsCard>
+  <div
+    v-if="currentTable === 'auth'"
+    class="fixed bottom-[16px] right-[16px] z-[999] flex justify-between bg-white p-[24px] shadow-[0_-1px_4px_rgba(2,2,2,0.1)]"
+    :style="{ width: `calc(100% - ${menuWidth + 16}px)` }"
+  >
+    <ms-button class="btn" :disabled="!canSave" @click="handleReset">{{ t('system.userGroup.reset') }}</ms-button>
+    <a-button class="btn" :disabled="!canSave" type="primary" @click="handleSave">{{
+      t('system.userGroup.save')
+    }}</a-button>
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -42,12 +52,20 @@
   import UserGroupLeft from './components/index.vue';
   import UserTable from './components/userTable.vue';
   import AuthTable from './components/authTable.vue';
+  import MsIcon from '@/components/pure/ms-icon-font/index.vue';
+  import MsButton from '@/components/pure/ms-button/index.vue';
+  import { useAppStore } from '@/store';
 
   const currentTable = ref('auth');
-  const collapse = ref(true);
 
   const { t } = useI18n();
   const currentKeyword = ref('');
+  const authRef = ref<{
+    handleReset: () => void;
+    handleSave: () => void;
+    canSave: boolean;
+  }>();
+  const appStore = useAppStore();
 
   const handleSearch = (value: string) => {
     currentKeyword.value = value;
@@ -58,6 +76,10 @@
 
   const store = useUserGroupStore();
   const couldShowUser = computed(() => store.userGroupInfo.currentType === 'SYSTEM');
+  const handleCollapse = () => {
+    store.setCollapse(!store.collapse);
+  };
+  const collapse = computed(() => store.collapse);
   watch(
     () => couldShowUser.value,
     (val) => {
@@ -66,6 +88,26 @@
       }
     }
   );
+  const menuWidth = computed(() => {
+    const width = appStore.menuCollapse ? 86 : appStore.menuWidth;
+    if (store.collapse) {
+      return width + 300;
+    }
+    return width + 24;
+  });
+
+  const handleReset = () => {
+    authRef.value?.handleReset();
+  };
+  const handleSave = () => {
+    authRef.value?.handleSave();
+  };
+  const canSave = computed(() => {
+    if (currentTable.value === 'auth') {
+      return authRef.value?.canSave;
+    }
+    return true;
+  });
 </script>
 
 <style lang="scss" scoped>
@@ -77,19 +119,23 @@
   }
   .user-group-left {
     position: relative;
-    padding: 24px;
     border-right: 1px solid var(--color-border);
     .usergroup-collapse {
       position: absolute;
       top: 50%;
       right: -16px;
+      z-index: 100;
       display: flex;
       justify-content: center;
       align-items: center;
       width: 16px;
       height: 36px;
       background-color: var(--color-text-n8);
+      opacity: 0;
       cursor: pointer;
+      &:hover {
+        opacity: 1;
+      }
       .icon {
         font-size: 12px;
         color: var(--color-text-brand);
diff --git a/frontend/src/views/setting/system/usergroup/locale/en-US.ts b/frontend/src/views/setting/system/usergroup/locale/en-US.ts
index 4373d38851..c9ed5e503e 100644
--- a/frontend/src/views/setting/system/usergroup/locale/en-US.ts
+++ b/frontend/src/views/setting/system/usergroup/locale/en-US.ts
@@ -54,6 +54,8 @@ export default {
       phone: 'Phone',
       remove: 'Remove',
       quickAddUser: 'Quick add user',
+      removeName: 'Confirm to remove {name} this user',
+      removeTip: 'After removal, the User Group permission will be lost',
     },
   },
   permission: {
diff --git a/frontend/src/views/setting/system/usergroup/locale/zh-CN.ts b/frontend/src/views/setting/system/usergroup/locale/zh-CN.ts
index e5d841e2a2..54614ebea5 100644
--- a/frontend/src/views/setting/system/usergroup/locale/zh-CN.ts
+++ b/frontend/src/views/setting/system/usergroup/locale/zh-CN.ts
@@ -53,6 +53,8 @@ export default {
       phone: '手机',
       remove: '移除',
       quickAddUser: '快速添加用户',
+      removeName: '确认移除 {name} 这个用户吗',
+      removeTip: '移除后，将失去用户组权限',
     },
   },
   permission: {