From e2190b63c4d152a6b927a92b06b3ef38f30dda5c Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Wed, 20 Mar 2024 17:13:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E8=A1=A8=E6=A0=BC=E6=94=AF=E6=8C=81=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=98=BE=E7=A4=BA=E5=AD=90=E7=9B=AE=E5=BD=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/pure/ms-table/base-table.vue   |  2 +
 .../pure/ms-table/columnSelector.vue          | 14 +++---
 .../components/pure/ms-table/locale/en-US.ts  |  2 +-
 .../components/pure/ms-table/locale/zh-CN.ts  |  6 +--
 frontend/src/enums/tableEnum.ts               |  1 +
 frontend/src/router/routes/modules/apiTest.ts |  2 +-
 .../scenario/components/scenarioTable.vue     | 45 +++++++------------
 .../views/api-test/scenario/locale/en-US.ts   |  2 -
 .../views/api-test/scenario/locale/zh-CN.ts   |  2 -
 .../scenario/recycle/recycleTable.vue         | 44 +++++++-----------
 10 files changed, 47 insertions(+), 73 deletions(-)

diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue
index 7dac5f3cf6..6499c4d1e7 100644
--- a/frontend/src/components/pure/ms-table/base-table.vue
+++ b/frontend/src/components/pure/ms-table/base-table.vue
@@ -245,6 +245,7 @@
       :show-subdirectory="!!attrs.showSubdirectory"
       @init-data="handleInitColumn"
       @page-size-change="pageSizeChange"
+      @module-change="emit('moduleChange')"
     ></ColumnSelector>
   </div>
 </template>
@@ -325,6 +326,7 @@
     (e: 'cell-click', record: TableData, column: TableColumnData, ev: Event): void | Promise<any>;
     (e: 'clearSelector'): void;
     (e: 'filterChange', dataIndex: string, value: (string | number)[], multiple: boolean, isCustomParam: boolean): void;
+    (e: 'moduleChange'): void;
   }>();
   const attrs = useAttrs();
   // 全选按钮-总条数
diff --git a/frontend/src/components/pure/ms-table/columnSelector.vue b/frontend/src/components/pure/ms-table/columnSelector.vue
index 12e4dd53aa..7a405d8dbc 100644
--- a/frontend/src/components/pure/ms-table/columnSelector.vue
+++ b/frontend/src/components/pure/ms-table/columnSelector.vue
@@ -50,18 +50,18 @@
       <template v-if="props.showSubdirectory">
         <div class="mt-4">
           <a-switch v-model="subdirectoryVal" class="mb-1" size="small" type="line" @change="handleSubSwitch" />
-          <span class="ml-2 text-[var(--color-text-4)]">{{ t('msTable.columnSetting.showSubdirectoryTips') }}</span>
-          <a-popover position="rt">
+          <span class="ml-2 text-[var(--color-text-1)]">{{ t('msTable.columnSetting.showSubdirectoryTips') }}</span>
+          <a-tooltip position="rt">
             <icon-question-circle
               class="ml-[4px] text-[var(--color-text-3)] hover:text-[rgb(var(--primary-5))]"
               size="16"
             />
-            <template #title>
+            <template #content>
               <div class="w-[250px]"> {{ t('msTable.columnSetting.showSubdirectoryTips1') }} </div>
               <br />
               <div class="w-[250px]"> {{ t('msTable.columnSetting.showSubdirectoryTips2') }} </div>
             </template>
-          </a-popover>
+          </a-tooltip>
         </div>
       </template>
       <a-divider />
@@ -129,6 +129,7 @@
 
   const emit = defineEmits<{
     (e: 'initData'): void;
+    (e: 'moduleChange'): void;
     (e: 'pageSizeChange', value: number): void;
     (e: 'update:visible', value: boolean): void;
   }>();
@@ -170,8 +171,9 @@
     tableStore.setMode(props.tableKey, value as TableOpenDetailMode);
   };
 
