From 852353e15c870946c3557c79333ac1f91864d8d2 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Thu, 23 May 2024 15:40:28 +0800
Subject: [PATCH] =?UTF-8?q?style(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E6=82=AC=E6=B5=AE=E4=B8=8A=E5=8E=BBstyle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/ms-case-associate/index.vue      | 14 +++--
 .../report/component/case/setReportChart.vue  | 19 +++----
 .../serviceIntegration/locale/en-US.ts        |  6 +--
 .../serviceIntegration/locale/zh-CN.ts        |  4 +-
 .../report/detail/component/bugTable.vue      |  7 ++-
 .../detail/component/featureCaseTable.vue     |  7 ++-
 .../report/detail/component/planDetail.vue    | 52 ++++++++++++-------
 7 files changed, 68 insertions(+), 41 deletions(-)

diff --git a/frontend/src/components/business/ms-case-associate/index.vue b/frontend/src/components/business/ms-case-associate/index.vue
index a03d38c916..dc5ec6e59c 100644
--- a/frontend/src/components/business/ms-case-associate/index.vue
+++ b/frontend/src/components/business/ms-case-associate/index.vue
@@ -25,7 +25,10 @@
     <div class="flex h-full">
       <div class="w-[292px] border-r border-[var(--color-text-n8)] p-[16px]">
         <div class="flex items-center justify-between">
-          <div v-if="!props.hideProjectSelect" class="w-full max-w-[162px] flex-1">
+          <div
+            v-if="!props.hideProjectSelect"
+            :class="`${!props.hideProjectSelect && caseType !== 'API' ? 'max-w-[259px]' : 'max-w-[162px]'} flex-1`"
+          >
             <a-select
               v-model="innerProject"
               class="mb-[16px] w-full"
@@ -305,6 +308,8 @@
    * @param isSetDefaultKey 是否设置第一个节点为选中节点
    */
   async function initModules(isSetDefaultKey = false) {
+    console.log(111);
+
     try {
       moduleLoading.value = true;
       let params = {
@@ -330,6 +335,7 @@
       });
       if (isSetDefaultKey) {
         selectedModuleKeys.value = [folderTree.value[0].id];
+        [activeFolder.value] = [folderTree.value[0].id];
         activeFolderName.value = folderTree.value[0].name;
         const offspringIds: string[] = [];
         mapTree(folderTree.value[0].children || [], (e) => {
@@ -754,7 +760,7 @@
     value: string | number | boolean | Record<string, any> | (string | number | boolean | Record<string, any>)[]
   ) {
     caseType.value = value as keyof typeof CaseLinkEnum;
-    initModules();
+    initModules(true);
     searchCase();
   }
 
@@ -763,7 +769,7 @@
     (val) => {
       if (val) {
         resetSelector();
-        initModules();
+        initModules(true);
         searchCase();
         initFilter();
       }
@@ -798,7 +804,7 @@
       if (!props.hideProjectSelect) {
         initProjectList(true);
       }
-      initModules();
+      initModules(true);
       searchCase();
       initFilter();
     }
diff --git a/frontend/src/views/api-test/report/component/case/setReportChart.vue b/frontend/src/views/api-test/report/component/case/setReportChart.vue
index e0d54d41d2..8b54e4ccca 100644
--- a/frontend/src/views/api-test/report/component/case/setReportChart.vue
+++ b/frontend/src/views/api-test/report/component/case/setReportChart.vue
@@ -1,12 +1,12 @@
 <template>
-  <div :class="`min-h-[${props.size || '110px'}] flex items-center`">
+  <div :class="`min-h-[${props.size || '120px'}] flex items-center`">
     <div class="relative mr-4">
-      <div :class="`${props.offset || defaultOffset} charts absolute text-center`">
+      <div class="charts">
         <div class="text-[12px] text-[(var(--color-text-4))]">{{ t('report.detail.api.total') }}</div>
         <a-popover position="bottom" content-class="response-popover-content">
-          <div class="flex justify-center text-[18px] font-medium">
-            <div class="one-line-text max-w-[60px]">{{ getIndicators(requestTotal) }}</div>
-          </div>
+          <div class="one-line-text w-full max-w-[90%] text-center text-[18px] font-medium">{{
+            getIndicators(requestTotal)
+          }}</div>
           <template #content>
             <div class="min-w-[176px] max-w-[400px] p-4 text-[14px]">
               <div class="text-[12px] font-medium text-[var(--color-text-4)]">{{ t('report.detail.api.total') }}</div>
@@ -18,7 +18,7 @@
         </a-popover>
       </div>
       <a-popover position="bottom" content-class="response-popover-content">
-        <div> <MsChart :width="props.size || '110px'" :height="props.size || '110px'" :options="props.options" /></div>
+        <div> <MsChart :width="props.size || '120px'" :height="props.size || '120px'" :options="props.options" /></div>
         <template #content>
           <div class="min-w-[176px] max-w-[400px] p-4">
             <div v-for="item of legendData" :key="item.value" class="mb-2 flex flex-nowrap justify-between">
@@ -68,10 +68,7 @@
     legendData: LegendData[];
     requestTotal: number;
     size?: string;
-    offset?: string;
   }>();
-
-  const defaultOffset = ref('top-[30%] right-0 bottom-0 left-0');
 </script>
 
 <style scoped lang="less">
@@ -91,5 +88,9 @@
   .charts {
     z-index: 99;
     margin: auto;
+    width: 66%;
+    height: 66%;
+    border-radius: 50%;
+    @apply absolute bottom-0 left-0 right-0 top-0 flex flex-col items-center justify-center;
   }
 </style>
diff --git a/frontend/src/views/setting/organization/serviceIntegration/locale/en-US.ts b/frontend/src/views/setting/organization/serviceIntegration/locale/en-US.ts
index f538a3c28a..ecfbe90c4d 100644
--- a/frontend/src/views/setting/organization/serviceIntegration/locale/en-US.ts
+++ b/frontend/src/views/setting/organization/serviceIntegration/locale/en-US.ts
@@ -1,9 +1,7 @@
 export default {
   'organization.service.searchPlugin': 'Search by plug-in name',
-  'system.service.statusEnableTip':
-    'Open: projects can integrate with the platform and generate default templates for the platform',
-  'system.service.statusDisableTip':
-    'Shutdown: the project can not integrate with the platform and the default template for the platform is not available',
+  'system.service.statusEnableTip': 'Open: Projects can be integrated with the platform',
+  'system.service.statusDisableTip': 'Shutdown: Projects cannot integrate with the platform',
   'organization.service.headerTip': 'Service integration usage guidelines',
   'organization.service.integrationList': 'Integration of List',
   'organization.service.packUp': 'Pack Up',
diff --git a/frontend/src/views/setting/organization/serviceIntegration/locale/zh-CN.ts b/frontend/src/views/setting/organization/serviceIntegration/locale/zh-CN.ts
index f58b48edf0..de5845d60e 100644
--- a/frontend/src/views/setting/organization/serviceIntegration/locale/zh-CN.ts
+++ b/frontend/src/views/setting/organization/serviceIntegration/locale/zh-CN.ts
@@ -1,7 +1,7 @@
 export default {
   'organization.service.searchPlugin': '通过插件名称搜索',
-  'organization.service.statusEnableTip': '开启：项目可以与该平台集成并生成该平台的默认模板',
-  'organization.service.statusDisableTip': '关闭：项目无法与该平台集成且该平台默认模板不可用',
+  'organization.service.statusEnableTip': '开启：项目可以与该平台集成',
+  'organization.service.statusDisableTip': '关闭：项目无法与该平台集成',
   'organization.service.headerTip': '服务集成 使用指引',
   'organization.service.integrationList': '集成列表',
   'organization.service.packUp': '收起',
diff --git a/frontend/src/views/test-plan/report/detail/component/bugTable.vue b/frontend/src/views/test-plan/report/detail/component/bugTable.vue
index 0e9b8556c0..4769a78414 100644
--- a/frontend/src/views/test-plan/report/detail/component/bugTable.vue
+++ b/frontend/src/views/test-plan/report/detail/component/bugTable.vue
@@ -17,6 +17,7 @@
   const props = defineProps<{
     reportId: string;
     shareId?: string;
+    isDelete: boolean;
   }>();
 
   const tableStore = useTableStore();
@@ -79,8 +80,10 @@
     loadList();
   }
 
-  onBeforeMount(() => {
-    loadCaseList();
+  watchEffect(() => {
+    if (props.reportId && !props.isDelete) {
+      loadCaseList();
+    }
   });
 
   await tableStore.initColumn(TableKeyEnum.TEST_PLAN_REPORT_DETAIL_BUG, columns, 'drawer');
diff --git a/frontend/src/views/test-plan/report/detail/component/featureCaseTable.vue b/frontend/src/views/test-plan/report/detail/component/featureCaseTable.vue
index 3bd95bb6dd..2f00eda8ba 100644
--- a/frontend/src/views/test-plan/report/detail/component/featureCaseTable.vue
+++ b/frontend/src/views/test-plan/report/detail/component/featureCaseTable.vue
@@ -32,6 +32,7 @@
   const props = defineProps<{
     reportId: string;
     shareId?: string;
+    isDelete: boolean;
   }>();
 
   const tableStore = useTableStore();
@@ -114,8 +115,10 @@
     loadList();
   }
 
-  onBeforeMount(() => {
-    loadCaseList();
+  watchEffect(() => {
+    if (props.reportId && !props.isDelete) {
+      loadCaseList();
+    }
   });
 
   await tableStore.initColumn(TableKeyEnum.TEST_PLAN_REPORT_DETAIL_FEATURE_CASE, columns, 'drawer');
diff --git a/frontend/src/views/test-plan/report/detail/component/planDetail.vue b/frontend/src/views/test-plan/report/detail/component/planDetail.vue
index 8ca5a5ea45..992482e737 100644
--- a/frontend/src/views/test-plan/report/detail/component/planDetail.vue
+++ b/frontend/src/views/test-plan/report/detail/component/planDetail.vue
@@ -88,13 +88,12 @@
       <div class="block-title">{{ t('report.detail.executionAnalysis') }}</div>
       <SetReportChart
         size="150px"
-        offset="top-[34%] right-0 bottom-0 left-0"
         :legend-data="legendData"
         :options="charOptions"
         :request-total="getIndicators(detail.caseTotal) || 0"
       />
     </div>
-    <div class="analysis min-w-[297px]">
+    <div class="analysis min-w-[330px]">
       <div class="block-title">{{ t('report.detail.useCaseAnalysis') }}</div>
       <div class="flex">
         <div class="w-[70%]">
@@ -103,23 +102,25 @@
           <SingleStatusProgress :detail="detail" status="block" />
           <SingleStatusProgress :detail="detail" status="error" />
         </div>
-        <div class="relative w-[30%] min-w-[120px]">
+        <div class="relative w-[30%] min-w-[150px]">
           <div class="charts absolute w-full text-center">
-            <div class="text-[12px] !text-[var(--color-text-4)]">{{ t('report.passRate') }}</div>
+            <div class="text-[12px] !text-[var(--color-text-4)]">{{ t('report.detail.api.total') }}</div>
             <a-popover position="bottom" content-class="response-popover-content">
               <div class="flex justify-center text-[18px] font-medium">
-                <div class="one-line-text max-w-[60px] text-[var(--color-text-1)]">{{ detail.passRate }}% </div>
+                <div class="one-line-text max-w-[80px] text-[var(--color-text-1)]">{{ functionCaseTotal }} </div>
               </div>
               <template #content>
                 <div class="min-w-[95px] max-w-[400px] p-4 text-[14px]">
-                  <div class="text-[12px] font-medium text-[var(--color-text-4)]">{{ t('report.passRate') }}</div>
-                  <div class="mt-2 text-[18px] font-medium text-[var(--color-text-1)]">{{ detail.passRate }} %</div>
+                  <div class="text-[12px] font-medium text-[var(--color-text-4)]">{{
+                    t('report.detail.api.total')
+                  }}</div>
+                  <div class="mt-2 text-[18px] font-medium text-[var(--color-text-1)]">{{ functionCaseTotal }}</div>
                 </div>
               </template>
             </a-popover>
           </div>
-          <div class="flex h-full w-full min-w-[120px] items-center justify-center">
-            <MsChart width="120px" height="120px" :options="functionCaseOptions"
+          <div class="flex h-full w-full min-w-[150px] items-center justify-center">
+            <MsChart width="150px" height="150px" :options="functionCaseOptions"
           /></div>
         </div>
       </div>
@@ -155,8 +156,13 @@
       no-content
       class="relative mb-[16px] border-b"
     />
-    <BugTable v-if="activeTab === 'bug'" :report-id="reportId" :share-id="shareId" />
-    <FeatureCaseTable v-if="activeTab === 'featureCase'" :report-id="reportId" :share-id="shareId" />
+    <BugTable v-if="activeTab === 'bug'" :report-id="reportId" :share-id="shareId" :is-delete="isDelete" />
+    <FeatureCaseTable
+      v-if="activeTab === 'featureCase'"
+      :report-id="reportId"
+      :is-delete="isDelete"
+      :share-id="shareId"
+    />
   </MsCard>
 </template>
 
@@ -222,6 +228,7 @@
   const shareId = ref<string>(route.query.shareId as string);
   const reportId = ref<string>(props.reportId);
   const shareLoading = ref<boolean>(false);
+  const isDelete = ref<boolean>(false);
   async function shareHandler() {
     try {
       const res = await planReportShare({
@@ -229,9 +236,7 @@
         projectId: appStore.currentProjectId,
       });
       const { origin } = window.location;
-      const hrefShareDetail = await planGetShareHref(res.id);
-      reportId.value = hrefShareDetail.reportId;
-      shareLink.value = `${origin}/#/${RouteEnum.SHARE}/${RouteEnum.SHARE_REPORT_TEST_PLAN}${res.shareUrl}&id=${hrefShareDetail.reportId}`;
+      shareLink.value = `${origin}/#/${RouteEnum.SHARE}/${RouteEnum.SHARE_REPORT_TEST_PLAN}${res.shareUrl}`;
       if (navigator.clipboard) {
         navigator.clipboard.writeText(shareLink.value).then(
           () => {
@@ -397,15 +402,20 @@
 
   async function getDetail() {
     try {
+      // 如果分享id存在则为分享页面
       if (shareId.value) {
-        const result = await planReportShareDetail(shareId.value, reportId.value);
-        if (result.deleted) {
+        // 获取分享资源的详情
+        const hrefShareDetail = await planGetShareHref(shareId.value);
+        if (hrefShareDetail.deleted) {
+          isDelete.value = hrefShareDetail.deleted;
           router.push({
             name: NOT_FOUND_RESOURCE,
           });
-        } else {
-          detail.value = result;
+          return;
         }
+        reportId.value = hrefShareDetail.reportId;
+        const result = await planReportShareDetail(shareId.value, reportId.value);
+        detail.value = result;
       } else {
         detail.value = await getReportDetail(reportId.value);
       }
@@ -442,6 +452,12 @@
     showButton.value = false;
   }
 
+  const functionCaseTotal = computed(() => {
+    const { functionalCount } = detail.value;
+    const { success, error, pending, block } = functionalCount;
+    return success + error + pending + block;
+  });
+
   const activeTab = ref('bug');
   const contentTabList = ref([
     {