From 3c39d6155464a04b878967e5a8a21d7d5f078151 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Tue, 9 Jul 2024 16:41:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=8A=A5=E5=91=8A=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=8A=A5=E5=91=8A=E9=85=8D=E7=BD=AE=E6=94=BE?=
 =?UTF-8?q?=E5=BC=80=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81&=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/detail/component/config.vue          |  9 +++++----
 .../detail/component/system-card/summary.vue    | 17 ++++++++++++-----
 .../report/detail/component/viewReport.vue      | 15 +++++++--------
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/frontend/src/views/test-plan/report/detail/component/config.vue b/frontend/src/views/test-plan/report/detail/component/config.vue
index e5bc04510c..ce64014eb7 100644
--- a/frontend/src/views/test-plan/report/detail/component/config.vue
+++ b/frontend/src/views/test-plan/report/detail/component/config.vue
@@ -211,12 +211,9 @@
   }
 
   watch(
-    () => props.isGroup,
+    () => hasCaseList.value,
     () => {
       initDefaultConfig();
-    },
-    {
-      immediate: true,
     }
   );
 
@@ -389,6 +386,10 @@
       confirmLoading.value = false;
     }
   }
+
+  onBeforeMount(() => {
+    initDefaultConfig();
+  });
 </script>
 
 <style scoped lang="less">
diff --git a/frontend/src/views/test-plan/report/detail/component/system-card/summary.vue b/frontend/src/views/test-plan/report/detail/component/system-card/summary.vue
index 6b60265743..e1a3c7cf78 100644
--- a/frontend/src/views/test-plan/report/detail/component/system-card/summary.vue
+++ b/frontend/src/views/test-plan/report/detail/component/system-card/summary.vue
@@ -10,7 +10,13 @@
       @click="handleClick"
     />
     <MsFormItemSub
-      v-if="hasAnyPermission(['PROJECT_TEST_PLAN_REPORT:READ+UPDATE']) && !shareId && props.showButton && props.canEdit"
+      v-if="
+        hasAnyPermission(['PROJECT_TEST_PLAN_REPORT:READ+UPDATE']) &&
+        !shareId &&
+        props.showButton &&
+        props.canEdit &&
+        props.isPreview
+      "
       :text="t('report.detail.oneClickSummary')"
       :show-fill-icon="true"
       @fill="handleSummary"
@@ -39,22 +45,23 @@
   import { useI18n } from '@/hooks/useI18n';
   import { hasAnyPermission } from '@/utils/permission';
 
-  import type { PlanReportDetail } from '@/models/testPlan/testPlanReport';
+  import type { customValueForm, PlanReportDetail } from '@/models/testPlan/testPlanReport';
 
   import { getSummaryDetail } from '@/views/test-plan/report/utils';
 
   const { t } = useI18n();
   const props = defineProps<{
-    richText: { content: string; label: string; richTextTmpFileIds?: string[] };
+    richText: customValueForm;
     shareId?: string;
     showButton: boolean;
     isPlanGroup: boolean;
     detail: PlanReportDetail;
     canEdit: boolean;
+    isPreview?: boolean;
   }>();
 
   const emit = defineEmits<{
-    (e: 'updateSummary'): void;
+    (e: 'updateSummary', form: customValueForm): void;
     (e: 'cancel'): void;
     (e: 'dblclick'): void;
     (e: 'handleSummary', content: string): void;
@@ -67,7 +74,7 @@
   }
 
   function handleUpdateReportDetail() {
-    emit('updateSummary');
+    emit('updateSummary', innerSummary.value);
   }
 
   async function handleUploadImage(file: File) {
diff --git a/frontend/src/views/test-plan/report/detail/component/viewReport.vue b/frontend/src/views/test-plan/report/detail/component/viewReport.vue
index 1b5f21f48b..9c6a755cfd 100644
--- a/frontend/src/views/test-plan/report/detail/component/viewReport.vue
+++ b/frontend/src/views/test-plan/report/detail/component/viewReport.vue
@@ -180,11 +180,12 @@
               richTextTmpFileIds: [],
             }"
             :share-id="shareId"
+            :is-preview="props.isPreview"
             :can-edit="item.enableEdit"
             :show-button="showButton"
             :is-plan-group="props.isGroup"
             :detail="detail"
-            @update-summary="handleUpdateReportDetail(item)"
+            @update-summary="(formValue:customValueForm) => updateCustom(formValue, item)"
             @cancel="() => handleCancelCustom(item)"
             @handle-summary="(value:string) => handleSummary(value,item)"
             @dblclick="handleDoubleClick(item)"
@@ -529,7 +530,7 @@
     }
   }
 
-  const allowEditType = [ReportCardTypeEnum.CUSTOM_CARD];
+  const allowEditType = [ReportCardTypeEnum.CUSTOM_CARD, ReportCardTypeEnum.SUMMARY];
   function allowEdit(value: ReportCardTypeEnum) {
     return allowEditType.includes(value);
   }
@@ -563,12 +564,10 @@
   }
 
   function handleDoubleClick(cardItem: configItem) {
-    if (props.isPreview) {
-      if (cardItem.value === ReportCardTypeEnum.SUMMARY) {
-        showButton.value = true;
-      }
-      cardItem.enableEdit = !cardItem.enableEdit;
+    if (cardItem.value === ReportCardTypeEnum.SUMMARY) {
+      showButton.value = true;
     }
+    cardItem.enableEdit = !cardItem.enableEdit;
   }
 
   async function handleUpdateReportDetail(currentItem: configItem) {
@@ -586,7 +585,6 @@
       } else {
         currentItem.enableEdit = !currentItem.enableEdit;
       }
-      // TODO 此处的更新后后台数据未更新需要验证接口
       emit('updateSuccess');
     } catch (error) {
       console.log(error);
@@ -598,6 +596,7 @@
       ...currentItem,
       ...formValue,
     };
+
     innerCardList.value = innerCardList.value.map((item: configItem) => {
       if (item.id === currentItem.id) {
         return {