From 5cca0ba48d285fbf56db69f7909b6e911ff0222f Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Fri, 24 May 2024 19:38:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BC=98=E5=85=88?=
 =?UTF-8?q?=E7=BA=A7=E4=B8=AD=E5=92=8C=E4=BD=8E=E7=9A=84bugs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/ms-case-associate/index.vue      | 17 +++-
 .../pure/ms-table-more-action/index.vue       |  7 +-
 .../src/router/routes/modules/testPlan.ts     |  2 +-
 .../components/caseTable.vue                  |  6 ++
 .../tabContent/tabBug/addDefectDrawer.vue     |  1 +
 .../components/tabContent/tabBug/bugList.vue  | 26 ++++--
 .../tabContent/tabBug/linkDefectDrawer.vue    | 34 +++++--
 .../tabContent/tabBug/tabDefect.vue           |  2 +-
 .../tabContent/tabDemand/demand.vue           | 35 ++-----
 .../tabDemand/thirdDemandDrawer.vue           | 17 ++--
 .../components/tabContent/tabDetail.vue       |  1 +
 .../caseManagementFeature/components/utils.ts | 15 ++-
 .../caseManagementFeature/locale/en-US.ts     |  1 +
 .../caseManagementFeature/locale/zh-CN.ts     |  1 +
 .../menuManagement/components/relatedCase.vue |  3 +-
 .../testPlan/components/planTable.vue         | 19 ++--
 .../testPlan/components/testPlanTree.vue      | 10 +-
 .../detail/featureCase/detail/bug/index.vue   | 93 +++++++++++--------
 .../detail/featureCase/detail/index.vue       | 30 ++++--
 .../views/test-plan/testPlan/detail/index.vue |  6 +-
 .../src/views/test-plan/testPlan/index.vue    |  3 +-
 21 files changed, 201 insertions(+), 128 deletions(-)

diff --git a/frontend/src/components/business/ms-case-associate/index.vue b/frontend/src/components/business/ms-case-associate/index.vue
index a454416ca3..d82f0b2453 100644
--- a/frontend/src/components/business/ms-case-associate/index.vue
+++ b/frontend/src/components/business/ms-case-associate/index.vue
@@ -134,6 +134,7 @@
           no-disable
           class="mt-[16px]"
           v-on="propsEvent"
+          @filter-change="filterChange"
         >
           <template #num="{ record }">
             <a-tooltip :content="`${record.num}`">
@@ -149,6 +150,10 @@
             <ExecuteStatusTag v-if="record.lastExecuteResult" :execute-result="record.lastExecuteResult" />
             <span v-else>-</span>
           </template>
+          <!-- 用例等级 -->
+          <template #[FilterSlotNameEnum.CASE_MANAGEMENT_CASE_LEVEL]="{ filterContent }">
+            <caseLevel :case-level="filterContent.value" />
+          </template>
           <!-- 评审结果 -->
           <template #reviewStatus="{ record }">
             <MsIcon
@@ -219,6 +224,7 @@
   import { FilterSlotNameEnum } from '@/enums/tableFilterEnum';
 
   import { initGetModuleCountFunc, type RequestModuleEnum } from './utils';
+  import { casePriorityOptions } from '@/views/api-test/components/config';
   import { executionResultMap, statusIconMap } from '@/views/case-management/caseManagementFeature/components/utils';
 
   const router = useRouter();
@@ -385,7 +391,11 @@
           title: 'ms.case.associate.caseLevel',
           dataIndex: 'caseLevel',
           slotName: 'caseLevel',
-          width: 90,
+          width: 150,
+          filterConfig: {
+            options: casePriorityOptions,
+            filterSlotName: FilterSlotNameEnum.CASE_MANAGEMENT_CASE_LEVEL,
+          },
         },
       ];
     }
@@ -676,6 +686,7 @@
         sourceType: caseType.value,
         ...props.tableParams,
         ...props.moduleCountParams,
+        filter: propsRes.value.filter,
       };
       modulesCount.value = await initGetModuleCountFunc(props.type, params);
     } catch (error) {
@@ -814,6 +825,10 @@
     }
   );
 
