From 2dcef4ad0cfd40bd3959fb2f1d980022416c86b4 Mon Sep 17 00:00:00 2001
From: teukkk <mengyuan.lv@fit2cloud.com>
Date: Wed, 3 Apr 2024 16:51:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=97=B6=E8=A6=81=E5=88=87=E6=8D=A2=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?tab&=E5=AE=9A=E4=B9=89=E9=A1=B5=E9=9D=A2=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=E6=98=BE=E7=A4=BA=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C&=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1038249 --user=吕梦园 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001038249
--bug=1037030 --user=吕梦园 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001037030
--bug=1037049 --user=吕梦园 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001037049
--bug=1038227 --user=吕梦园 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001038227
---
 frontend/src/models/apiTest/scenario.ts          |  1 +
 .../views/api-test/components/batchAddKeyVal.vue |  7 ++++++-
 .../components/requestComposition/index.vue      | 16 ++++++++++++++++
 .../requestComposition/response/index.vue        | 10 ++++++----
 .../management/components/management/index.vue   |  8 +++++++-
 frontend/src/views/api-test/management/index.vue |  1 +
 .../api-test/scenario/components/baseInfo.vue    |  4 ++--
 7 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/frontend/src/models/apiTest/scenario.ts b/frontend/src/models/apiTest/scenario.ts
index 9c74d81d0a..9c6ff329d3 100644
--- a/frontend/src/models/apiTest/scenario.ts
+++ b/frontend/src/models/apiTest/scenario.ts
@@ -419,6 +419,7 @@ export interface ScenarioDetail extends Scenario {
   latest: boolean;
   modulePath: string;
   createUser: string;
+  createUserName: string;
   createTime: number;
   updateTime: number;
   updateUser: string;
diff --git a/frontend/src/views/api-test/components/batchAddKeyVal.vue b/frontend/src/views/api-test/components/batchAddKeyVal.vue
index bc3478fcb4..08bc81466b 100644
--- a/frontend/src/views/api-test/components/batchAddKeyVal.vue
+++ b/frontend/src/views/api-test/components/batchAddKeyVal.vue
@@ -18,7 +18,7 @@
             size="16"
           />
           <template #content>
-            <div>{{ props?.addTypeText || t('apiTestDebug.batchAddParamsTip1') }}</div>
+            <div v-if="props?.addTypeText">{{ props?.addTypeText }}</div>
             <div v-if="!props.noParamType">{{ t('apiTestDebug.batchAddParamsTip2') }}</div>
             <div>{{ t('apiTestDebug.batchAddParamsTip3') }}</div>
           </template>
@@ -35,6 +35,11 @@
         :show-full-screen="false"
         :show-theme-change="false"
       >
+        <template v-if="!props?.addTypeText" #rightTitle>
+          <div class="text-xs text-[var(--color-text-4)]">
+            {{ t('apiTestDebug.batchAddParamsTip1') }}
+          </div>
+        </template>
       </MsCodeEditor>
     </div>
   </MsDrawer>
diff --git a/frontend/src/views/api-test/components/requestComposition/index.vue b/frontend/src/views/api-test/components/requestComposition/index.vue
index 3e0990856b..6c1ee95bbf 100644
--- a/frontend/src/views/api-test/components/requestComposition/index.vue
+++ b/frontend/src/views/api-test/components/requestComposition/index.vue
@@ -283,9 +283,11 @@
             <template #second>
               <response
                 v-show="showResponse"
+                ref="responseRef"
                 v-model:active-layout="activeLayout"
                 v-model:active-tab="requestVModel.responseActiveTab"
                 v-model:response-definition="requestVModel.responseDefinition"
+                :show-response-result-button="requestVModel.mode === 'debug'"
                 :is-http-protocol="isHttpProtocol"
                 :is-priority-local-exec="isPriorityLocalExec"
                 :request-url="requestVModel.url"
@@ -1340,6 +1342,8 @@
     requestVModel.value.executeLoading = false;
   }
 
+  const responseRef = ref<InstanceType<typeof response>>();
+
   watch(
     () => requestVModel.value.id,
     async () => {
@@ -1361,6 +1365,9 @@
         // 如果定义有参数BODY/QUERY/REST，用例默认tab是参数tab
         requestVModel.value.activeTab = contentTabList.value[1].value;
       }
+      if (!props.isCase) {
+        responseRef.value?.setActiveResponse(requestVModel.value.mode === 'debug' ? 'result' : 'content');
+      }
       if (props.request.isExecute && !requestVModel.value.executeLoading) {
         // 如果是执行操作打开接口详情，且该接口不在执行状态中，则立即执行
         execute(isPriorityLocalExec.value ? 'localExec' : 'serverExec');
@@ -1376,6 +1383,15 @@
     }
   );
 