-  const handleSubSwitch = () => {
-    tableStore.setSubdirectory(props.tableKey, subdirectoryVal.value);
+  const handleSubSwitch = async () => {
+    await tableStore.setSubdirectory(props.tableKey, subdirectoryVal.value);
+    emit('moduleChange');
   };
 
   const handleSwitchChange = () => {
diff --git a/frontend/src/components/pure/ms-table/locale/en-US.ts b/frontend/src/components/pure/ms-table/locale/en-US.ts
index 7e3310066f..b2314a0267 100644
--- a/frontend/src/components/pure/ms-table/locale/en-US.ts
+++ b/frontend/src/components/pure/ms-table/locale/en-US.ts
@@ -28,7 +28,7 @@ export default {
       tooltipContentDrawer: 'Drawer: open a new page as a drawer',
       tooltipContentWindow: 'New Window: open a new page with a new page',
       pageSize: 'Number of items per page',
-      showSubdirectoryTips: 'Show Subdirectory',
+      showSubdirectoryTips: 'Show sub module resource',
       showSubdirectoryTips1: 'On: Show resources under the module and submodules.',
       showSubdirectoryTips2: 'Off: Only show resources under the module.',
     },
diff --git a/frontend/src/components/pure/ms-table/locale/zh-CN.ts b/frontend/src/components/pure/ms-table/locale/zh-CN.ts
index 1e56c2585f..42f2d99fb4 100644
--- a/frontend/src/components/pure/ms-table/locale/zh-CN.ts
+++ b/frontend/src/components/pure/ms-table/locale/zh-CN.ts
@@ -28,9 +28,9 @@ export default {
       tooltipContentDrawer: '抽屉：以抽屉形式打开新页面',
       tooltipContentWindow: '新窗口：以新开网页打开新页面',
       pageSize: '每页显示数量',
-      showSubdirectoryTips: '显示子目录',
-      showSubdirectoryTips1: '开启: 显示模块及子模块下的资源.',
-      showSubdirectoryTips2: '关闭: 选中模块时, 只显示模块下的资源, 子模块里的资源不显示.',
+      showSubdirectoryTips: '显示子模块资源',
+      showSubdirectoryTips1: '开启: 显示模块及子模块下的资源',
+      showSubdirectoryTips2: '关闭: 选中模块时, 只显示模块下的资源, 子模块里的资源不显示',
     },
     cancel: '取消',
     confirm: '确定',
diff --git a/frontend/src/enums/tableEnum.ts b/frontend/src/enums/tableEnum.ts
index dd60ebd1e5..5d52072160 100644
--- a/frontend/src/enums/tableEnum.ts
+++ b/frontend/src/enums/tableEnum.ts
@@ -12,6 +12,7 @@ export enum TableKeyEnum {
   API_TEST_DEBUG_FORM_DATA = 'apiTestDebugFormData',
   API_TEST_DEBUG_FORM_URL_ENCODE = 'apiTestDebugFormUrlEncoded',
   API_TEST_REPORT = 'apiTestReport',
+  API_SCENARIO = 'apiScenario',
   SYSTEM_USER = 'systemUser',
   SYSTEM_RESOURCEPOOL = 'systemResourcePool',
   SYSTEM_AUTH = 'systemAuth',
diff --git a/frontend/src/router/routes/modules/apiTest.ts b/frontend/src/router/routes/modules/apiTest.ts
index a270d7eda7..3e825eb283 100644
--- a/frontend/src/router/routes/modules/apiTest.ts
+++ b/frontend/src/router/routes/modules/apiTest.ts
@@ -76,7 +76,7 @@ const ApiTest: AppRouteRecordRaw = {
 
     // 接口场景回收站
     {
-      path: 'scenarioRecycle',
+      path: 'scenario/recycle',
       name: ApiTestRouteEnum.API_TEST_SCENARIO_RECYCLE,
       component: () => import('@/views/api-test/scenario/recycle.vue'),
       meta: {
diff --git a/frontend/src/views/api-test/scenario/components/scenarioTable.vue b/frontend/src/views/api-test/scenario/components/scenarioTable.vue
index d9da9cdb8f..5f3eb9286d 100644
--- a/frontend/src/views/api-test/scenario/components/scenarioTable.vue
+++ b/frontend/src/views/api-test/scenario/components/scenarioTable.vue
@@ -1,19 +1,6 @@
 <template>
   <div :class="['p-[16px_16px]', props.class]">
     <div class="mb-[16px] flex items-center justify-between">
-      <div>
-        <span class="flex items-center">
-          <a-switch
-            v-model:model-value="showItemFolderScenario"
-            size="small"
-            type="line"
-            @change="loadScenarioList(false)"
-          />
-          <span style="margin-left: 8px; font-family: 'PingFang SC'; color: #323233">{{
-            t('apiScenario.table.showChildrenModuleScenario')
-          }}</span>
-        </span>
-      </div>
       <div class="flex items-center gap-[8px]">
         <a-input-search
           v-model:model-value="keyword"
@@ -39,6 +26,7 @@
       v-on="propsEvent"
       @selected-change="handleTableSelect"
       @batch-action="handleTableBatch"
+      @module-change="loadScenarioList(false)"
     >
       <template #statusFilter="{ columnConfig }">
         <a-trigger
@@ -292,8 +280,6 @@
     offspringIds: string[];
     readOnly?: boolean; // 是否是只读模式
   }>();
-  // 场景属性
-  const showItemFolderScenario = ref(false);
 
   const appStore = useAppStore();
   const { t } = useI18n();
@@ -451,7 +437,7 @@
     {
       columns: props.readOnly ? columns : [],
       scroll: { x: '100%' },
-      tableKey: props.readOnly ? undefined : TableKeyEnum.API_TEST,
+      tableKey: TableKeyEnum.API_SCENARIO,
       showSetting: !props.readOnly,
       selectable: true,
       showSelectAll: !props.readOnly,
@@ -507,27 +493,27 @@
 
   const statusFilterVisible = ref(false);
   const statusFilters = ref(Object.keys(ApiScenarioStatus));
-  const moduleIds = computed(() => {
-    if (props.activeModule === 'all') {
-      return [];
-    }
-    if (showItemFolderScenario.value) {
-      return [props.activeModule, ...props.offspringIds];
-    }
-    return [props.activeModule];
-  });
+  const tableStore = useTableStore();
 
-  function loadScenarioList(refreshTreeCount?: boolean) {
+  async function loadScenarioList(refreshTreeCount?: boolean) {
+    let moduleIds: string[] = [];
+    if (props.activeModule && props.activeModule !== 'all') {
+      moduleIds = [props.activeModule];
+      const getAllChildren = await tableStore.getSubShow(TableKeyEnum.API_SCENARIO);
+      if (getAllChildren) {
+        moduleIds = [props.activeModule, ...props.offspringIds];
+      }
+    }
     const params = {
       keyword: keyword.value,
       projectId: appStore.currentProjectId,
-      moduleIds: moduleIds.value,
+      moduleIds,
       filter: {
         status: statusFilters.value.length === Object.keys(ApiScenarioStatus).length ? undefined : statusFilters.value,
       },
     };
     setLoadListParams(params);
-    loadList();
+    await loadList();
     if (refreshTreeCount) {
       emit('refreshModuleTree', params);
     }
@@ -857,8 +843,7 @@
   });
 
   if (!props.readOnly) {
-    const tableStore = useTableStore();
-    await tableStore.initColumn(TableKeyEnum.API_TEST, columns, 'drawer', true);
+    await tableStore.initColumn(TableKeyEnum.API_SCENARIO, columns, 'drawer', true);
   } else {
     columns = columns.filter(
       (item) => !['version', 'createTime', 'updateTime', 'operation'].includes(item.dataIndex as string)
diff --git a/frontend/src/views/api-test/scenario/locale/en-US.ts b/frontend/src/views/api-test/scenario/locale/en-US.ts
index 75b849170e..7d372229fc 100644
--- a/frontend/src/views/api-test/scenario/locale/en-US.ts
+++ b/frontend/src/views/api-test/scenario/locale/en-US.ts
@@ -5,7 +5,6 @@ export default {
   'apiScenario.importScenario': 'Import scenario',
   'apiScenario.tree.selectorPlaceholder': 'Please enter the module name',
   'apiScenario.tree.folder.allScenario': 'All scenarios',
-  'apiScenario.tree.showLeafNodeScenario': 'Show subdirectory scenarios',
   'apiScenario.tree.recycleBin': 'Recycle bin',
   'apiScenario.tree.noMatchModule': 'No matching module/scene yet',
   'apiScenario.createSubModule': 'Create sub-module',
@@ -33,7 +32,6 @@ export default {
   'apiScenario.params.paramValue': 'Parameter value',
   'apiScenario.params.tag': 'Tag',
   'apiScenario.params.desc': 'Description',
-  'apiScenario.table.showChildrenModuleScenario': 'Show subdirectory scenarios',
   'apiScenario.table.columns.name': 'Name',
   'apiScenario.table.columns.level': 'Level',
   'apiScenario.table.columns.status': 'status',
diff --git a/frontend/src/views/api-test/scenario/locale/zh-CN.ts b/frontend/src/views/api-test/scenario/locale/zh-CN.ts
index 457eef77e3..496cdcbf3f 100644
--- a/frontend/src/views/api-test/scenario/locale/zh-CN.ts
+++ b/frontend/src/views/api-test/scenario/locale/zh-CN.ts
@@ -5,7 +5,6 @@ export default {
   'apiScenario.importScenario': '导入场景',
   'apiScenario.tree.selectorPlaceholder': '请输入模块名称',
   'apiScenario.tree.folder.allScenario': '全部场景',
-  'apiScenario.tree.showLeafNodeScenario': '显示子目录场景',
   'apiScenario.tree.recycleBin': '回收站',
   'apiScenario.tree.noMatchModule': '暂无匹配的模块/场景',
   'apiScenario.createSubModule': '新建子模块',
@@ -32,7 +31,6 @@ export default {
   'apiScenario.params.paramValue': '参数值',
   'apiScenario.params.tag': '标签',
   'apiScenario.params.desc': '描述',
-  'apiScenario.table.showChildrenModuleScenario': '显示子目录场景',
   'apiScenario.table.columns.name': '场景名称',
   'apiScenario.table.columns.level': '场景等级',
   'apiScenario.table.columns.status': '状态',
diff --git a/frontend/src/views/api-test/scenario/recycle/recycleTable.vue b/frontend/src/views/api-test/scenario/recycle/recycleTable.vue
index 8e3214343f..a8a39d1a78 100644
--- a/frontend/src/views/api-test/scenario/recycle/recycleTable.vue
+++ b/frontend/src/views/api-test/scenario/recycle/recycleTable.vue
@@ -1,19 +1,6 @@
 <template>
   <div :class="['p-[16px_16px]', props.class]">
     <div class="mb-[16px] flex items-center justify-between">
-      <div>
-        <span class="flex items-center">
-          <a-switch
-            v-model:model-value="showItemFolderScenario"
-            size="small"
-            type="line"
-            @change="loadScenarioList(false)"
-          />
-          <span style="margin-left: 8px; font-family: 'PingFang SC'; color: #323233">{{
-            t('apiScenario.table.showChildrenModuleScenario')
-          }}</span>
-        </span>
-      </div>
       <div class="flex items-center gap-[8px]">
         <a-input-search
           v-model:model-value="keyword"
@@ -40,6 +27,7 @@
         v-on="propsEvent"
         @selected-change="handleTableSelect"
         @batch-action="handleTableBatch"
+        @module-change="loadScenarioList(false)"
       >
         <template #statusFilter="{ columnConfig }">
           <a-trigger
@@ -118,6 +106,7 @@
   } from '@/api/modules/api-test/scenario';
   import { useI18n } from '@/hooks/useI18n';
   import useModal from '@/hooks/useModal';
+  import useTableStore from '@/hooks/useTableStore';
   import useAppStore from '@/store/modules/app';
 
   import { ApiScenarioDetail } from '@/models/apiTest/scenario';
@@ -130,8 +119,6 @@
     offspringIds: string[];
     readOnly?: boolean; // 是否是只读模式
   }>();
-  // 场景属性
-  const showItemFolderScenario = ref(false);
 
   const appStore = useAppStore();
   const { t } = useI18n();
@@ -270,7 +257,7 @@
     {
       columns: props.readOnly ? columns : [],
       scroll: { x: '100%' },
-      tableKey: props.readOnly ? undefined : TableKeyEnum.API_TEST,
+      tableKey: props.readOnly ? undefined : TableKeyEnum.API_SCENARIO,
       showSetting: !props.readOnly,
       selectable: true,
       showSelectAll: !props.readOnly,
@@ -301,27 +288,28 @@
 
   const statusFilterVisible = ref(false);
   const statusFilters = ref(Object.keys(ApiScenarioStatus));
-  const moduleIds = computed(() => {
-    if (props.activeModule === 'all') {
-      return [];
-    }
-    if (showItemFolderScenario.value) {
-      return [props.activeModule, ...props.offspringIds];
-    }
-    return [props.activeModule];
-  });
+  const tableStore = useTableStore();
+
+  async function loadScenarioList(refreshTreeCount?: boolean) {
+    let moduleIds: string[] = [];
+    if (props.activeModule && props.activeModule !== 'all') {
+      moduleIds = [props.activeModule];
+      const getAllChildren = await tableStore.getSubShow(TableKeyEnum.API_SCENARIO);
+      if (getAllChildren) {
+        moduleIds = [props.activeModule, ...props.offspringIds];
+      }
+    }
 
-  function loadScenarioList(refreshTreeCount?: boolean) {
     const params = {
       keyword: keyword.value,
       projectId: appStore.currentProjectId,
-      moduleIds: moduleIds.value,
+      moduleIds,
       filter: {
         status: statusFilters.value.length === Object.keys(ApiScenarioStatus).length ? undefined : statusFilters.value,
       },
     };
     setLoadListParams(params);
-    loadList();
+    await loadList();
     if (refreshTreeCount) {
       emit('refreshModuleTree', params);
     }