From 283e55a67583e8421bdf6c001437c9bad221a652 Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Mon, 24 Jun 2024 11:00:55 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=84=91=E5=9B=BE):=20=E8=84=91=E5=9B=BE?=
 =?UTF-8?q?=E6=8A=BD=E5=B1=89=E7=BC=BA=E9=99=B7=E5=88=97=E8=A1=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ms-minders/featureCaseMinder/bugList.vue  | 38 ++++++++++++++----
 .../pure/ms-minder-editor/main/mainEditor.vue |  2 -
 frontend/src/hooks/useLeaveUnSaveTip.ts       | 39 +++++++++++--------
 3 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/frontend/src/components/business/ms-minders/featureCaseMinder/bugList.vue b/frontend/src/components/business/ms-minders/featureCaseMinder/bugList.vue
index 87088c60a0..d1d71217c3 100644
--- a/frontend/src/components/business/ms-minders/featureCaseMinder/bugList.vue
+++ b/frontend/src/components/business/ms-minders/featureCaseMinder/bugList.vue
@@ -1,11 +1,28 @@
 <template>
   <a-spin :loading="bugListLoading" class="block h-full pl-[16px]">
-    <a-button v-if="hasEditPermission" class="mr-3" type="primary" @click="linkBug">
-      {{ t('caseManagement.featureCase.linkDefect') }}
-    </a-button>
-    <a-button v-permission="['PROJECT_BUG:READ+ADD']" type="outline" @click="createBug">
-      {{ t('caseManagement.featureCase.createDefect') }}
-    </a-button>
+    <div class="flex items-center justify-between">
+      <div class="flex items-center justify-between">
+        <a-button v-if="hasEditPermission" class="mr-3" type="primary" @click="linkBug">
+          {{ t('caseManagement.featureCase.linkDefect') }}
+        </a-button>
+        <a-button v-permission="['PROJECT_BUG:READ+ADD']" type="outline" @click="createBug">
+          {{ t('caseManagement.featureCase.createDefect') }}
+        </a-button>
+      </div>
+      <a-radio-group
+        v-model:model-value="showType"
+        type="button"
+        class="file-show-type ml-[4px]"
+        @change="handleShowTypeChange"
+      >
+        <a-radio value="link" class="show-type-icon p-[2px]">
+          {{ t('caseManagement.featureCase.directLink') }}
+        </a-radio>
+        <a-radio value="testPlan" class="show-type-icon p-[2px]">
+          {{ t('caseManagement.featureCase.testPlan') }}
+        </a-radio>
+      </a-radio-group>
+    </div>
     <MsList
       v-model:data="bugList"
       mode="remote"
@@ -91,6 +108,7 @@
     pageSize: 10,
     current: 1,
   });
+  const showType = ref<'link' | 'testPlan'>('link');
   const bugListLoading = ref(false);
 
   async function loadBugList() {
@@ -99,7 +117,8 @@
       const res = await getLinkedCaseBugList({
         keyword: '',
         projectId: appStore.currentProjectId,
-        caseId: props.activeCase.id,
+        testPlanCaseId: showType.value === 'testPlan' ? props.activeCase.id : undefined,
+        caseId: showType.value === 'link' ? props.activeCase.id : undefined,
         current: pageNation.value.current || 1,
         pageSize: pageNation.value.pageSize,
       });
@@ -117,6 +136,11 @@
     }
   }
 
+  function handleShowTypeChange() {
+    pageNation.value.current = 1;
+    loadBugList();
+  }
+
   // 滚动翻页
   function handleReachBottom() {
     pageNation.value.current += 1;
diff --git a/frontend/src/components/pure/ms-minder-editor/main/mainEditor.vue b/frontend/src/components/pure/ms-minder-editor/main/mainEditor.vue
index a12bec4ebe..0f23575406 100644
--- a/frontend/src/components/pure/ms-minder-editor/main/mainEditor.vue
+++ b/frontend/src/components/pure/ms-minder-editor/main/mainEditor.vue
@@ -128,8 +128,6 @@
           'zoom',
           'zoomin',
           'zoomout',
-          'appendchildnode',
-          'appendsiblingnode',
         ]);
         if (selectNodes.length > 0 && !notChangeCommands.has(event.commandName.toLocaleLowerCase())) {
           minderStore.setMinderUnsaved(true);
diff --git a/frontend/src/hooks/useLeaveUnSaveTip.ts b/frontend/src/hooks/useLeaveUnSaveTip.ts
index a1f6509dab..0e515eab6e 100644
--- a/frontend/src/hooks/useLeaveUnSaveTip.ts
+++ b/frontend/src/hooks/useLeaveUnSaveTip.ts
@@ -1,4 +1,4 @@
-import { onBeforeRouteLeave } from 'vue-router';
+import { type NavigationGuardNext, onBeforeRouteLeave } from 'vue-router';
 
 import { useI18n } from '@/hooks/useI18n';
 import type { ModalType } from '@/hooks/useModal';
@@ -27,6 +27,25 @@ export default function useLeaveUnSaveTip(leaveProp = leaveProps) {
   const setIsSave = (flag: boolean) => {
     isSave.value = flag;
   };
+
+  function openUnsavedTip(next: NavigationGuardNext | (() => void)) {
+    openModal({
+      type: tipType,
+      title: t(leaveTitle),
+      content: t(leaveContent),
+      okText: t('common.leave'),
+      cancelText: t('common.stay'),
+      okButtonProps: {
+        status: 'normal',
+      },
+      onBeforeOk: async () => {
+        isSave.value = true;
+        next();
+      },
+      hideCancel: false,
+    });
+  }
+
   onBeforeRouteLeave((to, from, next) => {
     if (to.path === from.path) {
       next();
@@ -34,26 +53,14 @@ export default function useLeaveUnSaveTip(leaveProp = leaveProps) {
     }
 
     if (!isSave.value) {
-      openModal({
-        type: tipType,
-        title: t(leaveTitle),
-        content: t(leaveContent),
-        okText: t('common.leave'),
-        cancelText: t('common.stay'),
-        okButtonProps: {
-          status: 'normal',
-        },
-        onBeforeOk: async () => {
-          isSave.value = true;
-          next();
-        },
-        hideCancel: false,
-      });
+      openUnsavedTip(next);
     } else {
       next();
     }
   });
   return {
     setIsSave,
+    openUnsavedTip,
+    isSave,
   };
 }