From 90d20de060bdf0aff87d16a0394e3ab422858d02 Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Tue, 25 Jun 2024 18:25:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=85=A8=E5=B1=80):=20bugFix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/modules/api-test/management.ts    |  1 -
 frontend/src/api/requrls/api-test.ts          |  2 --
 .../components/pure/ms-form-table/index.vue   | 26 ++++++++++++++++++-
 frontend/src/config/pathMap.ts                |  2 +-
 .../components/management/api/apiTable.vue    | 11 +-------
 .../src/views/api-test/management/index.vue   | 17 ++++++------
 .../scenario/recycle/recycleTable.vue         | 22 +++++++++++++---
 .../bug-management/components/basicInfo.vue   |  3 ++-
 .../components/bug-detail-drawer.vue          |  6 ++++-
 9 files changed, 62 insertions(+), 28 deletions(-)
 delete mode 100644 frontend/src/api/requrls/api-test.ts

diff --git a/frontend/src/api/modules/api-test/management.ts b/frontend/src/api/modules/api-test/management.ts
index 7f1da8228c..0e87a1da8f 100644
--- a/frontend/src/api/modules/api-test/management.ts
+++ b/frontend/src/api/modules/api-test/management.ts
@@ -115,7 +115,6 @@ import {
   DefinitionHistoryItem,
   DefinitionHistoryPageParams,
   DefinitionReferencePageParams,
-  Environment,
   EnvModule,
   ImportApiDefinitionParams,
   mockParams,
diff --git a/frontend/src/api/requrls/api-test.ts b/frontend/src/api/requrls/api-test.ts
deleted file mode 100644
index 3c643dd393..0000000000
--- a/frontend/src/api/requrls/api-test.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export const GetApiTestListUrl = `/mock/list/menu`;
-export const GetApiTestList = `/api/definition/page`;
diff --git a/frontend/src/components/pure/ms-form-table/index.vue b/frontend/src/components/pure/ms-form-table/index.vue
index 28f7b9987e..e9d7d9b383 100644
--- a/frontend/src/components/pure/ms-form-table/index.vue
+++ b/frontend/src/components/pure/ms-form-table/index.vue
@@ -117,6 +117,16 @@
                 </template>
               </a-auto-complete>
             </template>
+            <a-input-number
+              v-else-if="item.inputType === 'inputNumber'"
+              v-model:model-value="record[item.dataIndex as string]"
+              :min="item.min"
+              :max="item.max"
+            ></a-input-number>
+            <a-textarea
+              v-else-if="item.inputType === 'textarea'"
+              v-model:model-value="record[item.dataIndex as string]"
+            ></a-textarea>
             <template v-else-if="item.inputType === 'text'">
               {{
                 typeof item.valueFormat === 'function'
@@ -188,9 +198,23 @@
   export interface FormTableColumn extends MsTableColumnData {
     enable?: boolean; // 是否启用
     required?: boolean; // 是否必填
-    inputType?: 'input' | 'select' | 'tags' | 'switch' | 'text' | 'checkbox' | 'autoComplete'; // 输入组件类型
+    inputType?:
+      | 'input'
+      | 'select'
+      | 'tags'
+      | 'switch'
+      | 'text'
+      | 'checkbox'
+      | 'autoComplete'
+      | 'textarea'
+      | 'inputNumber'; // 输入组件类型
     autoCompleteParams?: SelectOptionData[]; // 自动补全参数
     needValidRepeat?: boolean; // 是否需要判断重复
+    maxLength?: number;
+    // 数字输入框属性
+    min?: number;
+    max?: number;
+    step?: number;
     valueFormat?: (record: Record<string, any>) => string; // 展示值格式化，仅在inputType为text时生效
     [key: string]: any; // 扩展属性
   }
diff --git a/frontend/src/config/pathMap.ts b/frontend/src/config/pathMap.ts
index 34cfc53d16..1254318e0e 100644
--- a/frontend/src/config/pathMap.ts
+++ b/frontend/src/config/pathMap.ts
@@ -125,7 +125,7 @@ export const pathMap: PathMapItem[] = [
             level: MENU_LEVEL[2],
           },
           {
-            key: 'API_TEST_SCENARIO_RECYCLE', // 接口测试-场景-回收站
+            key: 'API_TEST_SCENARIO_MANAGEMENT_RECYCLE', // 接口测试-场景-回收站
             locale: 'menu.apiTest.scenario.recycle',
             route: RouteEnum.API_TEST_SCENARIO_RECYCLE,
             permission: [],
diff --git a/frontend/src/views/api-test/management/components/management/api/apiTable.vue b/frontend/src/views/api-test/management/components/management/api/apiTable.vue
index 410ea0b8d6..8f2694cf9a 100644
--- a/frontend/src/views/api-test/management/components/management/api/apiTable.vue
+++ b/frontend/src/views/api-test/management/components/management/api/apiTable.vue
@@ -634,15 +634,7 @@
   );
 
   watch(
-    () => props.activeModule,
-    () => {
-      resetSelector();
-      loadApiList(true);
-    }
-  );
-
-  watch(
-    () => props.selectedProtocols,
+    () => [props.activeModule, props.selectedProtocols],
     () => {
       resetSelector();
       loadApiList(true);
@@ -664,7 +656,6 @@
 
   onBeforeMount(() => {
     initProtocolList();
-    loadApiList(true);
   });
 
   const tableSelected = ref<(string | number)[]>([]);
diff --git a/frontend/src/views/api-test/management/index.vue b/frontend/src/views/api-test/management/index.vue
index 253d0a22c8..82bc84e25f 100644
--- a/frontend/src/views/api-test/management/index.vue
+++ b/frontend/src/views/api-test/management/index.vue
@@ -85,9 +85,11 @@
   import { ModuleTreeNode } from '@/models/common';
   import { ApiTestRouteEnum } from '@/enums/routeEnum';
 
+  const appStore = useAppStore();
   const route = useRoute();
   const { t } = useI18n();
   const router = useRouter();
+
   const activeModule = ref<string>('all');
   const folderTree = ref<ModuleTreeNode[]>([]);
   const folderTreePathMap = ref<Record<string, any>>({});
@@ -98,12 +100,6 @@
   const moduleTreeRef = ref<InstanceType<typeof moduleTree>>();
   const managementRef = ref<InstanceType<typeof management>>();
 
-  function handleModuleInit(tree: ModuleTreeNode[], _protocols: string[], pathMap: Record<string, any>) {
-    folderTree.value = tree;
-    selectedProtocols.value = _protocols;
-    folderTreePathMap.value = pathMap;
-  }
-
   function newApi() {
     importDrawerVisible.value = false;
     managementRef.value?.newTab();
@@ -132,7 +128,6 @@
     selectedProtocols.value = val;
   }
 
-  const appStore = useAppStore();
   const recycleModulesCount = ref(0);
   async function selectRecycleCount() {
     const res = await getTrashModuleCount({
@@ -144,6 +139,13 @@
     recycleModulesCount.value = res.all;
   }
 
+  function handleModuleInit(tree: ModuleTreeNode[], _protocols: string[], pathMap: Record<string, any>) {
+    folderTree.value = tree;
+    selectedProtocols.value = _protocols;
+    folderTreePathMap.value = pathMap;
+    selectRecycleCount();
+  }
+
   async function refreshModuleTree() {
     await moduleTreeRef.value?.refresh();
     //  涉及到模块树的刷新操作（比如删除），也会刷新回收站的数量
@@ -179,7 +181,6 @@
       // 携带 cId 参数，自动打开接口用例详情 tab
       managementRef.value?.newCaseTab(route.query.cId as string);
     }
-    selectRecycleCount();
   });
 
   // 获取激活用例类型样式
diff --git a/frontend/src/views/api-test/scenario/recycle/recycleTable.vue b/frontend/src/views/api-test/scenario/recycle/recycleTable.vue
index fc31186c3a..dcf22599ef 100644
--- a/frontend/src/views/api-test/scenario/recycle/recycleTable.vue
+++ b/frontend/src/views/api-test/scenario/recycle/recycleTable.vue
@@ -57,6 +57,25 @@
             :status="record.lastReportStatus"
           />
         </template>
+        <template #operation="{ record }">
+          <MsButton
+            v-permission="['PROJECT_API_SCENARIO:READ+DELETE']"
+            type="text"
+            class="!mr-0"
+            @click="recover(record)"
+          >
+            {{ t('api_scenario.recycle.recover') }}
+          </MsButton>
+          <a-divider v-permission="['PROJECT_API_SCENARIO:READ+DELETE']" direction="vertical" :margin="8"></a-divider>
+          <MsButton
+            v-permission="['PROJECT_API_SCENARIO:READ+DELETE']"
+            type="text"
+            class="!mr-0"
+            @click="deleteOperation(record)"
+          >
+            {{ t('api_scenario.recycle.batchCleanOut') }}
+          </MsButton>
+        </template>
       </ms-base-table>
     </a-spin>
   </div>
@@ -510,15 +529,12 @@
   :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);
       }
diff --git a/frontend/src/views/bug-management/components/basicInfo.vue b/frontend/src/views/bug-management/components/basicInfo.vue
index ee13a4323c..39f89fdeea 100644
--- a/frontend/src/views/bug-management/components/basicInfo.vue
+++ b/frontend/src/views/bug-management/components/basicInfo.vue
@@ -13,6 +13,7 @@
             v-model:form-rule="innerFormRules"
             class="w-full"
             :option="options"
+            :disabled="!hasAnyPermission(['PROJECT_BUG:READ+UPDATE'])"
             @change="handelFormCreateChange"
           />
           <!-- 自定义字段结束 -->
@@ -53,7 +54,6 @@
 </template>
 
 <script setup lang="ts">
-  import { ref } from 'vue';
   import { Message } from '@arco-design/web-vue';
   import { cloneDeep, debounce } from 'lodash-es';
 
@@ -163,6 +163,7 @@
         }
       });
     } catch (error) {
+      // eslint-disable-next-line no-console
       console.log(error);
     } finally {
       loading.value = false;
diff --git a/frontend/src/views/bug-management/components/bug-detail-drawer.vue b/frontend/src/views/bug-management/components/bug-detail-drawer.vue
index d2ab206a2a..7a23da7f86 100644
--- a/frontend/src/views/bug-management/components/bug-detail-drawer.vue
+++ b/frontend/src/views/bug-management/components/bug-detail-drawer.vue
@@ -82,7 +82,11 @@
                 <MsIcon type="icon-icon_copy_filled" class="font-[16px]" />
                 {{ t('common.copy') }}
               </a-doption>
-              <a-doption class="error-6 text-[rgb(var(--danger-6))]" @click="deleteHandler">
+              <a-doption
+                v-permission="['PROJECT_BUG:READ+DELETE']"
+                class="error-6 text-[rgb(var(--danger-6))]"
+                @click="deleteHandler"
+              >
                 <MsIcon type="icon-icon_delete-trash_outlined" class="font-[16px] text-[rgb(var(--danger-6))]" />
                 {{ t('common.delete') }}
               </a-doption>