From d4b5219e08a7f75330cf930f477130ff08e81cef Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Tue, 14 Nov 2023 16:24:34 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=EF=BC=8C=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=EF=BC=8C=E8=BF=87=E6=BB=A4=E5=99=A8=E6=BC=8F?=
 =?UTF-8?q?=E6=96=97=E5=9B=BE=E6=A0=87=E4=BD=8D=E7=BD=AE=E9=94=99=E4=BD=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20-=20[=E4=BF=AE=E5=A4=8D]=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=EF=BC=8C=E4=BB=8E=E9=AB=98=E7=BA=A7=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E5=88=87=E6=8D=A2=E5=88=B0=E7=AE=80=E5=8D=95=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E7=AE=80=E5=8D=95=E6=A8=A1=E5=BC=8F=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E9=9D=A2=E6=9D=BF=E6=B2=A1=E6=9C=89=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/executionMode/filters.vue  |  3 +++
 .../autoexec/components/common/filter-search.vue | 16 ++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/views/pages/autoexec/components/common/executionMode/filters.vue b/src/views/pages/autoexec/components/common/executionMode/filters.vue
index 119525488..c27b41b20 100644
--- a/src/views/pages/autoexec/components/common/executionMode/filters.vue
+++ b/src/views/pages/autoexec/components/common/executionMode/filters.vue
@@ -228,6 +228,9 @@ export default {
 .search{
   width: 100%;
   display: inline-block;
+  /deep/ .btn-filter {
+    top: 7px;// 修复漏洞图标对不齐问题
+  }
 }
 .padding-top{
   padding-top: 8px;
diff --git a/src/views/pages/autoexec/components/common/filter-search.vue b/src/views/pages/autoexec/components/common/filter-search.vue
index e1408e7bb..e957587c8 100644
--- a/src/views/pages/autoexec/components/common/filter-search.vue
+++ b/src/views/pages/autoexec/components/common/filter-search.vue
@@ -20,7 +20,7 @@
       type="fix"
     ></Loading>
     <CombineSearcher
-      v-if="!loadingShow && isSimpleMode"
+      v-show="!loadingShow && isSimpleMode"
       ref="combineSearcher"
       v-model="searchVal"
       searchMode="clickBtnSearch"
@@ -32,7 +32,7 @@
       :readonly="readonly"
       :showSearchNumber="showSearchNumber"
       @confirm="simpleModeSearch"
-      @switchMode="switchToSimpleMode"
+      @switchMode="switchMode"
     >
     </CombineSearcher>
     <AdvancedModeSearch
@@ -44,7 +44,7 @@
       :disabledUuidList="disabledUuidList"
       :disabledGroupUuidList="disabledGroupUuidList"
       @search="advancedModeSearch"
-      @switchMode="switchToSimpleMode"
+      @switchMode="switchMode"
       @clickMoreBtn="() => $emit('clickMoreBtn')"
     >
     </AdvancedModeSearch>
@@ -87,6 +87,7 @@ export default {
         labelWidth: 100,
         search: true,
         keywordText: this.$t('page.keyword'),
+        isShowAdvanceMode: true,
         searchList: [
           {
             type: 'tree',
@@ -470,13 +471,8 @@ export default {
       }
       this.complexSearchVal = (this.defaultValue && !this.$utils.isEmptyObj(this.defaultValue)) ? this.defaultValue : this.defaultSearchValue;
     },
-    switchComplexMode() {
-      // 切换到复杂模式
-      this.isSimpleMode = !this.isSimpleMode;
-      this.$refs.advancedModeSearch && this.$refs.advancedModeSearch.openDropdown();
-    },
-    switchToSimpleMode() {
-      // 切换到简单模式
+    switchMode() {
+      // 切换模式
       this.isSimpleMode = !this.isSimpleMode;
       this.$refs.advancedModeSearch && this.$refs.advancedModeSearch.openDropdown(); // 切换到简单模式，把高级模式关闭
       this.$nextTick(() => {
-- 
Gitee