+  watch(
+    () => requestVModel.value?.mode,
+    (val: 'debug' | 'definition' | undefined) => {
+      if (val) {
+        responseRef.value?.setActiveResponse(val === 'debug' ? 'result' : 'content');
+      }
+    }
+  );
+
   async function updateRequest() {
     try {
       if (!props.updateApi) return;
diff --git a/frontend/src/views/api-test/components/requestComposition/response/index.vue b/frontend/src/views/api-test/components/requestComposition/response/index.vue
index 8d20760f3b..776fe1a2e7 100644
--- a/frontend/src/views/api-test/components/requestComposition/response/index.vue
+++ b/frontend/src/views/api-test/components/requestComposition/response/index.vue
@@ -24,10 +24,7 @@
               <icon-right :size="8" />
             </MsButton>
           </template>
-          <div
-            v-if="props.isEdit && props.requestResult?.responseResult?.responseCode"
-            class="ml-[4px] flex items-center"
-          >
+          <div v-if="props.isEdit && props.showResponseResultButton" class="ml-[4px] flex items-center">
             <MsButton
               type="text"
               :class="['font-medium', activeResponseType === 'content' ? '' : '!text-[var(--color-text-n4)]', '!mr-0']"
@@ -116,6 +113,7 @@
       isDefinition?: boolean;
       isResponseModel?: boolean;
       showEmpty?: boolean;
+      showResponseResultButton?: boolean; // 展示执行结果按钮
     }>(),
     {
       isExpanded: true,
@@ -212,6 +210,10 @@
       }
     }
   );
+
+  defineExpose({
+    setActiveResponse,
+  });
 </script>
 
 <style lang="less" scoped>
diff --git a/frontend/src/views/api-test/management/components/management/index.vue b/frontend/src/views/api-test/management/components/management/index.vue
index 21f58b0d3b..24f7547f3d 100644
--- a/frontend/src/views/api-test/management/components/management/index.vue
+++ b/frontend/src/views/api-test/management/components/management/index.vue
@@ -210,10 +210,15 @@
     }
   );
 
+  // 切换到第一个tab
+  function changeActiveApiTabTofirst() {
+    activeApiTab.value = apiTabs.value[0] as RequestParam;
+  }
+
   // 下拉框切换
   function currentTabChange(val: any) {
     apiTabs.value[0].label = val === 'api' ? t('apiTestManagement.allApi') : t('case.allCase');
-    activeApiTab.value = apiTabs.value[0] as RequestParam;
+    changeActiveApiTabTofirst();
   }
 
   watch(
@@ -305,6 +310,7 @@
     refreshApiTable,
     handleApiUpdateFromModuleTree,
     handleDeleteApiFromModuleTree,
+    changeActiveApiTabTofirst,
   });
 </script>
 
diff --git a/frontend/src/views/api-test/management/index.vue b/frontend/src/views/api-test/management/index.vue
index c4370db679..1ecb4c4bab 100644
--- a/frontend/src/views/api-test/management/index.vue
+++ b/frontend/src/views/api-test/management/index.vue
@@ -106,6 +106,7 @@
   function handleNodeSelect(keys: string[], _offspringIds: string[]) {
     [activeModule.value] = keys;
     offspringIds.value = _offspringIds;
+    managementRef.value?.changeActiveApiTabTofirst();
   }
 
   function handleApiNodeClick(node: ModuleTreeNode) {
diff --git a/frontend/src/views/api-test/scenario/components/baseInfo.vue b/frontend/src/views/api-test/scenario/components/baseInfo.vue
index c85b6eaf46..4ce01617a5 100644
--- a/frontend/src/views/api-test/scenario/components/baseInfo.vue
+++ b/frontend/src/views/api-test/scenario/components/baseInfo.vue
@@ -62,8 +62,8 @@
       />
     </a-form-item>
     <template v-if="props.isEdit">
-      <a-form-item field="createUser" :label="t('apiScenario.table.columns.createUser')" class="mb-[16px]">
-        <a-input :model-value="(scenario as ScenarioDetail).createUser" disabled />
+      <a-form-item field="createUserName" :label="t('apiScenario.table.columns.createUser')" class="mb-[16px]">
+        <a-input :model-value="(scenario as ScenarioDetail).createUserName" disabled />
       </a-form-item>
       <a-form-item field="createTime" :label="t('apiScenario.table.columns.createTime')" class="mb-[16px]">
         <a-input :model-value="dayjs((scenario as ScenarioDetail).createTime).format('YYYY-MM-DD HH:mm:ss')" disabled />