diff --git a/frontend/public/templates/user_import_cn.xlsx b/frontend/public/templates/user_import_cn.xlsx
new file mode 100644
index 0000000000..9b6d1509e8
Binary files /dev/null and b/frontend/public/templates/user_import_cn.xlsx differ
diff --git a/frontend/public/templates/user_import.xlsx b/frontend/public/templates/user_import_en.xlsx
similarity index 100%
rename from frontend/public/templates/user_import.xlsx
rename to frontend/public/templates/user_import_en.xlsx
diff --git a/frontend/src/api/http/index.ts b/frontend/src/api/http/index.ts
index 5b14c907ac..2bbf7c2fee 100644
--- a/frontend/src/api/http/index.ts
+++ b/frontend/src/api/http/index.ts
@@ -183,7 +183,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
         // authenticationScheme: 'Bearer',
         authenticationScheme: '',
         baseURL: `${window.location.origin}/${import.meta.env.VITE_API_BASE_URL as string}`,
-        timeout: 60 * 1000,
+        timeout: 120 * 1000,
         headers: { 'Content-Type': ContentTypeEnum.JSON },
         // 如果是form-data格式
         // headers: { 'Content-Type': ContentTypeEnum.FORM_URLENCODED },
diff --git a/frontend/src/api/modules/case-management/featureCase.ts b/frontend/src/api/modules/case-management/featureCase.ts
index acf3d67c6b..a3cb580e73 100644
--- a/frontend/src/api/modules/case-management/featureCase.ts
+++ b/frontend/src/api/modules/case-management/featureCase.ts
@@ -1,4 +1,3 @@
-import { MsFileItem } from '@/components/pure/ms-upload/types';
 import { CommentItem, CommentParams } from '@/components/business/ms-comment/types';
 
 import MSR from '@/api/http/index';
