From 6980ca0b5336771f12250d21b515d75452700553 Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Fri, 24 May 2024 11:53:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=20=20=E9=83=A8=E5=88=86=20bug=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/ms-add-attachment/index.vue      |  5 ++++-
 .../pure/ms-time-selector/MsTimeSelector.vue  | 12 +++++++---
 .../pure/ms-user-admin-div/index.vue          |  2 +-
 frontend/src/components/pure/navbar/index.vue |  4 ++--
 frontend/src/config/permission.ts             | 12 ----------
 frontend/src/hooks/usePermission.ts           |  3 ++-
 frontend/src/utils/permission.ts              | 22 ++++++++++++++-----
 .../components/requestComposition/body.vue    |  8 +++----
 .../management/mock/mockDetailDrawer.vue      |  8 +++----
 .../management/mock/mockResponse.vue          | 10 ++++-----
 .../step/stepNodeComposition/csvTag.vue       | 11 ++--------
 .../menuManagement/menuManagement.vue         |  2 +-
 .../testPlan/components/planTable.vue         |  1 -
 .../testPlan/components/testPlanTree.vue      |  2 +-
 .../featureCase/components/caseTree.vue       |  2 +-
 .../src/views/test-plan/testPlan/index.vue    |  1 +
 16 files changed, 53 insertions(+), 52 deletions(-)
 delete mode 100644 frontend/src/config/permission.ts

diff --git a/frontend/src/components/business/ms-add-attachment/index.vue b/frontend/src/components/business/ms-add-attachment/index.vue
index 862c022257..24da337a85 100644
--- a/frontend/src/components/business/ms-add-attachment/index.vue
+++ b/frontend/src/components/business/ms-add-attachment/index.vue
@@ -376,7 +376,10 @@
       fileList.value = [{ ...file, fileId: file.uid || '', fileName: file.name || '' }];
       inputFileName.value = file.name || '';
     }
-    emit('change', fileList.value);
+    nextTick(() => {
+      // fileList赋值以后需要 nextTick 才能获取到更新后的值
+      emit('change', fileList.value);
+    });
   }
 
   const inputFilesPopoverVisible = ref(false);
diff --git a/frontend/src/components/pure/ms-time-selector/MsTimeSelector.vue b/frontend/src/components/pure/ms-time-selector/MsTimeSelector.vue
index d4a76dc524..58984ec246 100644
--- a/frontend/src/components/pure/ms-time-selector/MsTimeSelector.vue
+++ b/frontend/src/components/pure/ms-time-selector/MsTimeSelector.vue
@@ -99,9 +99,15 @@
     });
   }
 
-  onBeforeMount(() => {
-    initNumberAndType();
-  });
+  watch(
+    () => modelValue.value,
+    () => {
+      initNumberAndType();
+    },
+    {
+      immediate: true,
+    }
+  );
 </script>
 
 <style lang="less" scoped>
diff --git a/frontend/src/components/pure/ms-user-admin-div/index.vue b/frontend/src/components/pure/ms-user-admin-div/index.vue
index 811d7d868d..73c94f83cc 100644
--- a/frontend/src/components/pure/ms-user-admin-div/index.vue
+++ b/frontend/src/components/pure/ms-user-admin-div/index.vue
@@ -15,4 +15,4 @@
 
   const { t } = useI18n();
   const props = withDefaults(defineProps<{ name?: string; isAdmin?: boolean }>(), { isAdmin: false });
-</script>
\ No newline at end of file
+</script>
diff --git a/frontend/src/components/pure/navbar/index.vue b/frontend/src/components/pure/navbar/index.vue
index 9291a8356a..eaaf378d58 100644
--- a/frontend/src/components/pure/navbar/index.vue
+++ b/frontend/src/components/pure/navbar/index.vue
@@ -167,6 +167,7 @@
   import useLocale from '@/locale/useLocale';
   import useAppStore from '@/store/modules/app';
   import useUserStore from '@/store/modules/user';
