From 0402b9f7528dd10f275f8b883ec517002b714985 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Fri, 21 Jun 2024 13:22:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92&?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E5=85=B3=E8=81=94=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E8=BF=87=E6=BB=A4=E6=8A=A5=E5=91=8A=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3&=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E8=AF=A6=E6=83=85=E6=8A=BD=E5=B1=89style?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ms-associate-case/apiCaseTable.vue         |  5 +----
 .../business/ms-associate-case/apiTable.vue    |  5 +----
 .../business/ms-associate-case/caseTable.vue   |  5 +----
 .../ms-associate-case/scenarioCaseTable.vue    |  5 +----
 .../components/caseDetailDrawer.vue            | 18 +++++++++++-------
 .../components/caseTable.vue                   |  2 +-
 .../test-plan/report/component/reportList.vue  |  6 +-----
 .../src/views/test-plan/report/locale/en-US.ts |  4 ++--
 .../src/views/test-plan/report/locale/zh-CN.ts |  4 ++--
 .../test-plan/testPlan/detail/reportDrawer.vue |  7 ++++++-
 10 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/frontend/src/components/business/ms-associate-case/apiCaseTable.vue b/frontend/src/components/business/ms-associate-case/apiCaseTable.vue
index 7b23f107f0..5460944541 100644
--- a/frontend/src/components/business/ms-associate-case/apiCaseTable.vue
+++ b/frontend/src/components/business/ms-associate-case/apiCaseTable.vue
@@ -248,10 +248,7 @@
       projectId: props.currentProject,
       moduleIds: props.activeModule === 'all' || !props.activeModule ? [] : [props.activeModule, ...props.offspringIds],
       excludeIds: [...excludeKeys],
-      condition: {
-        keyword: props.keyword,
-        filter: propsRes.value.filter,
-      },
+      filter: propsRes.value.filter,
       protocols: props.protocols,
       ...props.extraTableParams,
     };
diff --git a/frontend/src/components/business/ms-associate-case/apiTable.vue b/frontend/src/components/business/ms-associate-case/apiTable.vue
index 25d5a9a5b0..24e0ef0771 100644
--- a/frontend/src/components/business/ms-associate-case/apiTable.vue
+++ b/frontend/src/components/business/ms-associate-case/apiTable.vue
@@ -204,10 +204,7 @@
       protocols: props.protocols,
       moduleIds: props.activeModule === 'all' || !props.activeModule ? [] : [props.activeModule, ...props.offspringIds],
       excludeIds: [...excludeKeys],
-      condition: {
-        keyword: props.keyword,
-        filter: propsRes.value.filter,
-      },
+      filter: propsRes.value.filter,
       ...props.extraTableParams,
     };
   }
diff --git a/frontend/src/components/business/ms-associate-case/caseTable.vue b/frontend/src/components/business/ms-associate-case/caseTable.vue
index 67434a86dc..b5af408546 100644
--- a/frontend/src/components/business/ms-associate-case/caseTable.vue
+++ b/frontend/src/components/business/ms-associate-case/caseTable.vue
@@ -251,10 +251,7 @@
       projectId: props.currentProject,
       moduleIds: props.activeModule === 'all' || !props.activeModule ? [] : [props.activeModule, ...props.offspringIds],
       excludeIds: [...excludeKeys],
-      condition: {
-        keyword: props.keyword,
-        filter: propsRes.value.filter,
-      },
+      filter: propsRes.value.filter,
       ...props.extraTableParams,
     };
   }
diff --git a/frontend/src/components/business/ms-associate-case/scenarioCaseTable.vue b/frontend/src/components/business/ms-associate-case/scenarioCaseTable.vue
index 9507f521a9..f94fe1ad4a 100644
--- a/frontend/src/components/business/ms-associate-case/scenarioCaseTable.vue
+++ b/frontend/src/components/business/ms-associate-case/scenarioCaseTable.vue
@@ -221,10 +221,7 @@
       projectId: props.currentProject,
       moduleIds: props.activeModule === 'all' || !props.activeModule ? [] : [props.activeModule, ...props.offspringIds],
       excludeIds: [...excludeKeys],
-      condition: {
-        keyword: props.keyword,
-        filter: propsRes.value.filter,
-      },
+      filter: propsRes.value.filter,
       ...props.extraTableParams,
     };
   }
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseDetailDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseDetailDrawer.vue
index 66c92b5249..fb47e84475 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseDetailDrawer.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseDetailDrawer.vue
@@ -88,10 +88,7 @@
       </div>
     </template>
     <template #default="{ detail, loading }">
-      <div
-        ref="wrapperRef"
-        :class="[`${!commentInputIsActive ? 'h-[calc(100%-72px)]' : 'h-[calc(100%-286px)]'}`, 'bg-white']"
-      >
+      <div ref="wrapperRef" class="bg-white">
         <div class="header relative h-[48px] pl-2">
           <MsTab
             v-model:active-key="activeTab"
@@ -104,8 +101,12 @@
             t('caseManagement.featureCase.detailDisplaySetting')
           }}</span>
         </div>
