fix(测试计划&功能用例): 修复测试计划关联用例过滤报告分享接口&优化功能用例详情抽屉style

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: {
+      filter: propsRes.value.filter,
-        keyword: props.keyword,
-        filter: propsRes.value.filter,
-      },
       protocols: props.protocols,
       ...props.extraTableParams,
     };

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: {
+      filter: propsRes.value.filter,
-        keyword: props.keyword,
-        filter: propsRes.value.filter,
-      },
       ...props.extraTableParams,
     };
   }

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: {
+      filter: propsRes.value.filter,
-        keyword: props.keyword,
-        filter: propsRes.value.filter,
-      },
       ...props.extraTableParams,
     };
   }

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: {
+      filter: propsRes.value.filter,
-        keyword: props.keyword,
-        filter: propsRes.value.filter,
-      },
       ...props.extraTableParams,
     };
   }

frontend/src/views/case-management/caseManagementFeature/components/caseDetailDrawer.vue

@@ -88,10 +88,7 @@
       </div>
     </template>
     <template #default="{ detail, loading }">
-      <div
+      <div ref="wrapperRef" class="bg-white">
-        ref="wrapperRef"
-        :class="[`${!commentInputIsActive ? 'h-[calc(100%-72px)]' : 'h-[calc(100%-286px)]'}`, '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>
-          <div class="w-full p-[16px] pt-4">
+          <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 {

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 {

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>
 

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.testReport': 'Planning report',
-  'report.detail.testPlanGroupReport': 'Test group report',
+  'report.detail.testPlanGroupReport': 'Planning groups report',
 };

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': '计划组报告',
 };

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);