+  function filterChange() {
+    initModuleCount();
+  }
+
   defineExpose({
     initModules,
   });
diff --git a/frontend/src/components/pure/ms-table-more-action/index.vue b/frontend/src/components/pure/ms-table-more-action/index.vue
index 8913ee5e0f..f314645206 100644
--- a/frontend/src/components/pure/ms-table-more-action/index.vue
+++ b/frontend/src/components/pure/ms-table-more-action/index.vue
@@ -8,7 +8,7 @@
     >
       <slot>
         <div :class="['ms-more-action-trigger-content', visible ? 'ms-more-action-trigger-content--focus' : '']">
-          <MsButton type="text" size="mini" class="more-icon-btn" @click="visible = !visible">
+          <MsButton v-if="isHasAllPermission" type="text" size="mini" class="more-icon-btn" @click="visible = !visible">
             <MsIcon type="icon-icon_more_outlined" size="16" class="text-[var(--color-text-4)]" />
           </MsButton>
         </div>
@@ -91,6 +91,11 @@
     return result;
   });
 
+  // 判断是否有所有权限
+  const isHasAllPermission = computed(() => {
+    return props.list.some((item: ActionsItem) => hasAnyPermission(item.permission || []));
+  });
+
   function selectHandler(value: SelectedValue) {
     const item = props.list.find((e: ActionsItem) => e.eventTag === value);
     emit('select', item);
diff --git a/frontend/src/router/routes/modules/testPlan.ts b/frontend/src/router/routes/modules/testPlan.ts
index 74815e6c3a..bd5338cee9 100644
--- a/frontend/src/router/routes/modules/testPlan.ts
+++ b/frontend/src/router/routes/modules/testPlan.ts
@@ -52,7 +52,7 @@ const TestPlan: AppRouteRecordRaw = {
           },
           {
             name: TestPlanRouteEnum.TEST_PLAN_REPORT_DETAIL,
-            locale: 'menu.testPlan.testPlanDetail',
+            locale: 'menu.apiTest.reportDetail',
           },
         ],
       },
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
index 5a3679eae1..c5d4359074 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
@@ -52,6 +52,7 @@
         @change="changeHandler"
         @module-change="initData"
         @cell-click="handleCellClick"
+        @filter-change="filterChange"
       >
         <template #num="{ record }">
           <span type="text" class="one-line-text cursor-pointer px-0 text-[rgb(var(--primary-5))]">
@@ -885,6 +886,7 @@
       ...tableParams,
       current: propsRes.value.msPagination?.current,
       pageSize: propsRes.value.msPagination?.pageSize,
+      filter: propsRes.value.filter,
     });
   }
 
@@ -1466,6 +1468,10 @@
     }
   });
 
