From b7c8ca38eb3349b697b35fc550c0b34eba49f0b8 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Tue, 14 Nov 2023 15:51:56 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E7=A0=94=E5=8F=91?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E8=BF=87=E6=BB=A4=E5=99=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=20=20-=20[=E5=85=B3=E8=81=94]#[1021552353574912]?=
 =?UTF-8?q?=E7=A0=94=E5=8F=91=E7=AE=A1=E7=90=86-=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=99=A8=E9=97=AE=E9=A2=98=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/bug-detail/939050947543040/939050947543057/1021552353574?=
 =?UTF-8?q?912?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CombineSearcher/CombineSearcher.vue       | 32 ++++++++-----------
 .../project/viewtab/components/issue-list.vue |  8 -----
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/src/resources/components/CombineSearcher/CombineSearcher.vue b/src/resources/components/CombineSearcher/CombineSearcher.vue
index f9a0280e..773dc702 100644
--- a/src/resources/components/CombineSearcher/CombineSearcher.vue
+++ b/src/resources/components/CombineSearcher/CombineSearcher.vue
@@ -98,7 +98,7 @@
             <div v-if="clearable && totalText && Object.keys(totalText).length" class="tsfont-close-s icon-dropdown bg-op item-clear" @click.stop="clearSearch"></div>
           </div>
           <DropdownMenu v-if="searchList && searchList.length > 0" slot="list" ref="dropdown">
-            <li :style="'padding: 16px 20px;width:' + width + 'px;max-height:500px;overflow:auto;'" @click="isVisible = true">
+            <li :style="'padding: 16px 20px;width:' + width + 'px;max-height:400px;overflow:auto;'" @click="isVisible = true">
               <TsForm
                 ref="form"
                 v-model="searchValue"
@@ -361,6 +361,18 @@ export default {
     handleCancel() {
       // 点击取消
       this.isVisible = false;
+      if (this.searchMode == 'clickBtnSearch' && !this.isVisible) {
+        // 点击取消按钮时，删除已选择但是没有搜索的字段
+        for (let key in this.searchValue) {
+          if (key && !this.totalText.hasOwnProperty([key])) {
+            this.$nextTick(() => {
+              this.$delete(this.searchValue, key);
+              this.$delete(this.textConfig, key);
+              this.$delete(this.totalText, key);
+            });
+          }
+        }
+      }
     },
     doSearch(val) {
       this.isVisible = false;
@@ -623,24 +635,6 @@ export default {
       },
       deep: true,
       immediate: true      
-    },
-    isVisible: {
-      handler() {
-        // 点击关闭时，清空没有搜索的值
-        if (this.searchMode == 'clickBtnSearch' && !this.isVisible) {
-          // for (let key in this.searchValue) {
-          //   if (key && !this.totalText.hasOwnProperty([key])) {
-          //     this.$delete(this.searchValue, key);
-          //     this.$delete(this.textConfig, key);
-          //     this.$delete(this.totalText, key);
-          //   }
-          // }
-          // let fullSearch = this.getFullSearch();
-          // this.$emit('update:value', fullSearch);
-          // this.$emit('close', fullSearch);
-        }
-      },
-      deep: true
     }
   }
 };
diff --git a/src/views/pages/rdm/project/viewtab/components/issue-list.vue b/src/views/pages/rdm/project/viewtab/components/issue-list.vue
index d1aade7e..61be3f97 100644
--- a/src/views/pages/rdm/project/viewtab/components/issue-list.vue
+++ b/src/views/pages/rdm/project/viewtab/components/issue-list.vue
@@ -24,7 +24,6 @@
           v-if="canSearch && isShowCombineSearcher"
           v-model="searchValue"
           v-bind="searchConfig"
-          @close="closeCombineSearcher"
           @confirm="searchIssue(1)"
         >
           <template v-slot:createDate="{ valueConfig, textConfig }">
@@ -380,13 +379,6 @@ export default {
         this.$delete(textConfig, 'attr_' + attr.id);
       }
     },
-    closeCombineSearcher() {
-      // 取消关闭弹窗后，刷新自定属性
-      this.isSearchReady = false;
-      this.$nextTick(() => {
-        this.isSearchReady = true;
-      });
-    },
     restoreHistory(historyData) {
       if (historyData) {
         if (historyData['searchValue']) {
-- 
Gitee