-        <div class="leftWrapper h-full">
-          <div class="w-full p-[16px] pt-4">
+        <div>
+          <div
+            :class="`${
+              !commentInputIsActive ? 'h-[calc(100vh-174px)]' : 'h-[calc(100vh-378px)]'
+            } content-wrapper w-full p-[16px] pt-4`"
+          >
             <template v-if="activeTab === 'detail'">
               <TabDetail :form="detailInfo" :allow-edit="true" :form-rules="formItem" @update-success="updateSuccess" />
             </template>
@@ -139,7 +140,6 @@
           </div>
         </div>
         <inputComment
-          v-if="activeTab !== 'detail'"
           ref="commentInputRef"
           v-model:content="content"
           v-model:notice-user-ids="noticeUserIds"
@@ -602,6 +602,10 @@
       border-bottom: 1px solid var(--color-text-n8);
     }
   }
+  .content-wrapper {
+    @apply overflow-y-auto overflow-x-hidden;
+    .ms-scroll-bar();
+  }
   .rightButtons {
     :deep(.ms-button--secondary):hover,
     :hover > .arco-icon {
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
index c4fec07979..3fa54590e8 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
@@ -1045,8 +1045,8 @@
       }
       isMove.value = false;
       emitTableParams();
-      loadList();
       resetSelector();
+      loadList();
     } catch (error) {
       console.log(error);
     } finally {
diff --git a/frontend/src/views/test-plan/report/component/reportList.vue b/frontend/src/views/test-plan/report/component/reportList.vue
index 79b19e720f..f906b44918 100644
--- a/frontend/src/views/test-plan/report/component/reportList.vue
+++ b/frontend/src/views/test-plan/report/component/reportList.vue
@@ -43,11 +43,7 @@
       </template>
       <template #integrated="{ record }">
         <MsTag theme="light" :type="record.integrated ? 'primary' : undefined">
-          {{
-            record.integrated
-              ? t('report.detail.testPlanGroupReport')
-              : t('report.detail.testReport')
-          }}
+          {{ record.integrated ? t('report.detail.testPlanGroupReport') : t('report.detail.testReport') }}
         </MsTag>
       </template>
 
diff --git a/frontend/src/views/test-plan/report/locale/en-US.ts b/frontend/src/views/test-plan/report/locale/en-US.ts
index 404f3ad254..7df254550a 100644
--- a/frontend/src/views/test-plan/report/locale/en-US.ts
+++ b/frontend/src/views/test-plan/report/locale/en-US.ts
@@ -45,6 +45,6 @@ export default {
   'report.detail.testPlanGroup.result': 'Result',
   'report.detail.testPlanGroup.useCasesCount': 'Use cases',
   'report.detail.testPlanGroup.viewReport': 'View Report',
-  'report.detail.testReport': 'Test report',
-  'report.detail.testPlanGroupReport': 'Test group report',
+  'report.detail.testReport': 'Planning report',
+  'report.detail.testPlanGroupReport': 'Planning groups report',
 };
diff --git a/frontend/src/views/test-plan/report/locale/zh-CN.ts b/frontend/src/views/test-plan/report/locale/zh-CN.ts
index 573bf61903..6b82d9c8d4 100644
--- a/frontend/src/views/test-plan/report/locale/zh-CN.ts
+++ b/frontend/src/views/test-plan/report/locale/zh-CN.ts
@@ -40,11 +40,11 @@ export default {
   'report.detail.apiCaseDetails': '接口用例明细',
   'report.detail.scenarioCaseDetails': '场景用例明细',
   'report.detail.oneClickSummary': '一键填写报告总结',
-  'report.detail.testReport': '测试报告',
-  'report.detail.testPlanGroupReport': '测试组报告',
   'report.detail.testPlanTotal': '计划总数',
   'report.detail.testPlanCaseTotal': '用例总数',
   'report.detail.testPlanGroup.result': '结果',
   'report.detail.testPlanGroup.useCasesCount': '用例数',
   'report.detail.testPlanGroup.viewReport': '查看报告',
+  'report.detail.testReport': '计划报告',
+  'report.detail.testPlanGroupReport': '计划组报告',
 };
diff --git a/frontend/src/views/test-plan/testPlan/detail/reportDrawer.vue b/frontend/src/views/test-plan/testPlan/detail/reportDrawer.vue
index 373b723eec..21c9ee4cbe 100644
--- a/frontend/src/views/test-plan/testPlan/detail/reportDrawer.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/reportDrawer.vue
@@ -18,6 +18,7 @@
 
 <script setup lang="ts">
   import { ref } from 'vue';
+  import { useRoute } from 'vue-router';
   import { cloneDeep } from 'lodash-es';
 
   import MsDrawer from '@/components/pure/ms-drawer/index.vue';
@@ -37,10 +38,14 @@
     required: true,
   });
 
+  const route = useRoute();
+
+  const shareId = ref<string>(route.query.shareId as string);
+
   const detail = ref<PlanReportDetail>(cloneDeep(defaultReportDetail));
   async function getDetail() {
     try {
-      detail.value = await getReportDetail(props.reportId);
+      detail.value = await getReportDetail(props.reportId, shareId.value);
     } catch (error) {
       // eslint-disable-next-line no-console
       console.log(error);