+  function filterChange() {
+    emitTableParams();
+  }
+
   onMounted(async () => {
     if (route.query.id) {
       showCaseDetail(route.query.id as string, 0);
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/addDefectDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/addDefectDrawer.vue
index 923b13fabf..f2a1502b27 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/addDefectDrawer.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/addDefectDrawer.vue
@@ -16,6 +16,7 @@
     <a-form ref="formRef" :model="form" layout="vertical">
       <a-form-item
         field="title"
+        asterisk-position="end"
         :label="t('bugManagement.bugName')"
         :rules="[{ required: true, message: t('bugManagement.edit.nameIsRequired') }]"
         :placeholder="t('bugManagement.edit.pleaseInputBugName')"
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/bugList.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/bugList.vue
index 94e345391a..626731f455 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/bugList.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/bugList.vue
@@ -4,13 +4,15 @@
       <span type="text" class="one-line-text cursor-pointer px-0 text-[rgb(var(--primary-5))]">{{ record.num }}</span>
     </template>
     <template #name="{ record }">
-      <div class="one-line-text flex max-w-[150px] flex-nowrap items-center"> {{ characterLimit(record.name) }}</div>
-      <a-popover title="" position="right" style="width: 480px">
-        <div class="ml-1 text-[rgb(var(--primary-5))]">{{ t('caseManagement.featureCase.preview') }}</div>
-        <template #content>
-          <div v-dompurify-html="record.content" class="markdown-body" style="margin-left: 48px"> </div>
-        </template>
-      </a-popover>
+      <div class="flex flex-nowrap items-center">
+        <div class="one-line-text max-w-[200px] flex-auto items-center"> {{ characterLimit(record.name) }}</div>
+        <a-popover class="bug-content-popover" title="" position="right" style="width: 480px">
+          <span class="ml-1 text-[rgb(var(--primary-5))]">{{ t('caseManagement.featureCase.preview') }}</span>
+          <template #content>
+            <div v-dompurify-html="record.content" class="markdown-body bug-content"> </div>
+          </template>
+        </a-popover>
+      </div>
     </template>
     <template #statusName="{ record }">
       <div class="one-line-text">{{ record.statusName || '-' }}</div>
@@ -149,4 +151,12 @@
   });
 </script>
 
-<style scoped></style>
+<style lang="less">
+  .bug-content-popover {
+    .arco-popover-content {
+      overflow: auto;
+      max-height: 400px;
+      .ms-scroll-bar();
+    }
+  }
+</style>
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/linkDefectDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/linkDefectDrawer.vue
index c53014bb61..f82fe50b03 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/linkDefectDrawer.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/linkDefectDrawer.vue
@@ -38,13 +38,17 @@
         v-on="propsEvent"
       >
         <template #name="{ record }">
-          <span class="one-line-text max-w-[300px]"> {{ record.name }}</span>
-          <a-popover title="" position="right" style="width: 480px">
-            <span class="ml-1 text-[rgb(var(--primary-5))]">{{ t('caseManagement.featureCase.preview') }}</span>
-            <template #content>
-              <div v-dompurify-html="record.content" class="markdown-body" style="margin-left: 48px"> </div>
-            </template>
-          </a-popover>
+          <div class="flex flex-nowrap items-center">
+            <div class="one-line-text max-w-[200px] flex-auto items-center"> {{ characterLimit(record.name) }}</div>
+            <a-popover class="bug-content-popover" title="" position="right" style="width: 480px">
+              <div class="ml-1 flex-auto text-[rgb(var(--primary-5))]">{{
+                t('caseManagement.featureCase.preview')
+              }}</div>
+              <template #content>
+                <div v-dompurify-html="record.content" class="markdown-body"> </div>
+              </template>
+            </a-popover>
+          </div>
         </template>
       </ms-base-table>
     </div>
@@ -62,6 +66,7 @@
   import { getDrawerDebugPage } from '@/api/modules/case-management/featureCase';
   import { useI18n } from '@/hooks/useI18n';
   import { useAppStore } from '@/store';
+  import { characterLimit } from '@/utils';
 
   import { TableKeyEnum } from '@/enums/tableEnum';
 
@@ -77,7 +82,7 @@
       visible: boolean;
       caseId: string;
       drawerLoading: boolean;
-      showSelectorAll: boolean;
+      showSelectorAll?: boolean;
     }>(),
     {
       showSelectorAll: true,
@@ -101,7 +106,7 @@
       dataIndex: 'name',
       showInTable: true,
       showTooltip: true,
-      width: 200,
+      width: 300,
       ellipsis: true,
       showDrag: false,
     },
@@ -157,6 +162,7 @@
   const { propsRes, propsEvent, loadList, setLoadListParams, resetSelector } = useTable(
     getDrawerDebugPage,
     {
+      scroll: { x: 'auto' },
       columns,
       tableKey: TableKeyEnum.CASE_MANAGEMENT_TAB_DEFECT,
       selectable: true,
@@ -229,4 +235,12 @@
   );
 </script>
 
-<style scoped></style>
+<style lang="less">
+  .bug-content-popover {
+    .arco-popover-content {
+      overflow: auto;
+      max-height: 400px;
+      .ms-scroll-bar();
+    }
+  }
+</style>
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue
index ed1b5f1be1..074f4985d0 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue
@@ -205,7 +205,7 @@
       dataIndex: 'name',
       showInTable: true,
       showTooltip: false,
-      width: 250,
+      width: 300,
       ellipsis: true,
       showDrag: false,
     },
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/demand.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/demand.vue
index 31dacbef81..416df8ad2c 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/demand.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/demand.vue
@@ -65,7 +65,7 @@
     >
       <div class="flex items-center justify-between">
         <div
