From 5d6d392768d9a444efdb3f340275fed746ba713d Mon Sep 17 00:00:00 2001
From: teukkk <mengyuan.lv@fit2cloud.com>
Date: Tue, 9 Apr 2024 19:11:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=BA=E6=99=AF=E8=AF=A6=E6=83=85=E4=B8=AD?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=8E=86=E5=8F=B2=E7=9A=84=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=8A=BD=E5=B1=89&=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=AD=90=E6=A8=A1=E5=9D=97=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1038771 --user=吕梦园 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001038771
--bug=1038703 --user=吕梦园 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001038703
---
 frontend/config/vite.config.dev.ts            | 14 ++---
 .../management/components/moduleTree.vue      | 47 ++++++----------
 .../scenario/components/executeHistory.vue    | 10 +++-
 .../components/scenarioModuleTree.vue         | 56 ++++++-------------
 4 files changed, 48 insertions(+), 79 deletions(-)

diff --git a/frontend/config/vite.config.dev.ts b/frontend/config/vite.config.dev.ts
index f93feff307..e7ddff02fc 100644
--- a/frontend/config/vite.config.dev.ts
+++ b/frontend/config/vite.config.dev.ts
@@ -13,38 +13,38 @@ export default mergeConfig(
       },
       proxy: {
         '/ws': {
-          target: 'https://qadevtest.fit2cloud.com/',
+          target: 'http://172.16.200.18:8081/',
           changeOrigin: true,
           rewrite: (path: string) => path.replace(/^\/front\/ws/, ''),
           ws: true,
         },
         '/front': {
-          target: 'https://qadevtest.fit2cloud.com/',
+          target: 'http://172.16.200.18:8081/',
           changeOrigin: true,
           rewrite: (path: string) => path.replace(/^\/front/, ''),
         },
         '/file': {
-          target: 'https://qadevtest.fit2cloud.com/',
+          target: 'http://172.16.200.18:8081/',
           changeOrigin: true,
           rewrite: (path: string) => path.replace(/^\/front\/file/, ''),
         },
         '/attachment': {
-          target: 'https://qadevtest.fit2cloud.com/',
+          target: 'http://172.16.200.18:8081/',
           changeOrigin: true,
           rewrite: (path: string) => path.replace(/^\/front\/attachment/, ''),
         },
         '/bug/attachment': {
-          target: 'https://qadevtest.fit2cloud.com/',
+          target: 'http://172.16.200.18:8081/',
           changeOrigin: true,
           rewrite: (path: string) => path.replace(/^\/front\/bug\/attachment/, ''),
         },
         '/plugin/image': {
-          target: 'https://qadevtest.fit2cloud.com/',
+          target: 'http://172.16.200.18:8081/',
           changeOrigin: true,
           rewrite: (path: string) => path.replace(/^\/front\/plugin\/image/, ''),
         },
         '/base-display': {
-          target: 'https://qadevtest.fit2cloud.com/',
+          target: 'http://172.16.200.18:8081/',
           changeOrigin: true,
           rewrite: (path: string) => path.replace(/^\/front\/base-display/, ''),
         },
diff --git a/frontend/src/views/api-test/management/components/moduleTree.vue b/frontend/src/views/api-test/management/components/moduleTree.vue
index 6b1a709a1b..5abf1938c9 100644
--- a/frontend/src/views/api-test/management/components/moduleTree.vue
+++ b/frontend/src/views/api-test/management/components/moduleTree.vue
@@ -69,34 +69,22 @@
               <MsIcon :type="isExpandAll ? 'icon-icon_folder_collapse1' : 'icon-icon_folder_expansion1'" />
             </MsButton>
           </a-tooltip>
-          <template v-if="!props.readOnly && !props.trash">
-            <a-dropdown @select="handleSelect">
-              <MsButton v-permission="['PROJECT_API_DEFINITION:READ+ADD']" type="icon" class="!mr-0 p-[2px]">
-                <MsIcon
-                  type="icon-icon_create_planarity"
-                  size="18"
-                  class="text-[rgb(var(--primary-5))] hover:text-[rgb(var(--primary-4))]"
-                />
-              </MsButton>
-              <template #content>
-                <a-doption v-permission="['PROJECT_API_DEFINITION:READ+ADD']" value="newApi">{{
-                  t('apiTestManagement.newApi')
-                }}</a-doption>
-                <a-doption v-permission="['PROJECT_API_DEFINITION:READ+ADD']" value="addModule">{{
-                  t('apiTestManagement.addSubModule')
-                }}</a-doption>
-              </template>
-            </a-dropdown>
-            <popConfirm
-              mode="add"
-              :all-names="rootModulesName"
-              parent-id="NONE"
-              :add-module-api="addModule"
-              @add-finish="handleAddFinish"
-            >
-              <span id="addModulePopSpan"></span>
-            </popConfirm>
-          </template>
+          <popConfirm
+            v-if="hasAnyPermission(['PROJECT_API_DEFINITION:READ+ADD']) && !props.readOnly && !props.trash"
+            mode="add"
+            :all-names="rootModulesName"
+            parent-id="NONE"
+            :add-module-api="addModule"
+            @add-finish="handleAddFinish"
+          >
+            <MsButton type="icon" class="!mr-0 p-[2px]">
+              <MsIcon
+                type="icon-icon_create_planarity"
+                size="18"
+                class="text-[rgb(var(--primary-5))] hover:text-[rgb(var(--primary-4))]"
+              />
+            </MsButton>
+          </popConfirm>
         </div>
       </div>
       <a-divider class="my-[8px]" />
@@ -283,9 +271,6 @@
       case 'import':
         emit('import');
         break;
-      case 'addModule':
-        document.querySelector('#addModulePopSpan')?.dispatchEvent(new Event('click'));
-        break;
       default:
         break;
     }