+  import { getFirstRouteNameByPermission } from '@/utils/permission';
 
   import { IconInfoCircle, IconQuestionCircle } from '@arco-design/web-vue/es/icon';
 
@@ -230,9 +231,8 @@
       await userStore.checkIsLogin();
       appStore.hideLoading();
       router.replace({
-        path: route.path,
+        name: getFirstRouteNameByPermission(router.getRoutes()),
         query: {
-          ...route.query,
           orgId: appStore.currentOrgId,
           pId: value as string,
         },
diff --git a/frontend/src/config/permission.ts b/frontend/src/config/permission.ts
deleted file mode 100644
index 99878dc811..0000000000
--- a/frontend/src/config/permission.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// 这里控制项目模块选择，如果是顶层则验证 appStore 里的 currentMenuConfig
-// 项目管理 和 系统设置 不受此控制
-export const firstLevelMenu = [
-  'workstation',
-  'testPlan',
-  'bugManagement',
-  'caseManagement',
-  'apiTest',
-  'uiTest',
-  'loadTest',
-];
-export default {};
diff --git a/frontend/src/hooks/usePermission.ts b/frontend/src/hooks/usePermission.ts
index 1456aaa911..99546bd9dc 100644
--- a/frontend/src/hooks/usePermission.ts
+++ b/frontend/src/hooks/usePermission.ts
@@ -1,6 +1,5 @@
 import { RouteLocationNormalized, RouteRecordRaw } from 'vue-router';
 
-import { firstLevelMenu } from '@/config/permission';
 import { useUserStore } from '@/store';
 import { hasAnyPermission, topLevelMenuHasPermission } from '@/utils/permission';
 
@@ -9,6 +8,8 @@ import { hasAnyPermission, topLevelMenuHasPermission } from '@/utils/permission'
  * @returns 调用方法
  */
 export default function usePermission() {
+  const firstLevelMenu = ['testPlan', 'bugManagement', 'caseManagement', 'apiTest'];
+
   return {
     /**
      * 是否为允许访问的路由
diff --git a/frontend/src/utils/permission.ts b/frontend/src/utils/permission.ts
index b6d01796a4..aa2827d03a 100644
--- a/frontend/src/utils/permission.ts
+++ b/frontend/src/utils/permission.ts
@@ -1,7 +1,5 @@
 import { RouteLocationNormalized, RouteRecordNormalized, RouteRecordRaw } from 'vue-router';
-import { includes } from 'lodash-es';
 
-import { firstLevelMenu } from '@/config/permission';
 import { INDEX_ROUTE } from '@/router/routes/base';
 import appRoutes from '@/router/routes/index';
 import { useAppStore, useUserStore } from '@/store';
@@ -106,11 +104,23 @@ export function topLevelMenuHasPermission(route: RouteLocationNormalized | Route
 // 有权限的第一个路由名，如果没有找到则返回IndexRoute
 export function getFirstRouteNameByPermission(routerList: RouteRecordNormalized[]) {
   const currentRoute = routerList
-    .filter((item) => includes(firstLevelMenu, item.name))
+    .filter((item) => hasAnyPermission(item.meta.roles || [])) // 排除没有权限的路由
     .sort((a, b) => {
-      return (a.meta.order || 0) - (b.meta.order || 0);
-    })
-    .find((item) => hasAnyPermission(item.meta.roles || []));
+      // 如果 a 和 b 都有 order，按照 order 的值进行升序排序
+      if (a.meta.order !== undefined && b.meta.order !== undefined) {
+        return a.meta.order - b.meta.order;
+      }
+      // 如果 a 有 order 但是 b 没有 order，a 排前面
+      if (a.meta.order !== undefined && b.meta.order === undefined) {
+        return -1;
+      }
+      // 如果 a 没有 order 但是 b 有 order，b 排前面
+      if (a.meta.order === undefined && b.meta.order !== undefined) {
+        return 1;
+      }
+      // 如果 a 和 b 都没有 order，它们的位置不变
+      return 0;
+    })[0];
   return currentRoute?.name || INDEX_ROUTE.name;
 }
 
diff --git a/frontend/src/views/api-test/components/requestComposition/body.vue b/frontend/src/views/api-test/components/requestComposition/body.vue
index 1a6249df93..36db6438de 100644
--- a/frontend/src/views/api-test/components/requestComposition/body.vue
+++ b/frontend/src/views/api-test/components/requestComposition/body.vue
@@ -175,10 +175,10 @@
       } else {
         // 关联文件
         innerParams.value.binaryBody.file = {
-          ...fileList.value[0],
-          fileId: fileList.value[0]?.uid,
-          fileName: fileList.value[0]?.originalName || '',
-          fileAlias: fileList.value[0]?.name || '',
+          ...files[0],
+          fileId: files[0]?.uid,
+          fileName: files[0]?.originalName || '',
+          fileAlias: files[0]?.name || '',
           local: false,
         };
       }
diff --git a/frontend/src/views/api-test/management/components/management/mock/mockDetailDrawer.vue b/frontend/src/views/api-test/management/components/management/mock/mockDetailDrawer.vue
index 7763187bb6..3686a94515 100644
--- a/frontend/src/views/api-test/management/components/management/mock/mockDetailDrawer.vue
+++ b/frontend/src/views/api-test/management/components/management/mock/mockDetailDrawer.vue
@@ -608,10 +608,10 @@
       } else {
         // 关联文件
         mockDetail.value.mockMatchRule.body.binaryBody.file = {
-          ...file,
-          fileId: file?.uid || '',
-          fileName: file?.originalName || '',
-          fileAlias: file?.name || '',
+          ...files[0],
+          fileId: files[0]?.uid || files[0]?.id || '',
+          fileName: files[0]?.originalName || '',
+          fileAlias: files[0]?.name || '',
           local: false,
         };
       }
diff --git a/frontend/src/views/api-test/management/components/management/mock/mockResponse.vue b/frontend/src/views/api-test/management/components/management/mock/mockResponse.vue
index cf6ea03ff9..c19d6c0976 100644
--- a/frontend/src/views/api-test/management/components/management/mock/mockResponse.vue
+++ b/frontend/src/views/api-test/management/components/management/mock/mockResponse.vue
@@ -446,12 +446,12 @@
           local: true,
         };
         loading.value = false;
-      } else if (fileList.value[0]) {
+      } else if (files[0]) {
         mockResponse.value.body.binaryBody.file = {
-          ...fileList.value[0],
-          fileId: fileList.value[0].uid,
-          fileName: fileList.value[0]?.originalName || '',
-          fileAlias: fileList.value[0]?.name || '',
+          ...files[0],
+          fileId: files[0].uid,
+          fileName: files[0]?.originalName || '',
+          fileAlias: files[0]?.name || '',
           local: false,
         };
       } else {
diff --git a/frontend/src/views/api-test/scenario/components/step/stepNodeComposition/csvTag.vue b/frontend/src/views/api-test/scenario/components/step/stepNodeComposition/csvTag.vue
index d67bcb4bfb..5ce16f4cc0 100644
--- a/frontend/src/views/api-test/scenario/components/step/stepNodeComposition/csvTag.vue
+++ b/frontend/src/views/api-test/scenario/components/step/stepNodeComposition/csvTag.vue
@@ -2,19 +2,12 @@
   <a-popover
     v-model:popup-visible="popoverVisible"
     position="bl"
-    :disabled="!props.step.csvIds || props.step.csvIds.length === 0"
+    :disabled="!props.step.csvIds || props.step.csvIds.length === 0 || props.step.isRefScenarioStep"
     content-class="csv-popover"
     arrow-class="hidden"
     :popup-offset="0"
   >
-    <div
-      v-if="
-        !props.step.isRefScenarioStep &&
-        props.step.stepType === ScenarioStepType.LOOP_CONTROLLER &&
-        props.step.csvIds?.length
-      "
-      class="csv-tag"
-    >
+    <div v-if="props.step.stepType === ScenarioStepType.LOOP_CONTROLLER && props.step.csvIds?.length" class="csv-tag">
       {{ `CSV ${props.step.csvIds?.length}` }}
     </div>
     <template #content>
diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue b/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue
index 0cf701e1aa..b83792eac3 100644
--- a/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue
+++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue
@@ -821,7 +821,7 @@
         suffix
       );
 
-      if (type.includes('REPORT')) {
+      if (type.includes('REPORT') && !type.includes('CLEAN')) {
         Message.success(t('project.application.report.tips'));
       } else {
         Message.success(t('common.operationSuccess'));
diff --git a/frontend/src/views/test-plan/testPlan/components/planTable.vue b/frontend/src/views/test-plan/testPlan/components/planTable.vue
index d2e806a5d2..1126070c42 100644
--- a/frontend/src/views/test-plan/testPlan/components/planTable.vue
+++ b/frontend/src/views/test-plan/testPlan/components/planTable.vue
@@ -1,4 +1,3 @@
-<!-- eslint-disable prettier/prettier -->
 <template>
   <MsAdvanceFilter
     v-model:keyword="keyword"
diff --git a/frontend/src/views/test-plan/testPlan/components/testPlanTree.vue b/frontend/src/views/test-plan/testPlan/components/testPlanTree.vue
index a2e546c235..d241ecccf6 100644
--- a/frontend/src/views/test-plan/testPlan/components/testPlanTree.vue
+++ b/frontend/src/views/test-plan/testPlan/components/testPlanTree.vue
@@ -57,7 +57,7 @@
           :all-names="(nodeData.parent? nodeData.parent.children || [] : testPlanTree).filter((e: ModuleTreeNode) => e.id !== nodeData.id).map((e: ModuleTreeNode) => e.name || '')"
           :is-delete="false"
           :ok-text="t('common.confirm')"
-          :field-config="{ field: renameCaseName }"
+          :field-config="{ field: renameCaseName, nameExistTipText: t('project.fileManagement.nameExist') }"
           :loading="confirmLoading"
           @confirm="updateNameModule"
           @cancel="resetFocusNodeKey"
diff --git a/frontend/src/views/test-plan/testPlan/detail/featureCase/components/caseTree.vue b/frontend/src/views/test-plan/testPlan/detail/featureCase/components/caseTree.vue
index 3b5b90299c..63fb800911 100644
--- a/frontend/src/views/test-plan/testPlan/detail/featureCase/components/caseTree.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/featureCase/components/caseTree.vue
@@ -29,7 +29,7 @@
         :keyword="moduleKeyword"
         :default-expand-all="isExpandAll"
         :expand-all="isExpandAll"
-        :empty-text="t('caseManagement.caseReview.noCases')"
+        :empty-text="t('common.noMatchData')"
         :draggable="false"
         :virtual-list-props="virtualListProps"
         :field-names="{
diff --git a/frontend/src/views/test-plan/testPlan/index.vue b/frontend/src/views/test-plan/testPlan/index.vue
index df40fa1de0..e17faab155 100644
--- a/frontend/src/views/test-plan/testPlan/index.vue
+++ b/frontend/src/views/test-plan/testPlan/index.vue
@@ -46,6 +46,7 @@
                   :ok-text="t('common.confirm')"
                   :field-config="{
                     placeholder: t('testPlan.testPlanIndex.addGroupTip'),
+                    nameExistTipText: t('project.fileManagement.nameExist'),
                   }"
                   @confirm="confirmHandler"
                 >