-          ><span class="font-medium">{{ getPlatName() }}</span
+          ><span class="font-medium">{{ platName }}</span
           ><span class="ml-1 text-[var(--color-text-4)]">({{ propsRes?.msPagination?.total || 0 }})</span></div
         >
         <a-input-search
@@ -126,6 +126,8 @@
   import type { CreateOrUpdateDemand, DemandItem } from '@/models/caseManagement/featureCase';
   import { TableKeyEnum } from '@/enums/tableEnum';
 
+  import { getPlatName } from '@/views/case-management/caseManagementFeature/components/utils';
+
   const { t } = useI18n();
   const appStore = useAppStore();
   const currentProjectId = computed(() => appStore.currentProjectId);
@@ -207,7 +209,7 @@
     scroll: { x: '100%' },
     heightUsed: 290,
     selectable: true,
-    showSelectorAll: true,
+    showSelectorAll: false,
     showSetting: false,
   });
 
@@ -411,32 +413,9 @@
     initPlatform();
   });
 
-  // watch(
-  //   () => activeTab.value,
-  //   async (val) => {
-  //     if (val === 'requirement') {
-  //       try {
-  //         const result = await getCaseRelatedInfo(currentProjectId.value);
-  //         if (result && result.platform_key) {
-  //           platformInfo.value = { ...result };
-  //         }
-  //       } catch (error) {
-  //         console.log(error);
-  //       }
-  //     }
-  //   }
-  // );
-
-  function getPlatName() {
-    switch (platformInfo.value.platform_key) {
-      case 'zentao':
-        return t('caseManagement.featureCase.zentao');
-      case 'jira':
-        return t('caseManagement.featureCase.jira');
-      default:
-        break;
-    }
-  }
+  const platName = computed(() => {
+    return getPlatName(platformInfo.value.platform_key);
+  });
 </script>
 
 <style scoped></style>
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/thirdDemandDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/thirdDemandDrawer.vue
index 2a8f252e97..e3d88f7367 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/thirdDemandDrawer.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/thirdDemandDrawer.vue
@@ -14,7 +14,7 @@
   >
     <div class="flex items-center justify-between">
       <div
-        ><span class="font-medium">{{ getPlatName() }}</span
+        ><span class="font-medium">{{ platName }}</span
         ><span class="ml-1 text-[var(--color-text-4)]">({{ propsRes?.msPagination?.total || 0 }})</span></div
       >
       <a-input-search
@@ -58,6 +58,8 @@
   import type { CreateOrUpdateDemand, DemandItem } from '@/models/caseManagement/featureCase';
   import { TableKeyEnum } from '@/enums/tableEnum';
 
+  import { getPlatName } from '@/views/case-management/caseManagementFeature/components/utils';
+
   const { t } = useI18n();
   const appStore = useAppStore();
   const currentProjectId = computed(() => appStore.currentProjectId);
@@ -138,16 +140,9 @@
     return filteredData;
   });
 
