From 579e032de2823ae4f7ae08f3493d43766bf36b5b Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Tue, 13 Aug 2024 11:52:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E4=BE=8B=E7=BB=A7=E7=BB=AD=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=88=90=E5=8A=9F=E5=90=8E=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=88=9B=E5=BB=BA=E7=94=A8=E4=BE=8B=E9=A1=B5?=
 =?UTF-8?q?=E6=9C=AA=E6=98=BE=E7=A4=BA=E6=A8=A1=E6=9D=BF=E5=86=85=E7=9A=84?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=86=85=E5=AE=B9&=E6=8A=A5=E5=91=8Astyle?=
 =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/caseTemplateDetail.vue         | 13 ++----------
 .../report/detail/component/config.vue        |  3 ++-
 .../detail/component/system-card/summary.vue  |  8 ++++++--
 .../report/detail/component/viewReport.vue    | 20 ++++++++++---------
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTemplateDetail.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTemplateDetail.vue
index 77aad9fb36..6e3b8b6cfd 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseTemplateDetail.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTemplateDetail.vue
@@ -783,8 +783,9 @@
     });
     return data;
   }
-
+  // 重置包含重置到默认模板状态
   async function resetForm() {
+    caseFormRef.value?.resetFields();
     form.value = { ...initForm, templateId: form.value.templateId };
     await initDefaultFields();
     form.value.customFields = formItem.value.map((item: any) => {
@@ -795,16 +796,6 @@
     });
     fileList.value = [];
     form.value.tags = [];
-    stepData.value = [
-      {
-        id: getGenerateId(),
-        step: '',
-        expected: '',
-        showStep: false,
-        showExpected: false,
-      },
-    ];
-    caseFormRef.value?.resetFields();
   }
 
   const caseId = ref(props.caseId);
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 e74cd82a64..62ec7cd257 100644
--- a/frontend/src/views/test-plan/report/detail/component/config.vue
+++ b/frontend/src/views/test-plan/report/detail/component/config.vue
@@ -432,8 +432,9 @@
       }
     }
     .config-right-container {
-      padding: 16px;
+      padding: 16px 0 16px 16px;
       width: calc(100% - 300px);
+      min-width: 1000px;
       background: var(--color-bg-3);
     }
   }
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 186e5c1f85..6a8a1654d0 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
@@ -1,12 +1,16 @@
 <template>
-  <div :class="`${hasAnyPermission(['PROJECT_TEST_PLAN_REPORT:READ+UPDATE']) && !shareId ? '' : 'cursor-not-allowed'}`">
+  <div
+    :class="`${
+      hasAnyPermission(['PROJECT_TEST_PLAN_REPORT:READ+UPDATE']) && !shareId ? '' : 'cursor-not-allowed'
+    } w-full`"
+  >
     <MsRichText
       ref="msRichTextRef"
       v-model:raw="innerSummary.content"
       v-model:filedIds="innerSummary.richTextTmpFileIds"
       :upload-image="handleUploadImage"
       :preview-url="`${ReportPlanPreviewImageUrl}/${appStore.currentProjectId}`"
-      class="mt-[8px] w-full"
+      class="mt-[8px]"
       :editable="props.canEdit"
       @click="handleRichClick"
       @update="emit('handleSetSave')"
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 94450c59fb..4fbd4692d5 100644
--- a/frontend/src/views/test-plan/report/detail/component/viewReport.vue
+++ b/frontend/src/views/test-plan/report/detail/component/viewReport.vue
@@ -2,7 +2,7 @@
   <ReportHeader v-if="!props.isDrawer && props.isPreview" :detail="detail" :share-id="shareId" :is-group="false" />
   <div class="analysis-wrapper" :data-cards="cardCount">
     <SystemTrigger :is-preview="props.isPreview">
-      <div :class="`${getAnalysisHover} analysis min-w-[238px]`">
+      <div :class="`${getAnalysisHover} analysis min-w-[330px]`">
         <div class="block-title">{{ t('report.detail.api.reportAnalysis') }}</div>
         <ReportMetricsItem
           v-for="analysisItem in reportAnalysisList"
@@ -161,7 +161,7 @@
             </a-tooltip>
           </div>
         </div>
-        <MsCard simple auto-height auto-width>
+        <div class="wrapper-preview-card">
           <div v-if="item.value !== ReportCardTypeEnum.CUSTOM_CARD" class="mb-[8px] font-medium">
             {{ t(item.label) }}
           </div>
@@ -226,7 +226,7 @@
             @cancel="() => handleCancelCustom(item)"
             @handle-set-save="setIsSave(false)"
           />
-        </MsCard>
+        </div>
       </div>
     </VueDraggable>
   </div>
@@ -240,7 +240,6 @@
   import { VueDraggable } from 'vue-draggable-plus';
 
   import MsChart from '@/components/pure/chart/index.vue';
-  import MsCard from '@/components/pure/ms-card/index.vue';
   import SingleStatusProgress from '@/views/test-plan/report/component/singleStatusProgress.vue';
   import CustomRichText from '@/views/test-plan/report/detail/component/custom-card/customRichText.vue';
   import ApiAndScenarioTable from '@/views/test-plan/report/detail/component/system-card/apiAndScenarioTable.vue';
@@ -646,11 +645,6 @@
   .block-title {
     @apply mb-4 font-medium;
   }
-  .config-right-container {
-    padding: 16px;
-    width: calc(100% - 300px);
-    background: var(--color-bg-3);
-  }
   .analysis-wrapper {
     @apply mb-4 grid items-center gap-4;
     .analysis {
@@ -695,6 +689,7 @@
   .drag-container {
     .card-item {
       position: relative;
+      width: 100%;
       border: 1px solid transparent;
       border-radius: 12px;
       .action {
@@ -727,4 +722,11 @@
       background: var(--color-text-n9);
     }
   }
+  .wrapper-preview-card {
+    display: flex;
+    padding: 16px;
+    border-radius: 12px;
+    box-shadow: 0 0 10px rgb(120 56 135 / 5%);
+    @apply flex-col bg-white;
+  }
 </style>