From ccda1a8b6bdc7cf58ffc7c5af0565b3b1f9161c6 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Tue, 16 Apr 2024 18:51:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=94=E7=94=A8=E8=AE=BE=E7=BD=AE=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E9=9C=80=E6=B1=82=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?bugs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pure/ms-form-create/comp/jiraKey.vue      |  4 ++--
 .../component/step/reportInfoHeaders.vue      |  9 +++++++
 .../menuManagement/components/defectSync.vue  |  6 ++---
 .../menuManagement/components/relatedCase.vue | 24 +++++++++++++++++++
 .../menuManagement/menuManagement.vue         |  7 ++++--
 .../taskCenter/component/apiCase.vue          |  2 +-
 6 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/pure/ms-form-create/comp/jiraKey.vue b/frontend/src/components/pure/ms-form-create/comp/jiraKey.vue
index 2d14181c34..c0acd80608 100644
--- a/frontend/src/components/pure/ms-form-create/comp/jiraKey.vue
+++ b/frontend/src/components/pure/ms-form-create/comp/jiraKey.vue
@@ -7,7 +7,7 @@
     @blur="handleBlur"
   />
   <div class="flex flex-row items-center gap-[10px] text-[12px] leading-[16px]">
-    <span class="text-[var(--color-text-4)]">{{ attrs.subDesc }}</span>
+    <span class="mt-2 text-[var(--color-text-4)]">{{ attrs.subDesc }}</span>
     <a-popover position="rt">
       <template #title>
         {{ null }}
@@ -17,7 +17,7 @@
           <img class="w-full" :src="previewIcon" />
         </div>
       </template>
-      <span class="cursor-pointer text-[rgb(var(--primary-5))]">{{ t('project.menu.preview') }}</span>
+      <span class="mt-2 cursor-pointer text-[rgb(var(--primary-5))]">{{ t('project.menu.preview') }}</span>
     </a-popover>
   </div>
 </template>
diff --git a/frontend/src/views/api-test/report/component/step/reportInfoHeaders.vue b/frontend/src/views/api-test/report/component/step/reportInfoHeaders.vue
index 172ada409b..ec3a5a9aac 100644
--- a/frontend/src/views/api-test/report/component/step/reportInfoHeaders.vue
+++ b/frontend/src/views/api-test/report/component/step/reportInfoHeaders.vue
@@ -19,6 +19,15 @@
         :virtual-list-props="{ height: 200 }"
         :placeholder="t('report.detail.api.filterPlaceholder')"
       >
+        <template #label="{ data }">
+          <a-tooltip
+            :content="`${cascaderOptions.find((item: any) => innerKeyword.includes(item.value))?.label} / ${data.label}`"
+          >
+            <div class="one-line-text inline-flex w-full items-center justify-between pr-[8px]" title="">
+              {{ cascaderOptions.find((item: any) => innerKeyword.includes(item.value))?.label }} / {{ data.label }}
+            </div>
+          </a-tooltip>
+        </template>
         <template #option="{ data }">
           <div title="">
             <a-tooltip :content="t(data.label)">
diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue b/frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue
index 054eca02f5..338452e9e7 100644
--- a/frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue
+++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue
@@ -73,10 +73,10 @@
       <a-form-item field="CRON_EXPRESSION" :label="t('project.menu.CRON_EXPRESSION')">
         <a-select v-model="form.CRON_EXPRESSION">
           <a-option v-for="data in frequencyOption" :key="data.value" :value="data.value">
-            <span class="text-[var(--color-text-1)]">
-              {{ data.label }}
+            <span class="text-[var(--color-text-2)]"> {{ data.label }}</span
+            ><span class="ml-1 text-[var(--color-text-n4)] hover:text-[rgb(var(--primary-5))]">
+              {{ data.extra }}
             </span>
-            <span v-if="data.extra" class="text-[var(--color-text-4)]"> {{ data.extra }} </span>
           </a-option>
           <!--          <a-option value="custom">
             <div class="border-t-1 cursor-pointer text-[rgb(var(&#45;&#45;primary-5))]">{{
diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/components/relatedCase.vue b/frontend/src/views/project-management/projectAndPermission/menuManagement/components/relatedCase.vue
index 7ef755533a..55a3f2194f 100644
--- a/frontend/src/views/project-management/projectAndPermission/menuManagement/components/relatedCase.vue
+++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/components/relatedCase.vue
@@ -33,6 +33,8 @@
         v-model:api="fApi"
         v-model:form-item="platformItem"
         :form-rule="platformRules"
+        @change="changeHandler"
+        @mounted="handleMounted"
       />
     </a-form>
     <template v-if="platformOption.length" #footerLeft>
@@ -118,6 +120,7 @@
 
   const emit = defineEmits<{
     (e: 'cancel', shouldSearch: boolean): void;
+    (e: 'ok'): void;
   }>();
 
   const resetForm = () => {
@@ -167,6 +170,7 @@
           currentProjectId.value
         );
         handleCancel(true);
+        emit('ok');
       } catch (error) {
         // eslint-disable-next-line no-console
         console.error(error);
@@ -205,6 +209,26 @@
     }
   };
 
+  /**
+   * 初始化回显字段值
+   */
+  function setValue() {
+    const tempObj: Record<string, any> = {};
+    platformRules.value.forEach((item) => {
+      tempObj[item.name] = item.value;
+    });
+    fApi.value?.setValue({ ...tempObj });
+  }
+
+  function changeHandler(a: string, formValue: Record<string, any>) {
+    fApi.value.validateField(formValue.field);
+    fApi.value.refreshValidate();
+  }
+
+  function handleMounted() {
+    setValue();
+  }
+
   watch(
     () => props.visible,
     (val) => {
diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue b/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue
index 93d49c131d..24e5dc003f 100644
--- a/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue
+++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue
@@ -392,7 +392,11 @@
     </template>
   </MsBaseTable>
   <DefectSync v-model:visible="defectDrawerVisible" @cancel="defectDrawerVisible = false" @ok="initMenuData()" />
-  <RelatedCase v-model:visible="relatedCaseDrawerVisible" @cancel="relatedCaseDrawerVisible = false" />
+  <RelatedCase
+    v-model:visible="relatedCaseDrawerVisible"
+    @cancel="relatedCaseDrawerVisible = false"
+    @ok="initMenuData()"
+  />
 </template>
 
 <script setup lang="ts">
@@ -727,7 +731,6 @@
   };
 
   const handleMenuStatusChange = async (type: string, typeValue: string | boolean, suffix: string) => {
-    debugger;
     try {
       let hasAuth = false;
       switch (suffix) {
diff --git a/frontend/src/views/project-management/taskCenter/component/apiCase.vue b/frontend/src/views/project-management/taskCenter/component/apiCase.vue
index cbc131c950..e0d8806fff 100644
--- a/frontend/src/views/project-management/taskCenter/component/apiCase.vue
+++ b/frontend/src/views/project-management/taskCenter/component/apiCase.vue
@@ -48,7 +48,7 @@
           trigger="click"
           @popup-visible-change="handleFilterHidden"
         >
-          <a-button type="text" class="arco-btn-text--secondary p-[8px_4px]" @click="statusFilterVisible = true">
+          <a-button type="text" class="arco-btn-text--secondary p-[8px_4px]" @click.stop="statusFilterVisible = true">
             <div class="font-medium">
               {{ t(columnConfig.title as string) }}
             </div>