-  function getPlatName() {
-    switch (props.platformInfo.platform_key) {
-      case 'zentao':
-        return t('caseManagement.featureCase.zentao');
-      case 'jira':
-        return t('caseManagement.featureCase.jira');
-      default:
-        break;
-    }
-  }
+  const platName = computed(() => {
+    return getPlatName(props.platformInfo.value.platform_key);
+  });
 
   async function handleDrawerConfirm() {
     const demandList = tableSelected.value.map((item) => {
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDetail.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDetail.vue
index 2b178fcdb7..fde995cdf3 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDetail.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDetail.vue
@@ -449,6 +449,7 @@
   function getParams() {
     const steps = stepData.value.map((item, index) => {
       return {
+        id: item.id,
         num: index,
         desc: item.step,
         result: item.expected,
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/utils.ts b/frontend/src/views/case-management/caseManagementFeature/components/utils.ts
index 2c3d687161..690250dd3e 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/utils.ts
+++ b/frontend/src/views/case-management/caseManagementFeature/components/utils.ts
@@ -280,10 +280,6 @@ export function initFormCreate(customFields: CustomAttributes[], permission: str
 }
 
 export function makeColumns(optionsMap: Record<string, any>, columnData: MsTableColumn) {
-  // const optionsMap: Record<string, any> = {
-  //   status: statusFilterOptions.value,
-  //   handleUser: handleUserFilterOptions.value,
-  // };
   return columnData.map((e) => {
     if (Object.prototype.hasOwnProperty.call(optionsMap, e.dataIndex as string)) {
       return {
@@ -297,3 +293,14 @@ export function makeColumns(optionsMap: Record<string, any>, columnData: MsTable
     return { ...e };
   });
 }
+
+export function getPlatName(platformKey: string) {
+  switch (platformKey) {
+    case 'zentao':
+      return t('caseManagement.featureCase.zentao');
+    case 'jira':
+      return t('caseManagement.featureCase.jira');
+    default:
+      break;
+  }
+}
diff --git a/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts b/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts
index 7029e6eb49..f11adf6787 100644
--- a/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts
+++ b/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts
@@ -264,6 +264,7 @@ export default {
   'caseManagement.featureCase.sortSuccess': 'Sort successfully',
   'caseManagement.featureCase.zentao': 'ZenTao',
   'caseManagement.featureCase.jira': 'JIRA',
+  'caseManagement.featureCase.tapd': 'TAPD',
   'caseManagement.featureCase.searchPlaceholder': 'Search by ID, name, or tag',
   'caseManagement.featureCase.ModuleOwned': 'Module owned',
   'caseManagement.featureCase.excelImportTip': 'Only xls/xlsx files are supported',
diff --git a/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts b/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts
index f055479c52..f0b349d3c2 100644
--- a/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts
+++ b/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts
@@ -260,6 +260,7 @@ export default {
   'caseManagement.featureCase.sortSuccess': '排序成功',
   'caseManagement.featureCase.zentao': '禅道',
   'caseManagement.featureCase.jira': 'JIRA',
+  'caseManagement.featureCase.tapd': 'TAPD',
   'caseManagement.featureCase.searchPlaceholder': '通过ID、名称或标签搜索',
   'caseManagement.featureCase.ModuleOwned': '所属模块',
   'caseManagement.featureCase.excelImportTip': '仅支持 xls/xlsx 格式的文件',
diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/components/relatedCase.vue b/frontend/src/views/project-management/projectAndPermission/menuManagement/components/relatedCase.vue
index 03de6e4538..031ca53fb2 100644
--- a/frontend/src/views/project-management/projectAndPermission/menuManagement/components/relatedCase.vue
+++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/components/relatedCase.vue
@@ -72,7 +72,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { FormInstance } from '@arco-design/web-vue';
+  import { FormInstance, Message } from '@arco-design/web-vue';
 
   import MsDrawer from '@/components/pure/ms-drawer/index.vue';
   import MsFormCreate from '@/components/pure/ms-form-create/ms-form-create.vue';
@@ -168,6 +168,7 @@
           { ...form, DEMAND_PLATFORM_CONFIG: JSON.stringify(formData) },
           currentProjectId.value
         );
+        Message.success(t('common.linkSuccess'));
         handleCancel(true);
         emit('ok');
       } catch (error) {
diff --git a/frontend/src/views/test-plan/testPlan/components/planTable.vue b/frontend/src/views/test-plan/testPlan/components/planTable.vue
index 1126070c42..ab404f8eec 100644
--- a/frontend/src/views/test-plan/testPlan/components/planTable.vue
+++ b/frontend/src/views/test-plan/testPlan/components/planTable.vue
@@ -47,6 +47,7 @@
     :selectable="hasOperationPermission"
     v-on="propsEvent"
     @batch-action="handleTableBatch"
+    @filter-change="filterChange"
   >
     <!-- :expanded-keys="expandedKeys" -->
     <template #num="{ record }">
@@ -624,18 +625,15 @@
     currentSelectCount: 0,
   });
 
-  const conditionParams = ref({
-    keyword: '',
-    filter: {},
-    combine: {},
-  });
-
-  async function initTableParams(isSetDefaultKey = false) {
-    conditionParams.value = {
+  const conditionParams = computed(() => {
+    return {
       keyword: keyword.value,
       filter: propsRes.value.filter,
       combine: batchParams.value.condition,
     };
+  });
+
+  async function initTableParams(isSetDefaultKey = false) {
     let moduleIds =
       props.activeFolder && props.activeFolder !== 'all' ? [props.activeFolder, ...props.offspringIds] : [];
     if (isSetDefaultKey) {
@@ -671,6 +669,7 @@
       ...tableParams,
       current: propsRes.value.msPagination?.current,
       pageSize: propsRes.value.msPagination?.pageSize,
+      filter: propsRes.value.filter,
     });
   }
 
@@ -1026,6 +1025,10 @@
     }
   );
 
+  function filterChange() {
+    emitTableParams();
+  }
+
   defineExpose({
     fetchData,
     emitTableParams,
diff --git a/frontend/src/views/test-plan/testPlan/components/testPlanTree.vue b/frontend/src/views/test-plan/testPlan/components/testPlanTree.vue
index d241ecccf6..2824651ab4 100644
--- a/frontend/src/views/test-plan/testPlan/components/testPlanTree.vue
+++ b/frontend/src/views/test-plan/testPlan/components/testPlanTree.vue
@@ -47,7 +47,13 @@
           @confirm="addSubModule"
           @cancel="resetFocusNodeKey"
         >
-          <MsButton type="icon" size="mini" class="ms-tree-node-extra__btn !mr-0" @click="setFocusKey(nodeData)">
+          <MsButton
+            v-if="hasAnyPermission(['PROJECT_TEST_PLAN:READ+ADD'])"
+            type="icon"
+            size="mini"
+            class="ms-tree-node-extra__btn !mr-0"
+            @click="setFocusKey(nodeData)"
+          >
             <MsIcon type="icon-icon_add_outlined" size="14" class="text-[var(--color-text-4)]" />
           </MsButton>
         </MsPopConfirm>
@@ -134,11 +140,13 @@
     {
       label: 'caseManagement.featureCase.rename',
       eventTag: 'rename',
+      permission: ['PROJECT_TEST_PLAN:READ+UPDATE'],
     },
     {
       label: 'caseManagement.featureCase.delete',
       eventTag: 'delete',
       danger: true,
+      permission: ['PROJECT_TEST_PLAN:READ+DELETE'],
     },
   ];
 
diff --git a/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/bug/index.vue b/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/bug/index.vue
index f13a286c19..a790200319 100644
--- a/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/bug/index.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/bug/index.vue
@@ -1,51 +1,62 @@
 <template>
   <div>
-    <div class="mb-4 flex items-center justify-between">
-      <a-dropdown-button
-        v-if="hasAnyPermission(['PROJECT_BUG:READ']) && total"
-        type="primary"
-        @click="handleSelect('associated')"
-      >
-        {{ t('common.associated') }}
-        <template #icon>
-          <icon-down />
-        </template>
-        <template #content>
-          <a-doption v-permission="['PROJECT_BUG:READ+ADD']" value="new" @click="handleSelect('new')">
-            {{ t('common.newCreate') }}
-          </a-doption>
-        </template>
-      </a-dropdown-button>
-      <a-dropdown-button
-        v-if="hasAnyPermission(['PROJECT_BUG:READ+ADD']) && !total"
-        type="primary"
-        @click="handleSelect('new')"
-      >
-        {{ t('common.newCreate') }}
-        <template #icon>
-          <icon-down />
-        </template>
-        <template #content>
-          <a-popover title="" position="right">
-            <a-doption value="associated" :disabled="!total" @click="handleSelect('associated')">
-              {{ t('common.associated') }}
+    <div class="mb-4 grid grid-cols-3">
+      <div>
+        <a-dropdown-button
+          v-if="hasAnyPermission(['PROJECT_BUG:READ']) && total"
+          type="primary"
+          @click="handleSelect('associated')"
+        >
+          {{ t('common.associated') }}
+          <template #icon>
+            <icon-down />
+          </template>
+          <template #content>
+            <a-doption :disabled="!hasAnyPermission(['PROJECT_BUG:READ+ADD'])" value="new" @click="handleSelect('new')">
+              {{ t('common.newCreate') }}
             </a-doption>
-            <template #content>
-              <div class="flex items-center text-[14px]">
-                <span class="text-[var(--color-text-4)]">{{ t('testPlan.featureCase.noBugDataTooltip') }}</span>
-                <MsButton type="text" @click="handleSelect('new')">
-                  {{ t('testPlan.featureCase.noBugDataNewBug') }}
-                </MsButton>
-              </div>
-            </template>
-          </a-popover>
-        </template>
-      </a-dropdown-button>
+          </template>
+        </a-dropdown-button>
+        <a-dropdown-button
+          v-if="hasAnyPermission(['PROJECT_BUG:READ+ADD']) && !total"
+          type="primary"
+          @click="handleSelect('new')"
+        >
+          {{ t('common.newCreate') }}
+          <template #icon>
+            <icon-down />
+          </template>
+          <template #content>
+            <a-popover title="" position="right">
+              <a-doption
+                value="associated"
+                :disabled="!total && !hasAnyPermission(['PROJECT_BUG:READ'])"
+                @click="handleSelect('associated')"
+              >
+                {{ t('common.associated') }}
+              </a-doption>
+              <template #content>
+                <div class="flex items-center text-[14px]">
+                  <span class="text-[var(--color-text-4)]">{{ t('testPlan.featureCase.noBugDataTooltip') }}</span>
+                  <MsButton
+                    :disabled="!hasAnyPermission(['PROJECT_BUG:READ+ADD'])"
+                    type="text"
+                    @click="handleSelect('new')"
+                  >
+                    {{ t('testPlan.featureCase.noBugDataNewBug') }}
+                  </MsButton>
+                </div>
+              </template>
+            </a-popover>
+          </template>
+        </a-dropdown-button>
+      </div>
+
       <a-input-search
         v-model:model-value="keyword"
         :placeholder="t('caseManagement.featureCase.searchByName')"
         allow-clear
-        class="mx-[8px] w-[240px]"
+        class="col-span-2 col-end-7 mx-[8px] w-[240px]"
         @search="initData"
         @press-enter="initData"
         @clear="resetHandler"
diff --git a/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/index.vue b/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/index.vue
index 98a013170f..36dbb4023d 100644
--- a/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/index.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/index.vue
@@ -127,20 +127,26 @@
                     <span class="ml-1 text-[rgb(var(--danger-6))]">{{ caseDetail.bugListCount }}</span>
                   </MsTag>
                   <a-dropdown @select="handleSelect">
-                    <a-button type="outline" size="mini" class="ml-1">
+                    <a-button v-if="hasAnyPermission(['PROJECT_BUG:READ'])" type="outline" size="mini" class="ml-1">
                       <template #icon> <icon-plus class="text-[12px]" /> </template>
                     </a-button>
                     <template #content>
-                      <a-doption v-permission="['PROJECT_BUG:READ+ADD']" value="new">{{
-                        t('common.newCreate')
-                      }}</a-doption>
-                      <a-doption v-if="createdBugCount > 0 && hasAnyPermission(['PROJECT_BUG:READ'])" value="link">{{
-                        t('common.associated')
-                      }}</a-doption>
+                      <a-doption
+                        v-permission="['PROJECT_BUG:READ+ADD']"
+                        :disabled="!hasAnyPermission(['PROJECT_BUG:READ+ADD'])"
+                        value="new"
+                        >{{ t('common.newCreate') }}</a-doption
+                      >
+                      <a-doption
+                        v-if="createdBugCount > 0 && hasAnyPermission(['PROJECT_BUG:READ'])"
+                        :disabled="!hasAnyPermission(['PROJECT_BUG:READ'])"
+                        value="link"
+                        >{{ t('common.associated') }}</a-doption
+                      >
                       <a-popover v-else title="" position="left">
                         <a-doption
                           v-if="createdBugCount < 1 && hasAnyPermission(['PROJECT_BUG:READ'])"
-                          :disabled="true"
+                          :disabled="!hasAnyPermission(['PROJECT_BUG:READ'])"
                           value="link"
                           >{{ t('common.associated') }}</a-doption
                         >
@@ -149,7 +155,11 @@
                             <span class="text-[var(--color-text-4)]">{{
                               t('testPlan.featureCase.noBugDataTooltip')
                             }}</span>
-                            <MsButton type="text" @click="handleSelect('new')">
+                            <MsButton
+                              :disabled="!hasAnyPermission(['PROJECT_BUG:READ+ADD'])"
+                              type="text"
+                              @click="handleSelect('new')"
+                            >
                               {{ t('testPlan.featureCase.noBugDataNewBug') }}
                             </MsButton>
                           </div>
@@ -238,7 +248,7 @@
   import { testPlanDefaultDetail } from '@/config/testPlan';
   import { useI18n } from '@/hooks/useI18n';
   import useAppStore from '@/store/modules/app';
-  import { hasAnyPermission } from '@/utils/permission';
+  import { hasAllPermission, hasAnyPermission } from '@/utils/permission';
 
   import type { TableQueryParams } from '@/models/common';
   import type { PlanDetailFeatureCaseItem, TestPlanDetail } from '@/models/testPlan/testPlan';
diff --git a/frontend/src/views/test-plan/testPlan/detail/index.vue b/frontend/src/views/test-plan/testPlan/detail/index.vue
index cd21c300d4..f0c365e22b 100644
--- a/frontend/src/views/test-plan/testPlan/detail/index.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/index.vue
@@ -56,7 +56,11 @@
         />
         {{ t(detail.followFlag ? 'common.forked' : 'common.fork') }}
       </MsButton>
-      <MsTableMoreAction :list="moreAction" @select="handleMoreSelect">
+      <MsButton v-if="detail.status === 'ARCHIVED'" status="danger" type="button" @click="deleteHandler">
+        <MsIcon type="icon-icon_delete-trash_outlined" class="mr-[8px] text-[rgb(var(--danger-6))]" />
+        <span class="text-[rgb(var(--danger-6))]"> {{ t('common.delete') }}</span>
+      </MsButton>
+      <MsTableMoreAction v-else :list="moreAction" @select="handleMoreSelect">
         <MsButton v-permission="['PROJECT_TEST_PLAN:READ+DELETE']" type="button" status="default">
           <MsIcon type="icon-icon_more_outlined" class="mr-[8px]" />
           {{ t('common.more') }}
diff --git a/frontend/src/views/test-plan/testPlan/index.vue b/frontend/src/views/test-plan/testPlan/index.vue
index e17faab155..ccb76a774e 100644
--- a/frontend/src/views/test-plan/testPlan/index.vue
+++ b/frontend/src/views/test-plan/testPlan/index.vue
@@ -50,7 +50,7 @@
                   }"
                   @confirm="confirmHandler"
                 >
-                  <MsButton type="icon" class="!mr-0 p-[2px]">
+                  <MsButton v-permission="['PROJECT_TEST_PLAN:READ+ADD']" type="icon" class="!mr-0 p-[2px]">
                     <MsIcon
                       type="icon-icon_create_planarity"
                       size="18"
@@ -119,6 +119,7 @@
   import { createPlanModuleTree, getPlanModulesCount } from '@/api/modules/test-plan/testPlan';
   import { useI18n } from '@/hooks/useI18n';
   import useAppStore from '@/store/modules/app';
+  import { hasAnyPermission } from '@/utils/permission';
 
   import type { CreateOrUpdateModule } from '@/models/caseManagement/featureCase';
   import { ModuleTreeNode, TableQueryParams } from '@/models/common';