From 0e5c550b70a0155060b434260dc4f40ce9e09174 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Thu, 25 Apr 2024 12:11:20 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA&=E6=96=AD=E8=A8=80=E6=A0=B7=E5=BC=8F&=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E7=AE=A1=E7=90=86=E6=96=B0=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ms-assertion/comp/ResponseBodyTab.vue     |  5 +-
 .../api-test/debug/components/moduleTree.vue  |  2 +-
 .../management/components/moduleTree.vue      |  2 +-
 .../report/component/step/stepTree.vue        |  3 ++
 .../components/scenarioModuleTree.vue         |  3 +-
 .../caseManagementFeature/index.vue           | 46 +++++++++++++------
 6 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/frontend/src/components/business/ms-assertion/comp/ResponseBodyTab.vue b/frontend/src/components/business/ms-assertion/comp/ResponseBodyTab.vue
index 68448714ce..afcf316260 100644
--- a/frontend/src/components/business/ms-assertion/comp/ResponseBodyTab.vue
+++ b/frontend/src/components/business/ms-assertion/comp/ResponseBodyTab.vue
@@ -456,13 +456,13 @@
       title: 'ms.assertion.expression',
       dataIndex: 'expression',
       slotName: 'expression',
-      width: 300,
     },
     {
       title: 'ms.assertion.matchCondition',
       dataIndex: 'condition',
       slotName: 'condition',
       options: statusCodeOptions,
+      width: 150,
     },
     {
       title: 'ms.assertion.matchValue',
@@ -475,7 +475,7 @@
       title: '',
       slotName: 'operation',
       fixed: 'right',
-      width: 130,
+      width: 80,
       moreAction: [
         {
           eventTag: 'copy',
@@ -702,6 +702,7 @@
     config: RegexExtract | JSONPathExtract | XPathExtract,
     matchResult: Record<string, any>
   ) {
+    debugger;
     condition.value.jsonPathAssertion.assertions = condition.value.jsonPathAssertion.assertions?.map((e: Param) => {
       if (e.id === activeRecord.value.id) {
         return {
diff --git a/frontend/src/views/api-test/debug/components/moduleTree.vue b/frontend/src/views/api-test/debug/components/moduleTree.vue
index 6ff66d9249..f51fdcbcd5 100644
--- a/frontend/src/views/api-test/debug/components/moduleTree.vue
+++ b/frontend/src/views/api-test/debug/components/moduleTree.vue
@@ -7,7 +7,7 @@
         type="primary"
         @click="handleSelect('newApi')"
       >
-        {{ t('apiTestDebug.newApi') }}
+        {{ t('common.newCreate') }}
         <template #icon>
           <icon-down />
         </template>
diff --git a/frontend/src/views/api-test/management/components/moduleTree.vue b/frontend/src/views/api-test/management/components/moduleTree.vue
index ad9badbc29..4e01a725ed 100644
--- a/frontend/src/views/api-test/management/components/moduleTree.vue
+++ b/frontend/src/views/api-test/management/components/moduleTree.vue
@@ -23,7 +23,7 @@
             type="primary"
             @click="handleSelect('newApi')"
           >
-            {{ t('apiTestManagement.newApi') }}
+            {{ t('common.newCreate') }}
             <template #icon>
               <icon-down />
             </template>
diff --git a/frontend/src/views/api-test/report/component/step/stepTree.vue b/frontend/src/views/api-test/report/component/step/stepTree.vue
index 2943368847..b22ea6fc7e 100644
--- a/frontend/src/views/api-test/report/component/step/stepTree.vue
+++ b/frontend/src/views/api-test/report/component/step/stepTree.vue
@@ -503,4 +503,7 @@
     height: 100%;
     height: 1000px;
   }
+  :deep(.step-tree-node-title) {
+    width: 100%;
+  }
 </style>
diff --git a/frontend/src/views/api-test/scenario/components/scenarioModuleTree.vue b/frontend/src/views/api-test/scenario/components/scenarioModuleTree.vue
index 4d69942b78..eb2a1e685c 100644
--- a/frontend/src/views/api-test/scenario/components/scenarioModuleTree.vue
+++ b/frontend/src/views/api-test/scenario/components/scenarioModuleTree.vue
@@ -15,7 +15,8 @@
             emit('newScenario');
           }
         "
-        >{{ t('apiScenario.createScenario') }}</a-button
+      >
+        {{ t('common.newCreate') }}</a-button
       >
     </div>
     <div class="folder" @click="setActiveFolder('all')">
diff --git a/frontend/src/views/case-management/caseManagementFeature/index.vue b/frontend/src/views/case-management/caseManagementFeature/index.vue
index 97af2668ea..da4bd51112 100644
--- a/frontend/src/views/case-management/caseManagementFeature/index.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/index.vue
@@ -11,19 +11,26 @@
                 allow-clear
                 :max-length="255"
               />
-              <a-dropdown position="br">
-                <a-button class="ml-2" type="primary">
-                  {{ t('common.newCreate') }}
-                </a-button>
-                <template #content>
-                  <a-doption v-permission="['FUNCTIONAL_CASE:READ+ADD']" @click="caseDetail">{{
-                    t('caseManagement.featureCase.creatingCase')
-                  }}</a-doption>
-                  <a-doption v-permission="['FUNCTIONAL_CASE:READ+IMPORT']" @click="importCase('Excel')">{{
-                    t('caseManagement.featureCase.importExcel')
-                  }}</a-doption>
+              <a-dropdown-button
+                v-if="hasAllPermission(['FUNCTIONAL_CASE:READ+ADD', 'FUNCTIONAL_CASE:READ+IMPORT'])"
+                class="ml-2"
+                type="primary"
+                @click="handleSelect('newCase')"
+              >
+                {{ t('common.newCreate') }}
+                <template #icon>
+                  <icon-down />
                 </template>
-              </a-dropdown>
+                <template #content>
+                  <a-doption
+                    v-permission="['FUNCTIONAL_CASE:READ+IMPORT']"
+                    value="Excel"
+                    @click="handleSelect('import', 'Excel')"
+                  >
+                    {{ t('caseManagement.featureCase.importExcel') }}
+                  </a-doption>
+                </template>
+              </a-dropdown-button>
             </div>
 
             <div class="case h-[38px]">
@@ -163,7 +170,7 @@
   import { useI18n } from '@/hooks/useI18n';
   import useAppStore from '@/store/modules/app';
   import useFeatureCaseStore from '@/store/modules/case/featureCase';
-  import { hasAnyPermission } from '@/utils/permission';
+  import { hasAllPermission, hasAnyPermission } from '@/utils/permission';
 
   import type { CaseModuleQueryParams, CreateOrUpdateModule, ValidateInfo } from '@/models/caseManagement/featureCase';
   import { TableQueryParams } from '@/models/common';
@@ -408,6 +415,19 @@
     }
   }
 
+  function handleSelect(value: string | number | Record<string, any> | undefined, type?: 'Excel' | 'Xmind') {
+    switch (value) {
+      case 'newCase':
+        caseDetail();
+        break;
+      case 'import':
+        importCase(type as 'Excel' | 'Xmind');
+        break;
+      default:
+        break;
+    }
+  }
+
   function dragUpdate() {
     caseTableRef.value.emitTableParams();
   }