From 9cc056beca337c19731936e04daaf7349e60eef8 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Wed, 25 Sep 2024 15:34:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA&=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E8=AF=A6=E6=83=85bugs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../featureCaseMinder/attachment.vue          |  1 +
 frontend/src/utils/index.ts                   |  3 +-
 .../components/bug-detail-drawer.vue          | 47 +++++++++----------
 .../bug-management/components/deleteModal.vue |  2 +-
 frontend/src/views/bug-management/index.vue   | 12 +++--
 .../tabContent/tabBug/bugNamePopover.vue      |  4 +-
 6 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/frontend/src/components/business/ms-minders/featureCaseMinder/attachment.vue b/frontend/src/components/business/ms-minders/featureCaseMinder/attachment.vue
index 267325f96a..bc48241078 100644
--- a/frontend/src/components/business/ms-minders/featureCaseMinder/attachment.vue
+++ b/frontend/src/components/business/ms-minders/featureCaseMinder/attachment.vue
@@ -48,6 +48,7 @@
             :file-save-as-api="transferFileRequest"
             :file-module-options-api="getTransferFileTree"
             source-id-key="caseId"
+            @finish="emit('uploadSuccess')"
           >
             <span :id="item.uid"></span>
           </SaveAsFilePopover>
diff --git a/frontend/src/utils/index.ts b/frontend/src/utils/index.ts
index ae4ca9afb8..8ef511b083 100644
--- a/frontend/src/utils/index.ts
+++ b/frontend/src/utils/index.ts
@@ -903,7 +903,7 @@ export function getCustomFieldIndex(field: CustomFieldItem) {
 // 表格自定义字段转column
 export function customFieldToColumns(customFields: CustomFieldItem[]) {
   return customFields.map((field) => {
-    const { fieldName, fieldKey, fieldId, options, platformOptionJson } = field;
+    const { fieldName, fieldKey, fieldId, options, platformOptionJson, type } = field;
     const column: MsTableColumnData = {
       title: fieldName,
       dataIndex: ['handleUser', 'status'].includes(fieldId) ? fieldKey : getCustomFieldIndex(field),
@@ -912,6 +912,7 @@ export function customFieldToColumns(customFields: CustomFieldItem[]) {
       showInTable: true,
       width: 200,
       options: options || JSON.parse(platformOptionJson),
+      type,
     };
     return column;
   });
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 c8b45a45e3..621996bb80 100644
--- a/frontend/src/views/bug-management/components/bug-detail-drawer.vue
+++ b/frontend/src/views/bug-management/components/bug-detail-drawer.vue
@@ -126,7 +126,7 @@
             class="no-content relative border-b"
           />
         </div>
-        <div class="leftWrapper h-full">
+        <div :class="`leftWrapper ${!commentInputIsActive ? 'h-[calc(100vh-178px)]' : 'h-[calc(100vh-382px)]'}`">
           <a-spin :loading="detailLoading" class="w-full">
             <div class="tab-pane-container">
               <BugDetailTab
@@ -179,6 +179,13 @@
       />
     </template>
   </MsDetailDrawer>
+  <DeleteModal
+    :id="props.detailId"
+    v-model:visible="deleteVisible"
+    :name="detailInfo.title"
+    :remote-func="deleteSingleBug"
+    @submit="handleSingleDelete"
+  />
 </template>
 
 <script setup lang="ts">
@@ -221,6 +228,8 @@
   import { BugEditCustomField, BugEditFormObject } from '@/models/bug-management';
   import { BugManagementRouteEnum, RouteEnum } from '@/enums/routeEnum';
 
+  const DeleteModal = defineAsyncComponent(() => import('@/views/bug-management/components/deleteModal.vue'));
+
   const router = useRouter();
   const route = useRoute();
   const detailDrawerRef = ref<InstanceType<typeof MsDetailDrawer>>();
@@ -498,35 +507,21 @@
       followLoading.value = false;
     }
   }
+  const deleteVisible = ref(false);
 
   // 删除用例
   function deleteHandler() {
-    const { id, name } = detailInfo.value;
-    openDeleteModal({
-      title: t('bugManagement.detail.deleteTitle', { name: characterLimit(name) }),
-      content: t('bugManagement.detail.deleteContent'),
-      onBeforeOk: async () => {
-        try {
-          const params = {
-            id,
-            deleteAll: false,
-            projectId: currentProjectId.value,
-          };
-          await deleteSingleBug(params);
-          Message.success(t('common.deleteSuccess'));
-          emit('submit');
-          if (!props.pagination && !props.tableData) {
-            showDrawerVisible.value = false;
-          } else {
-            detailDrawerRef.value?.openNextDetail();
-          }
-        } catch (error) {
-          // eslint-disable-next-line no-console
-          console.log(error);
-        }
-      },
-    });
+    deleteVisible.value = true;
   }
+
+  const handleSingleDelete = () => {
+    emit('submit');
+    if (!props.pagination && !props.tableData) {
+      showDrawerVisible.value = false;
+    } else {
+      detailDrawerRef.value?.openNextDetail();
+    }
+  };
   // 复制bug
   function handleCopy() {
     router.push({
diff --git a/frontend/src/views/bug-management/components/deleteModal.vue b/frontend/src/views/bug-management/components/deleteModal.vue
index 82b7f9bfa9..5d8f49676c 100644
--- a/frontend/src/views/bug-management/components/deleteModal.vue
+++ b/frontend/src/views/bug-management/components/deleteModal.vue
@@ -57,7 +57,7 @@
   const { t } = useI18n();
   const props = defineProps<{
     visible: boolean;
-    name: string;
+    name?: string;
     id: string;
     remoteFunc(params: Record<string, any>): Promise<any>; // 远程模式下的请求函数，返回一个 Promise
   }>();
diff --git a/frontend/src/views/bug-management/index.vue b/frontend/src/views/bug-management/index.vue
index a8e699ff2a..62e0b7f842 100644
--- a/frontend/src/views/bug-management/index.vue
+++ b/frontend/src/views/bug-management/index.vue
@@ -79,8 +79,8 @@
             </a-tooltip>
           </div>
         </template>
-        <template #description="{ record }">
-          <BugNamePopover :name="record.title" :content="record.description" />
+        <template v-for="item in richPreviewColumns" :key="item.slotName" #[item.slotName]="{ record }">
+          <BugNamePopover :content="record[item.dataIndex] || ''" />
         </template>
       </MsBaseTable>
     </div>
@@ -769,8 +769,8 @@
         } else {
           item.showInTable = false;
         }
-        if (item.title === '内容') {
-          item.slotName = 'description';
+        if (item.type === 'RICH_TEXT') {
+          item.slotName = item.dataIndex;
           item.showTooltip = false;
         }
       });
@@ -780,6 +780,10 @@
     }
   }
 
+  const richPreviewColumns = computed<Record<string, any>[]>(() => {
+    return customColumns.filter((item) => item.type === 'RICH_TEXT');
+  });
+
   await getColumnHeaders();
   await initFilterOptions();
   await tableStore.initColumn(TableKeyEnum.BUG_MANAGEMENT, columns.concat(customColumns), 'drawer');
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/bugNamePopover.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/bugNamePopover.vue
index c005a56865..686504938a 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/bugNamePopover.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/bugNamePopover.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-tooltip :content="props.name">
+  <a-tooltip :content="props.name" :disabled="!props.name">
     <div class="one-line-text max-w-[calc(100%-32px)]"> {{ props.name }}</div>
   </a-tooltip>
   <a-popover class="bug-content-popover" title="" position="right" style="width: 480px">
@@ -16,7 +16,7 @@
   const { t } = useI18n();
 
   const props = defineProps<{
-    name: string;
+    name?: string;
     content: string;
   }>();
 </script>