diff --git a/frontend/src/views/api-test/scenario/components/executeHistory.vue b/frontend/src/views/api-test/scenario/components/executeHistory.vue
index 2ecf4f0c06..e901d0d4c4 100644
--- a/frontend/src/views/api-test/scenario/components/executeHistory.vue
+++ b/frontend/src/views/api-test/scenario/components/executeHistory.vue
@@ -97,6 +97,8 @@
         </MsButton>
       </template>
     </ms-base-table>
+    <!-- 场景报告抽屉 -->
+    <caseAndScenarioReportDrawer v-model:visible="showScenarioReportVisible" is-scenario :report-id="reportId" />
   </div>
 </template>
 
@@ -108,6 +110,7 @@
   import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
   import { MsTableColumn } from '@/components/pure/ms-table/type';
   import useTable from '@/components/pure/ms-table/useTable';
+  import caseAndScenarioReportDrawer from '@/views/api-test/components/caseAndScenarioReportDrawer.vue';
   import ExecuteStatus from '@/views/api-test/scenario/components/executeStatus.vue';
 
   import { getExecuteHistory } from '@/api/modules/api-test/scenario';
@@ -241,7 +244,12 @@
     loadExecuteHistoryList();
   }
 
-  function showResult(record: ExecuteHistoryItem) {}
+  const showScenarioReportVisible = ref(false);
+  const reportId = ref('');
+  function showResult(record: ExecuteHistoryItem) {
+    reportId.value = record.id;
+    showScenarioReportVisible.value = true;
+  }
 
   onBeforeMount(() => {
     loadExecuteHistoryList();
diff --git a/frontend/src/views/api-test/scenario/components/scenarioModuleTree.vue b/frontend/src/views/api-test/scenario/components/scenarioModuleTree.vue
index a6e1a012d7..edb3fd51b5 100644
--- a/frontend/src/views/api-test/scenario/components/scenarioModuleTree.vue
+++ b/frontend/src/views/api-test/scenario/components/scenarioModuleTree.vue
@@ -30,30 +30,22 @@
             <MsIcon :type="isExpandAll ? 'icon-icon_folder_collapse1' : 'icon-icon_folder_expansion1'" />
           </MsButton>
         </a-tooltip>
-        <template v-if="!props.readOnly">
-          <a-dropdown @select="handleSelect">
-            <MsButton v-permission="['PROJECT_API_SCENARIO:READ+ADD']" type="icon" class="!mr-0 p-[2px]">
-              <MsIcon
-                type="icon-icon_create_planarity"
-                size="18"
-                class="text-[rgb(var(--primary-5))] hover:text-[rgb(var(--primary-4))]"
-              />
-            </MsButton>
-            <template #content>
-              <a-doption value="newScenario">{{ t('apiScenario.createScenario') }}</a-doption>
-              <a-doption value="addModule">{{ t('apiScenario.createSubModule') }}</a-doption>
-            </template>
-          </a-dropdown>
-          <popConfirm
-            mode="add"
-            :all-names="rootModulesName"
-            parent-id="NONE"
-            :add-module-api="addModule"
-            @add-finish="initModules"
-          >
-            <span id="addModulePopSpan"></span>
-          </popConfirm>
-        </template>
+        <popConfirm
+          v-if="hasAnyPermission(['PROJECT_API_SCENARIO:READ+ADD']) && !props.readOnly"
+          mode="add"
+          :all-names="rootModulesName"
+          parent-id="NONE"
+          :add-module-api="addModule"
+          @add-finish="initModules"
+        >
+          <MsButton type="icon" class="!mr-0 p-[2px]">
+            <MsIcon
+              type="icon-icon_create_planarity"
+              size="18"
+              class="text-[rgb(var(--primary-5))] hover:text-[rgb(var(--primary-4))]"
+            />
+          </MsButton>
+        </popConfirm>
       </div>
     </div>
     <a-divider class="my-[8px]" />
@@ -184,22 +176,6 @@
   const { t } = useI18n();
   const { openModal } = useModal();
 
-  function handleSelect(value: string | number | Record<string, any> | undefined) {
-    switch (value) {
-      case 'newScenario':
-        emit('newScenario');
-        break;
-      case 'import':
-        emit('import');
-        break;
-      case 'addModule':
-        document.querySelector('#addModulePopSpan')?.dispatchEvent(new Event('click'));
-        break;
-      default:
-        break;
-    }
-  }
-
   const virtualListProps = computed(() => {
     if (props.readOnly) {
       return {