@@ -53,7 +52,6 @@ import {
   GetRecycleCaseListUrl,
   GetRecycleCaseModulesCountUrl,
   GetReviewCommentListUrl,
-  GetReviewerListUrl,
   GetSearchCustomFieldsUrl,
   GetThirdDemandUrl,
   getTransferTreeUrl,
@@ -86,7 +84,6 @@ import type {
   CreateOrUpdateModule,
   DeleteCaseType,
   DemandItem,
-  DetailCase,
   DragCase,
   ImportExcelType,
   ModulesTreeType,
@@ -95,7 +92,7 @@ import type {
   UpdateModule,
 } from '@/models/caseManagement/featureCase';
 import type { CommonList, MoveModules, TableQueryParams } from '@/models/common';
-import type { UserListItem } from '@/models/setting/user';
+
 // 获取模块树
 export function getCaseModuleTree(params: TableQueryParams) {
   return MSR.get<ModulesTreeType[]>({ url: `${GetCaseModuleTreeUrl}/${params.projectId}` });
@@ -311,11 +308,6 @@ export function getDetailCaseReviewPage(data: TableQueryParams) {
   return MSR.post<CommonList<CaseManagementTable>>({ url: GetDetailCaseReviewUrl, data });
 }
 
-// 获取评审人列表
-export function getReviewerList(projectId: string, keyword: string) {
-  return MSR.get<UserListItem[]>({ url: `${GetReviewerListUrl}/${projectId}`, params: { keyword } });
-}
-
 // 用例接口用例分页列表
 export function getPublicLinkCaseList(data: TableQueryParams) {
   return MSR.post<CommonList<CaseManagementTable>>({ url: GetAssociationPublicCasePageUrl, data });
diff --git a/frontend/src/api/modules/project-management/project.ts b/frontend/src/api/modules/project-management/project.ts
index ffa6ee0ef5..b95c93f6a3 100644
--- a/frontend/src/api/modules/project-management/project.ts
+++ b/frontend/src/api/modules/project-management/project.ts
@@ -4,7 +4,7 @@ import { ProjectListUrl, ProjectSwitchUrl } from '@/api/requrls/project-manageme
 import type { ProjectListItem } from '@/models/setting/project';
 
 export function getProjectList(organizationId: string) {
-  return MSR.get<ProjectListItem[]>({ url: ProjectListUrl, params: organizationId });
+  return MSR.get<ProjectListItem[]>({ url: ProjectListUrl, params: organizationId }, { ignoreCancelToken: true });
 }
 
 export function switchProject(data: { projectId: string; userId: string }) {
diff --git a/frontend/src/api/modules/project-management/projectMember.ts b/frontend/src/api/modules/project-management/projectMember.ts
index a87d8efa1d..27c872134d 100644
--- a/frontend/src/api/modules/project-management/projectMember.ts
+++ b/frontend/src/api/modules/project-management/projectMember.ts
@@ -5,11 +5,13 @@ import {
   BatchRemoveMemberUrl,
   EditProjectMemberUrl,
   GetProjectMemberListUrl,
+  ProjectMemberCommentOptions,
   ProjectMemberOptions,
   ProjectUserGroupUrl,
   RemoveProjectMemberUrl,
 } from '@/api/requrls/project-management/projectMember';
 
+import { ReviewUserItem } from '@/models/caseManagement/caseReview';
 import type { CommonList, TableQueryParams } from '@/models/common';
 import type { ActionProjectMember, ProjectMemberItem } from '@/models/projectManagement/projectAndPermission';
 
@@ -50,3 +52,11 @@ export function getProjectUserGroup(projectId: string) {
 export function getProjectMemberOptions(projectId: string, keyword?: string) {
   return MSR.get({ url: `${ProjectMemberOptions}/${projectId}`, params: { keyword } });
 }
+
+// 项目成员-@成员下拉选项
+export function getProjectMemberCommentOptions(projectId: string, keyword?: string) {
+  return MSR.get<ReviewUserItem[]>({
+    url: `${ProjectMemberCommentOptions}/${projectId}`,
+    params: { keyword },
+  });
+}
diff --git a/frontend/src/api/modules/setting/user.ts b/frontend/src/api/modules/setting/user.ts
index b27a0cac8e..f77436da6f 100644
--- a/frontend/src/api/modules/setting/user.ts
+++ b/frontend/src/api/modules/setting/user.ts
@@ -22,6 +22,7 @@ import type { CommonList, TableQueryParams } from '@/models/common';
 import type {
   BatchAddParams,
   CreateUserParams,
+  CreateUserResult,
   DeleteUserParams,
   ImportResult,
   ImportUserParams,
@@ -35,6 +36,8 @@ import type {
   UserListItem,
 } from '@/models/setting/user';
 
+import { Result } from '#/axios';
+
 // 获取用户列表
 export function getUserList(data: TableQueryParams) {
   return MSR.post<CommonList<UserListItem>>({ url: GetUserListUrl, data });
@@ -42,7 +45,7 @@ export function getUserList(data: TableQueryParams) {
 
 // 批量创建用户
 export function batchCreateUser(data: CreateUserParams) {
-  return MSR.post({ url: CreateUserUrl, data });
+  return MSR.post<CreateUserResult>({ url: CreateUserUrl, data });
 }
 
 // 更新用户信息
@@ -68,7 +71,7 @@ export function deleteUserInfo(data: DeleteUserParams) {
 
 // 导入用户
 export function importUserInfo(data: ImportUserParams) {
-  return MSR.uploadFile<ImportResult>({ url: ImportUserUrl }, data);
+  return MSR.uploadFile<Result<ImportResult>>({ url: ImportUserUrl }, data);
 }
 
 // 获取系统用户组
diff --git a/frontend/src/api/requrls/case-management/featureCase.ts b/frontend/src/api/requrls/case-management/featureCase.ts
index cbcbf7de1f..026c91583e 100644
--- a/frontend/src/api/requrls/case-management/featureCase.ts
+++ b/frontend/src/api/requrls/case-management/featureCase.ts
@@ -104,8 +104,6 @@ export const UpdateCommentItemUrl = '/functional/case/comment/update';
 export const DeleteCommentItemUrl = '/functional/case/comment/delete';
 // 获取详情用例评审
 export const GetDetailCaseReviewUrl = '/functional/case/review/page';
-// 获取有权限的评审人
-export const GetReviewerListUrl = '/case/review/user-option';
 // 获取用例详情弹窗关联用例接口用例
 export const GetAssociationPublicCasePageUrl = '/functional/case/test/associate/case/page';
 // 获取接口测试接口模块数量
diff --git a/frontend/src/api/requrls/project-management/projectMember.ts b/frontend/src/api/requrls/project-management/projectMember.ts
index e2ca60a91c..b1da9cf9e1 100644
--- a/frontend/src/api/requrls/project-management/projectMember.ts
+++ b/frontend/src/api/requrls/project-management/projectMember.ts
@@ -6,3 +6,4 @@ export const RemoveProjectMemberUrl = '/project/member/remove';
 export const BatchAddUserGroup = '/project/member/add-role';
 export const ProjectUserGroupUrl = '/project/member/get-role/option';
 export const ProjectMemberOptions = '/project/member/get-member/option';
+export const ProjectMemberCommentOptions = '/project/member/comment/user-option'; // 项目成员-@成员下拉列表
diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less
index 6e38e16e1c..473a417e30 100644
--- a/frontend/src/assets/style/arco-reset.less
+++ b/frontend/src/assets/style/arco-reset.less
@@ -213,6 +213,9 @@
   .btn-outline-danger-active();
   .btn-outline-danger-disabled();
 }
+.arco-btn-size-mini {
+  line-height: 16px;
+}
 
 /** 输入框，选择器，文本域 **/
 .arco-select {
@@ -311,6 +314,14 @@
     }
   }
 }
+.arco-input-suffix {
+  .arco-icon-hover {
+    .arco-icon-eye-invisible,
+    .arco-icon-eye {
+      color: var(--color-text-brand);
+    }
+  }
+}
 .arco-textarea {
   .ms-scroll-bar();
 
diff --git a/frontend/src/components/business/ms-batch-form/index.vue b/frontend/src/components/business/ms-batch-form/index.vue
index f73ae3f2ce..cbc918c226 100644
--- a/frontend/src/components/business/ms-batch-form/index.vue
+++ b/frontend/src/components/business/ms-batch-form/index.vue
@@ -126,6 +126,7 @@
               />
             </div>
             <div
+              v-if="!props.hideAdd"
               v-show="form.list.length > 1"
               class="minus"
               :class="[
@@ -169,6 +170,7 @@
 
   import type { FormItemModel, FormMode } from './types';
   import type { FormInstance, ValidatedError } from '@arco-design/web-vue';
+  import { FieldData } from '@arco-design/web-vue/es/form/interface';
 
   const { t } = useI18n();
 
@@ -182,10 +184,12 @@
       isShowDrag?: boolean; // 是否可以拖拽
       formWidth?: string; // 自定义表单区域宽度
       showEnable?: boolean; // 是否显示启用禁用switch状态
+      hideAdd?: boolean; // 是否隐藏添加按钮
     }>(),
     {
       maxHeight: '30vh',
       isShowDrag: false,
+      hideAdd: false,
     }
   );
 
@@ -292,10 +296,15 @@
     formRef.value?.resetFields();
   }
 
+  function setFields(data: Record<string, FieldData>) {
+    formRef.value?.setFields(data);
+  }
+
   defineExpose({
     formValidate,
     getFormResult,
     resetForm,
+    setFields,
   });
 </script>
 
diff --git a/frontend/src/components/business/ms-cascader/index.vue b/frontend/src/components/business/ms-cascader/index.vue
index 41fc70c34e..86da8057e5 100644
--- a/frontend/src/components/business/ms-cascader/index.vue
+++ b/frontend/src/components/business/ms-cascader/index.vue
@@ -22,7 +22,7 @@
       {{ props.prefix }}
     </template>
     <template #label="{ data }">
-      <a-tooltip :content="getInputLabel(data)" position="top" :mouse-enter-delay="500" mini>
+      <a-tooltip :content="getInputLabelTooltip(data)" position="top" :mouse-enter-delay="500" mini>
         <div class="one-line-text inline-block">{{ getInputLabel(data) }}</div>
       </a-tooltip>
     </template>
@@ -64,7 +64,7 @@
     </template>
     <template #label="{ data }">
       <slot name="label" :data="{ ...data, [props.labelKey]: getInputLabel(data) }">
-        <a-tooltip :content="getInputLabel(data)" position="top" :mouse-enter-delay="500" mini>
+        <a-tooltip :content="getInputLabelTooltip(data)" position="top" :mouse-enter-delay="500" mini>
           <div class="one-line-text inline translate-y-[15%]">
             {{ getInputLabel(data) }}
           </div>
@@ -85,6 +85,7 @@
 
 <script setup lang="ts">
   import { Ref, ref, watch } from 'vue';
+  import { useVModel } from '@vueuse/core';
 
   import { useI18n } from '@/hooks/useI18n';
   import useSelect from '@/hooks/useSelect';
@@ -125,8 +126,9 @@
   const { t } = useI18n();
 
   const innerValue = ref<CascaderModelValue>([]);
-  const innerLevel = ref(''); // 顶级选项，该级别为单选选项
+  const innerLevel = useVModel(props, 'level', emit); // 顶级选项，该级别为单选选项
   const cascader: Ref = ref(null);
+  let selectedLabelObj: Record<string, any> = {}; // 存储已选的选项的label，用于多选时展示全部选项的 tooltip
 
   const { maxTagCount, getOptionComputedStyle, calculateMaxTag } = useSelect({
     selectRef: cascader,
@@ -158,6 +160,16 @@
   watch(
     () => innerValue.value,
     (val) => {
+      if (Array.isArray(val)) {
+        // 选项变化时，清理一次已选的选项的label对象
+        const tempObj: Record<string, any> = {};
+        for (let i = 0; i < val.length; i++) {
+          if (selectedLabelObj[val[i]]) {
+            tempObj[val[i]] = selectedLabelObj[val[i]];
+          }
+        }
+        selectedLabelObj = { ...tempObj };
+      }
       emit('update:modelValue', val);
       if (val === '') {
         innerLevel.value = '';
@@ -166,23 +178,6 @@
     }
   );
 
-  watch(
-    () => props.level,
-    (val) => {
-      innerLevel.value = val || '';
-    },
-    {
-      immediate: true,
-    }
-  );
-
-  watch(
-    () => innerLevel.value,
-    (val) => {
-      emit('update:level', val);
-    }
-  );
-
   interface CascaderValue {
     level: keyof typeof props.levelTop;
     value: string;
@@ -213,13 +208,25 @@
     calculateMaxTag();
   }
 
-  // TODO: 临时解决 arco-design 的 cascader 组件绑定值只能是 path-mode 的问题，如果实际值也包含了 ‘-’，则不要取这个值，而是取绑定的 v-model 的值
+  // TODO: 临时解决 arco-design 的 cascader 组件已选项的label只能是带路径‘/’的 path-mode 的问题
   function getInputLabel(data: CascaderOption) {
     const isTagCount = data[props.labelKey].includes('+');
     if (!props.pathMode) {
-      return isTagCount ? data[props.labelKey] : t(data[props.labelKey].split('-').pop());
+      return isTagCount ? data.label : t((data.label || '').split('/').pop() || ''); // 取路径最后一级
     }
-    return isTagCount ? data[props.labelKey] : t(data[props.labelKey]);
+    return isTagCount ? data.label || '' : t(data.label || '');
+  }
+
+  function getInputLabelTooltip(data: CascaderOption) {
+    const isTagCount = data[props.labelKey].includes('+');
+    if (isTagCount && Array.isArray(innerValue.value)) {
+      return Object.values(selectedLabelObj).join('，');
+    }
+    const label = getInputLabel(data);
+    if (data.value && typeof data.value === 'string') {
+      selectedLabelObj[data.value] = label;
+    }
+    return label;
   }
 
   function clearValues() {
diff --git a/frontend/src/components/business/ms-case-associate/index.vue b/frontend/src/components/business/ms-case-associate/index.vue
index 813dd2eaf1..20be7a9829 100644
--- a/frontend/src/components/business/ms-case-associate/index.vue
+++ b/frontend/src/components/business/ms-case-associate/index.vue
@@ -360,10 +360,8 @@
     },
   ];
 
-  const getTableList = computed(() => props.getTableFunc);
-
   const { propsRes, propsEvent, loadList, setLoadListParams, resetSelector } = useTable(
-    getTableList.value,
+    props.getTableFunc,
     {
       columns,
       showSetting: false,
diff --git a/frontend/src/components/business/ms-menu/index.vue b/frontend/src/components/business/ms-menu/index.vue
index 63c69dccfb..a3f64f5d4d 100644
--- a/frontend/src/components/business/ms-menu/index.vue
+++ b/frontend/src/components/business/ms-menu/index.vue
@@ -18,8 +18,6 @@
   import { openWindow, regexUrl } from '@/utils';
   import { listenerRouteChange } from '@/utils/route-listener';
 
-  import { WorkbenchRouteEnum } from '@/enums/routeEnum';
-
   import useMenuTree from './use-menu-tree';
   import type { RouteMeta } from 'vue-router';
 
@@ -125,15 +123,22 @@
 
       async function switchOrg(id: string) {
         try {
-          Message.loading(t('personal.switchOrgLoading'));
+          appStore.showLoading(t('personal.switchOrgLoading'));
           await switchUserOrg(id, userStore.id || '');
           switchOrgVisible.value = false;
-          Message.clear();
+          appStore.hideLoading();
           Message.success(t('personal.switchOrgSuccess'));
           personalMenusVisible.value = false;
           orgKeyword.value = '';
-          await router.replace({ name: WorkbenchRouteEnum.WORKBENCH });
-          userStore.isLogin();
+          await userStore.isLogin(true);
+          router.replace({
+            path: route.path,
+            query: {
+              ...route.query,
+              organizationId: appStore.currentOrgId,
+              projectId: appStore.currentProjectId,
+            },
+          });
         } catch (error) {
           // eslint-disable-next-line no-console
           console.log(error);
@@ -212,7 +217,7 @@
         return (
           <a-trigger
             v-model:popup-visible={personalMenusVisible.value}
-            trigger="click"
+            trigger="hover"
             unmount-on-close={false}
             popup-offset={4}
             position="right"
@@ -309,7 +314,7 @@
             }}
           >
             <a-menu-item class="flex items-center justify-between" key="personalInfo">
-              <div class="flex items-center gap-[8px] hover:!bg-transparent">
+              <div class="relative flex items-center gap-[8px] hover:!bg-transparent">
                 <MsAvatar avatar={userStore.avatar} size={20} />
                 {userStore.name}
               </div>
@@ -427,6 +432,7 @@
           @apply !bg-transparent;
         }
         .arco-menu-icon {
+          margin-right: 8px;
           .arco-icon {
             &:not(.arco-icon-down) {
               font-size: 18px;
@@ -456,6 +462,9 @@
       }
       .arco-menu-pop {
         @apply bg-transparent;
+        &:hover {
+          background-color: rgb(var(--primary-1)) !important;
+        }
       }
     }
   }
@@ -464,6 +473,10 @@
   }
   .arco-menu-collapsed {
     width: 86px;
+    .arco-avatar,
+    .arco-icon {
+      margin-right: 2px !important;
+    }
   }
   .arco-menu {
     &:hover {
@@ -484,6 +497,9 @@
       }
     }
   }
+  .arco-menu-item-tooltip {
+    @apply hidden;
+  }
   .switch-org-dropdown {
     @apply absolute max-h-none;
 
diff --git a/frontend/src/components/business/ms-params-input/paramsInputGroup.vue b/frontend/src/components/business/ms-params-input/paramsInputGroup.vue
index bd97f71e74..253dd9958f 100644
--- a/frontend/src/components/business/ms-params-input/paramsInputGroup.vue
+++ b/frontend/src/components/business/ms-params-input/paramsInputGroup.vue
@@ -18,7 +18,7 @@
       type="button"
     >
       <a-radio v-for="(option, i) of group.options || []" :key="`option${i}`" :value="option.value">
-        {{ t(option.label) }}
+        {{ t(option.label || '') }}
       </a-radio>
     </a-radio-group>
     <a-date-picker
diff --git a/frontend/src/components/business/ms-personal-drawer/components/apiKey.vue b/frontend/src/components/business/ms-personal-drawer/components/apiKey.vue
index 0ac2a86757..46294efeea 100644
--- a/frontend/src/components/business/ms-personal-drawer/components/apiKey.vue
+++ b/frontend/src/components/business/ms-personal-drawer/components/apiKey.vue
@@ -92,7 +92,7 @@
   </div>
   <a-modal
     v-model:visible="timeModalVisible"
-    :title="t('ms.personal.changeAvatar')"
+    :title="t('ms.personal.setValidTime')"
     title-align="start"
     :ok-text="t('common.save')"
     class="ms-usemodal"
diff --git a/frontend/src/components/business/ms-personal-drawer/components/baseInfo.vue b/frontend/src/components/business/ms-personal-drawer/components/baseInfo.vue
index beb0c2c13f..cbc1422ca8 100644
--- a/frontend/src/components/business/ms-personal-drawer/components/baseInfo.vue
+++ b/frontend/src/components/business/ms-personal-drawer/components/baseInfo.vue
@@ -253,11 +253,20 @@
 
   const avatarModalVisible = ref(false);
   const avatarList = ref<string[]>([]);
-  let i = 1;
-  while (i <= 46) {
-    avatarList.value.push(`/images/avatar/avatar-${i}.jpg`);
-    i++;
-  }
+
+  watch(
+    () => avatarModalVisible.value,
+    (val) => {
+      if (val && avatarList.value.length === 0) {
+        // 初始化头像列表，避免一开始就加载所有头像
+        let i = 1;
+        while (i <= 46) {
+          avatarList.value.push(`/images/avatar/avatar-${i}.jpg`);
+          i++;
+        }
+      }
+    }
+  );
 
   function changeAvatar(avatar: string) {
     activeAvatar.value = avatar;
diff --git a/frontend/src/components/business/ms-personal-drawer/index.vue b/frontend/src/components/business/ms-personal-drawer/index.vue
index a47de9dc7d..6d4b5996b5 100644
--- a/frontend/src/components/business/ms-personal-drawer/index.vue
+++ b/frontend/src/components/business/ms-personal-drawer/index.vue
@@ -22,6 +22,8 @@
 </template>
 
 <script setup lang="ts">
+  import { useVModel } from '@vueuse/core';
+
   import MsDrawer from '@/components/pure/ms-drawer/index.vue';
   import MsMenuPanel from '@/components/pure/ms-menu-panel/index.vue';
   import apiKey from './components/apiKey.vue';
@@ -41,27 +43,9 @@
 
   const { t } = useI18n();
 
-  const innerVisible = ref(false);
-
-  watch(
-    () => props.visible,
-    (val) => {
-      innerVisible.value = val;
-    }
-  );
-
+  const innerVisible = useVModel(props, 'visible', emit);
   const activeMenu = ref('baseInfo');
 
-  watch(
-    () => innerVisible.value,
-    (val) => {
-      emit('update:visible', val);
-      if (!val) {
-        activeMenu.value = 'baseInfo';
-      }
-    }
-  );
-
   const menuList = ref([
     {
       name: 'personal',
diff --git a/frontend/src/components/business/ms-personal-drawer/locale/en-US.ts b/frontend/src/components/business/ms-personal-drawer/locale/en-US.ts
index 2f7d13c072..fa70cf2c4a 100644
--- a/frontend/src/components/business/ms-personal-drawer/locale/en-US.ts
+++ b/frontend/src/components/business/ms-personal-drawer/locale/en-US.ts
@@ -25,7 +25,7 @@ export default {
   'ms.personal.avatar': 'Avatar{index}',
   'ms.personal.currentPsw': 'Current Password',
   'ms.personal.newPsw': 'New Password',
-  'ms.personal.changePswTip': 'After changing the password, you need to use the new email to log in to the system',
+  'ms.personal.changePswTip': 'After changing the password, you need to use the new password to log in to the system',
   'ms.personal.updatePswSuccess':
     'The password has been modified successfully and will automatically log out in {count} seconds. Please log in with the new password.',
   'ms.personal.apiKeyTip': 'After adding, you can access MeterSphere',
@@ -33,6 +33,7 @@ export default {
   'ms.personal.expired': 'Expired',
   'ms.personal.expiredTip': 'The expiration time can be changed in [Settings]',
   'ms.personal.validTime': 'Effective time',
+  'ms.personal.setValidTime': 'Set effective time',
   'ms.personal.desc': 'Description',
   'ms.personal.createTime': 'Created time',
   'ms.personal.copySuccess': 'Copied successfully',
diff --git a/frontend/src/components/business/ms-personal-drawer/locale/zh-CN.ts b/frontend/src/components/business/ms-personal-drawer/locale/zh-CN.ts
index ea39793e04..2e1fde0e5d 100644
--- a/frontend/src/components/business/ms-personal-drawer/locale/zh-CN.ts
+++ b/frontend/src/components/business/ms-personal-drawer/locale/zh-CN.ts
@@ -7,7 +7,7 @@ export default {
   'ms.personal.apiKey': 'APIKEY',
   'ms.personal.tripartite': '三方平台账号',
   'ms.personal.changeAvatar': '更换头像',
-  'ms.personal.name': '用户名称',
+  'ms.personal.name': '用户姓名',
   'ms.personal.namePlaceholder': '请输入用户名称',
   'ms.personal.nameRequired': '用户名称不能为空',
   'ms.personal.email': '邮箱',
@@ -24,13 +24,14 @@ export default {
   'ms.personal.avatar': '头像{index}',
   'ms.personal.currentPsw': '当前密码',
   'ms.personal.newPsw': '新密码',
-  'ms.personal.changePswTip': '修改密码后，需要使用新的邮箱登录系统',
+  'ms.personal.changePswTip': '修改密码后，需要使用新的密码登录系统',
   'ms.personal.updatePswSuccess': '密码修改成功，将在 {count} 秒后自动退出，请使用新密码登录',
   'ms.personal.apiKeyTip': '新增后，可访问 MeterSphere',
   'ms.personal.expireTime': '过期时间',
   'ms.personal.expired': '已到期',
   'ms.personal.expiredTip': '可在【设置】内更改到期时间',
   'ms.personal.validTime': '有效时间',
+  'ms.personal.setValidTime': '设置有效时间',
   'ms.personal.desc': '描述',
   'ms.personal.createTime': '创建时间',
   'ms.personal.copySuccess': '复制成功',
diff --git a/frontend/src/components/business/ms-select/index.tsx b/frontend/src/components/business/ms-select/index.tsx
index e44995a85d..688d02afe1 100644
--- a/frontend/src/components/business/ms-select/index.tsx
+++ b/frontend/src/components/business/ms-select/index.tsx
@@ -36,9 +36,13 @@ export interface MsSearchSelectProps {
   triggerProps?: TriggerProps; // 触发器属性
   loading?: boolean; // 加载状态
   fallbackOption?: boolean | ((value: string | number | boolean | Record<string, unknown>) => SelectOptionData); // 自定义值中不存在的选项
+  shouldCalculateMaxTag?: boolean; // 是否需要计算最大展示选项数量
+  disabled?: boolean; // 是否禁用
+  size?: 'mini' | 'small' | 'medium' | 'large'; // 尺寸
   remoteFunc?(params: Record<string, any>): Promise<any>; // 远程模式下的请求函数，返回一个 Promise
   optionLabelRender?: (item: SelectOptionData) => string; // 自定义 option 的 label 渲染，返回一个 html 字符串，默认使用 item.label
   optionTooltipContent?: (item: SelectOptionData) => string; // 自定义 option 的 tooltip 内容，返回一个字符串，默认使用 item.label
+  remoteFilterFunc?: (options: SelectOptionData[]) => SelectOptionData[]; // 自定义过滤函数，会在远程请求返回数据后执行
 }
 export interface RadioProps {
   options: SelectOptionData[];
@@ -61,6 +65,8 @@ export default defineComponent(
     const { t } = useI18n();
 
     const innerValue = ref(props.modelValue);
+    const inputValue = ref('');
+    const tempInputValue = ref('');
     const filterOptions = ref<SelectOptionData[]>([...props.options]); // 实际渲染的 options，会根据搜索关键字进行过滤
     const remoteOriginOptions = ref<SelectOptionData[]>([...props.options]); // 远程模式下的原始 options，接口返回的数据会存储在这里
 
@@ -68,7 +74,7 @@ export default defineComponent(
     const { maxTagCount, getOptionComputedStyle, singleTagMaxWidth, calculateMaxTag } = useSelect({
       selectRef,
       selectVal: innerValue,
-      isCascade: true,
+      isCascade: false,
       valueKey: props.valueKey,
       labelKey: props.labelKey,
     });
@@ -77,8 +83,8 @@ export default defineComponent(
       () => props.modelValue,
       (val) => {
         innerValue.value = val;
-        if (Array.isArray(val) && val.length > 0 && props.multiple) {
-          calculateMaxTag(remoteOriginOptions.value);
+        if (props.shouldCalculateMaxTag !== false && props.multiple) {
+          calculateMaxTag();
         }
       },
       {
@@ -139,6 +145,9 @@ export default defineComponent(
               return item;
             }
           );
+          if (props.remoteFilterFunc && typeof props.remoteFilterFunc === 'function') {
+            remoteOriginOptions.value = props.remoteFilterFunc(remoteOriginOptions.value);
+          }
           emit('remoteSearch', remoteOriginOptions.value);
         }
         if (val.trim() === '') {
@@ -161,10 +170,10 @@ export default defineComponent(
               for (let i = 0; i < props.searchKeys.length; i++) {
                 // 遍历传入的搜索字段
                 const key = props.searchKeys[i];
-                if (e[key].includes(val)) {
+                if (e[key]?.toLowerCase().includes(val.toLowerCase())) {
                   // 是否匹配
                   hasMatch = true;
-                  item[key] = e[key].replace(new RegExp(val, 'gi'), highlightedKeyword); // 高亮关键字替换
+                  item[props.labelKey || 'label'] = e[key].replace(new RegExp(val, 'gi'), highlightedKeyword); // 高亮关键字替换
                 }
               }
             }
@@ -180,6 +189,9 @@ export default defineComponent(
             return null;
           })
           .filter((e) => e) as SelectOptionData[];
+        if (props.shouldCalculateMaxTag !== false && props.multiple) {
+          calculateMaxTag();
+        }
       } catch (error) {
         // eslint-disable-next-line no-console
         console.log(error);
@@ -188,13 +200,14 @@ export default defineComponent(
       }
     }
 
-    const optionItemLabelRender = (item: SelectOptionData) =>
-      h('div', {
+    const optionItemLabelRender = (item: SelectOptionData) => {
+      return h('div', {
         innerHTML:
           typeof props.optionLabelRender === 'function'
             ? props.optionLabelRender(item)
             : item[props.labelKey || 'label'],
       });
+    };
 
     // 半选状态
     const indeterminate = computed(() => {
@@ -238,17 +251,24 @@ export default defineComponent(
             handleSelectAllChange(true);
           }
         }
-        calculateMaxTag(val);
+        if (props.shouldCalculateMaxTag !== false && props.multiple) {
+          calculateMaxTag();
+        }
       }
     );
 
     function getOptionItemDisabled(item: SelectOptionData) {
       return (
-        !!props.multiple &&
-        !!props.atLeastOne &&
-        Array.isArray(innerValue.value) &&
-        !!innerValue.value.find((e) => e[props.valueKey || 'value'] === item[props.valueKey || 'value']) &&
-        innerValue.value.length === 1
+        !!item.disabled ||
+        (!!props.multiple &&
+          !!props.atLeastOne &&
+          Array.isArray(innerValue.value) &&
+          !!innerValue.value.find((e) =>
+            props.objectValue
+              ? e[props.valueKey || 'value'] === item[props.valueKey || 'value']
+              : e === item[props.valueKey || 'value']
+          ) &&
+          innerValue.value.length === 1)
       );
     }
 
@@ -340,57 +360,110 @@ export default defineComponent(
       }
     });
 
+    /**
+     * 处理选择器值变化
+     * @param value
+     */
+    function handleChange(value: ModelType) {
+      if (props.multiple) {
+        nextTick(() => {
+          inputValue.value = tempInputValue.value;
+        });
+      }
+      emit('update:modelValue', value);
+      emit('change', value);
+    }
+
+    /**
+     * 处理输入框搜索值变化
+     * @param val 搜索值
+     */
+    function handleInputValueChange(val: string) {
+      inputValue.value = val;
+      if (val !== '') {
+        // 只存储有值的搜索值，因为当搜索完选中一个选项后，arco-select 会自动清空输入框，这里需要过滤掉
+        tempInputValue.value = val;
+      }
+    }
+
+    const selectFullTooltip = computed(() => {
+      const values = Array.isArray(innerValue.value) ? innerValue.value : [innerValue.value];
+      let tooltip = '';
+      if (props.objectValue) {
+        // 对象模式下，直接取 tooltipContent 或 label(若搜索的情况下会携带高亮代码，所以优先取tooltipContent)
+        tooltip = values.map((e) => e.tooltipContent || e[props.labelKey || 'label']).join('，');
+      } else {
+        // 非对象模式下，需要根据 valueKey 取 label
+        tooltip = remoteOriginOptions.value
+          .filter((e) => values.includes(e[props.valueKey || 'value']))
+          .map((e) => e[props.labelKey || 'label'])
+          .join('，');
+      }
+      return tooltip;
+    });
+
     return () => (
-      <a-select
-        ref={selectRef}
-        default-value={innerValue}
-        placeholder={t(props.placeholder || '')}
-        allow-clear={props.allowClear}
-        allow-search={props.allowSearch}
-        filter-option={false}
-        loading={loading.value}
-        multiple={props.multiple}
-        max-tag-count={maxTagCount.value}
-        search-delay={300}
-        class="ms-select"
-        value-key={props.valueKey || 'value'}
-        popup-container={props.popupContainer || document.body}
-        trigger-props={props.triggerProps}
-        fallback-option={props.fallbackOption}
-        onChange={(value: ModelType) => {
-          emit('update:modelValue', value);
-          emit('change', value);
-        }}
-        onSearch={handleSearch}
-        onPopupVisibleChange={(val: boolean) => {
-          handleSearch('', true);
-          emit('popupVisibleChange', val);
-        }}
-        onRemove={(val: string | number | boolean | Record<string, any> | undefined) => emit('remove', val)}
-        onKeyup={(e: KeyboardEvent) => {
-          // 阻止组件在回车时自动触发的事件
-          if (e.code === 'Enter') {
-            e.preventDefault();
-            e.stopPropagation();
-            handleSearch('', true);
-          }
-        }}
-      >
-        {{
-          prefix: props.prefix ? () => t(props.prefix || '') : null,
-          label: ({ data }: { data: SelectOptionData }) => (
-            <a-tooltip content={data.label} position="top" mouse-enter-delay={500} mini>
-              <div
-                class="one-line-text"
-                style={singleTagMaxWidth.value > 0 ? { maxWidth: `${singleTagMaxWidth.value}px` } : {}}
-              >
-                {slots.label ? slots.label(data) : data.label}
-              </div>
-            </a-tooltip>
-          ),
-          ...selectSlots(),
-        }}
-      </a-select>
+      <div class="w-full">
+        <a-tooltip content={selectFullTooltip.value} position="top" mouse-enter-delay={500} mini>
+          <a-select
+            ref={selectRef}
+            class="ms-select"
+            default-value={innerValue}
+            input-value={inputValue.value}
+            placeholder={t(props.placeholder || '')}
+            allow-clear={props.allowClear}
+            allow-search={props.allowSearch}
+            filter-option={true}
+            loading={loading.value}
+            multiple={props.multiple}
+            max-tag-count={maxTagCount.value}
+            search-delay={300}
+            value-key={props.valueKey || 'value'}
+            popup-container={props.popupContainer || document.body}
+            trigger-props={props.triggerProps}
+            fallback-option={props.fallbackOption}
+            disabled={props.disabled}
+            size={props.size}
+            onChange={handleChange}
+            onSearch={handleSearch}
+            onPopupVisibleChange={(val: boolean) => {
+              if (val) {
+                handleSearch('', true);
+              } else {
+                inputValue.value = '';
+                tempInputValue.value = '';
+              }
+              emit('popupVisibleChange', val);
+            }}
+            onRemove={(val: string | number | boolean | Record<string, any> | undefined) => emit('remove', val)}
+            onKeyup={(e: KeyboardEvent) => {
+              // 阻止组件在回车时自动触发的事件
+              if (e.code === 'Enter') {
+                e.preventDefault();
+                e.stopPropagation();
+                handleSearch('', true);
+              }
+              if (e.code === 'Backspace' && inputValue.value === '') {
+                tempInputValue.value = '';
+              }
+            }}
+            onInputValueChange={handleInputValueChange}
+          >
+            {{
+              prefix: props.prefix ? () => t(props.prefix || '') : null,
+              label: ({ data }: { data: SelectOptionData }) => (
+                <div
+                  class="one-line-text"
+                  style={singleTagMaxWidth.value > 0 ? { maxWidth: `${singleTagMaxWidth.value}px` } : {}}
+                >
+                  {slots.label ? slots.label(data) : data.label}
+                </div>
+              ),
+              ...selectSlots(),
+            }}
+          </a-select>
+        </a-tooltip>
+      </div>
     );
   },
   {
@@ -421,6 +494,10 @@ export default defineComponent(
       'labelKey',
       'atLeastOne',
       'objectValue',
+      'remoteFilterFunc',
+      'shouldCalculateMaxTag',
+      'disabled',
+      'size',
     ],
     emits: ['update:modelValue', 'remoteSearch', 'popupVisibleChange', 'update:loading', 'remove', 'change'],
   }
diff --git a/frontend/src/components/business/ms-thumbnail-card/index.vue b/frontend/src/components/business/ms-thumbnail-card/index.vue
index 2407e609fc..af0f1cc77f 100644
--- a/frontend/src/components/business/ms-thumbnail-card/index.vue
+++ b/frontend/src/components/business/ms-thumbnail-card/index.vue
@@ -57,7 +57,7 @@
 
   const fileType = computed(() => {
     if (props.type) {
-      return getFileEnum(`/${props.type.toLowerCase()}`);
+      return getFileEnum(props.type.toLowerCase());
     }
     return 'unknown';
   });
diff --git a/frontend/src/components/business/ms-top-menu/index.vue b/frontend/src/components/business/ms-top-menu/index.vue
index c133572eab..1f3dd39bc1 100644
--- a/frontend/src/components/business/ms-top-menu/index.vue
+++ b/frontend/src/components/business/ms-top-menu/index.vue
@@ -117,7 +117,7 @@
 <style lang="less" scoped>
   :deep(.arco-menu-inner) {
     overflow-y: hidden;
-    padding: 9px 20px;
+    padding: 9px 0;
     .arco-menu-selected-label {
       bottom: -8px !important;
     }
diff --git a/frontend/src/components/business/ms-transfer/index.vue b/frontend/src/components/business/ms-transfer/index.vue
index 3c3ec3daab..ad1f7af110 100644
--- a/frontend/src/components/business/ms-transfer/index.vue
+++ b/frontend/src/components/business/ms-transfer/index.vue
@@ -10,6 +10,21 @@
     }"
     :target-input-search-props="props.targetInputSearchProps"
   >
+    <template #source-title="{ countSelected, checked, indeterminate, onSelectAllChange }">
+      <div class="flex items-center gap-[8px]">
+        <a-checkbox :model-value="checked" :indeterminate="indeterminate" @change="onSelectAllChange" />
+        {{ t('ms.transfer.optional', { count: countSelected }) }}
+      </div>
+    </template>
+    <template #target-title="{ countTotal, checked, indeterminate, onSelectAllChange, onClear }">
+      <div class="flex items-center justify-between">
+        <div class="flex items-center gap-[8px]">
+          <a-checkbox :model-value="checked" :indeterminate="indeterminate" @change="onSelectAllChange" />
+          {{ t('ms.transfer.selected', { count: countTotal }) }}
+        </div>
+        <MsButton type="text" @click="onClear">{{ t('ms.transfer.clear') }}</MsButton>
+      </div>
+    </template>
     <template #source="{ selectedKeys, onSelect }">
       <MsTree
         :checkable="true"
@@ -19,24 +34,33 @@
         :keyword="sourceKeyword"
         block-node
         default-expand-all
+        :selectable="false"
         @check="onSelect"
       >
         <template #title="nodeData">
-          <div class="one-line-text">
+          <div class="one-line-text text-[var(--color-text-1)]">
             {{ nodeData.title }}
           </div>
         </template>
       </MsTree>
     </template>
+    <template #item="{ label }">
+      <a-tooltip :content="label">
+        <div class="one-line-text">{{ label }}</div>
+      </a-tooltip>
+    </template>
   </a-transfer>
 </template>
 
 <script setup lang="ts">
   import { ref, watch } from 'vue';
 
+  import MsButton from '@/components/pure/ms-button/index.vue';
   import MsTree from '@/components/business/ms-tree/index.vue';
   import type { MsTreeFieldNames, MsTreeNodeData } from '@/components/business/ms-tree/types';
 
+  import { useI18n } from '@/hooks/useI18n';
+
   export interface TransferDataItem {
     value: string;
     label: string;
@@ -66,6 +90,8 @@
   );
   const emit = defineEmits(['update:modelValue']);
 
+  const { t } = useI18n();
+
   const innerTarget = ref<string[]>([]);
   const transferData = ref<TransferDataItem[]>([]);
 
diff --git a/frontend/src/components/business/ms-transfer/locale/en-US.ts b/frontend/src/components/business/ms-transfer/locale/en-US.ts
new file mode 100644
index 0000000000..e2fd81e0e7
--- /dev/null
+++ b/frontend/src/components/business/ms-transfer/locale/en-US.ts
@@ -0,0 +1,5 @@
+export default {
+  'ms.transfer.optional': 'Optional {count} items',
+  'ms.transfer.selected': 'Selected {count} items',
+  'ms.transfer.clear': 'Clear',
+};
diff --git a/frontend/src/components/business/ms-transfer/locale/zh-CN.ts b/frontend/src/components/business/ms-transfer/locale/zh-CN.ts
new file mode 100644
index 0000000000..5f919f5c21
--- /dev/null
+++ b/frontend/src/components/business/ms-transfer/locale/zh-CN.ts
@@ -0,0 +1,5 @@
+export default {
+  'ms.transfer.optional': '可选 {count} 项',
+  'ms.transfer.selected': '已选 {count} 项',
+  'ms.transfer.clear': '清空',
+};
diff --git a/frontend/src/components/business/ms-tree/index.vue b/frontend/src/components/business/ms-tree/index.vue
index b3c6958a87..cdcf555549 100644
--- a/frontend/src/components/business/ms-tree/index.vue
+++ b/frontend/src/components/business/ms-tree/index.vue
@@ -152,7 +152,7 @@
   });
   const originalTreeData = ref<MsTreeNodeData[]>([]);
 
-  function init() {
+  function init(isFirstInit = false) {
     originalTreeData.value = mapTree<MsTreeNodeData>(props.data, (node: MsTreeNodeData) => {
       if (!props.showLine) {
         // 不展示连接线时才设置节点图标，因为展示连接线时非叶子节点会展示默认的折叠图标。它不会覆盖 switcherIcon，但是会被 switcherIcon 覆盖
@@ -169,22 +169,24 @@
       return node;
     });
     nextTick(() => {
-      if (props.defaultExpandAll) {
-        treeRef.value?.expandAll(true);
-      }
-      if (!isInitListener.value && treeRef.value) {
-        setContainer(
-          props.virtualListProps?.height
-            ? (treeRef.value.$el.querySelector('.arco-virtual-list') as HTMLElement)
-            : treeRef.value.$el
-        );
-        initScrollListener();
+      if (isFirstInit) {
+        if (props.defaultExpandAll) {
+          treeRef.value?.expandAll(true);
+        }
+        if (!isInitListener.value && treeRef.value) {
+          setContainer(
+            props.virtualListProps?.height
+              ? (treeRef.value.$el.querySelector('.arco-virtual-list') as HTMLElement)
+              : treeRef.value.$el
+          );
+          initScrollListener();
+        }
       }
     });
   }
 
   onBeforeMount(() => {
-    init();
+    init(true);
   });
 
   watch(
diff --git a/frontend/src/components/pure/message-box/list.vue b/frontend/src/components/pure/message-box/list.vue
index 58a02b20ae..4fc09e5154 100644
--- a/frontend/src/components/pure/message-box/list.vue
+++ b/frontend/src/components/pure/message-box/list.vue
@@ -102,9 +102,6 @@
 
       right: 20px;
     }
-    .arco-list-item-meta-content {
-      @apply flex-1;
-    }
     .item-wrap {
       @apply cursor-pointer;
     }
diff --git a/frontend/src/components/pure/ms-advance-filter/index.vue b/frontend/src/components/pure/ms-advance-filter/index.vue
index 6ea5d2f621..0d353ab536 100644
--- a/frontend/src/components/pure/ms-advance-filter/index.vue
+++ b/frontend/src/components/pure/ms-advance-filter/index.vue
@@ -10,6 +10,7 @@
         allow-clear
         @press-enter="emit('keywordSearch', innerKeyword)"
         @search="emit('keywordSearch', innerKeyword)"
+        @clear="emit('keywordSearch', innerKeyword)"
       ></a-input-search>
       <MsTag
         :type="visible ? 'primary' : 'default'"
@@ -17,8 +18,9 @@
         size="large"
         class="min-w-[64px] cursor-pointer"
         no-margin
+        @click="handleOpenFilter"
       >
-        <span :class="!visible ? 'text-[var(--color-text-4)]' : ''" @click="handleOpenFilter">
+        <span :class="!visible ? 'text-[var(--color-text-4)]' : ''">
           <icon-filter class="text-[16px]" />
           <span class="ml-[4px]">
             <span v-if="filterCount">{{ filterCount }}</span>
diff --git a/frontend/src/components/pure/ms-card/index.vue b/frontend/src/components/pure/ms-card/index.vue
index dcada00eef..e230ef4737 100644
--- a/frontend/src/components/pure/ms-card/index.vue
+++ b/frontend/src/components/pure/ms-card/index.vue
@@ -6,7 +6,7 @@
         'ms-card',
         'relative',
         'h-full',
-        props.isFullscreen || isFullScreen ? 'ms-card--no-radius' : '',
+        props.isFullscreen || isFullScreen ? 'ms-card--fullScreen' : '',
         props.autoHeight ? '' : 'min-h-[500px]',
         props.noContentPadding ? 'ms-card--noContentPadding' : 'p-[24px]',
         props.noBottomRadius ? 'ms-card--noBottomRadius' : '',
@@ -23,7 +23,7 @@
             <slot name="headerRight"></slot>
             <div
               v-if="props.showFullScreen"
-              class="w-[96px] cursor-pointer text-right !text-[var(--color-text-4)]"
+              class="cursor-pointer text-right !text-[var(--color-text-4)]"
               @click="toggleFullScreen"
             >
               <MsIcon v-if="isFullScreen" type="icon-icon_minify_outlined" />
@@ -48,8 +48,8 @@
       </div>
       <div
         v-if="!props.hideFooter && !props.simple"
-        class="fixed bottom-0 right-[16px] z-[100] flex items-center bg-white p-[24px] shadow-[0_-1px_4px_rgba(2,2,2,0.1)]"
-        :style="{ width: `calc(100% - ${menuWidth + 16}px)` }"
+        class="ms-card-footer"
+        :style="{ width: props.isFullscreen || isFullScreen ? '100%' : `calc(100% - ${menuWidth + 16}px)` }"
       >
         <div class="ml-0 mr-auto">
           <slot name="footerLeft"></slot>
@@ -71,7 +71,7 @@
 </template>
 
 <script setup lang="ts">
-  import { computed } from 'vue';
+  import { computed, watch } from 'vue';
   import { useRouter } from 'vue-router';
 
   import useFullScreen from '@/hooks/useFullScreen';
@@ -119,7 +119,7 @@
     }
   );
 
-  const emit = defineEmits(['saveAndContinue', 'save']);
+  const emit = defineEmits(['saveAndContinue', 'save', 'toggleFullScreen']);
 
   const router = useRouter();
   const { t } = useI18n();
@@ -134,9 +134,27 @@
   const fullRef = ref<HTMLElement | null>();
   const { isFullScreen, toggleFullScreen } = useFullScreen(fullRef);
 
+  watch(
+    () => isFullScreen.value,
+    (val) => {
+      emit('toggleFullScreen', val);
+    }
+  );
+
   const _specialHeight = props.hasBreadcrumb ? 32 + props.specialHeight : props.specialHeight; // 有面包屑的话，默认面包屑高度32
 
   const cardOverHeight = computed(() => {
+    if (isFullScreen.value) {
+      if (props.simple) {
+        // 简单模式没有标题、没有底部
+        return props.noContentPadding ? 0 : 48;
+      }
+      if (props.hideFooter) {
+        // 隐藏底部
+        return props.noContentPadding ? 88 : 118;
+      }
+      return 246;
+    }
     if (props.simple) {
       // 简单模式没有标题、没有底部
       return props.noContentPadding ? 88 + _specialHeight : 136 + _specialHeight;
@@ -153,7 +171,7 @@
       return {
         overflow: 'auto',
         width: 'auto',
-        height: 'auto',
+        height: props.autoHeight ? 'auto' : `calc(100vh - ${cardOverHeight.value}px)`,
       };
     }
     if (props.noContentPadding) {
@@ -218,10 +236,27 @@
       }
     }
     .ms-card-container {
-      @apply h-full;
+      @apply relative;
+    }
+    .ms-card-footer {
+      @apply fixed justify-between bg-white;
+
+      right: 16px;
+      bottom: 0;
+      z-index: 100;
+      padding: 24px;
+      border-bottom: 0;
+
+      --tw-shadow: 0 -1px 4px rgb(2 2 2 / 10%);
+      --tw-shadow-colored: 0 -1px 4px var(--tw-shadow-color);
+
+      box-shadow: var(--tw-ring-offset-shadow, 0 0 #00000000), var(--tw-ring-shadow, 0 0 #00000000), var(--tw-shadow);
     }
   }
-  .ms-card--no-radius {
+  .ms-card--fullScreen {
     border-radius: 0;
+    .ms-card-footer {
+      @apply left-0 right-0 w-full;
+    }
   }
 </style>
diff --git a/frontend/src/components/pure/ms-description/index.vue b/frontend/src/components/pure/ms-description/index.vue
index ad37aa6a4b..256ff349eb 100644
--- a/frontend/src/components/pure/ms-description/index.vue
+++ b/frontend/src/components/pure/ms-description/index.vue
@@ -18,14 +18,16 @@
       <div class="ms-description-item-label" :style="{ width: props.labelWidth || '120px' }">
         <slot name="item-label">{{ item.label }}</slot>
       </div>
-      <div class="ms-description-item-value">
+      <div :class="item.isTag ? 'ms-description-item-value--tagline' : 'ms-description-item-value'">
         <slot name="item-value" :item="item">
           <template v-if="item.isTag">
             <slot name="tag" :item="item">
               <MsTag
                 v-for="tag of Array.isArray(item.value) ? item.value : [item.value]"
                 :key="`${tag}`"
-                theme="outline"
+                :theme="item.tagTheme || 'outline'"
+                :type="item.tagType || 'primary'"
+                :max-width="item.tagMaxWidth"
                 color="var(--color-text-n8)"
                 :class="`mb-[8px] mr-[8px] font-normal !text-[var(--color-text-1)] ${item.tagClass || ''}`"
                 :closable="item.closable"
@@ -53,7 +55,15 @@
                     {{ t('ms.description.addTagRepeat') }}
                   </span>
                 </template>
-                <MsTag v-else type="primary" theme="outline" class="cursor-pointer" @click="handleEdit">
+                <!-- 标签数量大于等于10时，不显示添加标签 -->
+                <MsTag
+                  v-else-if="Array.isArray(item.value) && item.value.length < 10"
+                  type="primary"
+                  theme="outline"
+                  :max-width="item.tagMaxWidth"
+                  class="inline-flex cursor-pointer items-center gap-[4px]"
+                  @click="handleEdit"
+                >
                   <template #icon>
                     <MsIcon type="icon-icon_add_outlined" class="text-[rgb(var(--primary-5))]" />
                   </template>
@@ -102,7 +112,7 @@
 
   import MsButton from '@/components/pure/ms-button/index.vue';
   import MsIcon from '@/components/pure/ms-icon-font/index.vue';
-  import MsTag from '@/components/pure/ms-tag/ms-tag.vue';
+  import MsTag, { TagType, Theme } from '@/components/pure/ms-tag/ms-tag.vue';
 
   import { useI18n } from '@/hooks/useI18n';
 
@@ -112,6 +122,9 @@
     key?: string;
     isTag?: boolean; // 是否标签
     tagClass?: string; // 标签自定义类名
+    tagType?: TagType; // 标签类型
+    tagTheme?: Theme; // 标签主题
+    tagMaxWidth?: string; // 标签最大宽度
     closable?: boolean; // 标签是否可关闭
     showTagAdd?: boolean; // 是否显示添加标签
     isButton?: boolean;
@@ -227,9 +240,11 @@
       color: var(--color-text-3);
       word-wrap: break-word;
     }
-    .ms-description-item-value {
+    .ms-description-item-value,
+    .ms-description-item-value--tagline {
       @apply relative flex-1 overflow-hidden break-all align-top;
-
+    }
+    .ms-description-item-value {
       /* stylelint-disable-next-line value-no-vendor-prefix */
       display: -webkit-box;
       text-overflow: ellipsis;
diff --git a/frontend/src/components/pure/ms-drawer/index.vue b/frontend/src/components/pure/ms-drawer/index.vue
index 59a1414e3f..38d5c6246a 100644
--- a/frontend/src/components/pure/ms-drawer/index.vue
+++ b/frontend/src/components/pure/ms-drawer/index.vue
@@ -123,12 +123,12 @@
   const props = withDefaults(defineProps<DrawerProps>(), {
     footer: true,
     mask: true,
+    closable: true,
     showSkeleton: false,
     showContinue: false,
     popupContainer: 'body',
     disabledWidthDrag: false,
     okPermission: () => [], // 确认按钮权限
-    closable: true,
   });
   const emit = defineEmits(['update:visible', 'confirm', 'cancel', 'continue']);
 
diff --git a/frontend/src/components/pure/ms-list/index.vue b/frontend/src/components/pure/ms-list/index.vue
index 15df6b525b..6d5c080fe0 100644
--- a/frontend/src/components/pure/ms-list/index.vue
+++ b/frontend/src/components/pure/ms-list/index.vue
@@ -241,6 +241,9 @@
       }
       .arco-list-item-meta {
         @apply p-0;
+        .arco-list-item-meta-content {
+          @apply flex-1;
+        }
         .arco-list-item-meta-title:not(:last-child) {
           @apply mb-0;
         }
diff --git a/frontend/src/components/pure/ms-rich-text/MsRichText.vue b/frontend/src/components/pure/ms-rich-text/MsRichText.vue
index ae30277dcd..9098128aa4 100644
--- a/frontend/src/components/pure/ms-rich-text/MsRichText.vue
+++ b/frontend/src/components/pure/ms-rich-text/MsRichText.vue
@@ -514,6 +514,15 @@
         margin-top: 0;
       }
     }
+    :deep(.halo-rich-text-editor) {
+      padding: 16px 24px !important;
+      .editor-header {
+        justify-content: start !important;
+      }
+      p:first-child {
+        margin-top: 0;
+      }
+    }
   }
   :deep(.editor-header) {
     svg {
diff --git a/frontend/src/components/pure/ms-rich-text/extensions/mention/suggestion.ts b/frontend/src/components/pure/ms-rich-text/extensions/mention/suggestion.ts
index e01d563147..faa6239297 100644
--- a/frontend/src/components/pure/ms-rich-text/extensions/mention/suggestion.ts
+++ b/frontend/src/components/pure/ms-rich-text/extensions/mention/suggestion.ts
@@ -1,18 +1,17 @@
 import MentionList from './MentionList.vue';
 
-import { getReviewerList } from '@/api/modules/case-management/featureCase';
+import { getReviewUsers } from '@/api/modules/case-management/caseReview';
 import useAppStore from '@/store/modules/app';
 
-import type { UserListItem } from '@/models/setting/user';
+import { ReviewUserItem } from '@/models/caseManagement/caseReview';
 
-import { Extension, VueRenderer } from '@halo-dev/richtext-editor';
-import Suggestion from '@tiptap/suggestion';
+import { VueRenderer } from '@halo-dev/richtext-editor';
 import type { Instance } from 'tippy.js';
 import tippy from 'tippy.js';
 
 const appStore = useAppStore();
 
-const projectMember = ref<UserListItem[]>([]);
+const projectMember = ref<ReviewUserItem[]>([]);
 
 async function getMembersToolBar(query: string) {
   const params = {
@@ -20,8 +19,9 @@ async function getMembersToolBar(query: string) {
     keyword: query,
   };
   try {
-    projectMember.value = await getReviewerList(params.projectId, params.keyword);
+    projectMember.value = await getReviewUsers(params.projectId, params.keyword);
   } catch (error) {
+    // eslint-disable-next-line no-console
     console.log(error);
   }
 }
@@ -29,7 +29,9 @@ async function getMembersToolBar(query: string) {
 export default {
   items: async ({ query }: any) => {
     await getMembersToolBar(query);
-    return projectMember.value.filter((item: UserListItem) => item.name.toLowerCase().startsWith(query.toLowerCase()));
+    return projectMember.value.filter((item: ReviewUserItem) =>
+      item.name.toLowerCase().startsWith(query.toLowerCase())
+    );
   },
 
   render: () => {
diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue
index e2d5173e47..04e9112288 100644
--- a/frontend/src/components/pure/ms-table/base-table.vue
+++ b/frontend/src/components/pure/ms-table/base-table.vue
@@ -18,13 +18,17 @@
         <slot name="optional" v-bind="{ rowIndex, record }" />
       </template>
       <template #columns>
-        <a-table-column v-if="attrs.selectable && props.selectedKeys" :width="props.firstColumnWidth || 60">
+        <a-table-column
+          v-if="attrs.selectable && props.selectedKeys"
+          :width="props.firstColumnWidth || 60"
+          fixed="left"
+        >
           <template #title>
             <SelectALL
               v-if="attrs.selectorType === 'checkbox'"
               :total="selectTotal"
               :current="selectCurrent"
-              :show-select-all="(attrs.showPagination as boolean) && props.showSelectorAll"
+              :show-select-all="!!attrs.showPagination && props.showSelectorAll"
               :disabled="(attrs.data as []).length === 0"
               @change="handleSelectAllChange"
             />
@@ -211,7 +215,7 @@
       </div>
       <div class="min-w-[500px]">
         <ms-pagination
-          v-if="attrs.showPagination"
+          v-if="!!attrs.showPagination"
           v-show="props.selectorStatus !== SelectAllEnum.CURRENT"
           size="small"
           v-bind="(attrs.msPagination as MsPaginationI)"
@@ -226,7 +230,7 @@
       v-model:visible="columnSelectorVisible"
       :show-jump-method="(attrs.showJumpMethod as boolean)"
       :table-key="(attrs.tableKey as string)"
-      :show-pagination="(attrs.showPagination as boolean)"
+      :show-pagination="!!attrs.showPagination"
       @init-data="handleInitColumn"
       @page-size-change="pageSizeChange"
     ></ColumnSelector>
@@ -569,9 +573,15 @@
     }
   }
   .ms-base-table--hasQuickCreate {
-    :deep(.arco-table-body) {
+    :deep(.arco-table-body:not(.arco-scrollbar-container)) {
       padding-top: 54px;
     }
+    :deep(.arco-table-element:not(.arco-table-header .arco-table-element)) {
+      padding-bottom: 54px;
+      tbody {
+        transform: translateY(54px);
+      }
+    }
     :deep(.arco-table-tr:first-child) {
       .arco-table-td {
         border-top: 1px solid var(--color-text-n8);
diff --git a/frontend/src/components/pure/ms-tag/ms-tag.vue b/frontend/src/components/pure/ms-tag/ms-tag.vue
index 0ea8f965c4..6eb59c7281 100644
--- a/frontend/src/components/pure/ms-tag/ms-tag.vue
+++ b/frontend/src/components/pure/ms-tag/ms-tag.vue
@@ -8,7 +8,7 @@
       ...typeStyle,
       'margin-right': noMargin ? 0 : tagMargin,
       'min-width': props.width && `${props.width}ch`,
-      'max-width': '144px',
+      'max-width': props.maxWidth || '144px',
     }"
   >
     <slot name="icon"></slot>
@@ -33,6 +33,7 @@
       theme?: Theme; // tag主题
       selfStyle?: any; // 自定义样式
       width?: number; // tag宽度,不传入时绑定max-width
+      maxWidth?: string;
       noMargin?: boolean; // tag之间是否有间距
     }>(),
     {
diff --git a/frontend/src/components/pure/ms-upload/fileList.vue b/frontend/src/components/pure/ms-upload/fileList.vue
index 4f8034da14..c77880d7f6 100644
--- a/frontend/src/components/pure/ms-upload/fileList.vue
+++ b/frontend/src/components/pure/ms-upload/fileList.vue
@@ -1,112 +1,137 @@
 <template>
-  <div
-    v-if="props.mode === 'remote' && props.showTab"
-    class="sticky top-[0] z-[9999] mb-[8px] flex justify-between bg-white"
-  >
-    <a-radio-group v-model:model-value="fileListTab" type="button" size="small">
-      <a-radio value="all">{{ `${t('ms.upload.all')} (${innerFileList.length})` }}</a-radio>
-      <a-radio value="waiting">{{ `${t('ms.upload.uploading')} (${totalWaitingFileList.length})` }}</a-radio>
-      <a-radio value="success">{{ `${t('ms.upload.success')} (${totalSuccessFileList.length})` }}</a-radio>
-      <a-radio value="error">{{ `${t('ms.upload.fail')} (${totalFailFileList.length})` }}</a-radio>
-    </a-radio-group>
-    <slot name="tabExtra"></slot>
-  </div>
-  <MsList :data="filterFileList" :bordered="false" :split="false" item-border no-hover>
-    <template #item="{ item }">
-      <a-list-item
-        class="mb-[8px] w-full rounded-[var(--border-radius-small)] border border-solid border-[var(--color-text-n8)] !p-[8px_12px]"
-      >
-        <a-list-item-meta>
-          <template #avatar>
-            <a-avatar shape="square" class="rounded-[var(--border-radius-mini)] bg-[var(--color-text-n9)]">
-              <a-image v-if="item.file.type.includes('image/')" :src="item.url" width="40" height="40" hide-footer />
-              <MsIcon
-                v-else
-                :type="getFileIcon(item)"
-                size="24"
-                :class="getFileEnum(item.file?.type) === 'unknown' ? 'text-[var(--color-text-4)]' : ''"
-              />
-            </a-avatar>
-          </template>
-          <template #title>
-            <div class="flex items-center">
-              <a-tooltip :content="item.file.name">
-                <div class="one-line-text max-w-[80%] font-normal">{{ item.file.name }}</div>
-              </a-tooltip>
-              <slot name="title" :item="item"></slot>
-            </div>
-          </template>
-          <template #description>
-            <div v-if="item.status === UploadStatus.init" class="text-[12px] leading-[16px] text-[var(--color-text-4)]">
-              {{ t('ms.upload.waiting') }}
-            </div>
-            <div
-              v-else-if="item.status === UploadStatus.done"
-              class="flex items-center gap-[8px] text-[12px] leading-[16px] text-[var(--color-text-4)]"
-            >
-              {{
-                `${formatFileSize(item.file.size)}  ${t('ms.upload.uploadAt')} ${dayjs(item.uploadedTime).format(
-                  'YYYY-MM-DD HH:mm:ss'
-                )}`
-              }}
+  <div>
+    <div
+      v-if="props.mode === 'remote' && props.showTab"
+      class="sticky top-[0] z-[9999] mb-[8px] flex justify-between bg-white"
+    >
+      <a-radio-group v-model:model-value="fileListTab" type="button" size="small">
+        <a-radio value="all">{{ `${t('ms.upload.all')} (${innerFileList.length})` }}</a-radio>
+        <a-radio value="waiting">{{ `${t('ms.upload.uploading')} (${totalWaitingFileList.length})` }}</a-radio>
+        <a-radio value="success">{{ `${t('ms.upload.success')} (${totalSuccessFileList.length})` }}</a-radio>
+        <a-radio value="error">{{ `${t('ms.upload.fail')} (${totalFailFileList.length})` }}</a-radio>
+      </a-radio-group>
+      <slot name="tabExtra"></slot>
+    </div>
+    <MsList
+      v-if="props.showMode === 'fileList'"
+      :data="filterFileList"
+      :bordered="false"
+      :split="false"
+      item-border
+      no-hover
+    >
+      <template #item="{ item }">
+        <a-list-item
+          class="mb-[8px] w-full rounded-[var(--border-radius-small)] border border-solid border-[var(--color-text-n8)] !p-[8px_12px]"
+        >
+          <a-list-item-meta>
+            <template #avatar>
+              <a-avatar shape="square" class="rounded-[var(--border-radius-mini)] bg-[var(--color-text-n9)]">
+                <a-image v-if="item.file.type.includes('image/')" :src="item.url" width="40" height="40" hide-footer />
+                <MsIcon
+                  v-else
+                  :type="getFileIcon(item)"
+                  size="24"
+                  :class="item.status === UploadStatus.init ? 'text-[var(--color-text-4)]' : ''"
+                />
+              </a-avatar>
+            </template>
+            <template #title>
               <div class="flex items-center">
-                <MsIcon type="icon-icon_succeed_colorful" />
-                {{ t('ms.upload.uploadSuccess') }}
+                <a-tooltip :content="item.file.name">
+                  <div class="one-line-text max-w-[80%] font-normal">{{ item.file.name }}</div>
+                </a-tooltip>
+                <slot name="title" :item="item"></slot>
               </div>
-            </div>
-            <a-progress
-              v-else-if="item.status === UploadStatus.uploading"
-              :percent="asyncTaskStore.uploadFileTask.singleProgress / 100"
-              :show-text="false"
-              size="large"
-              class="w-[200px]"
-            />
-            <div v-else-if="item.status === UploadStatus.error" class="text-[rgb(var(--danger-6))]">
-              {{ item.errMsg || t('ms.upload.uploadFail') }}
+            </template>
+            <template #description>
+              <div
+                v-if="item.status === UploadStatus.init"
+                class="text-[12px] leading-[16px] text-[var(--color-text-4)]"
+              >
+                {{ t('ms.upload.waiting') }}
+              </div>
+              <div
+                v-else-if="item.status === UploadStatus.done"
+                class="flex items-center gap-[8px] text-[12px] leading-[16px] text-[var(--color-text-4)]"
+              >
+                {{
+                  `${formatFileSize(item.file.size)}  ${t('ms.upload.uploadAt')} ${dayjs(item.uploadedTime).format(
+                    'YYYY-MM-DD HH:mm:ss'
+                  )}`
+                }}
+                <div class="flex items-center">
+                  <MsIcon type="icon-icon_succeed_colorful" />
+                  {{ t('ms.upload.uploadSuccess') }}
+                </div>
+              </div>
+              <a-progress
+                v-else-if="item.status === UploadStatus.uploading"
+                :percent="asyncTaskStore.uploadFileTask.singleProgress / 100"
+                :show-text="false"
+                size="large"
+                class="w-[200px]"
+              />
+              <div v-else-if="item.status === UploadStatus.error" class="text-[rgb(var(--danger-6))]">
+                {{ item.errMsg || t('ms.upload.uploadFail') }}
+              </div>
+            </template>
+          </a-list-item-meta>
+          <template #actions>
+            <div class="flex items-center">
+              <MsButton
+                v-if="item.file.type.includes('image/')"
+                type="button"
+                status="primary"
+                class="!mr-0"
+                @click="handlePreview(item)"
+              >
+                {{ t('ms.upload.preview') }}
+              </MsButton>
+              <MsButton
+                v-if="item.status === UploadStatus.error"
+                type="button"
+                status="secondary"
+                class="!mr-0"
+                @click="reupload(item)"
+              >
+                {{ t('ms.upload.reUpload') }}
+              </MsButton>
+              <MsButton
+                v-if="props.showDelete"
+                type="button"
+                :status="item.deleteContent ? 'primary' : 'danger'"
+                class="!mr-[4px]"
+                @click="deleteFile(item)"
+              >
+                {{ t(item.deleteContent) || t('ms.upload.delete') }}
+              </MsButton>
+              <slot name="actions" :item="item"></slot>
             </div>
           </template>
-        </a-list-item-meta>
-        <template #actions>
-          <div class="flex items-center">
-            <MsButton
-              v-if="item.file.type.includes('image/')"
-              type="button"
-              status="primary"
-              class="!mr-0"
-              @click="handlePreview(item)"
-            >
-              {{ t('ms.upload.preview') }}
-            </MsButton>
-            <MsButton
-              v-if="item.status === UploadStatus.error"
-              type="button"
-              status="secondary"
-              class="!mr-0"
-              @click="reupload(item)"
-            >
-              {{ t('ms.upload.reUpload') }}
-            </MsButton>
-            <MsButton
-              v-if="props.showDelete"
-              type="button"
-              :status="item.deleteContent ? 'primary' : 'danger'"
-              class="!mr-[4px]"
-              @click="deleteFile(item)"
-            >
-              {{ t(item.deleteContent) || t('ms.upload.delete') }}
-            </MsButton>
-            <slot name="actions" :item="item"></slot>
-          </div>
-        </template>
-      </a-list-item>
-    </template>
-  </MsList>
-  <a-image-preview-group
-    v-model:visible="previewVisible"
-    v-model:current="previewCurrent"
-    infinite
-    :src-list="previewList"
-  />
+        </a-list-item>
+      </template>
+    </MsList>
+    <div v-else class="flex w-full items-center gap-[8px]">
+      <div v-for="item of filterFileList" :key="item.uid" class="image-item">
+        <a-image
+          :src="item.url"
+          width="40"
+          height="40"
+          :preview="false"
+          class="cursor-pointer"
+          @click="handlePreview(item)"
+        />
+        <icon-close-circle-fill class="image-item-close-icon" @click="deleteFile(item)" />
+      </div>
+    </div>
+    <a-image-preview-group
+      v-model:visible="previewVisible"
+      v-model:current="previewCurrent"
+      infinite
+      :src-list="previewList"
+    />
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -123,13 +148,14 @@
 
   import { UploadStatus } from '@/enums/uploadEnum';
 
-  import { getFileEnum, getFileIcon } from './iconMap';
+  import { getFileIcon } from './iconMap';
   import type { MsFileItem } from './types';
 
   const props = withDefaults(
     defineProps<{
       mode?: 'static' | 'remote'; // 静态|远程
       fileList: MsFileItem[];
+      showMode?: 'fileList' | 'imageList'; // 展示模式, 文件列表|图片列表
       uploadFunc?: (params: any) => Promise<any>; // 上传文件时，自定义上传方法
       requestParams?: Record<string, any>; // 上传文件时，额外的请求参数
       route?: string; // 用于后台上传文件时，查看详情跳转的路由
@@ -144,6 +170,7 @@
       mode: 'remote',
       showTab: true,
       showDelete: true,
+      showMode: 'fileList',
     }
   );
   const emit = defineEmits<{
@@ -294,4 +321,23 @@
   });
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+  .image-item {
+    @apply relative;
+    &:hover {
+      .image-item-close-icon {
+        @apply visible;
+      }
+    }
+    .image-item-close-icon {
+      @apply invisible absolute cursor-pointer rounded-full;
+
+      top: -7px;
+      right: -5px;
+      z-index: 10;
+      color: var(--color-text-4);
+      background-color: var(--color-text-n8);
+      cursor: pointer;
+    }
+  }
+</style>
diff --git a/frontend/src/components/pure/ms-upload/iconMap.ts b/frontend/src/components/pure/ms-upload/iconMap.ts
index 9bfef32abd..1700da169b 100644
--- a/frontend/src/components/pure/ms-upload/iconMap.ts
+++ b/frontend/src/components/pure/ms-upload/iconMap.ts
@@ -87,7 +87,7 @@ export function getFileEnum(fileType?: string): keyof typeof UploadAcceptEnum {
     const keys = Object.keys(UploadAcceptEnum);
     for (let i = 0; i < keys.length; i++) {
       const key = keys[i] as unknown as keyof typeof UploadAcceptEnum;
-      if (UploadAcceptEnum[key].split(',').includes(`.${fileType.split('/')[1]}`)) {
+      if (UploadAcceptEnum[key].includes(fileType)) {
         return key;
       }
     }
@@ -98,10 +98,13 @@ export function getFileEnum(fileType?: string): keyof typeof UploadAcceptEnum {
 /**
  * 获取文件图标
  * @param item 文件项
+ * @param status 文件状态
  */
-export function getFileIcon(item: MsFileItem) {
-  if (item.status === UploadStatus.done) {
-    return FileIconMap[getFileEnum(item.file?.type)]?.[item.status] ?? FileIconMap.unknown[UploadStatus.done];
+export function getFileIcon(item: MsFileItem, status?: UploadStatus) {
+  const fileType = item.file?.name.split('.').pop(); // 通过文件后缀判断文件类型
+  const _status = status || item.status;
+  if (_status === UploadStatus.done) {
+    return FileIconMap[getFileEnum(fileType)]?.[_status] ?? FileIconMap.unknown[UploadStatus.done];
   }
-  return FileIconMap[getFileEnum(item.file?.type)]?.[UploadStatus.init] ?? FileIconMap.unknown[UploadStatus.done];
+  return FileIconMap[getFileEnum(fileType)]?.[_status || UploadStatus.init] ?? FileIconMap.unknown[UploadStatus.done];
 }
diff --git a/frontend/src/components/pure/ms-upload/index.vue b/frontend/src/components/pure/ms-upload/index.vue
index 0a6e0cb149..9e0ed66c1a 100644
--- a/frontend/src/components/pure/ms-upload/index.vue
+++ b/frontend/src/components/pure/ms-upload/index.vue
@@ -16,6 +16,7 @@
     }"
     @change="handleChange"
     @before-upload="beforeUpload"
+    @exceed-limit="() => Message.warning(t('ms.upload.overLimit', { limit: props.limit }))"
   >
     <template #upload-button>
       <slot>
@@ -23,8 +24,8 @@
           <div class="ms-upload-icon-box">
             <MsIcon
               v-if="props.accept !== UploadAcceptEnum.none"
-              :type="FileIconMap[props.accept][UploadStatus.done]"
-              class="ms-upload-icon"
+              :type="fileIconType"
+              class="ms-upload-icon text-[var(--color-text-4)]"
             />
             <div v-else class="ms-upload-icon ms-upload-icon--default"></div>
           </div>
@@ -69,7 +70,7 @@
 
   import { UploadAcceptEnum, UploadStatus } from '@/enums/uploadEnum';
 
-  import { FileIconMap } from './iconMap';
+  import { FileIconMap, getFileIcon } from './iconMap';
   import type { MsFileItem, UploadType } from './types';
 
   const { t } = useI18n();
@@ -92,6 +93,7 @@
     isAllScreen?: boolean; // 是否是全屏显示拖拽上传
     cutHeight: number; // 被剪切高度
     fileTypeTip?: string; // 上传文件类型错误提示
+    limit: number; // 限制上传文件数量
   }> & {
     accept: UploadType;
     fileList: MsFileItem[];
@@ -124,6 +126,15 @@
     }
   );
 
+  const fileIconType = computed(() => {
+    // 单选并且选了文件，按文件类型展示图标(单选文件选择后直接展示绿色图标)
+    if (fileList.value.length > 0 && !props.multiple) {
+      return getFileIcon(fileList.value[0], UploadStatus.done);
+    }
+    // 多选直接按照类型展示
+    return FileIconMap[props.accept][UploadStatus.init];
+  });
+
   async function beforeUpload(file: File) {
     if (!props.multiple && fileList.value.length > 0) {
       // 单文件上传时，清空之前的文件
diff --git a/frontend/src/components/pure/ms-upload/locale/en-US.ts b/frontend/src/components/pure/ms-upload/locale/en-US.ts
index 1a97c181db..750c5ed102 100644
--- a/frontend/src/components/pure/ms-upload/locale/en-US.ts
+++ b/frontend/src/components/pure/ms-upload/locale/en-US.ts
@@ -16,4 +16,5 @@ export default {
   'ms.upload.success': 'Success',
   'ms.upload.detail': 'Detail',
   'ms.upload.fileTypeValidate': 'Only files in {type} format are supported',
+  'ms.upload.overLimit': 'The number of files exceeds the limit, the maximum number of uploads is {limit}',
 };
diff --git a/frontend/src/components/pure/ms-upload/locale/zh-CN.ts b/frontend/src/components/pure/ms-upload/locale/zh-CN.ts
index 7870d3cf96..d78f3254ad 100644
--- a/frontend/src/components/pure/ms-upload/locale/zh-CN.ts
+++ b/frontend/src/components/pure/ms-upload/locale/zh-CN.ts
@@ -16,4 +16,5 @@ export default {
   'ms.upload.fail': '失败',
   'ms.upload.detail': '查看详情',
   'ms.upload.fileTypeValidate': '仅支持 {type} 格式的文件',
+  'ms.upload.overLimit': '文件数量超出限制，最大上传数量为 {limit} 个',
 };
diff --git a/frontend/src/components/pure/navbar/index.vue b/frontend/src/components/pure/navbar/index.vue
index db677c65dc..82708438b8 100644
--- a/frontend/src/components/pure/navbar/index.vue
+++ b/frontend/src/components/pure/navbar/index.vue
@@ -12,8 +12,8 @@
       <template v-if="showProjectSelect">
         <a-divider direction="vertical" class="ml-0" />
         <a-select
+          v-model:model-value="appStore.currentProjectId"
           class="w-[200px] focus-within:!bg-[var(--color-text-n8)] hover:!bg-[var(--color-text-n8)]"
-          :default-value="appStore.currentProjectId"
           :bordered="false"
           allow-search
           @change="selectProject"
@@ -21,7 +21,12 @@
           <template #arrow-icon>
             <icon-caret-down />
           </template>
-          <a-tooltip v-for="project of projectList" :key="project.id" :mouse-enter-delay="500" :content="project.name">
+          <a-tooltip
+            v-for="project of appStore.projectList"
+            :key="project.id"
+            :mouse-enter-delay="500"
+            :content="project.name"
+          >
             <a-option
               :value="project.id"
               :class="project.id === appStore.currentProjectId ? 'arco-select-option-selected' : ''"
@@ -35,7 +40,7 @@
       <TopMenu />
     </div>
     <ul v-if="!props.isPreview && !props.hideRight" class="right-side">
-      <li>
+      <!-- <li>
         <a-tooltip :content="t('settings.navbar.search')">
           <a-button type="secondary">
             <template #icon>
@@ -43,7 +48,7 @@
             </template>
           </a-button>
         </a-tooltip>
-      </li>
+      </li> -->
       <li>
         <a-tooltip :content="t('settings.navbar.alerts')">
           <div class="message-box-trigger">
@@ -87,10 +92,25 @@
             </a-button>
           </a-tooltip>
           <template #content>
-            <a-doption v-for="item in helpCenterList" :key="item.name" :value="item.name">
-              <component :is="item.icon"></component>
-              {{ t(item.name) }}
+            <a-doption value="doc">
+              <component :is="IconQuestionCircle"></component>
+              {{ t('settings.help.doc') }}
             </a-doption>
+            <a-popover position="left">
+              <a-doption value="version">
+                <component :is="IconInfoCircle"></component>
+                {{ t('settings.help.versionInfo') }}
+              </a-doption>
+              <template #content>
+                <div
+                  class="flex cursor-pointer items-center gap-[4px] text-[14px] text-[var(--color-text-1)]"
+                  @click="copyVersion"
+                >
+                  <div class="text-[var(--color-text-4)]">{{ t('settings.help.version') }}：</div>
+                  {{ appStore.version }}
+                </div>
+              </template>
+            </a-popover>
           </template>
         </a-dropdown>
       </li>
@@ -118,13 +138,15 @@
 </template>
 
 <script lang="ts" setup>
-  import { computed, onBeforeMount, Ref, ref, watch } from 'vue';
+  import { computed, ref, watch } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
+  import { useClipboard } from '@vueuse/core';
+  import { Message } from '@arco-design/web-vue';
 
   import TopMenu from '@/components/business/ms-top-menu/index.vue';
   import MessageBox from '../message-box/index.vue';
 
-  import { getProjectList, switchProject } from '@/api/modules/project-management/project';
+  import { switchProject } from '@/api/modules/project-management/project';
   import { MENU_LEVEL, type PathMapRoute } from '@/config/pathMap';
   import { useI18n } from '@/hooks/useI18n';
   import usePathMap from '@/hooks/usePathMap';
@@ -132,9 +154,6 @@
   import useLocale from '@/locale/useLocale';
   import useAppStore from '@/store/modules/app';
   import useUserStore from '@/store/modules/user';
-  import { hasAnyPermission } from '@/utils/permission';
-
-  import type { ProjectListItem } from '@/models/setting/project';
 
   import { IconInfoCircle, IconQuestionCircle } from '@arco-design/web-vue/es/icon';
 
@@ -151,30 +170,13 @@
   const router = useRouter();
   const { t } = useI18n();
 
-  const projectList: Ref<ProjectListItem[]> = ref([]);
-
-  async function initProjects() {
-    try {
-      if (appStore.currentOrgId && hasAnyPermission(['SYSTEM_PARAMETER_SETTING_BASE:READ'])) {
-        const res = await getProjectList(appStore.getCurrentOrgId);
-        projectList.value = res;
-      } else {
-        projectList.value = [];
-      }
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.log(error);
-    }
-  }
-
-  onBeforeMount(() => {
-    initProjects();
-  });
-
   watch(
     () => appStore.currentOrgId,
     async () => {
-      initProjects();
+      appStore.initProjectList();
+    },
+    {
+      immediate: true,
     }
   );
 
@@ -189,6 +191,7 @@
   ) {
     appStore.setCurrentProjectId(value as string);
     try {
+      appStore.showLoading();
       await switchProject({
         projectId: value as string,
         userId: userStore.id || '',
@@ -197,6 +200,7 @@
       // eslint-disable-next-line no-console
       console.log(error);
     } finally {
+      appStore.hideLoading();
       router.replace({
         path: route.path,
         query: {
@@ -208,28 +212,15 @@
     }
   }
 
-  const helpCenterList = [
-    // {
-    //   name: 'settings.help.guide',
-    //   icon: IconCompass,
-    //   route: '/help-center/guide',
-    // },
-    {
-      name: 'settings.help.doc',
-      icon: IconQuestionCircle,
-      route: '/help-center/guide',
-    },
-    // {
-    //   name: 'settings.help.APIDoc',
-    //   icon: IconFile,
-    //   route: '/help-center/guide',
-    // },
-    {
-      name: 'settings.help.version',
-      icon: IconInfoCircle,
-      route: '/help-center/guide',
-    },
-  ];
+  const { copy, isSupported } = useClipboard();
+  function copyVersion() {
+    if (isSupported) {
+      copy(appStore.version);
+      Message.success(t('common.copySuccess'));
+    } else {
+      Message.warning(t('common.copyNotSupport'));
+    }
+  }
 
   const { changeLocale, currentLocale } = useLocale();
   const locales = [...LOCALE_OPTIONS];
@@ -334,4 +325,3 @@
     }
   }
 </style>
-@/models/setting/project @/api/modules/setting/project @/api/modules/project-management/project
diff --git a/frontend/src/config/fileManagement.ts b/frontend/src/config/fileManagement.ts
new file mode 100644
index 0000000000..f1e85944e2
--- /dev/null
+++ b/frontend/src/config/fileManagement.ts
@@ -0,0 +1,12 @@
+// 文件关联用例-用例类型
+export const associateFileSourceLocaleMap = {
+  BUG: 'project.fileManagement.caseTypeBug',
+  FUNCTIONAL_CASE: 'project.fileManagement.caseTypeFeature',
+  API_DEBUG: 'project.fileManagement.caseTypeApiDebug',
+  API_SCENARIO: 'project.fileManagement.caseTypeApiScene',
+  API_TEST_CASE: 'project.fileManagement.caseTypeApiCase',
+  API_DEFINITION: 'project.fileManagement.caseTypeApiDefine',
+  API_DEFINITION_MOCK: 'project.fileManagement.caseTypeApiMock',
+};
+
+export default {};
diff --git a/frontend/src/hooks/useSelect.ts b/frontend/src/hooks/useSelect.ts
index 729a08cf80..2ec093d325 100644
--- a/frontend/src/hooks/useSelect.ts
+++ b/frontend/src/hooks/useSelect.ts
@@ -30,33 +30,27 @@ export default function useSelect(config: UseSelectOption) {
    * 计算最大标签数量
    * @param options 选择器的选项
    */
-  function calculateMaxTag(options?: CascaderOption[] | SelectOptionData[]) {
-    nextTick(() => {
-      if (config.selectRef.value && selectViewInner.value && Array.isArray(config.selectVal.value)) {
-        if (maxTagCount.value >= 1 && config.selectVal.value.length > maxTagCount.value) return; // 已经超过最大数量的展示，不需要再计算
+  function calculateMaxTag() {
+    setTimeout(() => {
+      if (config.selectRef.value && selectViewInner.value) {
         const innerViewWidth = selectViewInner.value?.getBoundingClientRect().width;
         let lastWidth = innerViewWidth - 60; // 60px 是“+N”的标签宽度+聚焦输入框的宽度
-        let tagCount = 0;
-        const values = Object.values(config.selectVal.value);
-        for (let i = 0; i < values.length; i++) {
-          const option = options?.find((e) => e[config.valueKey || 'value'] === values[i]);
-          const tagWidth = (option ? option[config.labelKey || 'label']?.length || 0 : values[i].length) * 12; // 计算每个标签渲染出来的宽度，文字大小在12px时宽度也是 12px
-
-          if (lastWidth > tagWidth + 36) {
-            tagCount += 1;
-            lastWidth -= tagWidth + 36; // 36px是标签的边距、边框等宽度
-          } else {
-            lastWidth = 0; // 当剩余宽度已经放不下刚添加的标签，则剩余宽度置为 0，避免后面再进行计算
-            break;
+        const childrenNodes = selectViewInner.value.children;
+        if (maxTagCount.value >= 1 && maxTagCount.value < config.selectVal.value.length) {
+          return;
+        }
+        for (let i = 0; i < childrenNodes.length; i++) {
+          const child = childrenNodes[i];
+          if (child.classList.contains('arco-tag')) {
+            lastWidth -= child.clientWidth - 6; // 6px 是标签的边距、边框等宽度
+          }
+          if (lastWidth < 30) {
+            // 30px 是隐藏的输入搜索框的宽度+边距+容错宽度
+            maxTagCount.value = Math.max(1, i - 1);
+            break;
+          } else {
+            maxTagCount.value = Infinity;
           }
-        }
-        if (lastWidth === 0) {
-          maxTagCount.value = tagCount || 1;
-        }
-        if (tagCount <= 1 && values.length > 0) {
-          singleTagMaxWidth.value = innerViewWidth - 100; // 100px 是 60px + 标签边距边框和 x 图标等40px
-        } else {
-          singleTagMaxWidth.value = 0;
         }
       }
     });
diff --git a/frontend/src/layout/default-layout.vue b/frontend/src/layout/default-layout.vue
index a7781d71a7..220aac0d74 100644
--- a/frontend/src/layout/default-layout.vue
+++ b/frontend/src/layout/default-layout.vue
@@ -210,7 +210,7 @@
     background-color: var(--color-bg-3);
     transition: padding 0.2s cubic-bezier(0.34, 0.69, 0.1, 1);
     .arco-layout-content {
-      padding: 16px 16px 0 0;
+      padding: 8px 16px 0 0;
       min-height: 500px;
     }
   }
diff --git a/frontend/src/locale/en-US/common.ts b/frontend/src/locale/en-US/common.ts
index 22eca71bde..fcf995d2d1 100644
--- a/frontend/src/locale/en-US/common.ts
+++ b/frontend/src/locale/en-US/common.ts
@@ -76,6 +76,7 @@ export default {
   'common.expandAll': 'Expand all',
   'common.copy': 'Copy',
   'common.copySuccess': 'Copy successfully',
+  'common.copyNotSupport': 'Your browser does not support automatic copying. Please copy manually.',
   'common.fork': 'Fork',
   'common.forked': 'Forked',
   'common.more': 'More',
diff --git a/frontend/src/locale/en-US/settings.ts b/frontend/src/locale/en-US/settings.ts
index 8c8789e355..b50bdfd5ba 100644
--- a/frontend/src/locale/en-US/settings.ts
+++ b/frontend/src/locale/en-US/settings.ts
@@ -15,6 +15,7 @@ export default {
   'settings.help.guide': 'Use Guide',
   'settings.help.doc': 'Help docs',
   'settings.help.APIDoc': 'API docs',
+  'settings.help.versionInfo': 'Version info',
   'settings.help.version': 'Version',
   'settings.menu': 'Menu',
   'settings.tabBar': 'Tab Bar',
diff --git a/frontend/src/locale/zh-CN/common.ts b/frontend/src/locale/zh-CN/common.ts
index 7ef751e94c..7dc8c598c9 100644
--- a/frontend/src/locale/zh-CN/common.ts
+++ b/frontend/src/locale/zh-CN/common.ts
@@ -77,6 +77,7 @@ export default {
   'common.expandAll': '展开全部',
   'common.copy': '复制',
   'common.copySuccess': '复制成功',
+  'common.copyNotSupport': '您的浏览器不支持自动复制，请手动复制',
   'common.fork': '关注',
   'common.forked': '已关注',
   'common.more': '更多',
diff --git a/frontend/src/locale/zh-CN/settings.ts b/frontend/src/locale/zh-CN/settings.ts
index 1084ccd641..a54b48e487 100644
--- a/frontend/src/locale/zh-CN/settings.ts
+++ b/frontend/src/locale/zh-CN/settings.ts
@@ -15,7 +15,8 @@ export default {
   'settings.help.guide': '新手指引',
   'settings.help.doc': '帮助文档',
   'settings.help.APIDoc': 'API文档',
-  'settings.help.version': '版本信息',
+  'settings.help.versionInfo': '版本信息',
+  'settings.help.version': '版本',
   'settings.menu': '菜单栏',
   'settings.tabBar': '多页签',
   'settings.footer': '底部',
diff --git a/frontend/src/models/projectManagement/file.ts b/frontend/src/models/projectManagement/file.ts
index defaf722ed..71483c58ef 100644
--- a/frontend/src/models/projectManagement/file.ts
+++ b/frontend/src/models/projectManagement/file.ts
@@ -1,5 +1,6 @@
 import { BatchApiParams, TableQueryParams } from '@/models/common';
 
+export type FileStorageType = 'GIT' | 'MINIO';
 // 文件列表查询参数
 export interface FileListQueryParams extends TableQueryParams {
   moduleIds: string[];
@@ -25,13 +26,13 @@ export interface FileItem {
   branch?: string; // 分支
   filePath?: string; // 文件路径
   fileVersion?: string; // 文件版本
+  storage?: FileStorageType; // 存储方式
 }
 // 文件详情
 export interface FileDetail extends FileItem {
   projectId: string;
   moduleName: string; // 所属模块名
   moduleId: string;
-  storage?: string; // 存储方式
   createUser: string;
   createTime: number;
 }
diff --git a/frontend/src/models/setting/user.ts b/frontend/src/models/setting/user.ts
index aa29020fb1..3b75c601d4 100644
--- a/frontend/src/models/setting/user.ts
+++ b/frontend/src/models/setting/user.ts
@@ -120,3 +120,8 @@ export interface RegisterByInviteParams {
   password: string;
   phone: string;
 }
+
+export interface CreateUserResult {
+  errorEmails: Record<string, any>;
+  successList: any[];
+}
diff --git a/frontend/src/router/routes/modules/apiTest.ts b/frontend/src/router/routes/modules/apiTest.ts
index 55ec51805c..7727e197ed 100644
--- a/frontend/src/router/routes/modules/apiTest.ts
+++ b/frontend/src/router/routes/modules/apiTest.ts
@@ -33,6 +33,16 @@ const ApiTest: AppRouteRecordRaw = {
         isTopMenu: true,
       },
     },
+    {
+      path: 'management',
+      name: ApiTestRouteEnum.API_TEST_MANAGEMENT,
+      component: () => import('@/views/api-test/management/index.vue'),
+      meta: {
+        locale: 'menu.apiTest.management',
+        roles: ['*'],
+        isTopMenu: true,
+      },
+    },
   ],
 };
 
diff --git a/frontend/src/router/routes/modules/projectManagement.ts b/frontend/src/router/routes/modules/projectManagement.ts
index ca945546f7..23ab6d7eab 100644
--- a/frontend/src/router/routes/modules/projectManagement.ts
+++ b/frontend/src/router/routes/modules/projectManagement.ts
@@ -95,7 +95,7 @@ const ProjectManagement: AppRouteRecordRaw = {
           component: () => import('@/views/project-management/projectAndPermission/projectVersion/index.vue'),
           meta: {
             locale: 'project.permission.projectVersion',
-            roles: ['*'],
+            roles: ['PROJECT_VERSION:READ'],
           },
         },
         // 成员
@@ -252,7 +252,7 @@ const ProjectManagement: AppRouteRecordRaw = {
       component: () => import('@/views/project-management/messageManagement/edit.vue'),
       meta: {
         locale: 'menu.projectManagement.messageManagementEdit',
-        roles: ['*'],
+        roles: ['PROJECT_MESSAGE:READ+UPDATE'],
         breadcrumbs: [
           {
             name: ProjectManagementRouteEnum.PROJECT_MANAGEMENT_MESSAGE_MANAGEMENT,
diff --git a/frontend/src/store/modules/app/index.ts b/frontend/src/store/modules/app/index.ts
index 96593a1c25..6610d0e0ac 100644
--- a/frontend/src/store/modules/app/index.ts
+++ b/frontend/src/store/modules/app/index.ts
@@ -4,7 +4,7 @@ import { cloneDeep } from 'lodash-es';
 
 import type { BreadcrumbItem } from '@/components/business/ms-breadcrumb/types';
 
-import { getProjectInfo } from '@/api/modules/project-management/basicInfo';
+import { getProjectList } from '@/api/modules/project-management/project';
 import { getPageConfig } from '@/api/modules/setting/config';
 import { getPackageType, getSystemVersion } from '@/api/modules/system';
 import { getMenuList } from '@/api/modules/user';
@@ -13,6 +13,7 @@ import { useI18n } from '@/hooks/useI18n';
 import { watchStyle, watchTheme } from '@/utils/theme';
 
 import type { PageConfig, PageConfigKeys, Style, Theme } from '@/models/setting/config';
+import { ProjectListItem } from '@/models/setting/project';
 
 import type { AppState } from './types';
 import type { NotificationReturn } from '@arco-design/web-vue/es/notification/interface';
@@ -59,6 +60,7 @@ const useAppStore = defineStore('app', {
       ...defaultPlatformConfig,
     },
     packageType: '',
+    projectList: [] as ProjectListItem[],
   }),
 
   getters: {
@@ -218,6 +220,7 @@ const useAppStore = defineStore('app', {
       try {
         this.version = await getSystemVersion();
       } catch (error) {
+        // eslint-disable-next-line no-console
         console.log(error);
       }
     },
@@ -228,6 +231,7 @@ const useAppStore = defineStore('app', {
       try {
         this.packageType = await getPackageType();
       } catch (error) {
+        // eslint-disable-next-line no-console
         console.log(error);
       }
     },
@@ -293,6 +297,7 @@ const useAppStore = defineStore('app', {
           window.document.title = this.pageConfig.title;
         }
       } catch (error) {
+        // eslint-disable-next-line no-console
         console.log(error);
       }
     },
@@ -303,6 +308,19 @@ const useAppStore = defineStore('app', {
     async setCurrentMenuConfig(menuConfig: string[]) {
       this.currentMenuConfig = menuConfig;
     },
+    async initProjectList() {
+      try {
+        if (this.currentOrgId) {
+          const res = await getProjectList(this.getCurrentOrgId);
+          this.projectList = res;
+        } else {
+          this.projectList = [];
+        }
+      } catch (error) {
+        // eslint-disable-next-line no-console
+        console.log(error);
+      }
+    },
   },
   persist: {
     paths: ['currentOrgId', 'currentProjectId', 'pageConfig'],
diff --git a/frontend/src/store/modules/app/types.ts b/frontend/src/store/modules/app/types.ts
index bcd340ef77..102f82b929 100644
--- a/frontend/src/store/modules/app/types.ts
+++ b/frontend/src/store/modules/app/types.ts
@@ -2,7 +2,7 @@ import type { MsFileItem } from '@/components/pure/ms-upload/types';
 import type { BreadcrumbItem } from '@/components/business/ms-breadcrumb/types';
 
 import type { LoginConfig, PageConfig, PlatformConfig, ThemeConfig } from '@/models/setting/config';
-import { UserGroupAuthSetting } from '@/models/setting/usergroup';
+import { ProjectListItem } from '@/models/setting/project';
 
 import type { RouteRecordNormalized, RouteRecordRaw } from 'vue-router';
 
@@ -38,6 +38,7 @@ export interface AppState {
   innerHeight: number;
   currentMenuConfig: string[];
   packageType: string;
+  projectList: ProjectListItem[];
 }
 
 export interface UploadFileTaskState {
diff --git a/frontend/src/store/modules/user/index.ts b/frontend/src/store/modules/user/index.ts
index bfa91611d9..c810a926ce 100644
--- a/frontend/src/store/modules/user/index.ts
+++ b/frontend/src/store/modules/user/index.ts
@@ -111,8 +111,11 @@ const useUserStore = defineStore('user', {
         this.logoutCallBack();
       }
     },
-    // 是否已经登录
-    async isLogin() {
+    /**
+     * 判断用户是否登录并设置用户信息
+     * @param forceSet 是否强制设置项目 id 和组织 id，用于切换组织和项目时重写用户信息
+     */
+    async isLogin(forceSet = false) {
       try {
         const res = await userIsLogin();
         const appStore = useAppStore();
@@ -120,10 +123,10 @@ const useUserStore = defineStore('user', {
         this.setInfo(res);
         const { organizationId, projectId } = getHashParameters();
         // 如果访问页面的时候携带了组织 ID和项目 ID，则不设置
-        if (!organizationId) {
+        if (!organizationId || forceSet) {
           appStore.setCurrentOrgId(res.lastOrganizationId || '');
         }
-        if (!projectId) {
+        if (!projectId || forceSet) {
           appStore.setCurrentProjectId(res.lastProjectId || '');
         }
         return true;
diff --git a/frontend/src/utils/index.ts b/frontend/src/utils/index.ts
index a6658cc174..18cbe8058e 100644
--- a/frontend/src/utils/index.ts
+++ b/frontend/src/utils/index.ts
@@ -1,7 +1,5 @@
 import JSEncrypt from 'jsencrypt';
 
-import { codeCharset } from '@/config/apiTest';
-
 import { isObject } from './is';
 
 type TargetContext = '_self' | '_parent' | '_blank' | '_top';
diff --git a/frontend/src/views/api-test/components/apiMethodName.vue b/frontend/src/views/api-test/components/apiMethodName.vue
index b5014084bc..9747917a47 100644
--- a/frontend/src/views/api-test/components/apiMethodName.vue
+++ b/frontend/src/views/api-test/components/apiMethodName.vue
@@ -1,12 +1,21 @@
 <template>
-  <div class="font-medium" :style="{ color: methodColor }">{{ props.method }}</div>
+  <MsTag
+    v-if="props.isTag"
+    :self-style="{ border: `1px solid ${methodColor}`, color: methodColor, backgroundColor: 'white' }"
+  >
+    {{ props.method }}
+  </MsTag>
+  <div v-else class="font-medium" :style="{ color: methodColor }">{{ props.method }}</div>
 </template>
 
 <script setup lang="ts">
+  import MsTag from '@/components/pure/ms-tag/ms-tag.vue';
+
   import { RequestMethods } from '@/enums/apiEnum';
 
   const props = defineProps<{
     method: RequestMethods;
+    isTag?: boolean; // 是否展示为标签
   }>();
 
   const colorMaps = [
diff --git a/frontend/src/views/api-test/components/apiMethodSelect.vue b/frontend/src/views/api-test/components/apiMethodSelect.vue
new file mode 100644
index 0000000000..d2f65a94df
--- /dev/null
+++ b/frontend/src/views/api-test/components/apiMethodSelect.vue
@@ -0,0 +1,38 @@
+<template>
+  <a-select
+    v-model:model-value="method"
+    :placeholder="t('common.pleaseSelect')"
+    @change="(val) => emit('change', val as string)"
+  >
+    <template #label="{ data }">
+      <apiMethodName :method="data.value" class="inline-block" />
+    </template>
+    <a-option v-for="item of RequestMethods" :key="item" :value="item">
+      <apiMethodName :method="item" />
+    </a-option>
+  </a-select>
+</template>
+
+<script setup lang="ts">
+  import { useVModel } from '@vueuse/core';
+
+  import apiMethodName from '@/views/api-test/components/apiMethodName.vue';
+
+  import { useI18n } from '@/hooks/useI18n';
+
+  import { RequestMethods } from '@/enums/apiEnum';
+
+  const props = defineProps<{
+    modelValue: string;
+  }>();
+  const emit = defineEmits<{
+    (e: 'update:modelValue', value: string): void;
+    (e: 'change', value: string): void;
+  }>();
+
+  const { t } = useI18n();
+
+  const method = useVModel(props, 'modelValue', emit);
+</script>
+
+<style lang="less" scoped></style>
diff --git a/frontend/src/views/api-test/components/apiStatus.vue b/frontend/src/views/api-test/components/apiStatus.vue
new file mode 100644
index 0000000000..4e2f7e6fc2
--- /dev/null
+++ b/frontend/src/views/api-test/components/apiStatus.vue
@@ -0,0 +1,52 @@
+<template>
+  <MsTag :self-style="status.style"> {{ status.text }}</MsTag>
+</template>
+
+<script setup lang="ts">
+  import MsTag from '@/components/pure/ms-tag/ms-tag.vue';
+
+  import { useI18n } from '@/hooks/useI18n';
+
+  import { RequestDefinitionStatus } from '@/enums/apiEnum';
+
+  const props = defineProps<{
+    status: RequestDefinitionStatus;
+  }>();
+
+  const { t } = useI18n();
+
+  const statusMap = {
+    [RequestDefinitionStatus.DEPRECATED]: {
+      bgColor: 'var(--color-text-n8)',
+      color: 'var(--color-text-4)',
+      text: 'apiTestManagement.deprecate',
+    },
+    [RequestDefinitionStatus.PROCESSING]: {
+      bgColor: 'rgb(var(--link-2))',
+      color: 'rgb(var(--link-5))',
+      text: 'apiTestManagement.processing',
+    },
+    [RequestDefinitionStatus.DEBUGGING]: {
+      bgColor: 'rgb(var(--link-2))',
+      color: 'rgb(var(--link-6))',
+      text: 'apiTestManagement.debugging',
+    },
+    [RequestDefinitionStatus.DONE]: {
+      bgColor: 'rgb(var(--success-2))',
+      color: 'rgb(var(--success-6))',
+      text: 'apiTestManagement.done',
+    },
+  };
+  const status = computed(() => {
+    const config = statusMap[props.status];
+    return {
+      style: {
+        backgroundColor: config.bgColor,
+        color: config.color,
+      },
+      text: t(config.text),
+    };
+  });
+</script>
+
+<style lang="less" scoped></style>
diff --git a/frontend/src/views/api-test/debug/components/popConfirm.vue b/frontend/src/views/api-test/components/popConfirm.vue
similarity index 98%
rename from frontend/src/views/api-test/debug/components/popConfirm.vue
rename to frontend/src/views/api-test/components/popConfirm.vue
index 3aca1fa197..8e1c61d185 100644
--- a/frontend/src/views/api-test/debug/components/popConfirm.vue
+++ b/frontend/src/views/api-test/components/popConfirm.vue
@@ -66,7 +66,7 @@
   }
 
   const props = defineProps<{
-    mode: 'add' | 'rename' | 'fileRename' | 'fileUpdateDesc' | 'repositoryRename';
+    mode: 'add' | 'rename';
     visible?: boolean;
     title?: string;
     allNames: string[];
diff --git a/frontend/src/views/api-test/debug/components/debug/index.vue b/frontend/src/views/api-test/debug/components/debug/index.vue
index ef545e85b8..ff9992d788 100644
--- a/frontend/src/views/api-test/debug/components/debug/index.vue
+++ b/frontend/src/views/api-test/debug/components/debug/index.vue
@@ -26,14 +26,11 @@
           @change="handleActiveDebugChange"
         />
         <a-input-group class="flex-1">
-          <a-select v-model:model-value="activeDebug.method" class="w-[140px]" @change="handleActiveDebugChange">
-            <template #label="{ data }">
-              <apiMethodName :method="data.value" class="inline-block" />
-            </template>
-            <a-option v-for="method of RequestMethods" :key="method" :value="method">
-              <apiMethodName :method="method" />
-            </a-option>
-          </a-select>
+          <apiMethodSelect
+            v-model:model-value="activeDebug.method"
+            class="w-[140px]"
+            @change="handleActiveDebugChange"
+          />
           <a-input
             v-model:model-value="activeDebug.url"
             :max-length="255"
@@ -198,6 +195,7 @@
   import debugRest from './rest.vue';
   import debugSetting from './setting.vue';
   import apiMethodName from '@/views/api-test/components/apiMethodName.vue';
+  import apiMethodSelect from '@/views/api-test/components/apiMethodSelect.vue';
 
   import { useI18n } from '@/hooks/useI18n';
   import { registerCatchSaveShortcut, removeCatchSaveShortcut } from '@/utils/event';
diff --git a/frontend/src/views/api-test/debug/components/moduleTree.vue b/frontend/src/views/api-test/debug/components/moduleTree.vue
index b50a63d784..10295afb21 100644
--- a/frontend/src/views/api-test/debug/components/moduleTree.vue
+++ b/frontend/src/views/api-test/debug/components/moduleTree.vue
@@ -106,7 +106,7 @@
   import type { ActionsItem } from '@/components/pure/ms-table-more-action/types';
   import MsTree from '@/components/business/ms-tree/index.vue';
   import type { MsTreeNodeData } from '@/components/business/ms-tree/types';
-  import popConfirm from './popConfirm.vue';
+  import popConfirm from '@/views/api-test/components/popConfirm.vue';
 
   import { deleteReviewModule, getReviewModules, moveReviewModule } from '@/api/modules/case-management/caseReview';
   import { useI18n } from '@/hooks/useI18n';
@@ -336,7 +336,7 @@
 
 <style lang="less" scoped>
   .folder {
-    @apply flex cursor-pointer items-center justify-between;
+    @apply flex items-center justify-between;
 
     padding: 8px 4px;
     border-radius: var(--border-radius-small);
@@ -344,7 +344,7 @@
       background-color: rgb(var(--primary-1));
     }
     .folder-text {
-      @apply flex cursor-pointer items-center;
+      @apply flex items-center;
       .folder-icon {
         margin-right: 4px;
         color: var(--color-text-4);
diff --git a/frontend/src/views/api-test/debug/locale/zh-CN.ts b/frontend/src/views/api-test/debug/locale/zh-CN.ts
index b80679e2c1..c1e6b4b2fe 100644
--- a/frontend/src/views/api-test/debug/locale/zh-CN.ts
+++ b/frontend/src/views/api-test/debug/locale/zh-CN.ts
@@ -84,7 +84,7 @@ export default {
   'apiTestDebug.storageByResult': '按结果存储',
   'apiTestDebug.storageByResultPlaceholder': '如 {a}',
   'apiTestDebug.extractParameter': '提取参数',
-  'apiTestDebug.searchTip': '请输入分组名称',
+  'apiTestDebug.searchTip': '请输入模块/请求名称',
   'apiTestDebug.allRequest': '全部请求',
   'apiTestDebug.deleteFolderTipTitle': '是否删除 `{name}` 模块？',
   'apiTestDebug.deleteFolderTipContent': '该操作会删除模块及其下所有资源，请谨慎操作！',
diff --git a/frontend/src/views/api-test/management/components/import.vue b/frontend/src/views/api-test/management/components/import.vue
new file mode 100644
index 0000000000..3db7a89a3c
--- /dev/null
+++ b/frontend/src/views/api-test/management/components/import.vue
@@ -0,0 +1,409 @@
+<template>
+  <MsDrawer
+    v-model:visible="visible"
+    width="100%"
+    :popup-container="props.popupContainer"
+    :closable="false"
+    :ok-disabled="disabledConfirm"
+    disabled-width-drag
+    no-title
+    @confirm="confirmImport"
+    @cancel="cancelImport"
+  >
+    <template #title> </template>
+    <div class="flex items-center justify-between p-[12px_8px]">
+      <div class="font-medium text-[var(--color-text-1)]">{{ t('apiTestManagement.importApi') }}</div>
+      <a-radio-group v-model:model-value="importType" type="button">
+        <a-radio value="file">{{ t('apiTestManagement.fileImport') }}</a-radio>
+        <a-radio value="time">{{ t('apiTestManagement.timeImport') }}</a-radio>
+      </a-radio-group>
+    </div>
+    <div
+      v-if="importType === 'file'"
+      class="my-[16px] flex items-center gap-[16px] rounded-[var(--border-radius-small)] bg-[var(--color-text-n9)] p-[16px]"
+    >
+      <div
+        v-for="item of importFormatList"
+        :key="item.value"
+        :class="`import-item ${importFormat === item.value ? 'import-item--active' : ''}`"
+        @click="() => setActiveImportFormat(item.value)"
+      >
+        <div class="flex h-[24px] w-[24px] items-center justify-center rounded-[var(--border-radius-small)] bg-white">
+          <MsIcon :type="item.icon" :class="`text-[${item.iconColor}]`" :size="18" />
+        </div>
+        <div class="text-[var(--color-text-1)]">{{ item.name }}</div>
+      </div>
+    </div>
+    <a-form ref="importFormRef" :model="importForm" layout="vertical">
+      <template v-if="importType === 'file'">
+        <a-form-item :label="t('apiTestManagement.belongModule')">
+          <a-tree-select
+            v-model:modelValue="importForm.module"
+            :data="moduleTree"
+            class="w-[436px]"
+            :field-names="{ title: 'name', key: 'id', children: 'children' }"
+            allow-search
+          />
+        </a-form-item>
+        <a-form-item>
+          <template #label>
+            <div class="flex items-center gap-[2px]">
+              {{ t('apiTestManagement.importMode') }}
+              <a-tooltip position="right">
+                <icon-question-circle
+                  class="ml-[4px] text-[var(--color-text-4)] hover:text-[rgb(var(--primary-5))]"
+                  size="16"
+                />
+                <template #content>
+                  <div>{{ t('apiTestManagement.importModeTip1') }}</div>
+                  <div>{{ t('apiTestManagement.importModeTip2') }}</div>
+                  <div>{{ t('apiTestManagement.importModeTip3') }}</div>
+                  <div>{{ t('apiTestManagement.importModeTip4') }}</div>
+                  <div class="h-[22px] w-full"></div>
+                  <div>{{ t('apiTestManagement.importModeTip5') }}</div>
+                  <div>{{ t('apiTestManagement.importModeTip6') }}</div>
+                  <div>{{ t('apiTestManagement.importModeTip7') }}</div>
+                </template>
+              </a-tooltip>
+            </div>
+          </template>
+          <a-select v-model:model-value="importForm.mode" class="w-[240px]">
+            <a-option value="cover">{{ t('apiTestManagement.cover') }}</a-option>
+            <a-option value="uncover">{{ t('apiTestManagement.uncover') }}</a-option>
+          </a-select>
+        </a-form-item>
+        <a-collapse v-model:active-key="moreSettingActive" :bordered="false" :show-expand-icon="false">
+          <a-collapse-item :key="1">
+            <template #header>
+              <MsButton
+                type="text"
+                @click="() => (moreSettingActive.length > 0 ? (moreSettingActive = []) : (moreSettingActive = [1]))"
+              >
+                {{ t('apiTestDebug.moreSetting') }}
+                <icon-down v-if="moreSettingActive.length > 0" class="text-rgb(var(--primary-5))" />
+                <icon-right v-else class="text-rgb(var(--primary-5))" />
+              </MsButton>
+            </template>
+            <div class="mt-[16px]">
+              <a-checkbox v-model:model-value="importForm.syncImportCase" class="mr-[24px]">
+                {{ t('apiTestManagement.syncImportCase') }}
+              </a-checkbox>
+              <a-checkbox v-model:model-value="importForm.syncUpdateDirectory">
+                {{ t('apiTestManagement.syncUpdateDirectory') }}
+              </a-checkbox>
+            </div>
+          </a-collapse-item>
+        </a-collapse>
+        <a-form-item :label="t('apiTestManagement.importType')" class="mt-[8px]">
+          <a-radio-group v-model:model-value="importForm.importType" type="button">
+            <a-radio value="file">{{ t('apiTestManagement.fileImport') }}</a-radio>
+            <a-radio value="url">{{ t('apiTestManagement.urlImport') }}</a-radio>
+          </a-radio-group>
+        </a-form-item>
+        <MsUpload
+          v-if="importForm.importType === 'file'"
+          v-model:file-list="importForm.file"
+          accept="json"
+          :auto-upload="false"
+          draggable
+          size-unit="MB"
+          class="w-full"
+        >
+          <template #subText>
+            <div class="flex">
+              {{ t('apiTestManagement.importSwaggerFileTip1') }}
+              <div class="text-[rgb(var(--warning-6))]">{{ t('apiTestManagement.importSwaggerFileTip2') }}</div>
+              {{ t('apiTestManagement.importSwaggerFileTip3') }}
+            </div>
+          </template>
+        </MsUpload>
+        <template v-else>
+          <a-form-item
+            field="url"
+            label="SwaggerURL"
+            asterisk-position="end"
+            :rules="[{ required: true, message: t('apiTestManagement.swaggerURLRequired') }]"
+          >
+            <a-input
+              v-model:model-value="importForm.url"
+              :placeholder="t('apiTestManagement.urlImportPlaceholder')"
+              class="w-[700px]"
+              allow-clear
+            ></a-input>
+          </a-form-item>
+          <div class="mb-[16px] flex items-center gap-[8px]">
+            <a-switch v-model:model-value="importForm.basicAuth" type="line" size="small"></a-switch>
+            {{ t('apiTestManagement.basicAuth') }}
+          </div>
+          <template v-if="importForm.basicAuth">
+            <a-form-item
+              field="account"
+              :label="t('apiTestManagement.account')"
+              asterisk-position="end"
+              :rules="[{ required: true, message: t('apiTestManagement.accountRequired') }]"
+            >
+              <a-input
+                v-model:model-value="importForm.account"
+                :placeholder="t('common.pleaseInput')"
+                class="w-[500px]"
+                allow-clear
+              ></a-input>
+            </a-form-item>
+            <a-form-item
+              field="password"
+              :label="t('apiTestManagement.password')"
+              asterisk-position="end"
+              :rules="[{ required: true, message: t('apiTestManagement.passwordRequired') }]"
+              autocomplete="new-password"
+            >
+              <a-input-password
+                v-model:model-value="importForm.password"
+                :placeholder="t('common.pleaseInput')"
+                class="w-[500px]"
+                autocomplete="new-password"
+                allow-clear
+              ></a-input-password>
+            </a-form-item>
+          </template>
+        </template>
+      </template>
+      <template v-else>
+        <a-form-item
+          field="taskName"
+          :label="t('apiTestManagement.taskName')"
+          :rules="[{ required: true, message: t('apiTestManagement.taskNameRequired') }]"
+        >
+          <div class="flex w-full items-center gap-[8px]">
+            <a-input
+              v-model:model-value="importForm.taskName"
+              :placeholder="t('apiTestManagement.taskNamePlaceholder')"
+              :max-length="255"
+              class="flex-1"
+            ></a-input>
+            <MsButton type="text">{{ t('apiTestManagement.timeTaskList') }}</MsButton>
+          </div>
+        </a-form-item>
+        <a-form-item
+          field="url"
+          label="SwaggerURL"
+          asterisk-position="end"
+          :rules="[{ required: true, message: t('apiTestManagement.swaggerURLRequired') }]"
+        >
+          <a-input
+            v-model:model-value="importForm.url"
+            :placeholder="t('apiTestManagement.urlImportPlaceholder')"
+            class="w-[700px]"
+            allow-clear
+          ></a-input>
+        </a-form-item>
+        <div class="mb-[16px] flex items-center gap-[8px]">
+          <a-switch v-model:model-value="importForm.basicAuth" type="line" size="small"></a-switch>
+          {{ t('apiTestManagement.basicAuth') }}
+        </div>
+        <template v-if="importForm.basicAuth">
+          <a-form-item
+            field="account"
+            :label="t('apiTestManagement.account')"
+            :rules="[{ required: true, message: t('apiTestManagement.accountRequired') }]"
+            asterisk-position="end"
+          >
+            <a-input
+              v-model:model-value="importForm.account"
+              :placeholder="t('common.pleaseInput')"
+              class="w-[500px]"
+              allow-clear
+            />
+          </a-form-item>
+          <a-form-item
+            field="password"
+            :label="t('apiTestManagement.password')"
+            :rules="[{ required: true, message: t('apiTestManagement.passwordRequired') }]"
+            asterisk-position="end"
+            autocomplete="new-password"
+          >
+            <a-input-password
+              v-model:model-value="importForm.password"
+              :placeholder="t('common.pleaseInput')"
+              class="w-[500px]"
+              autocomplete="new-password"
+              allow-clear
+            />
+          </a-form-item>
+        </template>
+        <a-form-item :label="t('apiTestManagement.belongModule')">
+          <a-tree-select
+            v-model:modelValue="importForm.module"
+            :data="moduleTree"
+            class="w-[436px]"
+            :field-names="{ title: 'name', key: 'id', children: 'children' }"
+            allow-search
+          />
+        </a-form-item>
+        <a-form-item>
+          <template #label>
+            <div class="flex items-center gap-[2px]">
+              {{ t('apiTestManagement.importMode') }}
+              <a-tooltip position="right">
+                <icon-question-circle
+                  class="ml-[4px] text-[var(--color-text-4)] hover:text-[rgb(var(--primary-5))]"
+                  size="16"
+                />
+                <template #content>
+                  <div>{{ t('apiTestManagement.importModeTip1') }}</div>
+                  <div>{{ t('apiTestManagement.importModeTip2') }}</div>
+                  <div>{{ t('apiTestManagement.importModeTip3') }}</div>
+                  <div>{{ t('apiTestManagement.importModeTip4') }}</div>
+                  <div class="h-[22px] w-full"></div>
+                  <div>{{ t('apiTestManagement.importModeTip5') }}</div>
+                  <div>{{ t('apiTestManagement.importModeTip6') }}</div>
+                  <div>{{ t('apiTestManagement.importModeTip7') }}</div>
+                </template>
+              </a-tooltip>
+            </div>
+          </template>
+          <a-select v-model:model-value="importForm.mode" class="w-[240px]">
+            <a-option value="cover">{{ t('apiTestManagement.cover') }}</a-option>
+            <a-option value="uncover">{{ t('apiTestManagement.uncover') }}</a-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item :label="t('apiTestManagement.syncFrequency')">
+          <a-select v-model:model-value="importForm.syncFrequency" class="w-[240px]">
+            <template #label="{ data }">
+              <div class="flex items-center">
+                {{ data.value }}
+                <div class="ml-[4px] text-[var(--color-text-4)]">{{ data.label.split('?')[1] }}</div>
+              </div>
+            </template>
+            <a-option v-for="item of syncFrequencyOptions" :key="item.value" :value="item.value" class="block">
+              <div class="flex w-full items-center justify-between">
+                {{ item.value }}
+                <div class="ml-[4px] text-[var(--color-text-4)]">{{ item.label }}</div>
+              </div>
+            </a-option>
+            <template #footer>
+              <div class="flex items-center p-[4px_8px]">
+                <MsButton type="text">{{ t('apiTestManagement.customFrequency') }}</MsButton>
+              </div>
+            </template>
+          </a-select>
+        </a-form-item>
+      </template>
+    </a-form>
+  </MsDrawer>
+</template>
+
+<script setup lang="ts">
+  import { useVModel } from '@vueuse/core';
+  import { FormInstance, Message } from '@arco-design/web-vue';
+
+  import MsButton from '@/components/pure/ms-button/index.vue';
+  import MsDrawer from '@/components/pure/ms-drawer/index.vue';
+  import MsIcon from '@/components/pure/ms-icon-font/index.vue';
+  import MsUpload from '@/components/pure/ms-upload/index.vue';
+
+  import { useI18n } from '@/hooks/useI18n';
+  import { mapTree } from '@/utils';
+
+  import { ModuleTreeNode } from '@/models/projectManagement/file';
+  import { RequestImportFormat } from '@/enums/apiEnum';
+
+  const props = defineProps<{
+    visible: boolean;
+    moduleTree: ModuleTreeNode[];
+    popupContainer?: string;
+  }>();
+  const emit = defineEmits(['update:visible']);
+
+  const { t } = useI18n();
+
+  const visible = useVModel(props, 'visible', emit);
+  const importType = ref<'file' | 'time'>('file');
+  const importFormat = ref<keyof typeof RequestImportFormat>('SWAGGER');
+  const importFormatList = [
+    {
+      name: 'Swagger',
+      value: RequestImportFormat.SWAGGER,
+      icon: 'icon-icon_swagger',
+      iconColor: 'rgb(var(--success-7))',
+    },
+  ];
+
+  function setActiveImportFormat(format: RequestImportFormat) {
+    importFormat.value = format;
+  }
+
+  const defaultForm = {
+    taskName: '',
+    module: 'root',
+    mode: 'cover',
+    syncImportCase: true,
+    syncUpdateDirectory: false,
+    importType: 'file',
+    file: [],
+    url: '',
+    basicAuth: false,
+    account: '',
+    password: '',
+    syncFrequency: '0 0 0/1 * ?',
+  };
+  const importForm = ref({ ...defaultForm });
+  const importFormRef = ref<FormInstance>();
+  const moreSettingActive = ref<number[]>([]);
+  const disabledConfirm = computed(() => {
+    if (importType.value === 'file') {
+      if (importForm.value.importType === 'file') {
+        return !importForm.value.file.length;
+      }
+      return !importForm.value.url;
+    }
+    return !importForm.value.taskName || !importForm.value.url;
+  });
+  const moduleTree = computed(() => mapTree(props.moduleTree, (node) => ({ ...node, draggable: false })));
+  const syncFrequencyOptions = [
+    { label: t('apiTestManagement.timeTaskHour'), value: '0 0 0/1 * ?' },
+    { label: t('apiTestManagement.timeTaskSixHour'), value: '0 0 0/6 * ?' },
+    { label: t('apiTestManagement.timeTaskTwelveHour'), value: '0 0 0/12 * ?' },
+    { label: t('apiTestManagement.timeTaskDay'), value: '0 0 0 * ?' },
+  ];
+
+  function cancelImport() {
+    visible.value = false;
+    importForm.value = { ...defaultForm };
+    importFormRef.value?.resetFields();
+  }
+
+  function confirmImport() {
+    importFormRef.value?.validate(async (errors) => {
+      if (!errors) {
+        try {
+          Message.success(t('common.importSuccess'));
+          cancelImport();
+        } catch (error) {
+          // eslint-disable-next-line no-console
+          console.log(error);
+        }
+      }
+    });
+  }
+</script>
+
+<style lang="less" scoped>
+  .import-item {
+    @apply flex cursor-pointer items-center bg-white;
+
+    padding: 8px;
+    gap: 6px;
+    width: 200px;
+    border-radius: var(--border-radius-small);
+  }
+  .import-item--active {
+    border: 1px solid rgb(var(--primary-5));
+    background-color: rgb(var(--primary-1));
+  }
+  :deep(.arco-form-item) {
+    margin-bottom: 16px;
+  }
+  :deep(.arco-select-view-value::after) {
+    @apply hidden;
+  }
+</style>
diff --git a/frontend/src/views/api-test/management/components/management/api.vue b/frontend/src/views/api-test/management/components/management/api.vue
new file mode 100644
index 0000000000..a83104aca0
--- /dev/null
+++ b/frontend/src/views/api-test/management/components/management/api.vue
@@ -0,0 +1,821 @@
+<template>
+  <div class="border-b border-[var(--color-text-n8)] px-[22px] pb-[16px]">
+    <MsEditableTab
+      v-model:active-tab="activeRequestTab"
+      v-model:tabs="apiTabs"
+      :more-action-list="tabMoreActionList"
+      @add="addDebugTab"
+      @close="closeDebugTab"
+      @change="setActiveDebug"
+      @more-action-select="handleTabMoreActionSelect"
+    >
+      <template #label="{ tab }">
+        <apiMethodName v-if="tab.id !== 'all'" :method="tab.method" class="mr-[4px]" />
+        {{ tab.label }}
+      </template>
+    </MsEditableTab>
+  </div>
+  <div class="p-[16px_22px]">
+    <div class="flex items-center justify-between">
+      <div class="flex items-center gap-[8px]">
+        <a-switch v-model:model-value="showSubdirectory" size="small" type="line"></a-switch>
+        {{ t('apiTestManagement.showSubdirectory') }}
+      </div>
+      <div class="flex items-center gap-[8px]">
+        <a-button type="outline" class="arco-btn-outline--secondary !p-[8px]">
+          <template #icon>
+            <icon-location class="text-[var(--color-text-4)]" />
+          </template>
+        </a-button>
+        <MsSelect
+          v-model:model-value="checkedEnv"
+          mode="static"
+          :options="envOptions"
+          class="w-[200px]"
+          :search-keys="['label']"
+          allow-search
+        />
+        <a-input-search
+          v-model:model-value="keyword"
+          :placeholder="t('apiTestManagement.searchPlaceholder')"
+          allow-clear
+          class="mr-[8px] w-[240px]"
+          @search="loadApiList"
+          @press-enter="loadApiList"
+        />
+        <a-button type="outline" class="arco-btn-outline--secondary !p-[8px]">
+          <template #icon>
+            <icon-refresh class="text-[var(--color-text-4)]" />
+          </template>
+        </a-button>
+      </div>
+    </div>
+    <ms-base-table
+      v-bind="propsRes"
+      :action-config="batchActions"
+      no-disable
+      filter-icon-align-left
+      v-on="propsEvent"
+      @selected-change="handleTableSelect"
+      @batch-action="handleTableBatch"
+    >
+      <template #typeFilter="{ columnConfig }">
+        <a-trigger v-model:popup-visible="typeFilterVisible" trigger="click" @popup-visible-change="handleFilterHidden">
+          <a-button type="text" class="arco-btn-text--secondary" @click="typeFilterVisible = true">
+            {{ t(columnConfig.title as string) }}
+            <icon-down :class="typeFilterVisible ? 'text-[rgb(var(--primary-5))]' : ''" />
+          </a-button>
+          <template #content>
+            <div class="arco-table-filters-content">
+              <div class="flex items-center justify-center px-[6px] py-[2px]">
+                <a-checkbox-group v-model:model-value="typeFilters" direction="vertical" size="small">
+                  <a-checkbox v-for="key of RequestMethods" :key="key" :value="key">
+                    <apiMethodName :method="key" />
+                  </a-checkbox>
+                </a-checkbox-group>
+              </div>
+            </div>
+          </template>
+        </a-trigger>
+      </template>
+      <template #statusFilter="{ columnConfig }">
+        <a-trigger
+          v-model:popup-visible="statusFilterVisible"
+          trigger="click"
+          @popup-visible-change="handleFilterHidden"
+        >
+          <a-button type="text" class="arco-btn-text--secondary" @click="statusFilterVisible = true">
+            {{ t(columnConfig.title as string) }}
+            <icon-down :class="statusFilterVisible ? 'text-[rgb(var(--primary-5))]' : ''" />
+          </a-button>
+          <template #content>
+            <div class="arco-table-filters-content">
+              <div class="flex items-center justify-center px-[6px] py-[2px]">
+                <a-checkbox-group v-model:model-value="statusFilters" direction="vertical" size="small">
+                  <a-checkbox v-for="key of RequestDefinitionStatus" :key="key" :value="key">
+                    <apiStatus :status="key" />
+                  </a-checkbox>
+                </a-checkbox-group>
+              </div>
+            </div>
+          </template>
+        </a-trigger>
+      </template>
+      <template #type="{ record }">
+        <apiMethodName :method="record.type" is-tag />
+      </template>
+      <template #status="{ record }">
+        <a-select
+          v-model:model-value="record.status"
+          :placeholder="t('common.pleaseSelect')"
+          class="param-input w-full"
+          @change="() => handleStatusChange(record)"
+        >
+          <template #label>
+            <apiStatus :status="record.status" />
+          </template>
+          <a-option v-for="item of RequestDefinitionStatus" :key="item" :value="item">
+            <apiStatus :status="item" />
+          </a-option>
+        </a-select>
+      </template>
+      <template #action="{ record }">
+        <MsButton type="text" class="!mr-0">
+          {{ t('apiTestManagement.execute') }}
+        </MsButton>
+        <a-divider direction="vertical" :margin="8"></a-divider>
+        <MsButton type="text" class="!mr-0">
+          {{ t('common.copy') }}
+        </MsButton>
+        <a-divider direction="vertical" :margin="8"></a-divider>
+        <MsTableMoreAction :list="tableMoreActionList" @select="handleTableMoreActionSelect($event, record)" />
+      </template>
+    </ms-base-table>
+  </div>
+  <a-modal v-model:visible="showBatchModal" title-align="start" class="ms-modal-upload ms-modal-medium" :width="480">
+    <template #title>
+      {{ t('common.edit') }}
+      <div class="text-[var(--color-text-4)]">
+        {{
+          t('apiTestManagement.batchModalSubTitle', {
+            count: batchParams.currentSelectCount || tableSelected.length,
+          })
+        }}
+      </div>
+    </template>
+    <a-form ref="batchFormRef" class="rounded-[4px]" :model="batchForm" layout="vertical">
+      <a-form-item
+        field="attr"
+        :label="t('apiTestManagement.chooseAttr')"
+        :rules="[{ required: true, message: t('apiTestManagement.attrRequired') }]"
+        asterisk-position="end"
+      >
+        <a-select v-model="batchForm.attr" :placeholder="t('common.pleaseSelect')">
+          <a-option v-for="item of attrOptions" :key="item.value" :value="item.value">
+            {{ t(item.name) }}
+          </a-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item
+        v-if="batchForm.attr === 'tag'"
+        field="values"
+        :label="t('apiTestManagement.batchUpdate')"
+        :rules="[{ required: true, message: t('apiTestManagement.valueRequired') }]"
+        asterisk-position="end"
+        class="mb-0"
+      >
+        <MsTagsInput
+          v-model:model-value="batchForm.values"
+          placeholder="common.tagsInputPlaceholder"
+          allow-clear
+          unique-value
+          retain-input-value
+        />
+      </a-form-item>
+      <a-form-item
+        v-else
+        field="value"
+        :label="t('apiTestManagement.batchUpdate')"
+        :rules="[{ required: true, message: t('apiTestManagement.valueRequired') }]"
+        asterisk-position="end"
+        class="mb-0"
+      >
+        <apiMethodSelect
+          v-if="batchForm.attr === 'type'"
+          v-model:model-value="batchForm.value"
+          @change="handleActiveDebugChange"
+        />
+        <a-select
+          v-else
+          v-model="batchForm.value"
+          :placeholder="t('common.pleaseSelect')"
+          :disabled="batchForm.attr === ''"
+        >
+          <a-option v-for="item of valueOptions" :key="item.value" :value="item.value">
+            {{ t(item.name) }}
+          </a-option>
+        </a-select>
+      </a-form-item>
+    </a-form>
+    <template #footer>
+      <a-button type="secondary" :disabled="batchUpdateLoading" @click="cancelBatch">
+        {{ t('common.cancel') }}
+      </a-button>
+      <a-button type="primary" :loading="batchUpdateLoading" @click="batchUpdate">
+        {{ t('common.update') }}
+      </a-button>
+    </template>
+  </a-modal>
+  <a-modal
+    v-model:visible="moveModalVisible"
+    title-align="start"
+    class="ms-modal-no-padding ms-modal-small"
+    :mask-closable="false"
+    :ok-text="t('apiTestManagement.batchMoveConfirm')"
+    :ok-button-props="{ disabled: selectedModuleKeys.length === 0 }"
+    :cancel-button-props="{ disabled: batchMoveApiLoading }"
+    :on-before-ok="handleApiMove"
+    @close="handleMoveApiModalCancel"
+  >
+    <template #title>
+      <div class="flex items-center">
+        {{ isBatchMove ? t('common.batchMove') : t('common.move') }}
+        <div
+          class="one-line-text ml-[4px] max-w-[70%] text-[var(--color-text-4)]"
+          :title="
+            isBatchMove
+              ? t('apiTestManagement.batchModalSubTitle', { count: tableSelected.length })
+              : `(${activeApi?.name})`
+          "
+        >
+          {{
+            isBatchMove
+              ? t('apiTestManagement.batchModalSubTitle', { count: tableSelected.length })
+              : `(${activeApi?.name})`
+          }}
+        </div>
+      </div>
+    </template>
+    <moduleTree
+      v-if="moveModalVisible"
+      :is-expand-all="true"
+      is-modal
+      :active-module="props.activeModule"
+      @folder-node-select="folderNodeSelect"
+    />
+  </a-modal>
+</template>
+
+<script setup lang="ts">
+  import { FormInstance, Message } from '@arco-design/web-vue';
+  import dayjs from 'dayjs';
+
+  import MsButton from '@/components/pure/ms-button/index.vue';
+  import MsEditableTab from '@/components/pure/ms-editable-tab/index.vue';
+  import { TabItem } from '@/components/pure/ms-editable-tab/types';
+  import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
+  import type { BatchActionParams, BatchActionQueryParams, MsTableColumn } from '@/components/pure/ms-table/type';
+  import useTable from '@/components/pure/ms-table/useTable';
+  import MsTableMoreAction from '@/components/pure/ms-table-more-action/index.vue';
+  import { ActionsItem } from '@/components/pure/ms-table-more-action/types';
+  import MsTagsInput from '@/components/pure/ms-tags-input/index.vue';
+  import MsSelect from '@/components/business/ms-select';
+  import moduleTree from '../moduleTree.vue';
+  import apiMethodName from '@/views/api-test/components/apiMethodName.vue';
+  import apiMethodSelect from '@/views/api-test/components/apiMethodSelect.vue';
+  import apiStatus from '@/views/api-test/components/apiStatus.vue';
+
+  import { useI18n } from '@/hooks/useI18n';
+  import useModal from '@/hooks/useModal';
+  import useTableStore from '@/hooks/useTableStore';
+  import useAppStore from '@/store/modules/app';
+
+  import { RequestDefinitionStatus, RequestMethods } from '@/enums/apiEnum';
+  import { TableKeyEnum } from '@/enums/tableEnum';
+
+  const props = defineProps<{
+    module: string;
+    allCount: number;
+    activeModule: string;
+    offspringIds: string[];
+  }>();
+  const emit = defineEmits<{
+    (e: 'init', params: any): void;
+  }>();
+
+  const appStore = useAppStore();
+  const { t } = useI18n();
+  const { openModal } = useModal();
+
+  const activeRequestTab = ref<string | number>('all');
+  const apiTabs = ref<TabItem[]>([
+    {
+      id: 'all',
+      label: `${t('apiTestManagement.allApi')}(${props.allCount})`,
+      closable: false,
+    },
+  ]);
+  const activeApiTab = ref<TabItem>(apiTabs.value[0]);
+
+  function setActiveDebug(item: TabItem) {
+    activeApiTab.value = item;
+  }
+
+  function handleActiveDebugChange() {
+    activeApiTab.value.unSaved = true;
+  }
+
+  function addDebugTab(defaultProps?: Partial<TabItem>) {
+    const id = `debug-${Date.now()}`;
+    apiTabs.value.push({
+      module: props.module,
+      label: t('apiTestDebug.newApi'),
+      id,
+      ...defaultProps,
+    });
+    activeRequestTab.value = id;
+    nextTick(() => {
+      if (defaultProps) {
+        handleActiveDebugChange();
+      }
+    });
+  }
+
+  function closeDebugTab(tab: TabItem) {
+    const index = apiTabs.value.findIndex((item) => item.id === tab.id);
+    apiTabs.value.splice(index, 1);
+    if (activeRequestTab.value === tab.id) {
+      activeRequestTab.value = apiTabs.value[0]?.id || '';
+    }
+  }
+
+  const tabMoreActionList = [
+    {
+      eventTag: 'closeAll',
+      label: t('apiTestManagement.closeAll'),
+    },
+    {
+      eventTag: 'closeOther',
+      label: t('apiTestManagement.closeOther'),
+    },
+  ];
+
+  function handleTabMoreActionSelect(event: ActionsItem) {
+    if (event.eventTag === 'closeOther') {
+      apiTabs.value = apiTabs.value.filter((item) => item.id === activeRequestTab.value || item.closable === false);
+    } else if (event.eventTag === 'closeAll') {
+      apiTabs.value = apiTabs.value.filter((item) => item.id === 'all');
+      activeRequestTab.value = 'all';
+    }
+  }
+
+  const showSubdirectory = ref(false);
+  const checkedEnv = ref('DEV');
+  const envOptions = ref([
+    {
+      label: 'DEV',
+      value: 'DEV',
+    },
+    {
+      label: 'TEST',
+      value: 'TEST',
+    },
+    {
+      label: 'PRE',
+      value: 'PRE',
+    },
+    {
+      label: 'PROD',
+      value: 'PROD',
+    },
+  ]);
+  const keyword = ref('');
+
+  const columns: MsTableColumn = [
+    {
+      title: 'ID',
+      dataIndex: 'num',
+      sortIndex: 1,
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+        sorter: true,
+      },
+      width: 100,
+    },
+    {
+      title: 'apiTestManagement.apiName',
+      dataIndex: 'name',
+      showTooltip: true,
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+        sorter: true,
+      },
+      width: 200,
+    },
+    {
+      title: 'apiTestManagement.apiType',
+      dataIndex: 'type',
+      slotName: 'type',
+      titleSlotName: 'typeFilter',
+      width: 120,
+    },
+    {
+      title: 'apiTestManagement.apiStatus',
+      dataIndex: 'status',
+      slotName: 'status',
+      titleSlotName: 'statusFilter',
+      width: 130,
+    },
+    {
+      title: 'apiTestManagement.responsiblePerson',
+      titleSlotName: 'responsiblePersonFilter',
+      showTooltip: true,
+      width: 100,
+    },
+    {
+      title: 'apiTestManagement.path',
+      slotName: 'path',
+      dataIndex: 'path',
+      width: 100,
+    },
+    {
+      title: 'common.tag',
+      dataIndex: 'tags',
+      isTag: true,
+      width: 150,
+    },
+    {
+      title: 'apiTestManagement.version',
+      dataIndex: 'version',
+      width: 100,
+    },
+    {
+      title: 'apiTestManagement.createTime',
+      dataIndex: 'createTime',
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+        sorter: true,
+      },
+      width: 200,
+    },
+    {
+      title: 'apiTestManagement.updateTime',
+      dataIndex: 'updateTime',
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+        sorter: true,
+      },
+      width: 200,
+    },
+    {
+      title: 'common.operation',
+      slotName: 'action',
+      dataIndex: 'operation',
+      fixed: 'right',
+      width: 150,
+    },
+  ];
+  const tableStore = useTableStore();
+  await tableStore.initColumn(TableKeyEnum.API_TEST, columns, 'drawer');
+  const { propsRes, propsEvent, loadList, setLoadListParams, resetSelector } = useTable(
+    () =>
+      Promise.resolve({
+        list: [
+          {
+            id: 1001,
+            name: 'asdasdasd',
+            type: RequestMethods.CONNECT,
+            status: RequestDefinitionStatus.DEBUGGING,
+          },
+          {
+            id: 10011,
+            name: '1123',
+            type: RequestMethods.OPTIONS,
+            status: RequestDefinitionStatus.DEPRECATED,
+          },
+          {
+            id: 10012,
+            name: 'vfd',
+            type: RequestMethods.POST,
+            status: RequestDefinitionStatus.DONE,
+          },
+          {
+            id: 10013,
+            name: 'ccf',
+            type: RequestMethods.DELETE,
+            status: RequestDefinitionStatus.PROCESSING,
+          },
+        ],
+        total: 0,
+      }),
+    {
+      tableKey: TableKeyEnum.API_TEST,
+      showSetting: true,
+      selectable: true,
+      showSelectAll: true,
+      draggable: { type: 'handle', width: 32 },
+    },
+    (item) => ({
+      ...item,
+      createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs(item.updateTime).format('YYYY-MM-DD HH:mm:ss'),
+    })
+  );
+  const batchActions = {
+    baseAction: [
+      {
+        label: 'common.export',
+        eventTag: 'export',
+      },
+      {
+        label: 'common.edit',
+        eventTag: 'edit',
+      },
+      {
+        label: 'common.move',
+        eventTag: 'move',
+      },
+    ],
+    moreAction: [
+      {
+        label: 'common.delete',
+        eventTag: 'delete',
+        danger: true,
+      },
+    ],
+  };
+  const tableMoreActionList = [
+    {
+      eventTag: 'delete',
+      label: t('common.delete'),
+      danger: true,
+    },
+  ];
+
+  const typeFilterVisible = ref(false);
+  const typeFilters = ref(Object.keys(RequestMethods));
+  const statusFilterVisible = ref(false);
+  const statusFilters = ref(Object.keys(RequestDefinitionStatus));
+  const tableQueryParams = ref<any>();
+  function loadApiList() {
+    const params = {
+      keyword: keyword.value,
+      projectId: appStore.currentProjectId,
+      moduleIds: props.activeModule === 'all' ? [] : [props.activeModule, ...props.offspringIds],
+      env: checkedEnv.value,
+      showSubdirectory: showSubdirectory.value,
+      filter: { status: statusFilters.value, type: typeFilters.value },
+    };
+    setLoadListParams(params);
+    loadList();
+    tableQueryParams.value = {
+      ...params,
+      current: propsRes.value.msPagination?.current,
+      pageSize: propsRes.value.msPagination?.pageSize,
+    };
+    emit('init', {
+      ...tableQueryParams.value,
+    });
+  }
+
+  function handleFilterHidden(val: boolean) {
+    if (!val) {
+      loadApiList();
+    }
+  }
+
+  async function handleStatusChange(record: any) {
+    try {
+      Message.success(t('common.updateSuccess'));
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.log(error);
+    }
+  }
+
+  onBeforeMount(() => {
+    loadApiList();
+  });
+
+  function emitTableParams() {
+    emit('init', {
+      keyword: keyword.value,
+      moduleIds: [],
+      projectId: appStore.currentProjectId,
+      current: propsRes.value.msPagination?.current,
+      pageSize: propsRes.value.msPagination?.pageSize,
+    });
+  }
+
+  const tableSelected = ref<(string | number)[]>([]);
+  const batchParams = ref<BatchActionQueryParams>({
+    selectedIds: [],
+    selectAll: false,
+    excludeIds: [],
+    currentSelectCount: 0,
+  });
+
+  /**
+   * 删除接口
+   */
+  function deleteApi(record?: any, isBatch?: boolean, params?: BatchActionQueryParams) {
+    let title = t('apiTestManagement.deleteApiTipTitle', { name: record?.name });
+    let selectIds = [record?.id || ''];
+    if (isBatch) {
+      title = t('apiTestManagement.batchDeleteApiTip', {
+        count: params?.currentSelectCount || tableSelected.value.length,
+      });
+      selectIds = tableSelected.value as string[];
+    }
+    openModal({
+      type: 'error',
+      title,
+      content: t('apiTestManagement.deleteApiTip'),
+      okText: t('common.confirmDelete'),
+      cancelText: t('common.cancel'),
+      okButtonProps: {
+        status: 'danger',
+      },
+      maskClosable: false,
+      onBeforeOk: async () => {
+        try {
+          Message.success(t('common.deleteSuccess'));
+          resetSelector();
+          loadList();
+        } catch (error) {
+          // eslint-disable-next-line no-console
+          console.log(error);
+        }
+      },
+      hideCancel: false,
+    });
+  }
+
+  /**
+   * 处理表格更多按钮事件
+   * @param item
+   */
+  function handleTableMoreActionSelect(item: ActionsItem, record: any) {
+    switch (item.eventTag) {
+      case 'delete':
+        deleteApi(record);
+        break;
+      default:
+        break;
+    }
+  }
+
+  /**
+   * 处理表格选中
+   */
+  function handleTableSelect(arr: (string | number)[]) {
+    tableSelected.value = arr;
+  }
+
+  const showBatchModal = ref(false);
+  const batchUpdateLoading = ref(false);
+  const batchFormRef = ref<FormInstance>();
+  const batchForm = ref({
+    attr: '',
+    value: '',
+    values: [],
+  });
+  const attrOptions = [
+    {
+      name: 'apiTestManagement.apiStatus',
+      value: 'status',
+    },
+    {
+      name: 'apiTestManagement.apiType',
+      value: 'type',
+    },
+    {
+      name: 'common.tag',
+      value: 'tag',
+    },
+  ];
+  const valueOptions = computed(() => {
+    switch (batchForm.value.attr) {
+      case 'status':
+        return [
+          {
+            name: 'apiTestManagement.processing',
+            value: RequestDefinitionStatus.PROCESSING,
+          },
+          {
+            name: 'apiTestManagement.done',
+            value: RequestDefinitionStatus.DONE,
+          },
+          {
+            name: 'apiTestManagement.deprecate',
+            value: RequestDefinitionStatus.DEPRECATED,
+          },
+          {
+            name: 'apiTestManagement.debugging',
+            value: RequestDefinitionStatus.DEBUGGING,
+          },
+        ];
+      default:
+        return [];
+    }
+  });
+
+  function cancelBatch() {
+    showBatchModal.value = false;
+    batchFormRef.value?.resetFields();
+    batchForm.value = {
+      attr: '',
+      value: '',
+      values: [],
+    };
+  }
+
+  function batchUpdate() {
+    batchFormRef.value?.validate(async (errors) => {
+      if (!errors) {
+        try {
+          batchUpdateLoading.value = true;
+          Message.success(t('common.updateSuccess'));
+          cancelBatch();
+          resetSelector();
+          loadList();
+        } catch (error) {
+          console.log(error);
+        } finally {
+          batchUpdateLoading.value = false;
+        }
+      }
+    });
+  }
+
+  const moveModalVisible = ref(false);
+  const selectedModuleKeys = ref<(string | number)[]>([]); // 移动文件选中节点
+  const isBatchMove = ref(false); // 是否批量移动文件
+  const activeApi = ref<any | null>(null); // 当前查看的接口项
+  const batchMoveApiLoading = ref(false); // 批量移动文件loading
+
+  /**
+   * 单个/批量移动接口
+   */
+  async function handleApiMove() {
+    try {
+      batchMoveApiLoading.value = true;
+      // await batchMoveFile({
+      //   selectIds: isBatchMove.value ? batchParams.value?.selectedIds || [] : [activeApi.value?.id || ''],
+      //   selectAll: !!batchParams.value?.selectAll,
+      //   excludeIds: batchParams.value?.excludeIds || [],
+      //   condition: { keyword: keyword.value },
+      //   projectId: appStore.currentProjectId,
+      //   moduleIds: props.activeModule === 'all' ? [] : [props.activeModule],
+      //   moveModuleId: selectedModuleKeys.value[0],
+      // });
+      Message.success(t('apiTestManagement.batchMoveSuccess'));
+      if (isBatchMove.value) {
+        tableSelected.value = [];
+        isBatchMove.value = false;
+      } else {
+        activeApi.value = null;
+      }
+      loadList();
+      resetSelector();
+      emitTableParams();
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.log(error);
+    } finally {
+      batchMoveApiLoading.value = false;
+    }
+  }
+
+  function handleMoveApiModalCancel() {
+    moveModalVisible.value = false;
+    selectedModuleKeys.value = [];
+  }
+
+  /**
+   * 处理文件夹树节点选中事件
+   */
+  function folderNodeSelect(keys: (string | number)[]) {
+    selectedModuleKeys.value = keys;
+  }
+
+  /**
+   * 处理表格选中后批量操作
+   * @param event 批量操作事件对象
+   */
+  function handleTableBatch(event: BatchActionParams, params: BatchActionQueryParams) {
+    tableSelected.value = params?.selectedIds || [];
+    batchParams.value = params;
+    switch (event.eventTag) {
+      case 'delete':
+        deleteApi(undefined, true, params);
+        break;
+      case 'edit':
+        showBatchModal.value = true;
+        break;
+      case 'move':
+        isBatchMove.value = true;
+        moveModalVisible.value = true;
+        break;
+      default:
+        break;
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  :deep(.param-input:not(.arco-input-focus, .arco-select-view-focus)) {
+    &:not(:hover) {
+      border-color: transparent !important;
+      .arco-input::placeholder {
+        @apply invisible;
+      }
+      .arco-select-view-icon {
+        @apply invisible;
+      }
+      .arco-select-view-value {
+        color: var(--color-text-brand);
+      }
+    }
+  }
+</style>
diff --git a/frontend/src/views/api-test/management/components/management/case.vue b/frontend/src/views/api-test/management/components/management/case.vue
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frontend/src/views/api-test/management/components/management/doc.vue b/frontend/src/views/api-test/management/components/management/doc.vue
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frontend/src/views/api-test/management/components/management/index.vue b/frontend/src/views/api-test/management/components/management/index.vue
new file mode 100644
index 0000000000..d30ab9beb5
--- /dev/null
+++ b/frontend/src/views/api-test/management/components/management/index.vue
@@ -0,0 +1,38 @@
+<template>
+  <a-tabs v-model:active-key="activeTab" animation lazy-load>
+    <a-tab-pane key="api" title="API">
+      <api
+        :active-module="activeModule"
+        :module="props.module"
+        :all-count="props.allCount"
+        :offspring-ids="props.offspringIds"
+      />
+    </a-tab-pane>
+    <a-tab-pane key="case" title="CASE"> </a-tab-pane>
+    <a-tab-pane key="mock" title="MOCK"> </a-tab-pane>
+    <a-tab-pane key="doc" :title="t('apiTestManagement.doc')"> </a-tab-pane>
+  </a-tabs>
+</template>
+
+<script setup lang="ts">
+  import api from './api.vue';
+
+  import { useI18n } from '@/hooks/useI18n';
+
+  const props = defineProps<{
+    module: string;
+    allCount: number;
+    activeModule: string;
+    offspringIds: string[];
+  }>();
+
+  const { t } = useI18n();
+
+  const activeTab = ref('api');
+</script>
+
+<style lang="less" scoped>
+  :deep(.arco-tabs-nav) {
+    border-bottom: 1px solid var(--color-text-n8);
+  }
+</style>
diff --git a/frontend/src/views/api-test/management/components/management/mock.vue b/frontend/src/views/api-test/management/components/management/mock.vue
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frontend/src/views/api-test/management/components/moduleTree.vue b/frontend/src/views/api-test/management/components/moduleTree.vue
new file mode 100644
index 0000000000..ab2e374779
--- /dev/null
+++ b/frontend/src/views/api-test/management/components/moduleTree.vue
@@ -0,0 +1,446 @@
+<template>
+  <div>
+    <template v-if="!props.isModal">
+      <a-select
+        v-model:model-value="moduleProtocol"
+        :options="moduleProtocolOptions"
+        class="mb-[8px]"
+        @change="(val) => handleProtocolChange(val as string)"
+      />
+      <div class="mb-[8px] flex items-center gap-[8px]">
+        <a-input v-model:model-value="moduleKeyword" :placeholder="t('apiTestManagement.searchTip')" allow-clear />
+        <a-dropdown @select="handleSelect">
+          <a-button type="primary">{{ t('apiTestManagement.newApi') }}</a-button>
+          <template #content>
+            <a-doption value="newApi">{{ t('apiTestManagement.newApi') }}</a-doption>
+            <a-doption value="import">{{ t('apiTestManagement.importApi') }}</a-doption>
+          </template>
+        </a-dropdown>
+      </div>
+      <div class="folder" @click="setActiveFolder('all')">
+        <div :class="allFolderClass">
+          <MsIcon type="icon-icon_folder_filled1" class="folder-icon" />
+          <div class="folder-name">{{ t('apiTestManagement.allApi') }}</div>
+          <div class="folder-count">({{ allFileCount }})</div>
+        </div>
+        <div class="ml-auto flex items-center">
+          <a-tooltip :content="isExpandAll ? t('common.collapseAll') : t('common.expandAll')">
+            <MsButton type="icon" status="secondary" class="!mr-0 p-[4px]" @click="changeExpand">
+              <MsIcon :type="isExpandAll ? 'icon-icon_folder_collapse1' : 'icon-icon_folder_expansion1'" />
+            </MsButton>
+          </a-tooltip>
+          <a-dropdown @select="handleSelect">
+            <MsButton type="icon" class="!mr-0 p-[2px]">
+              <MsIcon
+                type="icon-icon_create_planarity"
+                size="18"
+                class="text-[rgb(var(--primary-5))] hover:text-[rgb(var(--primary-4))]"
+              />
+            </MsButton>
+            <template #content>
+              <a-doption value="newApi">{{ t('apiTestManagement.newApi') }}</a-doption>
+              <a-doption value="addModule">{{ t('apiTestManagement.addSubModule') }}</a-doption>
+            </template>
+          </a-dropdown>
+          <popConfirm mode="add" :all-names="rootModulesName" parent-id="NONE" @add-finish="initModules">
+            <span id="addModulePopSpan"></span>
+          </popConfirm>
+        </div>
+      </div>
+      <a-divider class="my-[8px]" />
+    </template>
+    <a-input
+      v-if="props.isModal"
+      v-model:model-value="moduleKeyword"
+      :placeholder="t('apiTestManagement.moveSearchTip')"
+      allow-clear
+      class="mb-[16px]"
+    />
+    <a-spin class="min-h-[400px] w-full" :loading="loading">
+      <MsTree
+        v-model:focus-node-key="focusNodeKey"
+        v-model:selected-keys="selectedKeys"
+        :data="folderTree"
+        :keyword="moduleKeyword"
+        :node-more-actions="folderMoreActions"
+        :default-expand-all="isExpandAll"
+        :expand-all="isExpandAll"
+        :empty-text="t('apiTestManagement.noMatchModule')"
+        :virtual-list-props="virtualListProps"
+        :field-names="{
+          title: 'name',
+          key: 'id',
+          children: 'children',
+          count: 'count',
+        }"
+        block-node
+        title-tooltip-position="left"
+        @select="folderNodeSelect"
+        @more-action-select="handleFolderMoreSelect"
+        @more-actions-close="moreActionsClose"
+        @drop="handleDrop"
+      >
+        <template #title="nodeData">
+          <div class="inline-flex w-full">
+            <div class="one-line-text w-[calc(100%-32px)] text-[var(--color-text-1)]">{{ nodeData.name }}</div>
+            <div v-if="!props.isModal" class="ml-auto text-[var(--color-text-4)]">({{ nodeData.count || 0 }})</div>
+          </div>
+        </template>
+        <template v-if="!props.isModal" #extra="nodeData">
+          <!-- 默认模块的 id 是root，默认模块不可编辑、不可添加子模块 -->
+          <popConfirm
+            v-if="nodeData.id !== 'root'"
+            mode="add"
+            :all-names="(nodeData.children || []).map((e: ModuleTreeNode) => e.name || '')"
+            :parent-id="nodeData.id"
+            @close="resetFocusNodeKey"
+            @add-finish="() => initModules()"
+          >
+            <MsButton type="icon" size="mini" class="ms-tree-node-extra__btn !mr-0" @click="setFocusNodeKey(nodeData)">
+              <MsIcon type="icon-icon_add_outlined" size="14" class="text-[var(--color-text-4)]" />
+            </MsButton>
+          </popConfirm>
+          <popConfirm
+            v-if="nodeData.id !== 'root'"
+            mode="rename"
+            :parent-id="nodeData.id"
+            :node-id="nodeData.id"
+            :field-config="{ field: renameFolderTitle }"
+            :all-names="(nodeData.children || []).map((e: ModuleTreeNode) => e.name || '')"
+            @close="resetFocusNodeKey"
+            @rename-finish="initModules"
+          >
+            <span :id="`renameSpan${nodeData.id}`" class="relative"></span>
+          </popConfirm>
+        </template>
+      </MsTree>
+    </a-spin>
+  </div>
+</template>
+
+<script setup lang="ts">
+  import { computed, onBeforeMount, ref, watch } from 'vue';
+  import { Message } from '@arco-design/web-vue';
+
+  import MsButton from '@/components/pure/ms-button/index.vue';
+  import MsIcon from '@/components/pure/ms-icon-font/index.vue';
+  import type { ActionsItem } from '@/components/pure/ms-table-more-action/types';
+  import MsTree from '@/components/business/ms-tree/index.vue';
+  import type { MsTreeNodeData } from '@/components/business/ms-tree/types';
+  import popConfirm from '@/views/api-test/components/popConfirm.vue';
+
+  import { deleteReviewModule, getReviewModules, moveReviewModule } from '@/api/modules/case-management/caseReview';
+  import { useI18n } from '@/hooks/useI18n';
+  import useModal from '@/hooks/useModal';
+  import useAppStore from '@/store/modules/app';
+  import { mapTree } from '@/utils';
+
+  import { ModuleTreeNode } from '@/models/projectManagement/file';
+
+  const props = withDefaults(
+    defineProps<{
+      modulesCount?: Record<string, number>; // 模块数量统计对象
+      isExpandAll?: boolean; // 是否展开所有节点
+      activeModule?: string | number; // 选中的节点 key
+      isModal?: boolean; // 是否是弹窗模式
+    }>(),
+    {
+      activeModule: 'all',
+    }
+  );
+  const emit = defineEmits(['init', 'change', 'newApi', 'import', 'folderNodeSelect']);
+
+  const appStore = useAppStore();
+  const { t } = useI18n();
+  const { openModal } = useModal();
+
+  const moduleProtocol = ref('http');
+  const moduleProtocolOptions = ref([
+    {
+      label: 'HTTP',
+      value: 'http',
+    },
+  ]);
+
+  function handleProtocolChange(value: string | number | Record<string, any>) {
+    console.log(value);
+  }
+
+  function handleSelect(value: string | number | Record<string, any> | undefined) {
+    switch (value) {
+      case 'newApi':
+        emit('newApi');
+        break;
+      case 'import':
+        emit('import');
+        break;
+      case 'addModule':
+        document.querySelector('#addModulePopSpan')?.dispatchEvent(new Event('click'));
+        break;
+      default:
+        break;
+    }
+  }
+
+  const virtualListProps = computed(() => {
+    if (props.isModal) {
+      return {
+        height: 'calc(60vh - 190px)',
+      };
+    }
+    return {
+      height: 'calc(100vh - 305px)',
+    };
+  });
+
+  const allFileCount = ref(0);
+  const isExpandAll = ref(props.isExpandAll);
+  const rootModulesName = ref<string[]>([]); // 根模块名称列表
+
+  watch(
+    () => props.isExpandAll,
+    (val) => {
+      isExpandAll.value = val;
+    }
+  );
+
+  function changeExpand() {
+    isExpandAll.value = !isExpandAll.value;
+  }
+
+  const moduleKeyword = ref('');
+  const folderTree = ref<ModuleTreeNode[]>([]);
+  const focusNodeKey = ref<string | number>('');
+  const selectedKeys = ref<Array<string | number>>([props.activeModule]);
+  const allFolderClass = computed(() =>
+    selectedKeys.value[0] === 'all' ? 'folder-text folder-text--active' : 'folder-text'
+  );
+  const loading = ref(false);
+
+  watch(
+    () => selectedKeys.value,
+    (arr) => {
+      emit('change', arr ? arr[0] : '');
+    }
+  );
+
+  function setActiveFolder(id: string) {
+    selectedKeys.value = [id];
+  }
+  function setFocusNodeKey(node: MsTreeNodeData) {
+    focusNodeKey.value = node.id || '';
+  }
+
+  const folderMoreActions: ActionsItem[] = [
+    {
+      label: 'common.rename',
+      eventTag: 'rename',
+    },
+    {
+      label: 'apiTestManagement.execute',
+      eventTag: 'execute',
+    },
+    {
+      label: 'apiTestManagement.share',
+      eventTag: 'share',
+    },
+    {
+      isDivider: true,
+    },
+    {
+      label: 'common.delete',
+      eventTag: 'delete',
+      danger: true,
+    },
+  ];
+  const renamePopVisible = ref(false);
+
+  /**
+   * 初始化模块树
+   * @param isSetDefaultKey 是否设置第一个节点为选中节点
+   */
+  async function initModules(isSetDefaultKey = false) {
+    try {
+      loading.value = true;
+      const res = await getReviewModules(appStore.currentProjectId);
+      folderTree.value = mapTree<ModuleTreeNode>(res, (e) => {
+        return {
+          ...e,
+          hideMoreAction: e.id === 'root',
+          draggable: e.id !== 'root' && !props.isModal,
+          disabled: e.id === selectedKeys.value[0] && props.isModal,
+        };
+      });
+      if (isSetDefaultKey) {
+        selectedKeys.value = [folderTree.value[0].id];
+      }
+      emit('init', folderTree.value);
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.log(error);
+    } finally {
+      loading.value = false;
+    }
+  }
+
+  /**
+   * 处理文件夹树节点选中事件
+   */
+  function folderNodeSelect(_selectedKeys: (string | number)[], node: MsTreeNodeData) {
+    const offspringIds: string[] = [];
+    mapTree(node.children || [], (e) => {
+      offspringIds.push(e.id);
+      return e;
+    });
+    emit('folderNodeSelect', _selectedKeys, offspringIds);
+  }
+
+  /**
+   * 删除文件夹
+   * @param node 节点信息
+   */
+  function deleteFolder(node: MsTreeNodeData) {
+    openModal({
+      type: 'error',
+      title: t('apiTestDebug.deleteFolderTipTitle', { name: node.name }),
+      content: t('apiTestDebug.deleteFolderTipContent'),
+      okText: t('apiTestDebug.deleteConfirm'),
+      okButtonProps: {
+        status: 'danger',
+      },
+      maskClosable: false,
+      onBeforeOk: async () => {
+        try {
+          await deleteReviewModule(node.id);
+          Message.success(t('apiTestDebug.deleteSuccess'));
+          initModules();
+        } catch (error) {
+          // eslint-disable-next-line no-console
+          console.log(error);
+        }
+      },
+      hideCancel: false,
+    });
+  }
+
+  const renameFolderTitle = ref(''); // 重命名的文件夹名称
+
+  function resetFocusNodeKey() {
+    focusNodeKey.value = '';
+    renamePopVisible.value = false;
+    renameFolderTitle.value = '';
+  }
+
+  /**
+   * 处理树节点更多按钮事件
+   * @param item
+   */
+  function handleFolderMoreSelect(item: ActionsItem, node: MsTreeNodeData) {
+    switch (item.eventTag) {
+      case 'delete':
+        deleteFolder(node);
+        resetFocusNodeKey();
+        break;
+      case 'rename':
+        renameFolderTitle.value = node.name || '';
+        renamePopVisible.value = true;
+        document.querySelector(`#renameSpan${node.id}`)?.dispatchEvent(new Event('click'));
+        break;
+      default:
+        break;
+    }
+  }
+
+  /**
+   * 处理文件夹树节点拖拽事件
+   * @param tree 树数据
+   * @param dragNode 拖拽节点
+   * @param dropNode 释放节点
+   * @param dropPosition 释放位置
+   */
+  async function handleDrop(
+    tree: MsTreeNodeData[],
+    dragNode: MsTreeNodeData,
+    dropNode: MsTreeNodeData,
+    dropPosition: number
+  ) {
+    try {
+      loading.value = true;
+      await moveReviewModule({
+        dragNodeId: dragNode.id as string,
+        dropNodeId: dropNode.id || '',
+        dropPosition,
+      });
+      Message.success(t('apiTestDebug.moduleMoveSuccess'));
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.log(error);
+    } finally {
+      loading.value = false;
+      initModules();
+    }
+  }
+
+  function moreActionsClose() {
+    if (!renamePopVisible.value) {
+      // 当下拉菜单关闭时，若不是触发重命名气泡显示，则清空聚焦节点 key
+      resetFocusNodeKey();
+    }
+  }
+
+  onBeforeMount(() => {
+    initModules();
+  });
+
+  /**
+   * 初始化模块文件数量
+   */
+  watch(
+    () => props.modulesCount,
+    (obj) => {
+      folderTree.value = mapTree<ModuleTreeNode>(folderTree.value, (node) => {
+        return {
+          ...node,
+          count: obj?.[node.id] || 0,
+        };
+      });
+    }
+  );
+
+  defineExpose({
+    initModules,
+  });
+</script>
+
+<style lang="less" scoped>
+  .folder {
+    @apply flex cursor-pointer items-center justify-between;
+
+    padding: 8px 4px;
+    border-radius: var(--border-radius-small);
+    &:hover {
+      background-color: rgb(var(--primary-1));
+    }
+    .folder-text {
+      @apply flex flex-1 cursor-pointer items-center;
+      .folder-icon {
+        margin-right: 4px;
+        color: var(--color-text-4);
+      }
+      .folder-name {
+        color: var(--color-text-1);
+      }
+      .folder-count {
+        margin-left: 4px;
+        color: var(--color-text-4);
+      }
+    }
+    .folder-text--active {
+      .folder-icon,
+      .folder-name,
+      .folder-count {
+        color: rgb(var(--primary-5));
+      }
+    }
+  }
+</style>
diff --git a/frontend/src/views/api-test/management/index.vue b/frontend/src/views/api-test/management/index.vue
new file mode 100644
index 0000000000..8062c9142d
--- /dev/null
+++ b/frontend/src/views/api-test/management/index.vue
@@ -0,0 +1,74 @@
+<template>
+  <MsCard simple no-content-padding>
+    <MsSplitBox :size="0.25" :max="0.5">
+      <template #first>
+        <div class="p-[24px]">
+          <moduleTree
+            @init="(val) => (folderTree = val)"
+            @new-api="newApi"
+            @change="(val) => (activeModule = val)"
+            @import="importDrawerVisible = true"
+            @folder-node-select="(keys, _offspringIds) => (offspringIds = _offspringIds)"
+          />
+        </div>
+        <!-- <div class="b-0 absolute w-[88%]">
+                <a-divider class="!my-0 !mb-2" />
+                <div class="case h-[38px]">
+                  <div class="flex items-center" :class="getActiveClass('recycle')" @click="setActiveFolder('recycle')">
+                    <MsIcon type="icon-icon_delete-trash_outlined" class="folder-icon" />
+                    <div class="folder-name mx-[4px]">{{ t('caseManagement.featureCase.recycle') }}</div>
+                    <div class="folder-count">({{ recycleModulesCount.all || 0 }})</div></div
+                  >
+                </div>
+              </div> -->
+      </template>
+      <template #second>
+        <div class="relative flex h-full flex-col">
+          <div
+            id="managementContainer"
+            :class="['absolute z-[101] h-full w-full', importDrawerVisible ? '' : 'invisible']"
+            style="transition: all 0.3s"
+          >
+            <importApi
+              v-model:visible="importDrawerVisible"
+              :module-tree="folderTree"
+              popup-container="#managementContainer"
+            />
+          </div>
+          <management
+            :module="activeModule"
+            :all-count="allCount"
+            :active-module="activeModule"
+            :offspring-ids="offspringIds"
+          />
+        </div>
+      </template>
+    </MsSplitBox>
+  </MsCard>
+</template>
+
+<script lang="ts" setup>
+  import MsCard from '@/components/pure/ms-card/index.vue';
+  import MsSplitBox from '@/components/pure/ms-split-box/index.vue';
+  import importApi from './components/import.vue';
+  import management from './components/management/index.vue';
+  import moduleTree from './components/moduleTree.vue';
+
+  import { useI18n } from '@/hooks/useI18n';
+
+  import { ModuleTreeNode } from '@/models/projectManagement/file';
+
+  const { t } = useI18n();
+
+  const activeModule = ref<string>('all');
+  const folderTree = ref<ModuleTreeNode[]>([]);
+  const allCount = ref(0);
+  const importDrawerVisible = ref(false);
+  const offspringIds = ref<string[]>([]);
+
+  function newApi() {
+    // debugRef.value?.addDebugTab();
+  }
+</script>
+
+<style lang="less" scoped></style>
diff --git a/frontend/src/views/api-test/management/locale/en-US.ts b/frontend/src/views/api-test/management/locale/en-US.ts
new file mode 100644
index 0000000000..ff8b4c5632
--- /dev/null
+++ b/frontend/src/views/api-test/management/locale/en-US.ts
@@ -0,0 +1 @@
+export default {};
diff --git a/frontend/src/views/api-test/management/locale/zh-CN.ts b/frontend/src/views/api-test/management/locale/zh-CN.ts
new file mode 100644
index 0000000000..011f969e36
--- /dev/null
+++ b/frontend/src/views/api-test/management/locale/zh-CN.ts
@@ -0,0 +1,75 @@
+export default {
+  'apiTestManagement.newApi': '新建接口',
+  'apiTestManagement.importApi': '导入接口',
+  'apiTestManagement.fileImport': '文件导入',
+  'apiTestManagement.timeImport': '定时导入',
+  'apiTestManagement.addSubModule': '添加子模块',
+  'apiTestManagement.allApi': '全部接口',
+  'apiTestManagement.searchTip': '请输入模块/接口名称',
+  'apiTestManagement.moveSearchTip': '请输入模块名称搜索',
+  'apiTestManagement.noMatchModule': '暂无匹配的模块/接口',
+  'apiTestManagement.execute': '执行',
+  'apiTestManagement.share': '分享 API',
+  'apiTestManagement.doc': '文档',
+  'apiTestManagement.closeAll': '关闭全部tab',
+  'apiTestManagement.closeOther': '关闭其他tab',
+  'apiTestManagement.showSubdirectory': '显示子目录用例',
+  'apiTestManagement.searchPlaceholder': '输入 ID/名称/api路径搜索',
+  'apiTestManagement.apiName': '接口名称',
+  'apiTestManagement.apiType': '请求类型',
+  'apiTestManagement.apiStatus': '状态',
+  'apiTestManagement.responsiblePerson': '责任人',
+  'apiTestManagement.path': '路径',
+  'apiTestManagement.version': '版本',
+  'apiTestManagement.createTime': '创建时间',
+  'apiTestManagement.updateTime': '更新时间',
+  'apiTestManagement.deprecate': '已废弃',
+  'apiTestManagement.processing': '进行中',
+  'apiTestManagement.debugging': '联调中',
+  'apiTestManagement.done': '已完成',
+  'apiTestManagement.deleteApiTipTitle': '确认删除 {name} 吗？',
+  'apiTestManagement.deleteApiTip': '删除后，接口将放入回收站，可在回收站内进行数据恢复',
+  'apiTestManagement.batchDeleteApiTip': '确认删除已选中的 {count} 个接口吗？',
+  'apiTestManagement.batchModalSubTitle': '（已选 {count} 个接口）',
+  'apiTestManagement.chooseAttr': '选择属性',
+  'apiTestManagement.attrRequired': '属性不能为空',
+  'apiTestManagement.batchUpdate': '批量更新为',
+  'apiTestManagement.valueRequired': '属性值不能为空',
+  'apiTestManagement.batchMoveConfirm': '移动至所选模块',
+  'apiTestManagement.belongModule': '所属模块',
+  'apiTestManagement.importMode': '导入模式',
+  'apiTestManagement.importModeTip1': '覆盖：',
+  'apiTestManagement.importModeTip2': '1.同一接口请求类型+路径一致，请求参数内容不一致则覆盖',
+  'apiTestManagement.importModeTip3': '2.同一接口请求类型+路径一致，请求参数内容一致不做变更',
+  'apiTestManagement.importModeTip4': '3.非同一接口，请求类型+路径一致，则新增',
+  'apiTestManagement.importModeTip5': '不覆盖：',
+  'apiTestManagement.importModeTip6': '1.同一接口请求类型+路径一致，则不做变更',
+  'apiTestManagement.importModeTip7': '2.非同一接口请求类型+路径一致，则新增',
+  'apiTestManagement.cover': '覆盖',
+  'apiTestManagement.uncover': '不覆盖',
+  'apiTestManagement.moreSetting': '更多设置',
+  'apiTestManagement.importType': '导入方式',
+  'apiTestManagement.urlImport': 'URL 导入',
+  'apiTestManagement.syncImportCase': '同步导入接口用例',
+  'apiTestManagement.syncUpdateDirectory': '同步更新接口所在目录',
+  'apiTestManagement.importSwaggerFileTip1': '支持 Swagger 3.0 版本的 json 文件，',
+  'apiTestManagement.importSwaggerFileTip2': '2.0 的文件建议自行在官网转换成 3.0 再进行导入',
+  'apiTestManagement.importSwaggerFileTip3': '，大小不超过 50M',
+  'apiTestManagement.urlImportPlaceholder': '请输入OpenAPI/Swagger URL',
+  'apiTestManagement.swaggerURLRequired': 'SwaggerURL 不能为空',
+  'apiTestManagement.basicAuth': 'Basic Auth 认证',
+  'apiTestManagement.account': '账号',
+  'apiTestManagement.accountRequired': '账号不能为空',
+  'apiTestManagement.password': '密码',
+  'apiTestManagement.passwordRequired': '密码不能为空',
+  'apiTestManagement.taskName': '任务名称',
+  'apiTestManagement.taskNamePlaceholder': '请输入任务名称',
+  'apiTestManagement.taskNameRequired': '任务名称不能为空',
+  'apiTestManagement.syncFrequency': '同步频率',
+  'apiTestManagement.timeTaskList': '定时任务列表',
+  'apiTestManagement.timeTaskHour': '(每小时)',
+  'apiTestManagement.timeTaskSixHour': '(每 6 小时)',
+  'apiTestManagement.timeTaskTwelveHour': '(每 12 小时)',
+  'apiTestManagement.timeTaskDay': '(每天)',
+  'apiTestManagement.customFrequency': '自定义频率',
+};
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/associatedFileDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/associatedFileDrawer.vue
index a97ad1cce6..b1e08e2404 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/associatedFileDrawer.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/associatedFileDrawer.vue
@@ -190,7 +190,7 @@
   }
 
   function getFileType(type: string) {
-    const fileTypes = type ? getFileEnum(`/${type.toLowerCase()}`) : 'unknown';
+    const fileTypes = type ? getFileEnum(type.toLowerCase()) : 'unknown';
     return FileIconMap[fileTypes][UploadStatus.done];
   }
 
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/platformDemandDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/platformDemandDrawer.vue
index 6f5660bc01..8adfef1e38 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/platformDemandDrawer.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/platformDemandDrawer.vue
@@ -16,7 +16,7 @@
       <div>XXXXXX <span>(101)</span></div>
       <a-input-search
         v-model="keyword"
-        :max-length="250"
+        :max-length="255"
         :placeholder="t('project.member.searchMember')"
         allow-clear
         @search="searchHandler"
diff --git a/frontend/src/views/case-management/caseReview/caseDetail.vue b/frontend/src/views/case-management/caseReview/caseDetail.vue
index 15c7259ae0..cb06b9cc49 100644
--- a/frontend/src/views/case-management/caseReview/caseDetail.vue
+++ b/frontend/src/views/case-management/caseReview/caseDetail.vue
@@ -225,49 +225,7 @@
               />
             </a-tooltip>
           </div>
-          <a-form ref="dialogFormRef" :model="caseResultForm" layout="vertical">
-            <a-form-item field="reason" :label="t('caseManagement.caseReview.reviewResult')" class="mb-[8px]">
-              <a-radio-group v-model:model-value="caseResultForm.result" @change="() => dialogFormRef?.resetFields()">
-                <a-radio value="PASS">
-                  <div class="inline-flex items-center">
-                    <MsIcon type="icon-icon_succeed_filled" class="mr-[4px] text-[rgb(var(--success-6))]" />
-                    {{ t('caseManagement.caseReview.pass') }}
-                  </div>
-                </a-radio>
-                <a-radio value="UN_PASS">
-                  <div class="inline-flex items-center">
-                    <MsIcon type="icon-icon_close_filled" class="mr-[4px] text-[rgb(var(--danger-6))]" />
-                    {{ t('caseManagement.caseReview.fail') }}
-                  </div>
-                </a-radio>
-                <a-radio value="UNDER_REVIEWED">
-                  <div class="inline-flex items-center">
-                    <MsIcon type="icon-icon_warning_filled" class="mr-[4px] text-[rgb(var(--warning-6))]" />
-                    {{ t('caseManagement.caseReview.suggestion') }}
-                  </div>
-                  <a-tooltip :content="t('caseManagement.caseReview.suggestionTip')" position="right">
-                    <icon-question-circle
-                      class="ml-[4px] mt-[2px] text-[var(--color-text-4)] hover:text-[rgb(var(--primary-5))]"
-                      size="16"
-                    />
-                  </a-tooltip>
-                </a-radio>
-              </a-radio-group>
-            </a-form-item>
-            <a-form-item
-              field="reason"
-              :label="t('caseManagement.caseReview.reason')"
-              :rules="
-                caseResultForm.result === 'UN_PASS' || caseResultForm.result === 'UNDER_REVIEWED'
-                  ? [{ required: true, message: t('caseManagement.caseReview.reasonRequired') }]
-                  : []
-              "
-              asterisk-position="end"
-              class="mb-0"
-            >
-              <MsRichText v-model:raw="caseResultForm.reason" class="w-full" />
-            </a-form-item>
-          </a-form>
+          <reviewForm ref="dialogFormRef" />
           <a-button type="primary" class="mt-[16px]" :loading="submitReviewLoading" @click="submitReview">
             {{ t('caseManagement.caseReview.submitReview') }}
           </a-button>
@@ -292,7 +250,7 @@
    * @description 功能测试-用例评审-用例详情
    */
   import { useRoute, useRouter } from 'vue-router';
-  import { FormInstance, Message } from '@arco-design/web-vue';
+  import { Message } from '@arco-design/web-vue';
   import dayjs from 'dayjs';
 
   import MSAvatar from '@/components/pure/ms-avatar/index.vue';
@@ -302,13 +260,13 @@
   import MsEmpty from '@/components/pure/ms-empty/index.vue';
   import MsIcon from '@/components/pure/ms-icon-font/index.vue';
   import MsPagination from '@/components/pure/ms-pagination/index';
-  import MsRichText from '@/components/pure/ms-rich-text/MsRichText.vue';
-  import MsSplitBox from '@/components/pure/ms-split-box/index.vue';
+  import { MsFileItem } from '@/components/pure/ms-upload/types';
   import caseLevel from '@/components/business/ms-case-associate/caseLevel.vue';
   import type { CaseLevel } from '@/components/business/ms-case-associate/types';
   import caseTemplateDetail from '../caseManagementFeature/components/caseTemplateDetail.vue';
   import caseTabDemand from '../caseManagementFeature/components/tabContent/tabDemand/associatedDemandTable.vue';
   import caseTabDetail from '../caseManagementFeature/components/tabContent/tabDetail.vue';
+  import reviewForm from './components/reviewForm.vue';
 
   import {
     getCaseReviewHistoryList,
@@ -325,6 +283,8 @@
   import type { DetailCase } from '@/models/caseManagement/featureCase';
   import { CaseManagementRouteEnum } from '@/enums/routeEnum';
 
+  import { Instance } from 'tippy.js';
+
   const route = useRoute();
   const router = useRouter();
   const appStore = useAppStore();
@@ -529,11 +489,7 @@
   );
 
   const autoNext = ref(false);
-  const caseResultForm = ref({
-    result: 'PASS' as ReviewResult,
-    reason: '',
-  });
-  const dialogFormRef = ref<FormInstance>();
+  const dialogFormRef = ref<InstanceType<typeof reviewForm>>();
   const demandKeyword = ref('');
   const caseDemandRef = ref<InstanceType<typeof caseTabDemand>>();
 
@@ -553,47 +509,46 @@
   const submitReviewLoading = ref(false);
   // 提交评审
   function submitReview() {
-    dialogFormRef.value?.validate(async (errors) => {
-      if (!errors) {
-        try {
-          submitReviewLoading.value = true;
-          const params = {
-            projectId: appStore.currentProjectId,
-            caseId: activeCaseId.value,
-            reviewId: route.query.id as string,
-            status: caseResultForm.value.result,
-            reviewPassRule: reviewDetail.value.reviewPassRule,
-            content: caseResultForm.value.reason,
-            notifier: '', // TODO: 通知人
-          };
-          await saveCaseReviewResult(params);
-          Message.success(t('caseManagement.caseReview.reviewSuccess'));
-          caseResultForm.value = {
-            result: 'PASS' as ReviewResult,
-            reason: '',
-          };
-          if (autoNext.value) {
-            // 自动下一个，更改激活的 id会刷新详情
-            const index = caseList.value.findIndex((e) => e.caseId === activeCaseId.value);
-            if (index < caseList.value.length - 1) {
-              activeCaseId.value = caseList.value[index + 1].caseId;
-            } else {
-              // 当前是最后一个，刷新数据
-              loadCaseDetail();
-              initReviewHistoryList();
-            }
+    dialogFormRef.value?.validateForm(async (caseResultForm: Record<string, any>) => {
+      try {
+        submitReviewLoading.value = true;
+        const params = {
+          projectId: appStore.currentProjectId,
+          caseId: activeCaseId.value,
+          reviewId: route.query.id as string,
+          status: caseResultForm.value.result,
+          reviewPassRule: reviewDetail.value.reviewPassRule,
+          content: caseResultForm.value.reason,
+          notifier: '', // TODO: 通知人
+        };
+        await saveCaseReviewResult(params);
+        Message.success(t('caseManagement.caseReview.reviewSuccess'));
+        caseResultForm.value = {
+          result: 'PASS' as ReviewResult,
+          reason: '',
+          fileList: [] as MsFileItem[],
+        };
+        if (autoNext.value) {
+          // 自动下一个，更改激活的 id会刷新详情
+          const index = caseList.value.findIndex((e) => e.caseId === activeCaseId.value);
+          if (index < caseList.value.length - 1) {
+            activeCaseId.value = caseList.value[index + 1].caseId;
           } else {
-            // 不自动下一个才请求详情
+            // 当前是最后一个，刷新数据
             loadCaseDetail();
             initReviewHistoryList();
           }
-          loadCaseList();
-        } catch (error) {
-          // eslint-disable-next-line no-console
-          console.log(error);
-        } finally {
-          submitReviewLoading.value = false;
+        } else {
+          // 不自动下一个才请求详情
+          loadCaseDetail();
+          initReviewHistoryList();
         }
+        loadCaseList();
+      } catch (error) {
+        // eslint-disable-next-line no-console
+        console.log(error);
+      } finally {
+        submitReviewLoading.value = false;
       }
     });
   }
diff --git a/frontend/src/views/case-management/caseReview/components/create/associateDrawer.vue b/frontend/src/views/case-management/caseReview/components/create/associateDrawer.vue
index b404e23727..f2ba9e9102 100644
--- a/frontend/src/views/case-management/caseReview/components/create/associateDrawer.vue
+++ b/frontend/src/views/case-management/caseReview/components/create/associateDrawer.vue
@@ -9,6 +9,7 @@
     :confirm-loading="confirmLoading"
     :associated-ids="[]"
     :type="RequestModuleEnum.CASE_MANAGEMENT"
+    :table-params="{ reviewId: props.reviewId }"
     @close="emit('close')"
     @save="saveHandler"
   >
@@ -90,7 +91,7 @@
   const props = defineProps<{
     visible: boolean;
     project: string;
-    // associatedIds: string[];
+    reviewId?: string;
   }>();
   const emit = defineEmits<{
     (e: 'update:visible', val: boolean): void;
diff --git a/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue b/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue
index 434fde5331..af04cd5dab 100644
--- a/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue
+++ b/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue
@@ -33,7 +33,7 @@
       @selected-change="handleTableSelect"
       @batch-action="handleTableBatch"
     >
-      <template #resultColumn>
+      <template #resultTitle>
         <div class="flex items-center text-[var(--color-text-3)]">
           {{ t('caseManagement.caseReview.reviewResult') }}
           <a-tooltip :content="t('caseManagement.caseReview.reviewResultTip')" position="right">
@@ -96,7 +96,6 @@
     </ms-base-table>
     <a-modal
       v-model:visible="dialogVisible"
-      :on-before-ok="handleDeleteConfirm"
       class="p-[4px]"
       title-align="start"
       body-class="p-0"
@@ -158,7 +157,35 @@
           asterisk-position="end"
           class="mb-0"
         >
-          <MsRichText v-model:raw="dialogForm.reason" class="w-full" />
+          <div class="flex w-full items-center">
+            <a-mention
+              v-model:model-value="dialogForm.reason"
+              type="textarea"
+              :auto-size="{ minRows: 1 }"
+              :max-length="1000"
+              allow-clear
+              class="flex flex-1 items-center"
+            />
+            <MsUpload
+              v-model:file-list="dialogForm.fileList"
+              accept="image"
+              size-unit="MB"
+              :auto-upload="false"
+              multiple
+              :limit="10"
+              :disabled="dialogForm.fileList.length >= 10"
+            >
+              <a-button type="outline" class="ml-[8px] p-[8px_6px]" :disabled="dialogForm.fileList.length >= 10">
+                <icon-file-image :size="18" />
+              </a-button>
+            </MsUpload>
+          </div>
+          <MsFileList
+            v-model:file-list="dialogForm.fileList"
+            show-mode="imageList"
+            :show-tab="false"
+            class="mt-[8px]"
+          />
         </a-form-item>
         <a-form-item
           v-if="dialogShowType === 'changeReviewer'"
@@ -241,10 +268,12 @@
   import MsButton from '@/components/pure/ms-button/index.vue';
   import MsIcon from '@/components/pure/ms-icon-font/index.vue';
   import MsPopconfirm from '@/components/pure/ms-popconfirm/index.vue';
-  import MsRichText from '@/components/pure/ms-rich-text/MsRichText.vue';
   import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
   import type { BatchActionParams, BatchActionQueryParams, MsTableColumn } from '@/components/pure/ms-table/type';
   import useTable from '@/components/pure/ms-table/useTable';
+  import MsFileList from '@/components/pure/ms-upload/fileList.vue';
+  import MsUpload from '@/components/pure/ms-upload/index.vue';
+  import { MsFileItem } from '@/components/pure/ms-upload/types';
   import MsSelect from '@/components/business/ms-select';
 
   import {
@@ -255,7 +284,8 @@
     getReviewDetailCasePage,
     getReviewUsers,
   } from '@/api/modules/case-management/caseReview';
-  import { reviewResultMap, reviewStatusMap } from '@/config/caseManagement';
+  import { getProjectMemberCommentOptions } from '@/api/modules/project-management/projectMember';
+  import { reviewResultMap } from '@/config/caseManagement';
   import { useI18n } from '@/hooks/useI18n';
   import useModal from '@/hooks/useModal';
   import useTableStore from '@/hooks/useTableStore';
@@ -296,6 +326,10 @@
       dataIndex: 'num',
       slotName: 'num',
       sortIndex: 1,
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+        sorter: true,
+      },
       showTooltip: true,
       width: 100,
     },
@@ -313,27 +347,23 @@
       title: 'caseManagement.caseReview.reviewer',
       dataIndex: 'reviewNames',
       slotName: 'reviewNames',
-      sortable: {
-        sortDirections: ['ascend', 'descend'],
-        sorter: true,
-      },
       width: 150,
     },
     {
       title: 'caseManagement.caseReview.reviewResult',
       dataIndex: 'status',
       slotName: 'status',
-      titleSlotName: 'resultColumn',
+      titleSlotName: 'resultTitle',
       width: 110,
     },
-    {
-      title: 'caseManagement.caseReview.version',
-      dataIndex: 'versionName',
-      width: 90,
-    },
+    // {
+    //   title: 'caseManagement.caseReview.version',
+    //   dataIndex: 'versionName',
+    //   width: 90,
+    // },
     {
       title: 'caseManagement.caseReview.creator',
-      dataIndex: 'creator',
+      dataIndex: 'createUserName',
       width: 150,
     },
     {
@@ -345,7 +375,6 @@
     },
   ];
   const tableStore = useTableStore();
-  tableStore.initColumn(TableKeyEnum.CASE_MANAGEMENT_REVIEW_CASE, columns, 'drawer');
   const { propsRes, propsEvent, loadList, setLoadListParams, resetSelector, getTableQueryParams } = useTable(
     getReviewDetailCasePage,
     {
@@ -442,6 +471,7 @@
     reason: '',
     reviewer: [] as string[],
     isAppend: false,
+    fileList: [] as MsFileItem[],
   };
   const dialogForm = ref({ ...defaultDialogForm });
   const dialogFormRef = ref<FormInstance>();
@@ -488,27 +518,6 @@
     }
   }
 
-  /**
-   * 删除拦截
-   * @param done 关闭弹窗
-   */
-  async function handleDeleteConfirm(done: (closed: boolean) => void) {
-    try {
-      // if (replaceVersion.value !== '') {
-      //   await useLatestVersion(replaceVersion.value);
-      // }
-      // await toggleVersionStatus(activeRecord.value.id);
-      // Message.success(t('caseManagement.caseReview.close', { name: activeRecord.value.name }));
-      loadList();
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.log(error);
-      done(false);
-    } finally {
-      done(true);
-    }
-  }
-
   function handleArchive(record: ReviewItem) {
     openModal({
       type: 'warning',
@@ -730,72 +739,22 @@
   }
 
   onBeforeMount(async () => {
-    await initReviewers();
+    const [, memberRes] = await Promise.all([
+      initReviewers(),
+      getProjectMemberCommentOptions(appStore.currentProjectId, keyword.value),
+    ]);
+    const memberOptions = memberRes.map((e) => ({ label: e.name, value: e.id }));
     filterConfigList.value = [
       {
         title: 'ID',
-        dataIndex: 'ID',
+        dataIndex: 'id',
         type: FilterType.INPUT,
       },
       {
-        title: 'caseManagement.caseReview.name',
+        title: 'caseManagement.caseReview.caseName',
         dataIndex: 'name',
         type: FilterType.INPUT,
       },
-      {
-        title: 'caseManagement.caseReview.caseCount',
-        dataIndex: 'caseCount',
-        type: FilterType.NUMBER,
-      },
-      {
-        title: 'caseManagement.caseReview.status',
-        dataIndex: 'status',
-        type: FilterType.SELECT,
-        selectProps: {
-          mode: 'static',
-          options: [
-            {
-              label: t(reviewStatusMap.PREPARED.label),
-              value: 'PREPARED',
-            },
-            {
-              label: t(reviewStatusMap.UNDERWAY.label),
-              value: 'UNDERWAY',
-            },
-            {
-              label: t(reviewStatusMap.COMPLETED.label),
-              value: 'COMPLETED',
-            },
-            {
-              label: t(reviewStatusMap.ARCHIVED.label),
-              value: 'ARCHIVED',
-            },
-          ],
-        },
-      },
-      {
-        title: 'caseManagement.caseReview.passRate',
-        dataIndex: 'passRate',
-        type: FilterType.NUMBER,
-      },
-      {
-        title: 'caseManagement.caseReview.type',
-        dataIndex: 'reviewPassRule',
-        type: FilterType.SELECT,
-        selectProps: {
-          mode: 'static',
-          options: [
-            {
-              label: t('caseManagement.caseReview.single'),
-              value: 'SINGLE',
-            },
-            {
-              label: t('caseManagement.caseReview.multi'),
-              value: 'MULTIPLE',
-            },
-          ],
-        },
-      },
       {
         title: 'caseManagement.caseReview.reviewer',
         dataIndex: 'reviewers',
@@ -805,54 +764,35 @@
           options: reviewersOptions.value,
         },
       },
+      {
+        title: 'caseManagement.caseReview.reviewResult',
+        dataIndex: 'status',
+        type: FilterType.SELECT,
+        selectProps: {
+          mode: 'static',
+          options: Object.keys(reviewResultMap).map((e) => ({
+            label: t(reviewResultMap[e as ReviewResult].label),
+            value: e,
+          })),
+        },
+      },
       {
         title: 'caseManagement.caseReview.creator',
         dataIndex: 'createUser',
         type: FilterType.SELECT,
         selectProps: {
           mode: 'static',
-          options: reviewersOptions.value,
+          options: memberOptions,
         },
       },
-      {
-        title: 'caseManagement.caseReview.module',
-        dataIndex: 'module',
-        type: FilterType.TREE_SELECT,
-        treeSelectData: props.moduleTree,
-        treeSelectProps: {
-          fieldNames: {
-            title: 'name',
-            key: 'id',
-            children: 'children',
-          },
-        },
-      },
-      {
-        title: 'caseManagement.caseReview.tag',
-        dataIndex: 'tags',
-        type: FilterType.TAGS_INPUT,
-      },
-      {
-        title: 'caseManagement.caseReview.desc',
-        dataIndex: 'description',
-        type: FilterType.INPUT,
-      },
-      {
-        title: 'caseManagement.caseReview.startTime',
-        dataIndex: 'startTime',
-        type: FilterType.DATE_PICKER,
-      },
-      {
-        title: 'caseManagement.caseReview.endTime',
-        dataIndex: 'endTime',
-        type: FilterType.DATE_PICKER,
-      },
     ];
   });
 
   defineExpose({
     searchCase,
   });
+
+  await tableStore.initColumn(TableKeyEnum.CASE_MANAGEMENT_REVIEW_CASE, columns, 'drawer');
 </script>
 
 <style lang="less" scoped>
@@ -871,4 +811,3 @@
     @apply inline-flex;
   }
 </style>
-@/config/caseManagement
diff --git a/frontend/src/views/case-management/caseReview/components/index/reviewTable.vue b/frontend/src/views/case-management/caseReview/components/index/reviewTable.vue
index c34acd2582..d4ad5f677e 100644
--- a/frontend/src/views/case-management/caseReview/components/index/reviewTable.vue
+++ b/frontend/src/views/case-management/caseReview/components/index/reviewTable.vue
@@ -34,7 +34,9 @@
           @popup-visible-change="handleFilterHidden"
         >
           <a-button type="text" class="arco-btn-text--secondary p-[8px_4px]" @click="statusFilterVisible = true">
-            {{ t(columnConfig.title as string) }}
+            <div class="font-medium">
+              {{ t(columnConfig.title as string) }}
+            </div>
             <icon-down :class="statusFilterVisible ? 'text-[rgb(var(--primary-5))]' : ''" />
           </a-button>
           <template #content>
@@ -101,10 +103,10 @@
         <MsButton type="text" class="!mr-0" @click="() => editReview(record)">
           {{ t('common.edit') }}
         </MsButton>
-        <a-divider direction="vertical" :margin="8"></a-divider>
+        <!-- <a-divider direction="vertical" :margin="8"></a-divider>
         <MsButton type="text" class="!mr-0">
           {{ t('common.export') }}
-        </MsButton>
+        </MsButton> -->
         <a-divider direction="vertical" :margin="8"></a-divider>
         <MsTableMoreAction :list="getMoreAction(record.status)" @select="handleMoreActionSelect($event, record)" />
       </template>
@@ -169,6 +171,7 @@
   import ModuleTree from './moduleTree.vue';
 
   import { getReviewList, getReviewUsers } from '@/api/modules/case-management/caseReview';
+  import { getProjectMemberCommentOptions } from '@/api/modules/project-management/projectMember';
   import { reviewStatusMap } from '@/config/caseManagement';
   import { useI18n } from '@/hooks/useI18n';
   import useModal from '@/hooks/useModal';
@@ -211,8 +214,12 @@
 
   onBeforeMount(async () => {
     try {
-      const res = await getReviewUsers(appStore.currentProjectId, keyword.value);
-      const userOptions = res.map((e) => ({ label: e.name, value: e.id }));
+      const [userRes, memberRes] = await Promise.all([
+        getReviewUsers(appStore.currentProjectId, keyword.value),
+        getProjectMemberCommentOptions(appStore.currentProjectId, keyword.value),
+      ]);
+      const userOptions = userRes.map((e) => ({ label: e.name, value: e.id }));
+      const memberOptions = memberRes.map((e) => ({ label: e.name, value: e.id }));
       filterConfigList.value = [
         {
           title: 'ID',
@@ -293,7 +300,7 @@
           type: FilterType.SELECT,
           selectProps: {
             mode: 'static',
-            options: userOptions,
+            options: memberOptions,
           },
         },
         {
@@ -341,6 +348,10 @@
       dataIndex: 'num',
       slotName: 'num',
       sortIndex: 1,
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+        sorter: true,
+      },
       showTooltip: true,
       width: 100,
     },
@@ -382,16 +393,13 @@
       title: 'caseManagement.caseReview.reviewer',
       slotName: 'reviewers',
       dataIndex: 'reviewers',
-      sortable: {
-        sortDirections: ['ascend', 'descend'],
-        sorter: true,
-      },
       width: 150,
     },
     {
       title: 'caseManagement.caseReview.creator',
-      dataIndex: 'createUser',
-      width: 90,
+      dataIndex: 'createUserName',
+      showTooltip: true,
+      width: 120,
     },
     {
       title: 'caseManagement.caseReview.module',
@@ -402,7 +410,7 @@
       title: 'caseManagement.caseReview.tag',
       dataIndex: 'tags',
       isTag: true,
-      width: 300,
+      width: 170,
     },
     {
       title: 'caseManagement.caseReview.desc',
@@ -420,11 +428,11 @@
       slotName: 'action',
       dataIndex: 'operation',
       fixed: 'right',
-      width: 150,
+      width: 110,
     },
   ];
   const tableStore = useTableStore();
-  tableStore.initColumn(TableKeyEnum.CASE_MANAGEMENT_REVIEW, columns, 'drawer');
+  await tableStore.initColumn(TableKeyEnum.CASE_MANAGEMENT_REVIEW, columns, 'drawer');
   const { propsRes, propsEvent, loadList, setLoadListParams, resetSelector } = useTable(
     getReviewList,
     {
@@ -438,9 +446,12 @@
         ...item,
         tags: (item.tags || []).map((e: string) => ({ id: e, name: e })),
         reviewers: item.reviewers.map((e: ReviewDetailReviewersItem) => e.userName),
-        cycle: `${dayjs(item.startTime).format('YYYY-MM-DD HH:mm:ss')} - ${dayjs(item.endTime).format(
-          'YYYY-MM-DD HH:mm:ss'
-        )}`,
+        cycle:
+          item.startTime && item.endTime
+            ? `${dayjs(item.startTime).format('YYYY-MM-DD HH:mm:ss')} - ${dayjs(item.endTime).format(
+                'YYYY-MM-DD HH:mm:ss'
+              )}`
+            : '',
       };
     }
   );
diff --git a/frontend/src/views/case-management/caseReview/components/reviewForm.vue b/frontend/src/views/case-management/caseReview/components/reviewForm.vue
new file mode 100644
index 0000000000..8c973e3bfb
--- /dev/null
+++ b/frontend/src/views/case-management/caseReview/components/reviewForm.vue
@@ -0,0 +1,112 @@
+<template>
+  <a-form ref="dialogFormRef" :model="caseResultForm" layout="vertical">
+    <a-form-item field="reason" :label="t('caseManagement.caseReview.reviewResult')" class="mb-[8px]">
+      <a-radio-group v-model:model-value="caseResultForm.result" @change="() => dialogFormRef?.resetFields()">
+        <a-radio value="PASS">
+          <div class="inline-flex items-center">
+            <MsIcon type="icon-icon_succeed_filled" class="mr-[4px] text-[rgb(var(--success-6))]" />
+            {{ t('caseManagement.caseReview.pass') }}
+          </div>
+        </a-radio>
+        <a-radio value="UN_PASS">
+          <div class="inline-flex items-center">
+            <MsIcon type="icon-icon_close_filled" class="mr-[4px] text-[rgb(var(--danger-6))]" />
+            {{ t('caseManagement.caseReview.fail') }}
+          </div>
+        </a-radio>
+        <a-radio value="UNDER_REVIEWED">
+          <div class="inline-flex items-center">
+            <MsIcon type="icon-icon_warning_filled" class="mr-[4px] text-[rgb(var(--warning-6))]" />
+            {{ t('caseManagement.caseReview.suggestion') }}
+          </div>
+          <a-tooltip :content="t('caseManagement.caseReview.suggestionTip')" position="right">
+            <icon-question-circle
+              class="ml-[4px] mt-[2px] text-[var(--color-text-4)] hover:text-[rgb(var(--primary-5))]"
+              size="16"
+            />
+          </a-tooltip>
+        </a-radio>
+      </a-radio-group>
+    </a-form-item>
+    <a-form-item
+      field="reason"
+      :label="t('caseManagement.caseReview.reason')"
+      :rules="
+        caseResultForm.result !== 'PASS'
+          ? [{ required: true, message: t('caseManagement.caseReview.reasonRequired') }]
+          : []
+      "
+      asterisk-position="end"
+      class="mb-0"
+    >
+      <div class="flex w-full items-center">
+        <a-mention
+          v-model:model-value="caseResultForm.reason"
+          type="textarea"
+          :auto-size="{ minRows: 1 }"
+          :max-length="1000"
+          allow-clear
+          class="flex flex-1 items-center"
+        />
+        <MsUpload
+          v-model:file-list="caseResultForm.fileList"
+          accept="image"
+          size-unit="MB"
+          :auto-upload="false"
+          :limit="10"
+          multiple
+        >
+          <a-button type="outline" class="ml-[8px] p-[8px_6px]">
+            <icon-file-image :size="18" />
+          </a-button>
+        </MsUpload>
+      </div>
+      <MsFileList
+        v-model:file-list="caseResultForm.fileList"
+        show-mode="imageList"
+        :show-tab="false"
+        class="mt-[8px]"
+      />
+    </a-form-item>
+  </a-form>
+</template>
+
+<script setup lang="ts">
+  import { FormInstance } from '@arco-design/web-vue';
+
+  import MsIcon from '@/components/pure/ms-icon-font/index.vue';
+  import MsFileList from '@/components/pure/ms-upload/fileList.vue';
+  import MsUpload from '@/components/pure/ms-upload/index.vue';
+  import { MsFileItem } from '@/components/pure/ms-upload/types';
+
+  import { useI18n } from '@/hooks/useI18n';
+
+  import { ReviewResult } from '@/models/caseManagement/caseReview';
+
+  const { t } = useI18n();
+
+  const dialogFormRef = ref<FormInstance>();
+  const caseResultForm = ref({
+    result: 'PASS' as ReviewResult,
+    reason: '',
+    fileList: [] as MsFileItem[],
+  });
+
+  function validateForm(cb: (form: Record<string, any>) => void) {
+    dialogFormRef.value?.validate((errors) => {
+      if (!errors && typeof cb === 'function') {
+        cb(caseResultForm.value);
+      }
+    });
+  }
+
+  defineExpose({
+    validateForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .image-preview-container {
+    margin-top: 8px;
+  }
+</style>
diff --git a/frontend/src/views/case-management/caseReview/detail.vue b/frontend/src/views/case-management/caseReview/detail.vue
index 375d83ef6f..b6f7b87420 100644
--- a/frontend/src/views/case-management/caseReview/detail.vue
+++ b/frontend/src/views/case-management/caseReview/detail.vue
@@ -117,6 +117,7 @@
   <AssociateDrawer
     v-model:visible="associateDrawerVisible"
     v-model:project="associateDrawerProject"
+    :review-id="reviewId"
     @success="writeAssociateCases"
   />
   <deleteReviewModal v-model:visible="deleteModalVisible" :record="reviewDetail" @success="handleDeleteSuccess" />
@@ -172,11 +173,12 @@
   const reviewDetail = ref<ReviewItem>({
     ...reviewDefaultDetail,
   });
+  const reviewId = ref(route.query.id as string);
 
   async function initDetail() {
     try {
       loading.value = true;
-      const res = await getReviewDetail(route.query.id as string);
+      const res = await getReviewDetail(reviewId.value);
       reviewDetail.value = res;
     } catch (error) {
       // eslint-disable-next-line no-console
@@ -203,7 +205,7 @@
       modulesCount.value = await getReviewDetailModuleCount({
         ...params,
         viewFlag: onlyMine.value,
-        reviewId: route.query.id as string,
+        reviewId: reviewId.value,
       });
     } catch (error) {
       // eslint-disable-next-line no-console
@@ -237,7 +239,7 @@
     try {
       loading.value = true;
       await associateReviewCase({
-        reviewId: route.query.id as string,
+        reviewId: reviewId.value,
         projectId: appStore.currentProjectId,
         reviewers: params.reviewers,
         baseAssociateCaseRequest: params,
@@ -258,7 +260,7 @@
     router.push({
       name: CaseManagementRouteEnum.CASE_MANAGEMENT_REVIEW_CREATE,
       query: {
-        id: route.query.id,
+        id: reviewId.value,
       },
     });
   }
@@ -267,7 +269,7 @@
     router.push({
       name: CaseManagementRouteEnum.CASE_MANAGEMENT_CASE_DETAIL,
       query: {
-        reviewId: route.query.id,
+        reviewId: reviewId.value,
       },
     });
   }
@@ -337,7 +339,7 @@
       followLoading.value = true;
       await followReview({
         userId: userStore.id || '',
-        caseReviewId: route.query.id as string,
+        caseReviewId: reviewId.value,
       });
       Message.success(
         reviewDetail.value.followFlag
@@ -357,7 +359,7 @@
     router.push({
       name: CaseManagementRouteEnum.CASE_MANAGEMENT_REVIEW_CREATE,
       query: {
-        copyId: route.query.id,
+        copyId: reviewId.value,
       },
     });
   }
@@ -381,4 +383,3 @@
     @apply hidden;
   }
 </style>
-@/config/caseManagement
diff --git a/frontend/src/views/case-management/caseReview/locale/en-US.ts b/frontend/src/views/case-management/caseReview/locale/en-US.ts
index 33e2cfd7b5..c12766569a 100644
--- a/frontend/src/views/case-management/caseReview/locale/en-US.ts
+++ b/frontend/src/views/case-management/caseReview/locale/en-US.ts
@@ -50,7 +50,7 @@ export default {
   'caseManagement.caseReview.batchMoveConfirm': 'Move {count} use cases to the selected module',
   'caseManagement.caseReview.batchMoveTitleSub': '({count} reviews selected)',
   'caseManagement.caseReview.batchMoveSuccess': 'Review moved successfully',
-  'caseManagement.caseReview.folderSearchPlaceholder': 'Please enter a group name',
+  'caseManagement.caseReview.folderSearchPlaceholder': 'Please enter a module name',
   'caseManagement.caseReview.allReviews': 'All reviews',
   'caseManagement.caseReview.noReviews': 'No matching review data yet',
   'caseManagement.caseReview.deleteFolderTipTitle': 'Remove the `{name}` module?',
diff --git a/frontend/src/views/case-management/caseReview/locale/zh-CN.ts b/frontend/src/views/case-management/caseReview/locale/zh-CN.ts
index e3ad9ba400..6a8660db9a 100644
--- a/frontend/src/views/case-management/caseReview/locale/zh-CN.ts
+++ b/frontend/src/views/case-management/caseReview/locale/zh-CN.ts
@@ -43,10 +43,10 @@ export default {
   'caseManagement.caseReview.archiveSuccess': '归档成功',
   'caseManagement.caseReview.move': '移动到',
   'caseManagement.caseReview.batchMove': '批量移动',
-  'caseManagement.caseReview.batchMoveConfirm': '移动 {count} 个用例至已选模块 ',
+  'caseManagement.caseReview.batchMoveConfirm': '移动 {count} 个评审至已选模块 ',
   'caseManagement.caseReview.batchMoveTitleSub': '(已选 {count} 条评审) ',
   'caseManagement.caseReview.batchMoveSuccess': '评审移动成功',
-  'caseManagement.caseReview.folderSearchPlaceholder': '请输入分组名称',
+  'caseManagement.caseReview.folderSearchPlaceholder': '请输入模块名称',
   'caseManagement.caseReview.allReviews': '全部评审',
   'caseManagement.caseReview.noReviews': '暂无匹配的评审数据',
   'caseManagement.caseReview.deleteFolderTipTitle': '是否删除 `{name}` 模块？',
diff --git a/frontend/src/views/login/components/login-form.vue b/frontend/src/views/login/components/login-form.vue
index 08e39db881..1ed97cb0c4 100644
--- a/frontend/src/views/login/components/login-form.vue
+++ b/frontend/src/views/login/components/login-form.vue
@@ -86,7 +86,7 @@
   });
 
   const innerSlogan = computed(() => {
-    return props.isPreview ? props.slogan : appStore.pageConfig.slogan;
+    return props.isPreview ? props.slogan : t(appStore.pageConfig.slogan);
   });
 
   const errorMessage = ref('');
diff --git a/frontend/src/views/project-management/fileManagement/components/fileDetailDrawer.vue b/frontend/src/views/project-management/fileManagement/components/fileDetailDrawer.vue
index 5401d2c4ef..a32251fa0d 100644
--- a/frontend/src/views/project-management/fileManagement/components/fileDetailDrawer.vue
+++ b/frontend/src/views/project-management/fileManagement/components/fileDetailDrawer.vue
@@ -20,10 +20,10 @@
         :before-change="handleEnableIntercept"
         :disabled="loading"
         size="small"
-        class="mr-[4px]"
+        class="mr-[8px]"
         type="line"
       />
-      <a-tooltip :content="t('project.fileManagement.uploadTipSingle')">
+      <a-tooltip v-if="fileType === 'jar'" :content="t('project.fileManagement.uploadTipSingle')">
         <MsIcon type="icon-icon-maybe_outlined" class="mr-[8px] cursor-pointer hover:text-[rgb(var(--primary-5))]" />
       </a-tooltip>
       <MsButton
@@ -176,6 +176,16 @@
                 :action-config="caseBatchActions"
                 v-on="caseTableEvent"
               >
+                <template #id="{ record }">
+                  <a-tooltip :content="`${record.id}`">
+                    <a-button type="text" class="px-0" @click="goCaseDetail(record.id)">
+                      <div class="one-line-text max-w-[168px]">{{ record.id }}</div>
+                    </a-button>
+                  </a-tooltip>
+                </template>
+                <template #sourceType="{ record }">
+                  {{ t(associateFileSourceLocaleMap[record.sourceType]) }}
+                </template>
                 <template #action="{ record }">
                   <MsButton
                     v-permission="['PROJECT_FILE_MANAGEMENT:READ+UPDATE']"
@@ -215,7 +225,6 @@
   import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
   import type { MsPaginationI, MsTableColumn } from '@/components/pure/ms-table/type';
   import useTable from '@/components/pure/ms-table/useTable';
-  import { getFileEnum } from '@/components/pure/ms-upload/iconMap';
   import MsDetailDrawer from '@/components/business/ms-detail-drawer/index.vue';
   import MsThumbnailCard from '@/components/business/ms-thumbnail-card/index.vue';
   import popConfirm from './popConfirm.vue';
@@ -232,13 +241,16 @@
     upgradeAssociation,
   } from '@/api/modules/project-management/fileManagement';
   import { CompressImgUrl, OriginImgUrl } from '@/api/requrls/project-management/fileManagement';
+  import { associateFileSourceLocaleMap } from '@/config/fileManagement';
   import { useI18n } from '@/hooks/useI18n';
   import useLocale from '@/locale/useLocale';
+  import router from '@/router';
   import { useAppStore } from '@/store';
   import useUserStore from '@/store/modules/user';
   import { downloadByteFile, formatFileSize } from '@/utils';
 
   import { AssociationItem, FileDetail } from '@/models/projectManagement/file';
+  import { CaseManagementRouteEnum } from '@/enums/routeEnum';
 
   const props = defineProps<{
     visible: boolean;
@@ -352,10 +364,17 @@
   }
 
   async function handleFileTagClose(tag: string | number, item: Description) {
-    await updateFile({
-      id: props.fileId,
-      tags: Array.isArray(item.value) ? item.value.filter((e) => e !== tag) : [],
-    });
+    try {
+      const lastTags = Array.isArray(item.value) ? item.value.filter((e) => e !== tag) : [];
+      await updateFile({
+        id: props.fileId,
+        tags: lastTags,
+      });
+      item.value = [...lastTags];
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.log(error);
+    }
   }
 
   /**
@@ -379,23 +398,30 @@
 
   const caseColumns: MsTableColumn = [
     {
-      title: 'project.fileManagement.id',
+      title: 'project.fileManagement.caseId',
       dataIndex: 'id',
+      slotName: 'id',
       showTooltip: true,
+      width: 150,
     },
     {
-      title: 'project.fileManagement.name',
+      title: 'project.fileManagement.caseName',
       dataIndex: 'sourceName',
       showTooltip: true,
-      width: 200,
+      width: 150,
     },
     {
-      title: 'project.fileManagement.type',
+      title: 'project.fileManagement.caseType',
       dataIndex: 'sourceType',
+      slotName: 'sourceType',
+      width: 100,
+      showTooltip: true,
     },
     {
-      title: 'project.fileManagement.fileVersion',
+      title: 'project.fileManagement.caseFileVersion',
       dataIndex: 'fileVersion',
+      width: 140,
+      showTooltip: true,
     },
     {
       title: 'common.operation',
@@ -412,10 +438,10 @@
   } = useTable(getAssociationList, {
     scroll: { x: 800 },
     columns: caseColumns,
+    heightUsed: 200,
     selectable: true,
     showSelectAll: true,
     showPagination: false,
-    size: 'default',
   });
 
   const caseBatchActions = {
@@ -445,6 +471,15 @@
     }
   }
 
+  function goCaseDetail(id: string) {
+    router.push({
+      name: CaseManagementRouteEnum.CASE_MANAGEMENT_CASE_DETAIL,
+      query: {
+        id,
+      },
+    });
+  }
+
   const versionColumns: MsTableColumn = [
     {
       title: 'project.fileManagement.fileVersion',
@@ -504,9 +539,7 @@
   }
 
   function loadedFile(detail: FileDetail) {
-    if (detail.fileType) {
-      fileType.value = getFileEnum(`/${detail.fileType.toLowerCase()}`);
-    }
+    fileType.value = detail.fileType;
     renameTitle.value = detail.name;
     fileDescriptions.value = [
       {
@@ -543,6 +576,7 @@
         showTagAdd: true,
         closable: true,
         key: 'tag',
+        tagType: 'default',
       },
       {
         label: t('project.fileManagement.createTime'),
diff --git a/frontend/src/views/project-management/fileManagement/components/popConfirm.vue b/frontend/src/views/project-management/fileManagement/components/popConfirm.vue
index f82ee9239d..57de793f11 100644
--- a/frontend/src/views/project-management/fileManagement/components/popConfirm.vue
+++ b/frontend/src/views/project-management/fileManagement/components/popConfirm.vue
@@ -196,8 +196,8 @@
 
   function reset(val: boolean) {
     if (!val) {
-      form.value.field = '';
       formRef.value?.resetFields();
+      form.value.field = '';
     }
   }
 </script>
diff --git a/frontend/src/views/project-management/fileManagement/components/rightBox.vue b/frontend/src/views/project-management/fileManagement/components/rightBox.vue
index 827a4c6404..d2ccf0d49c 100644
--- a/frontend/src/views/project-management/fileManagement/components/rightBox.vue
+++ b/frontend/src/views/project-management/fileManagement/components/rightBox.vue
@@ -1,9 +1,9 @@
 <template>
-  <div class="flex h-[calc(100vh-88px)] flex-col overflow-hidden p-[24px]">
+  <div class="flex h-[calc(100vh-88px)] flex-col p-[24px]">
     <div class="header">
-      <a-button v-permission="['PROJECT_FILE_MANAGEMENT:READ+ADD']" type="primary" @click="handleAddClick">{{
-        t('project.fileManagement.addFile')
-      }}</a-button>
+      <a-button v-permission="['PROJECT_FILE_MANAGEMENT:READ+ADD']" type="primary" @click="handleAddClick">
+        {{ t('project.fileManagement.addFile') }}
+      </a-button>
       <div class="header-right">
         <a-select v-model="tableFileType" class="w-[240px]" :loading="fileTypeLoading" @change="searchList">
           <template #prefix>
@@ -21,6 +21,7 @@
           class="w-[240px]"
           @search="searchList"
           @press-enter="searchList"
+          @clear="searchList"
         />
         <a-radio-group
           v-if="props.activeFolderType === 'folder'"
@@ -113,7 +114,7 @@
             :type="item.fileType"
             :url="`${CompressImgUrl}/${userStore.id}/${item.id}`"
             :footer-text="item.name"
-            :more-actions="item.fileType === 'JAR' ? getJarFileActions(item) : normalFileActions"
+            :more-actions="item.fileType === 'jar' ? getJarFileActions(item) : normalFileActions"
             @click="openFileDetail(item.id, index)"
             @action-select="handleMoreActionSelect($event, item)"
           />
@@ -241,6 +242,7 @@
         :rules="[{ required: true, message: t('project.fileManagement.gitFilePathNotNull') }]"
         required
         asterisk-position="end"
+        class="mb-0"
       >
         <a-input
           v-model:model-value="storageForm.path"
@@ -356,6 +358,7 @@
   import useAsyncTaskStore from '@/store/modules/app/asyncTask';
   import useUserStore from '@/store/modules/user';
   import { characterLimit, downloadByteFile, formatFileSize } from '@/utils';
+  import { hasAnyPermission } from '@/utils/permission';
 
   import type { FileItem, FileListQueryParams, Repository } from '@/models/projectManagement/file';
   import { RouteEnum } from '@/enums/routeEnum';
@@ -444,7 +447,7 @@
         },
       ];
     }
-    return [
+    const normalActions = [
       {
         label: 'project.fileManagement.move',
         eventTag: 'move',
@@ -458,10 +461,20 @@
         danger: true,
       },
     ];
+    if (showType.value === 'card') {
+      return [
+        {
+          label: 'project.fileManagement.download',
+          eventTag: 'download',
+        },
+        ...normalActions,
+      ];
+    }
+    return normalActions;
   });
 
   function getJarFileActions(record: FileItem) {
-    const jarFileActions: ActionsItem[] = [
+    let jarFileActions: ActionsItem[] = [
       {
         label: 'project.fileManagement.move',
         eventTag: 'move',
@@ -483,10 +496,24 @@
         danger: true,
       },
     ];
-    if (record.enable) {
-      return jarFileActions.filter((e) => e.label !== 'common.enable');
+    if (showType.value === 'card') {
+      jarFileActions = [
+        {
+          label: 'project.fileManagement.download',
+          eventTag: 'download',
+        },
+        ...jarFileActions,
+      ];
     }
-    return jarFileActions.filter((e) => e.label !== 'common.disable');
+    if (record.storage === 'GIT') {
+      jarFileActions = jarFileActions.filter((e) => e.eventTag !== 'move');
+    }
+    if (record.enable) {
+      jarFileActions = jarFileActions.filter((e) => e.label !== 'common.enable');
+    } else if (record.enable === false) {
+      jarFileActions = jarFileActions.filter((e) => e.label !== 'common.disable');
+    }
+    return jarFileActions;
   }
 
   const columns: MsTableColumn = [
@@ -494,6 +521,7 @@
       title: 'project.fileManagement.name',
       slotName: 'name',
       dataIndex: 'name',
+      fixed: 'left',
       width: 270,
     },
     {
@@ -515,7 +543,7 @@
     },
     {
       title: 'project.fileManagement.creator',
-      dataIndex: 'creator',
+      dataIndex: 'createUser',
       showTooltip: true,
       width: 120,
     },
@@ -544,12 +572,13 @@
     },
   ];
   const tableStore = useTableStore();
+  await tableStore.initColumn(TableKeyEnum.FILE_MANAGEMENT_FILE, columns, 'drawer');
   const { propsRes, propsEvent, loadList, setLoadListParams, resetSelector, resetPagination } = useTable(
     getFileList,
     {
       tableKey: TableKeyEnum.FILE_MANAGEMENT_FILE,
       showSetting: true,
-      selectable: true,
+      selectable: !!hasAnyPermission(['PROJECT_FILE_MANAGEMENT:READ+DOWNLOAD+UPDATE+DELETE']),
       showSelectAll: true,
     },
     (item) => {
@@ -809,6 +838,7 @@
    */
   async function changeFileType() {
     await initFileTypes();
+    resetSelector();
     setTableParams();
     if (showType.value === 'card') {
       cardListRef.value?.reload();
@@ -938,6 +968,9 @@
       case 'toggle':
         toggleJarFile(record);
         break;
+      case 'download':
+        handleDownload(record);
+        break;
       default:
         break;
     }
diff --git a/frontend/src/views/project-management/fileManagement/locale/en-US.ts b/frontend/src/views/project-management/fileManagement/locale/en-US.ts
index 40795841e4..5cedb91de8 100644
--- a/frontend/src/views/project-management/fileManagement/locale/en-US.ts
+++ b/frontend/src/views/project-management/fileManagement/locale/en-US.ts
@@ -8,7 +8,7 @@ export default {
   'project.fileManagement.addStorage': 'Add repository',
   'project.fileManagement.rename': 'Rename',
   'project.fileManagement.nameNotNull': 'name cannot be empty',
-  'project.fileManagement.namePlaceholder': 'Please enter the group name and press Enter to save',
+  'project.fileManagement.namePlaceholder': 'Please enter the module name and press Enter to save',
   'project.fileManagement.renameSuccess': 'Rename successful',
   'project.fileManagement.updateDescSuccess': 'File description updated successfully',
   'project.fileManagement.addSubModuleSuccess': 'Added successfully',
@@ -132,4 +132,15 @@ export default {
   'project.fileManagement.batchMoveConfirm': 'Move to selected module',
   'project.fileManagement.batchMoveSuccess': 'File moved successfully',
   'project.fileManagement.moduleMoveSuccess': 'Module moved successfully',
+  'project.fileManagement.caseId': 'Case ID',
+  'project.fileManagement.caseName': 'Case name',
+  'project.fileManagement.caseType': 'Case type',
+  'project.fileManagement.caseFileVersion': 'Associated file version',
+  'project.fileManagement.caseTypeBug': 'Bug',
+  'project.fileManagement.caseTypeFeature': 'Feature',
+  'project.fileManagement.caseTypeApiDebug': 'Api debug',
+  'project.fileManagement.caseTypeApiScene': 'Api scene',
+  'project.fileManagement.caseTypeApiCase': 'Api case',
+  'project.fileManagement.caseTypeApiDefine': 'Api definition',
+  'project.fileManagement.caseTypeApiMock': 'Api Mock',
 };
diff --git a/frontend/src/views/project-management/fileManagement/locale/zh-CN.ts b/frontend/src/views/project-management/fileManagement/locale/zh-CN.ts
index 7d829d27ee..44878a915d 100644
--- a/frontend/src/views/project-management/fileManagement/locale/zh-CN.ts
+++ b/frontend/src/views/project-management/fileManagement/locale/zh-CN.ts
@@ -8,7 +8,7 @@ export default {
   'project.fileManagement.addStorage': '添加存储库',
   'project.fileManagement.rename': '重命名',
   'project.fileManagement.nameNotNull': '名字不能为空',
-  'project.fileManagement.namePlaceholder': '请输入分组名称，按回车键保存',
+  'project.fileManagement.namePlaceholder': '请输入模块名称，按回车键保存',
   'project.fileManagement.renameSuccess': '重命名成功',
   'project.fileManagement.updateDescSuccess': '文件描述更新成功',
   'project.fileManagement.addSubModuleSuccess': '添加成功',
@@ -124,4 +124,15 @@ export default {
   'project.fileManagement.batchMoveConfirm': '移动至所选模块',
   'project.fileManagement.batchMoveSuccess': '文件移动成功',
   'project.fileManagement.moduleMoveSuccess': '模块移动成功',
+  'project.fileManagement.caseId': '用例 ID',
+  'project.fileManagement.caseName': '用例名称',
+  'project.fileManagement.caseType': '用例类型',
+  'project.fileManagement.caseFileVersion': '关联的文件版本',
+  'project.fileManagement.caseTypeBug': '缺陷',
+  'project.fileManagement.caseTypeFeature': '功能用例',
+  'project.fileManagement.caseTypeApiDebug': '接口调试',
+  'project.fileManagement.caseTypeApiScene': '接口场景',
+  'project.fileManagement.caseTypeApiCase': '接口用例',
+  'project.fileManagement.caseTypeApiDefine': '接口定义',
+  'project.fileManagement.caseTypeApiMock': '接口 Mock',
 };
diff --git a/frontend/src/views/project-management/messageManagement/components/messageList.vue b/frontend/src/views/project-management/messageManagement/components/messageList.vue
index 9add39df4f..e360dfdfa0 100644
--- a/frontend/src/views/project-management/messageManagement/components/messageList.vue
+++ b/frontend/src/views/project-management/messageManagement/components/messageList.vue
@@ -1,121 +1,113 @@
 <template>
-  <MsCard ref="fullRef" :special-height="132" :is-fullscreen="isFullScreen" simple>
-    <div id="mscard">
-      <div class="mb-[16px] flex items-center justify-between">
-        <div class="font-medium text-[var(--color-text-000)]">{{ t('project.messageManagement.config') }}</div>
-        <div>
-          <MsSelect
-            v-model:model-value="robotFilters"
-            :options="robotOptions"
-            :allow-search="false"
-            allow-clear
-            class="mr-[8px] w-[240px]"
-            :prefix="t('project.messageManagement.robot')"
-            :multiple="true"
-            :has-all-select="true"
-            :default-all-select="true"
-            :popup-container="isFullScreen ? '#mscard' : undefined"
-          >
-            <template #footer>
-              <div class="mb-[6px] mt-[4px] p-[3px_8px]">
-                <MsButton v-permission="['PROJECT_MESSAGE:READ+ADD']" type="text" @click="emit('createRobot')">
-                  <MsIcon type="icon-icon_add_outlined" class="mr-[8px] text-[rgb(var(--primary-6))]" size="14" />
-                  {{ t('project.messageManagement.createBot') }}
-                </MsButton>
-              </div>
-            </template>
-          </MsSelect>
-          <a-button type="outline" class="arco-btn-outline--secondary px-[5px]" @click="toggleFullScreen">
-            <template #icon>
-              <MsIcon
-                :type="isFullScreen ? 'icon-icon_off_screen' : 'icon-icon_full_screen_one'"
-                class="text-[var(--color-text-4)]"
-                size="14"
-              />
-            </template>
-            {{ t(isFullScreen ? 'common.offFullScreen' : 'common.fullScreen') }}
-          </a-button>
-        </div>
-      </div>
-      <ms-base-table
-        ref="tableRef"
-        v-bind="propsRes"
-        v-model:expandedKeys="expandedKeys"
-        no-disable
-        :indent-size="0"
-        v-on="propsEvent"
+  <MsCard
+    ref="fullRef"
+    :special-height="132"
+    show-full-screen
+    hide-back
+    hide-footer
+    @toggle-full-screen="handleToggleFullScreen"
+  >
+    <template #headerLeft>
+      <div class="font-medium text-[var(--color-text-000)]">{{ t('project.messageManagement.config') }}</div>
+    </template>
+    <template #headerRight>
+      <MsSelect
+        v-model:model-value="robotFilters"
+        :options="robotOptions"
+        :allow-search="false"
+        allow-clear
+        class="mr-[8px] !w-[240px]"
+        :prefix="t('project.messageManagement.robot')"
+        :multiple="true"
+        :has-all-select="true"
+        :default-all-select="true"
       >
-        <template #name="{ record }">
-          <span class="font-medium text-[var(--color-text-1)]">{{ record.name }}</span>
+        <template #footer>
+          <div class="mb-[6px] mt-[4px] p-[3px_8px]">
+            <MsButton v-permission="['PROJECT_MESSAGE:READ+ADD']" type="text" @click="emit('createRobot')">
+              <MsIcon type="icon-icon_add_outlined" class="mr-[8px] text-[rgb(var(--primary-6))]" size="14" />
+              {{ t('project.messageManagement.createBot') }}
+            </MsButton>
+          </div>
         </template>
-        <template #eventName="{ record }">
-          <span>{{ record.eventName || '' }}</span>
-        </template>
-        <template #receiver="{ record, dataIndex }">
-          <MsSelect
-            v-if="!record.children"
-            :id="`${record.taskType}-${record.event}`"
-            v-model:model-value="record.receivers"
-            v-model:loading="record.loading"
-            mode="remote"
-            :options="defaultReceivers"
-            :search-keys="['label']"
-            allow-search
-            :at-least-one="true"
-            value-key="id"
-            label-key="name"
-            :multiple="true"
-            :placeholder="t('project.messageManagement.receiverPlaceholder')"
-            :remote-extra-params="{ projectId: appStore.currentProjectId }"
-            :remote-func="getMessageUserList"
-            :remote-fields-map="{ label: 'name', value: 'id', id: 'id' }"
-            :not-auto-init-search="true"
-            :popup-container="isFullScreen ? '#mscard' : undefined"
-            :fallback-option="(val) => ({
+      </MsSelect>
+    </template>
+    <ms-base-table
+      ref="tableRef"
+      v-bind="propsRes"
+      v-model:expandedKeys="expandedKeys"
+      no-disable
+      :indent-size="0"
+      v-on="propsEvent"
+    >
+      <template #name="{ record }">
+        <span class="font-medium text-[var(--color-text-1)]">{{ record.name }}</span>
+      </template>
+      <template #eventName="{ record }">
+        <span>{{ record.eventName || '' }}</span>
+      </template>
+      <template #receiver="{ record, dataIndex }">
+        <MsSelect
+          v-if="!record.children"
+          v-model:model-value="record.receivers"
+          v-model:loading="record.loading"
+          class="w-full"
+          mode="remote"
+          :options="defaultReceivers"
+          :remote-filter-func="(opts) => getReceiverOptions(opts, record.event)"
+          :search-keys="['label']"
+          allow-search
+          :at-least-one="true"
+          value-key="id"
+          label-key="name"
+          :multiple="true"
+          :placeholder="t('project.messageManagement.receiverPlaceholder')"
+          :remote-extra-params="{ projectId: appStore.currentProjectId }"
+          :remote-func="getMessageUserList"
+          :remote-fields-map="{ label: 'name', value: 'id', id: 'id' }"
+          :not-auto-init-search="true"
+          :fallback-option="(val) => ({
               label: (val as Record<string, any>).name,
               value: val,
             })"
-            :object-value="true"
-            @remove="changeMessageReceivers(false, record, dataIndex as string)"
-            @popup-visible-change="changeMessageReceivers($event, record, dataIndex as string)"
+          :object-value="true"
+          @remove="changeMessageReceivers(false, record, dataIndex as string)"
+          @popup-visible-change="changeMessageReceivers($event, record, dataIndex as string)"
+        />
+        <span v-else></span>
+      </template>
+      <template #robot="{ record, dataIndex }">
+        <div v-if="!record.children && record.projectRobotConfigMap?.[dataIndex as string]" class="flex items-center">
+          <a-switch
+            v-model:model-value="record.projectRobotConfigMap[dataIndex as string].enable"
+            v-permission="['PROJECT_MESSAGE:READ+UPDATE']"
+            :before-change="(val) => handleChangeIntercept(!!val, record, dataIndex as string)"
+            size="small"
+            type="line"
           />
-          <span v-else></span>
-        </template>
-        <template #robot="{ record, dataIndex }">
-          <div v-if="!record.children && record.projectRobotConfigMap?.[dataIndex as string]" class="flex items-center">
-            <a-switch
-              v-model:model-value="record.projectRobotConfigMap[dataIndex as string].enable"
-              v-permission="['PROJECT_MESSAGE:READ+UPDATE']"
-              :before-change="(val) => handleChangeIntercept(!!val, record, dataIndex as string)"
-              size="small"
-              type="line"
-            />
-            <a-popover position="right" :popup-container="isFullScreen ? '#mscard' : undefined">
-              <div
-                class="ml-[8px] mr-[4px] cursor-pointer text-[var(--color-text-1)] hover:text-[rgb(var(--primary-6))]"
-              >
-                {{ t('common.preview') }}
-              </div>
-              <template #content>
-                <MessagePreview
-                  :robot="record.projectRobotConfigMap[dataIndex as string]"
-                  :function-name="record.functionName"
-                  :event-name="record.eventName"
-                />
-              </template>
-            </a-popover>
-            <MsButton
-              v-permission="['PROJECT_MESSAGE:READ+UPDATE']"
-              v-xpack
-              type="button"
-              @click="editRobot(record, dataIndex as string)"
-              >{{ t('common.setting') }}</MsButton
-            >
-          </div>
-          <span v-else></span>
-        </template>
-      </ms-base-table>
-    </div>
+          <a-popover position="right">
+            <div class="ml-[8px] mr-[4px] cursor-pointer text-[var(--color-text-1)] hover:text-[rgb(var(--primary-6))]">
+              {{ t('common.preview') }}
+            </div>
+            <template #content>
+              <MessagePreview
+                :robot="record.projectRobotConfigMap[dataIndex as string]"
+                :function-name="record.functionName"
+                :event-name="record.eventName"
+              />
+            </template>
+          </a-popover>
+          <MsButton
+            v-permission="['PROJECT_MESSAGE:READ+UPDATE']"
+            v-xpack
+            type="button"
+            @click="editRobot(record, dataIndex as string)"
+            >{{ t('common.setting') }}</MsButton
+          >
+        </div>
+        <span v-else></span>
+      </template>
+    </ms-base-table>
   </MsCard>
 </template>
 
@@ -139,7 +131,6 @@
     getRobotList,
     saveMessageConfig,
   } from '@/api/modules/project-management/messageManagement';
-  import useFullScreen from '@/hooks/useFullScreen';
   import { useI18n } from '@/hooks/useI18n';
   import useAppStore from '@/store/modules/app';
 
@@ -157,9 +148,6 @@
 
   const robotFilters = ref<string[]>([]);
   const robotOptions = ref<(SelectOptionData & RobotItem)[]>([]);
-  const fullRef = ref<HTMLElement | null>();
-
-  const { isFullScreen, toggleFullScreen } = useFullScreen(fullRef);
 
   const tableRef = ref<InstanceType<typeof MsBaseTable> | null>(null);
   const staticColumns: MsTableColumn = [
@@ -219,6 +207,7 @@
   );
 
   const expandedKeys = ref<string[]>([]);
+  const heightUsed = ref(428);
 
   interface TableMessageChildrenItem {
     functionName: string;
@@ -243,7 +232,7 @@
       showPagination: false,
       hoverable: false,
       showExpand: true,
-      heightUsed: 50,
+      heightUsed: heightUsed.value,
       rowKey: 'key',
       rowClass: (record: TableMessageItem) => {
         if (record.children) {
@@ -302,6 +291,10 @@
     }
   );
 
+  function handleToggleFullScreen(val: boolean) {
+    propsRes.value.heightUsed = val ? 224 : 428;
+  }
+
   function spanMethod(data: {
     record: TableData;
     column: TableColumnData | TableOperationColumn;
@@ -326,6 +319,14 @@
     }));
   }
 
+  function getReceiverOptions(options, event: string) {
+    if (event === 'CREATE') {
+      // 创建事件的接收人不包含操作人、创建人、关注人
+      return options.filter((e) => !['OPERATOR', 'CREATE_USER', 'FOLLOW_PEOPLE'].includes(e.id));
+    }
+    return options;
+  }
+
   async function initRobotList() {
     const res = await getRobotList(appStore.currentProjectId);
     robotOptions.value = res
diff --git a/frontend/src/views/project-management/messageManagement/components/robotList.vue b/frontend/src/views/project-management/messageManagement/components/robotList.vue
index 18757855c0..c183ff775f 100644
--- a/frontend/src/views/project-management/messageManagement/components/robotList.vue
+++ b/frontend/src/views/project-management/messageManagement/components/robotList.vue
@@ -89,6 +89,7 @@
       :ok-loading="drawerLoading"
       :show-continue="!isEdit"
       :ok-text="isEdit ? t('common.update') : t('common.create')"
+      :save-continue-text="t('project.messageManagement.saveContinueText')"
       @confirm="handleDrawerConfirm"
       @continue="handleDrawerConfirm(true)"
       @cancel="handleDrawerCancel"
@@ -407,8 +408,16 @@
       title: t(robot.enable ? 'project.messageManagement.disableTitle' : 'project.messageManagement.enableTitle', {
         name: characterLimit(robot.name),
       }),
-      content: t(robot.enable ? 'project.messageManagement.disableContent' : 'project.messageManagement.enableContent'),
-      okText: t(robot.enable ? 'project.messageManagement.disableConfirm' : 'project.messageManagement.enableConfirm'),
+      content: () =>
+        h('div', {
+          innerHTML: `<div>${t(
+            robot.enable ? 'project.messageManagement.disableContent' : 'project.messageManagement.enableContent',
+            { robot: robot.name }
+          )}</div><div>${robot.platform === 'MAIL' ? t('project.messageManagement.enableEmailContentTip') : ''}</div>`,
+        }),
+      okText: t(robot.enable ? 'project.messageManagement.disableConfirm' : 'project.messageManagement.enableConfirm', {
+        robot: robot.name,
+      }),
       cancelText: t('common.cancel'),
       maskClosable: false,
       onBeforeOk: async () => {
diff --git a/frontend/src/views/project-management/messageManagement/locale/en-US.ts b/frontend/src/views/project-management/messageManagement/locale/en-US.ts
index 56c93da654..320953807a 100644
--- a/frontend/src/views/project-management/messageManagement/locale/en-US.ts
+++ b/frontend/src/views/project-management/messageManagement/locale/en-US.ts
@@ -54,12 +54,14 @@ export default {
   'project.messageManagement.appSecretRequired': 'AppSecret cannot be empty',
   'project.messageManagement.disableTitle': 'Are you sure you want to close {name}?',
   'project.messageManagement.disableContent':
-    'After closing, it will no longer receive in-site message notifications and will not be displayed on the message list page.',
+    'After closing, it will no longer receive {robot} message notifications and will not be displayed on the message list page.',
   'project.messageManagement.disableConfirm': 'Confirm close',
   'project.messageManagement.disableSuccess': 'Closed successfully',
   'project.messageManagement.enableTitle': 'Turn on {name}',
   'project.messageManagement.enableContent':
-    'After turning it on, site messages will be displayed in the message settings list, and the notification type needs to be manually set.',
+    'After turning it on, {robot} messages will be displayed in the message settings list, and the notification type needs to be manually set.',
+  'project.messageManagement.enableEmailContentTip':
+    'Email notifications can be sent only after configuring the SMTP service in System Settings-Email Settings.',
   'project.messageManagement.enableConfirm': 'Confirm to open',
   'project.messageManagement.enableSuccess': 'Opened successfully',
   'project.messageManagement.deleteTitle': 'Confirm to delete {name}?',
@@ -100,4 +102,5 @@ export default {
   'project.messageManagement.receiverNotNull': 'Please set at least one message recipient',
   'project.messageManagement.unsetReceiversTip': 'Please set the message recipients before configuring the template.',
   'project.messageManagement.noMatchField': 'No matching fields yet',
+  'project.messageManagement.saveContinueText': 'Save and continue creating',
 };
diff --git a/frontend/src/views/project-management/messageManagement/locale/zh-CN.ts b/frontend/src/views/project-management/messageManagement/locale/zh-CN.ts
index 03ce6627a8..b1f9ea6d51 100644
--- a/frontend/src/views/project-management/messageManagement/locale/zh-CN.ts
+++ b/frontend/src/views/project-management/messageManagement/locale/zh-CN.ts
@@ -12,7 +12,7 @@ export default {
   'project.messageManagement.updateAt': '更新于',
   'project.messageManagement.status': '状态',
   'project.messageManagement.statusTipOn': '开启：在消息通知列表展示及使用',
-  'project.messageManagement.statusTipOff': '关闭：暂不使用改机器人',
+  'project.messageManagement.statusTipOff': '关闭：暂不使用该机器人',
   'project.messageManagement.choosePlatform': '选择配置平台',
   'project.messageManagement.WE_COM': '企业微信',
   'project.messageManagement.DING_TALK': '钉钉',
@@ -49,11 +49,12 @@ export default {
   'project.messageManagement.appSecretPlaceholder': '打开帮助文档可直接获取',
   'project.messageManagement.appSecretRequired': 'AppSecret 不能为空',
   'project.messageManagement.disableTitle': '确定关闭 {name} 吗？',
-  'project.messageManagement.disableContent': '关闭后，将不在接收站内信通知，且不在消息列表页展示',
+  'project.messageManagement.disableContent': '关闭后，将不在接收 {robot} 通知，且不在消息列表页展示',
   'project.messageManagement.disableConfirm': '确认关闭',
   'project.messageManagement.disableSuccess': '关闭成功',
   'project.messageManagement.enableTitle': '开启 {name}',
-  'project.messageManagement.enableContent': '开启后，站内信则显示在消息设置列表，需要手动设置通知类型',
+  'project.messageManagement.enableContent': '开启后，{robot} 则显示在消息设置列表，需要手动设置通知类型',
+  'project.messageManagement.enableEmailContentTip': '在系统设置-邮件设置中配置 SMTP 服务后才可发送邮件通知',
   'project.messageManagement.enableConfirm': '确认开启',
   'project.messageManagement.enableSuccess': '开启成功',
   'project.messageManagement.deleteTitle': '确认删除 {name} ？',
@@ -92,4 +93,5 @@ export default {
   'project.messageManagement.receiverNotNull': '请最少设置一位消息接收人',
   'project.messageManagement.unsetReceiversTip': '配置模板前请先设置消息接收人',
   'project.messageManagement.noMatchField': '暂无匹配字段',
+  'project.messageManagement.saveContinueText': '保存并继续创建',
 };
diff --git a/frontend/src/views/project-management/projectAndPermission/projectVersion/index.vue b/frontend/src/views/project-management/projectAndPermission/projectVersion/index.vue
index c67adb667d..e8b970a4c4 100644
--- a/frontend/src/views/project-management/projectAndPermission/projectVersion/index.vue
+++ b/frontend/src/views/project-management/projectAndPermission/projectVersion/index.vue
@@ -31,17 +31,18 @@
         </div>
       </div>
       <div class="mt-[40px] flex justify-center">
-        <a-button type="outline" @click="() => openProjectVersion(true)">
+        <a-button v-permission="['PROJECT_VERSION:READ+UPDATE']" type="outline" @click="() => openProjectVersion(true)">
           {{ t('project.projectVersion.openVersion') }}
         </a-button>
       </div>
     </div>
   </a-spin>
-  <div v-if="projectVersionStatus">
-    <div class="flex justify-between">
+  <div v-if="projectVersionStatus" class="table-container">
+    <div class="mb-[16px] flex justify-between">
       <div>
         <a-switch
           v-model:model-value="projectVersionStatus"
+          v-permission="['PROJECT_VERSION:READ+UPDATE']"
           size="small"
           :before-change="(val) => openProjectVersion(val)"
           type="line"
@@ -56,14 +57,20 @@
         allow-clear
         @search="searchVersion"
         @press-enter="searchVersion"
+        @clear="searchVersion"
       />
     </div>
     <MsBaseTable v-bind="propsRes" v-on="propsEvent">
       <template #statusTitle>
         <div class="flex items-center">
-          {{ t('project.projectVersion.status') }}
+          <div class="font-medium text-[var(--color-text-3)]">
+            {{ t('project.projectVersion.status') }}
+          </div>
           <a-popover position="rt">
-            <icon-info-circle class="ml-[4px] hover:text-[rgb(var(--primary-5))]" size="16" />
+            <icon-info-circle
+              class="ml-[4px] text-[var(--color-text-3)] hover:text-[rgb(var(--primary-5))]"
+              size="16"
+            />
             <template #title>
               <div class="w-[256px]"> {{ t('project.projectVersion.statusTip') }} </div>
             </template>
@@ -93,7 +100,7 @@
           </a-popover>
         </div>
       </template>
-      <template #quickCreate>
+      <template v-if="hasAnyPermission(['PROJECT_VERSION:READ+ADD'])" #quickCreate>
         <a-form
           v-if="showQuickCreateForm"
           ref="quickCreateFormRef"
@@ -144,6 +151,7 @@
       <template #status="{ record }">
         <a-switch
           v-model:model-value="record.status"
+          v-permission="['PROJECT_VERSION:READ+UPDATE']"
           size="small"
           :before-change="(val) => handleStatusChange(val, record)"
           type="line"
@@ -152,6 +160,7 @@
       <template #latest="{ record }">
         <a-switch
           v-model:model-value="record.latest"
+          v-permission="['PROJECT_VERSION:READ+UPDATE']"
           :disabled="record.latest"
           :before-change="() => handleUseLatestVersionChange(record)"
           size="small"
@@ -161,6 +170,7 @@
       <template #action="{ record }">
         <a-tooltip :content="t('project.projectVersion.latestVersionDeleteTip')" :disabled="!record.latest">
           <MsButton
+            v-permission="['PROJECT_VERSION:READ+DELETE']"
             type="text"
             :loading="delLoading"
             :disabled="record.latest"
@@ -234,6 +244,7 @@
   import { useI18n } from '@/hooks/useI18n';
   import useModal from '@/hooks/useModal';
   import useAppStore from '@/store/modules/app';
+  import { hasAnyPermission } from '@/utils/permission';
 
   import { ProjectItem, ProjectVersionOption } from '@/models/projectManagement/projectVersion';
   import { ColumnEditTypeEnum } from '@/enums/tableEnum';
@@ -310,7 +321,7 @@
       dataIndex: 'name',
       showTooltip: true,
       editType: ColumnEditTypeEnum.INPUT,
-      width: 150,
+      width: 120,
     },
     {
       title: 'project.projectVersion.status',
@@ -346,6 +357,7 @@
     {
       title: 'project.projectVersion.creator',
       dataIndex: 'createUser',
+      showTooltip: true,
     },
     {
       title: 'common.operation',
@@ -358,8 +370,8 @@
   const { propsRes, propsEvent, loadList, setKeyword, setLoadListParams } = useTable(
     getVersionList,
     {
+      scroll: { x: '100%' },
       columns,
-      size: 'default',
     },
     (item) => {
       return {
@@ -585,4 +597,10 @@
     box-shadow: 0 5px 5px -3px rgb(0 0 0 / 10%), 0 8px 10px 1px rgb(0 0 0 / 6%), 0 3px 14px 2px rgb(0 0 0 / 5%);
     gap: 2px;
   }
+  .table-container {
+    .ms-scroll-bar();
+    @apply overflow-auto;
+
+    min-width: 850px;
+  }
 </style>
diff --git a/frontend/src/views/setting/organization/member/index.vue b/frontend/src/views/setting/organization/member/index.vue
index 41e0eaef3b..943adfb751 100644
--- a/frontend/src/views/setting/organization/member/index.vue
+++ b/frontend/src/views/setting/organization/member/index.vue
@@ -12,7 +12,7 @@
       </div>
       <a-input-search
         v-model="keyword"
-        :max-length="250"
+        :max-length="255"
         allow-clear
         :placeholder="t('organization.member.searchMember')"
         class="w-[230px]"
diff --git a/frontend/src/views/setting/organization/project/components/addProjectModal.vue b/frontend/src/views/setting/organization/project/components/addProjectModal.vue
index 6e173a912f..2e7457e686 100644
--- a/frontend/src/views/setting/organization/project/components/addProjectModal.vue
+++ b/frontend/src/views/setting/organization/project/components/addProjectModal.vue
@@ -198,6 +198,7 @@
         Message.success(
           isEdit.value ? t('system.project.updateProjectSuccess') : t('system.project.createProjectSuccess')
         );
+        appStore.initProjectList();
         handleCancel(true);
       } catch (error) {
         // eslint-disable-next-line no-console
diff --git a/frontend/src/views/setting/system/config/components/authConfig.vue b/frontend/src/views/setting/system/config/components/authConfig.vue
index 145173cba8..f56e0c1571 100644
--- a/frontend/src/views/setting/system/config/components/authConfig.vue
+++ b/frontend/src/views/setting/system/config/components/authConfig.vue
@@ -664,7 +664,6 @@
     },
   ];
   const tableStore = useTableStore();
-  tableStore.initColumn(TableKeyEnum.SYSTEM_AUTH, columns, 'drawer');
   const { propsRes, propsEvent, loadList } = useTable(getAuthList, {
     tableKey: TableKeyEnum.SYSTEM_AUTH,
     columns,
@@ -1193,6 +1192,7 @@
   >;
 
   export declare type AuthConfigInstance = InstanceType<typeof _default>;
+  await tableStore.initColumn(TableKeyEnum.SYSTEM_AUTH, columns, 'drawer');
 </script>
 
 <style lang="less" scoped></style>
diff --git a/frontend/src/views/setting/system/config/index.vue b/frontend/src/views/setting/system/config/index.vue
index 2ae4a1a2d2..2928855410 100644
--- a/frontend/src/views/setting/system/config/index.vue
+++ b/frontend/src/views/setting/system/config/index.vue
@@ -38,7 +38,7 @@
     {
       key: 'memoryCleanup',
       title: t('system.config.memoryCleanup'),
-      permission: ['SYSTEM_PARAMETER_SETTING_MEMORY_CLEAN:READ'],
+      permission: ['SYSTEM_PARAMETER_SETTING_MEMORY_CLEAN:READ+UPDATE'],
     },
   ]);
 
diff --git a/frontend/src/views/setting/system/log/components/logCards.vue b/frontend/src/views/setting/system/log/components/logCards.vue
index ed1faa349a..d78821a8b1 100644
--- a/frontend/src/views/setting/system/log/components/logCards.vue
+++ b/frontend/src/views/setting/system/log/components/logCards.vue
@@ -52,6 +52,7 @@
         :level-top="[...MENU_LEVEL]"
         :virtual-list-props="{ height: 200 }"
         :loading="rangeLoading"
+        path-mode
         class="filter-item"
       />
       <a-select v-model:model-value="type" class="filter-item">
@@ -450,6 +451,7 @@
       dataIndex: 'content',
       slotName: 'content',
       showTooltip: true,
+      width: 150,
     },
     {
       title: 'system.log.time',
@@ -463,7 +465,7 @@
     },
   ];
   const tableStore = useTableStore();
-  tableStore.initColumn(TableKeyEnum.SYSTEM_LOG, columns, 'drawer');
+  await tableStore.initColumn(TableKeyEnum.SYSTEM_LOG, columns, 'drawer');
   const { propsRes, propsEvent, loadList, setLoadListParams, resetPagination } = useTable(
     requestFuncMap[props.mode].listFunc,
     {
@@ -471,7 +473,6 @@
       columns,
       selectable: false,
       showSelectAll: false,
-      size: 'default',
     }
   );
 
@@ -494,7 +495,7 @@
     }
 
     setLoadListParams({
-      operator: operator.value,
+      operUser: operator.value,
       projectIds,
       organizationIds,
       type: type.value,
diff --git a/frontend/src/views/setting/system/organizationAndProject/components/addProjectModal.vue b/frontend/src/views/setting/system/organizationAndProject/components/addProjectModal.vue
index d2b56da431..c58b303f3a 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/addProjectModal.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/addProjectModal.vue
@@ -117,12 +117,14 @@
 
   import { createOrUpdateProject, getSystemOrgOption } from '@/api/modules/setting/organizationAndProject';
   import { useI18n } from '@/hooks/useI18n';
+  import useAppStore from '@/store/modules/app';
   import useLicenseStore from '@/store/modules/setting/license';
 
   import { CreateOrUpdateSystemProjectParams, SystemOrgOption } from '@/models/setting/system/orgAndProject';
 
   import type { FormInstance, ValidatedError } from '@arco-design/web-vue';
 
+  const appStore = useAppStore();
   const { t } = useI18n();
   const props = defineProps<{
     visible: boolean;
@@ -193,6 +195,7 @@
         Message.success(
           isEdit.value ? t('system.project.updateProjectSuccess') : t('system.project.createProjectSuccess')
         );
+        appStore.initProjectList();
         handleCancel(true);
       } catch (error) {
         // eslint-disable-next-line no-console
diff --git a/frontend/src/views/setting/system/resourcePool/detail.vue b/frontend/src/views/setting/system/resourcePool/detail.vue
index 1f8e67d16b..dfc15ca544 100644
--- a/frontend/src/views/setting/system/resourcePool/detail.vue
+++ b/frontend/src/views/setting/system/resourcePool/detail.vue
@@ -136,7 +136,8 @@
       <a-form-item v-if="isShowTypeItem" :label="t('system.resourcePool.type')" field="type" class="form-item">
         <a-radio-group v-model:model-value="form.type" type="button" @change="changeResourceType">
           <a-radio value="Node">Node</a-radio>
-          <a-radio v-xpack value="Kubernetes">Kubernetes</a-radio>
+          <!-- TODO:第一版不上 -->
+          <!-- <a-radio v-xpack value="Kubernetes">Kubernetes</a-radio> -->
         </a-radio-group>
       </a-form-item>
       <template v-if="isShowNodeResources">
@@ -187,6 +188,7 @@
           form-mode="create"
           add-text="system.resourcePool.addResource"
           :default-vals="defaultVals"
+          :hide-add="!isXpack"
           max-height="250px"
         ></MsBatchForm>
         <!-- TODO:代码编辑器懒加载 -->
@@ -402,21 +404,28 @@
   const form = ref({ ...defaultForm });
   const formRef = ref<FormInstance | null>(null);
   const orgOptions = ref<SelectOptionData>([]);
+  // TODO:第一版只有接口测试
   const useList = ref([
-    {
-      label: 'system.resourcePool.usePerformance',
-      value: 'performance',
-    },
+    // {
+    //   label: 'system.resourcePool.usePerformance',
+    //   value: 'performance',
+    // },
     {
       label: 'system.resourcePool.useAPI',
       value: 'API',
     },
-    {
-      label: 'system.resourcePool.useUI',
-      value: 'UI',
-    },
+    // {
+    //   label: 'system.resourcePool.useUI',
+    //   value: 'UI',
+    // },
   ]);
   const defaultGrid = 'http://selenium-hub:4444';
+  const maxConcurrentNumber = computed(() => {
+    if (isXpack.value) {
+      return 9999999;
+    }
+    return 10;
+  });
 
   onBeforeMount(async () => {
     orgOptions.value = await getSystemOrgOption();
@@ -445,6 +454,7 @@
         },
       };
     } catch (error) {
+      // eslint-disable-next-line no-console
       console.log(error);
     } finally {
       loading.value = false;
@@ -555,7 +565,7 @@
       ],
       placeholder: 'system.resourcePool.concurrentNumberPlaceholder',
       min: 1,
-      max: 9999999,
+      max: maxConcurrentNumber.value,
     },
   ]);
 
diff --git a/frontend/src/views/setting/system/resourcePool/index.vue b/frontend/src/views/setting/system/resourcePool/index.vue
index 9f80db1f58..f2cf517120 100644
--- a/frontend/src/views/setting/system/resourcePool/index.vue
+++ b/frontend/src/views/setting/system/resourcePool/index.vue
@@ -11,6 +11,7 @@
         allow-clear
         @search="searchPool"
         @press-enter="searchPool"
+        @clear="searchPool"
       ></a-input-search>
     </div>
     <ms-base-table v-bind="propsRes" no-disable v-on="propsEvent">
@@ -88,6 +89,7 @@
   import useTable from '@/components/pure/ms-table/useTable';
   import MsTableMoreAction from '@/components/pure/ms-table-more-action/index.vue';
   import type { ActionsItem } from '@/components/pure/ms-table-more-action/types';
+  import { TagType, Theme } from '@/components/pure/ms-tag/ms-tag.vue';
   import JobTemplateDrawer from './components/jobTemplateDrawer.vue';
 
   import { delPoolInfo, getPoolInfo, getPoolList, togglePoolStatus } from '@/api/modules/setting/resourcePool';
@@ -142,7 +144,7 @@
     },
   ];
   const tableStore = useTableStore();
-  tableStore.initColumn(TableKeyEnum.SYSTEM_RESOURCEPOOL, columns, 'drawer');
+  await tableStore.initColumn(TableKeyEnum.SYSTEM_RESOURCEPOOL, columns, 'drawer');
   const { propsRes, propsEvent, loadList, setKeyword } = useTable(getPoolList, {
     tableKey: TableKeyEnum.SYSTEM_RESOURCEPOOL,
     columns,
@@ -257,8 +259,8 @@
   }
 
   const showDetailDrawer = ref(false);
-  const activePoolDesc: Ref<Description[]> = ref([]);
-  const activePool: Ref<ResourcePoolDetail | null> = ref(null);
+  const activePoolDesc = ref<Description[]>([]);
+  const activePool = ref<ResourcePoolDetail | null>(null);
   const showJobDrawer = ref(false);
   const drawerLoading = ref(false);
   /**
@@ -301,6 +303,9 @@
                 {
                   label: t('system.resourcePool.detailResources'),
                   value: nodesList?.map((e) => `${e.ip},${e.port},${e.monitor},${e.concurrentNumber}`),
+                  tagTheme: 'light' as Theme,
+                  tagType: 'default' as TagType,
+                  tagMaxWidth: '280px',
                   isTag: true,
                 },
               ]
@@ -402,10 +407,14 @@
               ? [t('system.resourcePool.orgAll')]
               : activePool.value.testResourceReturnDTO.orgIdNameMap.map((e) => e.name),
             isTag: true,
+            tagTheme: 'light',
+            tagType: 'default',
           },
           {
             label: t('system.resourcePool.detailUse'),
             value: poolUses.filter((e) => e !== ''),
+            tagTheme: 'light',
+            tagType: 'default',
             isTag: true,
           },
           ...performanceDesc,
@@ -416,6 +425,7 @@
         ];
       }
     } catch (error) {
+      // eslint-disable-next-line no-console
       console.log(error);
     } finally {
       drawerLoading.value = false;
diff --git a/frontend/src/views/setting/system/user/components/batchModal.vue b/frontend/src/views/setting/system/user/components/batchModal.vue
index e6dc810efe..d8715427e4 100644
--- a/frontend/src/views/setting/system/user/components/batchModal.vue
+++ b/frontend/src/views/setting/system/user/components/batchModal.vue
@@ -1,5 +1,10 @@
 <template>
-  <a-modal v-model:visible="showBatchModal" title-align="start" class="ms-modal-upload ms-modal-medium">
+  <a-modal
+    v-model:visible="showBatchModal"
+    title-align="start"
+    class="ms-modal-upload ms-modal-medium"
+    unmount-on-close
+  >
     <template #title>
       {{ batchTitle }}
       <div class="text-[var(--color-text-4)]">
@@ -174,11 +179,14 @@
       showBatchModal.value = false;
       emit('finished');
     } catch (error) {
+      // eslint-disable-next-line no-console
       console.log(error);
     } finally {
       batchLoading.value = false;
     }
   }
+
+  function handleClose() {}
 </script>
 
 <style lang="less" scoped></style>
diff --git a/frontend/src/views/setting/system/user/index.vue b/frontend/src/views/setting/system/user/index.vue
index 62fcaf9723..458bb62ebd 100644
--- a/frontend/src/views/setting/system/user/index.vue
+++ b/frontend/src/views/setting/system/user/index.vue
@@ -8,9 +8,9 @@
         <a-button v-permission="['SYSTEM_USER_INVITE']" class="mr-3" type="outline" @click="showEmailInviteModal">
           {{ t('system.user.emailInvite') }}
         </a-button>
-        <a-button v-permission="['SYSTEM_USER:READ+IMPORT']" class="mr-3" type="outline" @click="showImportModal">{{
-          t('system.user.importUser')
-        }}</a-button>
+        <a-button v-permission="['SYSTEM_USER:READ+IMPORT']" class="mr-3" type="outline" @click="showImportModal">
+          {{ t('system.user.importUser') }}
+        </a-button>
       </div>
       <a-input-search
         v-model:model-value="keyword"
@@ -19,7 +19,8 @@
         allow-clear
         @search="searchUser"
         @press-enter="searchUser"
-      ></a-input-search>
+        @clear="searchUser"
+      />
     </div>
     <ms-base-table
       v-bind="propsRes"
@@ -27,19 +28,50 @@
       v-on="propsEvent"
       @batch-action="handleTableBatch"
     >
+      <template #userGroup="{ record }">
+        <MsTagGroup
+          v-if="!record.selectUserGroupVisible"
+          :tag-list="record.userRoleList"
+          type="primary"
+          theme="outline"
+          @click="record.selectUserGroupVisible = true"
+        />
+        <MsSelect
+          v-else
+          v-model:model-value="record.userRoleList"
+          :placeholder="t('system.user.createUserUserGroupPlaceholder')"
+          :options="userGroupOptions"
+          :search-keys="['name']"
+          :loading="record.selectUserGroupLoading"
+          :disabled="record.selectUserGroupLoading"
+          :fallback-option="(val) => ({
+              label: (val as Record<string, any>).name,
+              value: val,
+            })"
+          value-key="id"
+          label-key="name"
+          class="w-full"
+          allow-clear
+          :multiple="true"
+          :at-least-one="true"
+          :object-value="true"
+          @popup-visible-change="(value) => handleUserGroupChange(value, record)"
+        >
+        </MsSelect>
+      </template>
       <template #action="{ record }">
         <template v-if="!record.enable">
           <MsButton @click="enableUser(record)">{{ t('system.user.enable') }}</MsButton>
-          <MsButton v-permission="['SYSTEM_USER:READ+DELETE']" @click="deleteUser(record)">{{
-            t('system.user.delete')
-          }}</MsButton>
+          <MsButton v-permission="['SYSTEM_USER:READ+DELETE']" @click="deleteUser(record)">
+            {{ t('system.user.delete') }}
+          </MsButton>
         </template>
         <template v-else>
-          <MsButton v-permission="['SYSTEM_USER:READ+UPDATE']" @click="showUserModal('edit', record)">{{
-            t('system.user.editUser')
-          }}</MsButton>
+          <MsButton v-permission="['SYSTEM_USER:READ+UPDATE']" @click="showUserModal('edit', record)">
+            {{ t('system.user.editUser') }}
+          </MsButton>
           <MsTableMoreAction
-            v-if="hasAnyPermission(['SYSTEM_USER:READ+UPDATE', 'SYSTEM_USER:READ+UPDATE', 'SYSTEM_USER:READ+DELETE'])"
+            v-permission="['SYSTEM_USER:READ+UPDATE+DELETE']"
             :list="tableActions"
             @select="handleSelect($event, record)"
           ></MsTableMoreAction>
@@ -56,7 +88,14 @@
     @close="handleUserModalClose"
   >
     <a-alert class="mb-[16px]">{{ t('system.user.createUserTip') }}</a-alert>
-    <a-form ref="userFormRef" class="rounded-[4px]" :model="userForm" layout="vertical">
+    <a-form
+      v-if="visible"
+      ref="userFormRef"
+      class="rounded-[4px]"
+      :model="userForm"
+      layout="vertical"
+      scroll-to-first-error
+    >
       <MsBatchForm
         ref="batchFormRef"
         :models="batchFormModels"
@@ -69,25 +108,27 @@
         class="mb-0"
         field="userGroup"
         :label="t('system.user.createUserUserGroup')"
-        required
+        :rules="[{ required: true, message: t('system.user.createUserUserGroupNotNull') }]"
         asterisk-position="end"
       >
-        <a-select
-          v-model="userForm.userGroup"
-          multiple
+        <MsSelect
+          v-model:model-value="userForm.userGroup"
+          :multiple="true"
           :placeholder="t('system.user.createUserUserGroupPlaceholder')"
+          :options="userGroupOptions"
+          :search-keys="['name']"
+          :fallback-option="(val) => ({
+              label: (val as Record<string, any>).name,
+              value: val,
+            })"
+          :object-value="true"
+          value-key="id"
+          label-key="name"
           allow-clear
+          :at-least-one="true"
+          :should-calculate-max-tag="false"
         >
-          <a-option
-            v-for="item of userGroupOptions"
-            :key="item.id"
-            :tag-props="{ closable: userForm.userGroup.length > 1 }"
-            :value="item.id"
-            :disabled="userForm.userGroup.includes(item.id) && userForm.userGroup.length === 1"
-          >
-            {{ item.name }}
-          </a-option>
-        </a-select>
+        </MsSelect>
       </a-form-item>
     </a-form>
     <template #footer>
@@ -107,8 +148,9 @@
     :title="t('system.user.importModalTitle')"
     title-align="start"
     class="ms-modal-upload"
+    @close="userImportFile = []"
   >
-    <a-alert class="mb-[16px]" closable>
+    <a-alert class="mb-[16px]">
       {{ t('system.user.importModalTip') }}
       <a-button type="text" size="small" @click="downLoadUserTemplate">
         {{ t('system.user.importDownload') }}
@@ -120,6 +162,7 @@
       :show-file-list="false"
       :auto-upload="false"
       :disabled="importLoading"
+      size-unit="MB"
     ></MsUpload>
     <template #footer>
       <a-button type="secondary" :disabled="importLoading" @click="cancelImport">
@@ -130,16 +173,8 @@
       </a-button>
     </template>
   </a-modal>
-  <a-modal v-model:visible="importResultVisible" title-align="start" class="ms-modal-upload">
+  <a-modal v-model:visible="importResultVisible" title-align="start" class="ms-modal-upload" :closable="false">
     <template #title>
-      <icon-exclamation-circle-fill
-        v-if="importResult === 'fail'"
-        class="mr-[8px] text-[20px] text-[rgb(var(--warning-6))]"
-      />
-      <icon-close-circle-fill
-        v-if="importResult === 'allFail'"
-        class="mr-[8px] text-[20px] text-[rgb(var(--danger-6))]"
-      />
       {{ importResultTitle }}
     </template>
     <div v-if="importResult === 'success'" class="flex flex-col items-center justify-center">
@@ -152,20 +187,46 @@
       </div>
     </div>
     <template v-else>
-      <div>
-        {{ t('system.user.importResultContent', { successNum: importSuccessCount, failNum: importFailCount }) }}
-      </div>
-      <div>
-        {{ t('system.user.importResultContentSubStart') }}
-        <a-link
-          class="text-[rgb(var(--primary-5))]"
-          :href="importErrorFileUrl"
-          :download="`${t('system.user.importErrorFile')}.pdf`"
-        >
-          {{ t('system.user.importResultContentDownload') }}
-        </a-link>
-        {{ t('system.user.importResultContentSubEnd') }}
-      </div>
+      <a-alert type="error">
+        <template #icon>
+          <icon-exclamation-circle-fill class="text-[rgb(var(--danger-6))]" />
+        </template>
+        <div class="flex items-center">
+          {{ t('system.user.importResultContent', { successNum: importSuccessCount }) }}
+          <div class="mx-[4px] text-[rgb(var(--danger-6))]">{{ importFailCount }}</div>
+          {{ t('system.user.importResultContentEnd') }}
+          <a-popover content-class="w-[400px] p-0" position="right">
+            <MsButton type="text">
+              {{ t('system.user.importErrorDetail') }}
+            </MsButton>
+            <template #content>
+              <div class="px-[16px] pt-[16px] text-[14px]">
+                <div class="flex items-center font-medium">
+                  <div class="text-[var(--color-text-1)]">{{ t('system.user.importErrorMessageTitle') }}</div>
+                  <div class="ml-[4px] text-[var(--color-text-4)]">({{ importFailCount }})</div>
+                </div>
+                <div class="import-error-message-list mt-[8px]">
+                  <div
+                    v-for="key of Object.keys(importErrorMessages)"
+                    :key="key"
+                    class="mb-[16px] flex items-center text-[var(--color-text-2)]"
+                  >
+                    {{ t('system.user.num') }}
+                    <div class="mx-[4px] font-medium">{{ key }}</div>
+                    {{ t('system.user.line') }}：
+                    {{ importErrorMessages[key] }}
+                  </div>
+                </div>
+              </div>
+              <div class="import-error-message-footer">
+                <MsButton type="text" @click="importErrorMessageDrawerVisible = true">
+                  {{ t('system.user.seeMore') }}
+                </MsButton>
+              </div>
+            </template>
+          </a-popover>
+        </div>
+      </a-alert>
     </template>
     <template #footer>
       <a-button type="text" class="!text-[var(--color-text-1)]" @click="cancelImport">
@@ -185,6 +246,27 @@
     :keyword="keyword"
     @finished="resetSelector"
   ></batchModal>
+  <MsDrawer v-model:visible="importErrorMessageDrawerVisible" :width="680" :footer="false">
+    <template #title>
+      <div class="flex items-center font-medium">
+        <div class="text-[var(--color-text-1)]">{{ t('system.user.importErrorMessageTitle') }}</div>
+        <div class="ml-[4px] text-[var(--color-text-4)]">({{ importFailCount }})</div>
+      </div>
+    </template>
+    <div class="import-error-message-list !max-h-full">
+      <div
+        v-for="key of Object.keys(importErrorMessages)"
+        :key="key"
+        class="mb-[16px] flex items-center text-[var(--color-text-2)]"
+      >
+        <div class="mr-[8px] h-[6px] w-[6px] rounded-full bg-[var(--color-text-input-border)]"></div>
+        {{ t('system.user.num') }}
+        <div class="mx-[4px] font-medium">{{ key }}</div>
+        {{ t('system.user.line') }}：
+        {{ importErrorMessages[key] }}
+      </div>
+    </div>
+  </MsDrawer>
 </template>
 
 <script setup lang="ts">
@@ -198,14 +280,17 @@
 
   import MsButton from '@/components/pure/ms-button/index.vue';
   import MsCard from '@/components/pure/ms-card/index.vue';
+  import MsDrawer from '@/components/pure/ms-drawer/index.vue';
   import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
   import type { BatchActionParams, BatchActionQueryParams, MsTableColumn } from '@/components/pure/ms-table/type';
   import useTable from '@/components/pure/ms-table/useTable';
   import MsTableMoreAction from '@/components/pure/ms-table-more-action/index.vue';
   import type { ActionsItem } from '@/components/pure/ms-table-more-action/types';
+  import MsTagGroup from '@/components/pure/ms-tag/ms-tag-group.vue';
   import MsUpload from '@/components/pure/ms-upload/index.vue';
   import MsBatchForm from '@/components/business/ms-batch-form/index.vue';
   import type { FormItemModel, MsBatchFormInstance } from '@/components/business/ms-batch-form/types';
+  import MsSelect from '@/components/business/ms-select';
   import batchModal from './components/batchModal.vue';
   import inviteModal from './components/inviteModal.vue';
 
@@ -221,6 +306,7 @@
   } from '@/api/modules/setting/user';
   import { useI18n } from '@/hooks/useI18n';
   import useModal from '@/hooks/useModal';
+  import useLocale from '@/locale/useLocale';
   import { useTableStore } from '@/store';
   import { characterLimit, formatPhoneNumber } from '@/utils';
   import { hasAnyPermission } from '@/utils/permission';
@@ -230,8 +316,10 @@
   import { TableKeyEnum } from '@/enums/tableEnum';
 
   import type { FileItem, FormInstance, ValidatedError } from '@arco-design/web-vue';
+  import type { FieldData } from '@arco-design/web-vue/es/form/interface';
 
   const { t } = useI18n();
+  const { currentLocale } = useLocale();
   const route = useRoute();
 
   const columns: MsTableColumn = [
@@ -259,8 +347,8 @@
     },
     {
       title: 'system.user.tableColumnUserGroup',
-      isTag: true,
       dataIndex: 'userRoleList',
+      slotName: 'userGroup',
       width: 300,
     },
     {
@@ -282,8 +370,7 @@
     {
       tableKey: TableKeyEnum.SYSTEM_USER,
       columns,
-      size: 'default',
-      selectable: true,
+      selectable: !!hasAnyPermission(['SYSTEM_USER:READ+ADD+UPDATE+DELETE']),
       showSetting: true,
       showJumpMethod: true,
       heightUsed: 288,
@@ -293,6 +380,8 @@
       organizationList: record.organizationList.filter((e: any) => e),
       userRoleList: record.userRoleList.filter((e: any) => e),
       phone: formatPhoneNumber(record.phone || ''),
+      selectUserGroupVisible: false,
+      selectUserGroupLoading: false,
     })
   );
 
@@ -585,7 +674,7 @@
 
   interface UserForm {
     list: SimpleUserInfo[];
-    userGroup: string[];
+    userGroup: Record<string, any>[];
   }
 
   const visible = ref(false);
@@ -609,9 +698,7 @@
     try {
       userGroupOptions.value = await getSystemRoles();
       if (userGroupOptions.value.length) {
-        userForm.value.userGroup = userGroupOptions.value
-          .filter((e: SystemRole) => e.selected === true)
-          .map((e: SystemRole) => e.id);
+        userForm.value.userGroup = userGroupOptions.value.filter((e: SystemRole) => e.selected === true);
       }
     } catch (error) {
       // eslint-disable-next-line no-console
@@ -620,10 +707,10 @@
   }
 
   onBeforeMount(async () => {
-    if (route.query.id) {
-      keyword.value = route.query.id as string;
-    }
     setKeyword(keyword.value);
+    if (route.query.id) {
+      setKeyword(route.query.id as string);
+    }
     init();
     loadList();
   });
@@ -634,9 +721,7 @@
   function resetUserForm() {
     userForm.value.list = [];
     userFormRef.value?.resetFields();
-    userForm.value.userGroup = userGroupOptions.value
-      .filter((e: SystemRole) => e.selected === true)
-      .map((e: SystemRole) => e.id);
+    userForm.value.userGroup = userGroupOptions.value.filter((e: SystemRole) => e.selected === true);
   }
 
   /**
@@ -656,7 +741,7 @@
           phone: record.phone ? record.phone.replace(/\s/g, '') : record.phone,
         },
       ];
-      userForm.value.userGroup = record.userRoleList.map((e) => e.id);
+      userForm.value.userGroup = record.userRoleList;
     }
   }
 
@@ -668,7 +753,7 @@
   function checkUerName(value: string | undefined, callback: (error?: string) => void) {
     if (value === '' || value === undefined) {
       callback(t('system.user.createUserNameNotNull'));
-    } else if (value.length > 50) {
+    } else if (value.length > 255) {
       callback(t('system.user.createUserNameOverLength'));
     }
   }
@@ -693,7 +778,7 @@
    * @param callback 失败回调，入参是提示信息
    */
   function checkUerPhone(value: string | undefined, callback: (error?: string) => void) {
-    if (value !== '' && value !== undefined && !validatePhone(value)) {
+    if (value !== null && value !== '' && value !== undefined && !validatePhone(value)) {
       callback(t('system.user.createUserPhoneErr'));
     }
   }
@@ -745,7 +830,7 @@
       name: activeUser.name,
       email: activeUser.email,
       phone: activeUser.phone,
-      userRoleIdList: userForm.value.userGroup,
+      userRoleIdList: userForm.value.userGroup.map((e) => e.id),
     };
     await updateUserInfo(params);
     Message.success(t('system.user.updateUserSuccess'));
@@ -753,6 +838,32 @@
     loadList();
   }
 
+  /**
+   * 快捷修改用户组
+   */
+  async function handleUserGroupChange(val: boolean, record: UserListItem & Record<string, any>) {
+    try {
+      if (!val) {
+        record.selectUserGroupLoading = true;
+        const params = {
+          id: record.id,
+          name: record.name,
+          email: record.email,
+          phone: record.phone,
+          userRoleIdList: record.userRoleList.map((e) => e.id),
+        };
+        await updateUserInfo(params);
+        Message.success(t('system.user.updateUserSuccess'));
+        record.selectUserGroupVisible = false;
+      }
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.log(error);
+    } finally {
+      record.selectUserGroupLoading = false;
+    }
+  }
+
   /**
    * 创建用户
    * @param isContinue 是否继续创建
@@ -760,14 +871,28 @@
   async function createUser(isContinue?: boolean) {
     const params = {
       userInfoList: userForm.value.list,
-      userRoleIdList: userForm.value.userGroup,
+      userRoleIdList: userForm.value.userGroup.map((e) => e.id),
     };
-    await batchCreateUser(params);
-    Message.success(t('system.user.addUserSuccess'));
-    if (!isContinue) {
-      visible.value = false;
+    const res = await batchCreateUser(params);
+    if (res.errorEmails !== null) {
+      const errData: Record<string, FieldData> = {};
+      Object.keys(res.errorEmails).forEach((key) => {
+        const filedIndex = userForm.value.list.findIndex((e) => e.email === key);
+        if (filedIndex > -1) {
+          errData[`list[${filedIndex}].email`] = {
+            status: 'error',
+            message: t('system.user.createUserEmailExist'),
+          };
+        }
+      });
+      batchFormRef.value?.setFields(errData);
+    } else {
+      Message.success(t('system.user.addUserSuccess'));
+      if (!isContinue) {
+        visible.value = false;
+      }
+      loadList();
     }
-    loadList();
   }
 
   /**
@@ -834,9 +959,10 @@
   const importResultVisible = ref(false);
   const importSuccessCount = ref(0);
   const importFailCount = ref(0);
-  const importErrorFileUrl = ref('');
   const importResult = ref<'success' | 'allFail' | 'fail'>('allFail');
   const importResultTitle = ref(t('system.user.importSuccessTitle'));
+  const importErrorMessages = ref<Record<string, any>>({});
+  const importErrorMessageDrawerVisible = ref(false);
 
   function showImportModal() {
     importVisible.value = true;
@@ -886,16 +1012,18 @@
       const res = await importUserInfo({
         fileList: [userImportFile.value[0].file],
       });
-      const failCount = res.importCount - res.successCount;
-      if (failCount === res.importCount) {
+      const { data } = res;
+      const failCount = data.importCount - data.successCount;
+      if (failCount === data.importCount) {
         importResult.value = 'allFail';
       } else if (failCount > 0) {
         importResult.value = 'fail';
       } else {
         importResult.value = 'success';
       }
-      importSuccessCount.value = res.successCount;
+      importSuccessCount.value = data.successCount;
       importFailCount.value = failCount;
+      importErrorMessages.value = data.errorMessages;
       showImportResult();
     } catch (error) {
       // eslint-disable-next-line no-console
@@ -906,7 +1034,11 @@
   }
 
   function downLoadUserTemplate() {
-    window.open('/templates/user_import.xlsx', '_blank');
+    if (currentLocale.value === 'zh-CN') {
+      window.open('/templates/user_import_cn.xlsx', '_blank');
+    } else {
+      window.open('/templates/user_import_en.xlsx', '_blank');
+    }
   }
   await tableStore.initColumn(TableKeyEnum.SYSTEM_USER, columns, 'drawer');
 </script>
@@ -920,4 +1052,16 @@
     border-color: rgb(var(--primary-5));
     color: rgb(var(--primary-5));
   }
+  .import-error-message-list {
+    .ms-scroll-bar();
+    @apply overflow-y-auto;
+
+    max-height: 250px;
+  }
+  .import-error-message-footer {
+    @apply flex items-center justify-center;
+
+    padding: 8px 0;
+    box-shadow: 0 -1px 4px 0 rgb(31 35 41 / 10%);
+  }
 </style>
diff --git a/frontend/src/views/setting/system/user/locale/en-US.ts b/frontend/src/views/setting/system/user/locale/en-US.ts
index 76881d6f70..1039831d04 100644
--- a/frontend/src/views/setting/system/user/locale/en-US.ts
+++ b/frontend/src/views/setting/system/user/locale/en-US.ts
@@ -10,26 +10,26 @@ export default {
   'system.user.enable': 'Enable',
   'system.user.tableEnable': 'Enabled',
   'system.user.tableDisable': 'Disabled',
-  'system.user.deleteUserTip': 'Are you sure to delete the user `{name}` ?',
+  'system.user.deleteUserTip': 'Are you sure to delete the user {name} ?',
   'system.user.batchDeleteUserTip': 'Are you sure you want to delete the {count} users selected?',
   'system.user.deleteUserContent': "Only delete user information, does not handle the user's system data",
   'system.user.deleteUserConfirm': 'Delete',
   'system.user.deleteUserCancel': 'Cancel',
   'system.user.deleteUserSuccess': 'Delete successfully',
-  'system.user.disableUserTip': 'Are you sure to disable the user `{name}` ?',
+  'system.user.disableUserTip': 'Are you sure to disable the user {name} ?',
   'system.user.batchDisableUserTip': 'Are you sure to disable the {count} selected users?',
   'system.user.disableUserContent': "Disabled users can't log in to the system",
   'system.user.disableUserConfirm': 'Disabled',
   'system.user.disableUserCancel': 'Cancel',
   'system.user.disableUserSuccess': 'Disabled successfully',
-  'system.user.enableUserTip': 'Are you sure to enable the user `{name}` ?',
+  'system.user.enableUserTip': 'Are you sure to enable the user {name} ?',
   'system.user.batchEnableUserTip': 'Are you sure to enable the {count} selected users?',
   'system.user.enableUserContent': 'Enabled users can log in to the system',
   'system.user.enableUserConfirm': 'Enable',
   'system.user.enableUserCancel': 'Cancel',
   'system.user.enableUserSuccess': 'Enable successfully',
   'system.user.resetPswStart': 'Reset the password of',
-  'system.user.resetPswTip': 'Reset the password of `{name}` to its initial password?',
+  'system.user.resetPswTip': 'Reset the password of {name} to its initial password?',
   'system.user.batchResetPswTip': 'Reset the passwords of the selected {count} users to their initial passwords?',
   'system.user.resetPswContent': "The initial password is the user's mailbox, which will take effect at the next login",
   'system.user.resetPswConfirm': 'Reset',
@@ -48,6 +48,7 @@ export default {
   'system.user.createUserEmailNotNull': 'Email cannot be empty',
   'system.user.createUserEmailErr': 'Please enter the correct email',
   'system.user.createUserEmailNoRepeat': 'Email cannot be repeated',
+  'system.user.createUserEmailExist': 'Email already exists',
   'system.user.createUserEmailPlaceholder': 'Please input the email address',
   'system.user.createUserPhone': 'Phone',
   'system.user.createUserPhoneErr': 'Please enter 11 digit mobile number',
@@ -56,6 +57,7 @@ export default {
   'system.user.createUserOrganizationPlaceholder': 'Please select user organization',
   'system.user.createUserUserGroup': 'User Group',
   'system.user.createUserUserGroupPlaceholder': 'Please select a user group',
+  'system.user.createUserUserGroupNotNull': 'Please select at least one user group',
   'system.user.editUserModalTitle': 'Edit the user',
   'system.user.editUserModalCancelCreate': 'Cancel',
   'system.user.editUserModalSaveAndContinue': 'Save & Continue',
@@ -79,14 +81,15 @@ export default {
   'system.user.importSuccess': 'Import succeeded',
   'system.user.importFailTitle': 'Some user information failed to import',
   'system.user.importAllFailTitle': 'User information import failed',
-  'system.user.importResultContent': 'Successfully imported user {successNum} items, failed to import {failNum} items;',
+  'system.user.importResultContent': 'Successfully imported user {successNum} items, failed to import',
+  'system.user.importResultContentEnd': 'items;',
   'system.user.importResultContentSubStart': 'You can',
   'system.user.importResultContentDownload': 'Download bug report',
   'system.user.importResultContentSubEnd': ',re-import after modification',
   'system.user.importResultSuccessContent': 'Successfully imported user {successNum} items',
   'system.user.importResultReturn': 'Return list',
   'system.user.importResultContinue': 'Continue importing',
-  'system.user.importErrorFile': 'error report',
+  'system.user.importErrorDetail': 'Error Detail',
   'system.user.batchActionAddProject': 'Add to project',
   'system.user.batchActionAddUserGroup': 'Add to user group',
   'system.user.batchActionAddOrganization': 'Add to org',
@@ -108,4 +111,8 @@ export default {
   'system.user.tableColumnStatus': 'Status',
   'system.user.tableColumnActions': 'Actions',
   'system.user.batchTransferSearchPlaceholder': 'Enter name to search',
+  'system.user.importErrorMessageTitle': 'Failed to import some user information',
+  'system.user.seeMore': 'View more',
+  'system.user.num': 'Line',
+  'system.user.line': '',
 };
diff --git a/frontend/src/views/setting/system/user/locale/zh-CN.ts b/frontend/src/views/setting/system/user/locale/zh-CN.ts
index 3a738fde65..9cec5e1e54 100644
--- a/frontend/src/views/setting/system/user/locale/zh-CN.ts
+++ b/frontend/src/views/setting/system/user/locale/zh-CN.ts
@@ -2,7 +2,7 @@ export default {
   'system.user.createUser': '创建用户',
   'system.user.emailInvite': '邮箱邀请',
   'system.user.importUser': '导入用户',
-  'system.user.searchUser': '通过名称或邮箱搜索',
+  'system.user.searchUser': '通过姓名或邮箱搜索',
   'system.user.editUser': '编辑',
   'system.user.resetPassword': '重置密码',
   'system.user.disable': '禁用',
@@ -10,25 +10,25 @@ export default {
   'system.user.enable': '启用',
   'system.user.tableEnable': '正常',
   'system.user.tableDisable': '禁用',
-  'system.user.deleteUserTip': '确认删除 `{name}` 这个用户吗？',
+  'system.user.deleteUserTip': '确认删除 {name} 这个用户吗？',
   'system.user.batchDeleteUserTip': '确认删除已选中的 {count} 个用户吗？',
   'system.user.deleteUserContent': '仅删除用户信息，不处理该用户的系统数据',
   'system.user.deleteUserConfirm': '确认删除',
   'system.user.deleteUserCancel': '取消',
   'system.user.deleteUserSuccess': '删除成功',
-  'system.user.disableUserTip': '确认禁用 `{name}` 这个用户吗？',
+  'system.user.disableUserTip': '确认禁用 {name} 这个用户吗？',
   'system.user.batchDisableUserTip': '确认禁用已选中的 {count} 个用户吗？',
   'system.user.disableUserContent': '禁用的用户无法登录系统',
   'system.user.disableUserConfirm': '确认禁用',
   'system.user.disableUserCancel': '取消',
   'system.user.disableUserSuccess': '禁用成功',
-  'system.user.enableUserTip': '确认启用 `{name}` 这个用户吗？',
+  'system.user.enableUserTip': '确认启用 {name} 这个用户吗？',
   'system.user.batchEnableUserTip': '确认启用已选中的 {count} 个用户吗？',
   'system.user.enableUserContent': '启用后用户可以登录系统',
   'system.user.enableUserConfirm': '确认启用',
   'system.user.enableUserCancel': '取消',
   'system.user.enableUserSuccess': '启用成功',
-  'system.user.resetPswTip': '是否将 `{name}` 的密码重置为初始密码？',
+  'system.user.resetPswTip': '是否将 {name} 的密码重置为初始密码？',
   'system.user.batchResetPswTip': '是否将选中的 {count} 个用户的密码重置为初始密码？',
   'system.user.resetPswContent': '初始的密码为用户邮箱，下次登录时生效',
   'system.user.resetPswConfirm': '确认重置',
@@ -36,7 +36,7 @@ export default {
   'system.user.resetPswSuccess': '重置成功',
   'system.user.createUserModalTitle': '创建用户',
   'system.user.addUser': '添加用户',
-  'system.user.addUserSuccess': '添加成功',
+  'system.user.addUserSuccess': '创建成功',
   'system.user.updateUserSuccess': '更新成功',
   'system.user.createUserTip': '初始密码为邮箱地址',
   'system.user.createUserName': '姓名',
@@ -47,6 +47,7 @@ export default {
   'system.user.createUserEmailNotNull': '邮箱不能为空',
   'system.user.createUserEmailErr': '请输入正确的邮箱',
   'system.user.createUserEmailNoRepeat': '邮箱不能重复',
+  'system.user.createUserEmailExist': '邮箱已存在',
   'system.user.createUserEmailPlaceholder': '请输入邮箱地址',
   'system.user.createUserPhone': '手机',
   'system.user.createUserPhoneErr': '请输入11位手机号',
@@ -55,6 +56,7 @@ export default {
   'system.user.createUserOrganizationPlaceholder': '请选择用户组织',
   'system.user.createUserUserGroup': '用户组',
   'system.user.createUserUserGroupPlaceholder': '请选择用户组',
+  'system.user.createUserUserGroupNotNull': '请至少选择一个用户组',
   'system.user.editUserModalTitle': '编辑用户',
   'system.user.editUserModalCancelCreate': '取消',
   'system.user.editUserModalSaveAndContinue': '保存并继续创建',
@@ -78,14 +80,15 @@ export default {
   'system.user.importSuccess': '导入成功',
   'system.user.importFailTitle': '部分用户信息导入失败',
   'system.user.importAllFailTitle': '用户信息导入失败',
-  'system.user.importResultContent': '成功导入用户 {successNum} 个，导入失败 {failNum} 个；',
+  'system.user.importResultContent': '成功导入用户 {successNum} 个，导入失败',
+  'system.user.importResultContentEnd': '个；',
   'system.user.importResultContentSubStart': '可',
   'system.user.importResultContentDownload': '下载错误报告',
   'system.user.importResultContentSubEnd': '，修改后重新导入',
   'system.user.importResultSuccessContent': '成功导入 {successNum} 个用户',
   'system.user.importResultReturn': '返回列表',
   'system.user.importResultContinue': '继续导入',
-  'system.user.importErrorFile': '错误报告',
+  'system.user.importErrorDetail': '错误详情',
   'system.user.batchActionAddProject': '添加至项目',
   'system.user.batchActionAddUserGroup': '添加至用户组',
   'system.user.batchActionAddOrganization': '添加至组织',
@@ -107,4 +110,8 @@ export default {
   'system.user.tableColumnStatus': '状态',
   'system.user.tableColumnActions': '操作',
   'system.user.batchTransferSearchPlaceholder': '输入名称搜索',
+  'system.user.importErrorMessageTitle': '部分用户信息导入失败',
+  'system.user.seeMore': '查看更多',
+  'system.user.num': '第',
+  'system.user.line': '行',
 };