diff --git a/src/resources/components/CombineSearcher/CombineSearcher.vue b/src/resources/components/CombineSearcher/CombineSearcher.vue
index 773dc7022183062029e786763198937c604e99b1..44c46ff6a9a580397cebd2235618aab050b00617 100644
--- a/src/resources/components/CombineSearcher/CombineSearcher.vue
+++ b/src/resources/components/CombineSearcher/CombineSearcher.vue
@@ -329,7 +329,6 @@ export default {
           let totalSearch = this.getFullSearch();
           this.$emit('remove-label');
           this.$emit('change', totalSearch);
-          this.$emit('confirm', totalSearch);
         });
       }
       //只有在搜索模式下才去匹配输入框的，如果是删除下拉的属性会在watch里触发，如果是删除关键词的还需要在这里触发一次change
@@ -339,7 +338,6 @@ export default {
         let totalSearch = this.getFullSearch();
         this.$emit('remove-label');
         this.$emit('change', totalSearch);
-        this.$emit('confirm', totalSearch);
       }
     },
     addKeyword() {
@@ -353,9 +351,6 @@ export default {
         this.isVisible = false;
         this.$emit('change', newValue);
         this.keyword = '';
-        if (this.searchMode == 'clickBtnSearch') {
-          this.$emit('confirm', newValue); // 非实时搜索模式下，需要分发值出去，否则关键字搜索无反应
-        }
       }
     },
     handleCancel() {
@@ -380,7 +375,7 @@ export default {
       if (this.searchMode == 'clickBtnSearch') {
         this.refreshTextConfig(); // 点击确认时，需要把搜索结果显示在搜索栏中
       }
-      this.$emit('confirm', fullSearch);
+      this.$emit('change', fullSearch);
     },
     clearSearch() {
       this.keyword = '';
@@ -390,17 +385,15 @@ export default {
       this.isVisible = false;
       this.$refs.form && this.$refs.form.clearFormInput(); // 解决input输入框清空失败的问题
       this.$forceUpdate();
-      this.$emit('change', {});// 非实时搜索，删除全部数据后，触发change
-      this.$emit('confirm', {});
+      this.$emit('change', {});
     },
     handleSearch() {
       this.$emit('change', this.getFullSearch());
-      this.$emit('confirm', this.getFullSearch());
     },
     getFullSearch() {
       let fullSearch = {};
       if (this.searchValue && Object.keys(this.searchValue).length) {
-        for (var s in this.searchValue) {
+        for (let s in this.searchValue) {
           if (this.searchValue[s] != null && this.searchValue[s] != '') {
             let newitem = {};
             newitem[s] = this.searchValue[s];
@@ -421,7 +414,7 @@ export default {
       //console.log(e);
     },
     updateVal(val) {
-      this.$nextTick(() => { 
+      this.$nextTick(() => {
         this.searchValue = this.$utils.deepClone(val);
         this.totalText = this.$utils.deepClone(val);
         //清除searchList和关键字（keywordName）中没有定义的属性值，避免回显错误的选项 
@@ -564,13 +557,14 @@ export default {
   },
   watch: {
     searchValue: {
-      handler: function(val, oldval) {
-        let _this = this;
+      handler(val, oldval) {
         if (val) {
-          let totalSearch = _this.getFullSearch();
-          let isEmit = this.$utils.isSame(totalSearch, _this.value);
+          let totalSearch = this.getFullSearch();
+          let isEmit = this.$utils.isSame(totalSearch, this.value);
           if (!isEmit) {
-            this.$emit('change', totalSearch);
+            if (this.searchMode == 'realtimeSearch') {
+              this.$emit('change', totalSearch);
+            }
           }
         }
       },
@@ -609,14 +603,10 @@ export default {
     textConfig: {
       handler(val) {
         if (val && typeof val == 'object') {
-          if (this.searchMode == 'realtimeSearch') {
-            this.refreshTextConfig();
-          } else if (this.searchMode == 'clickBtnSearch' && !this.isCloseAutomaticSearch) {
-            // 非实时搜索
+          if (this.searchMode == 'realtimeSearch' || (this.searchMode == 'clickBtnSearch' && !this.isCloseAutomaticSearch)) {
             this.refreshTextConfig();
           }
         }
-        this.$emit('change-label', this.totalText);
       },
       deep: true,
       immediate: true
diff --git a/src/resources/plugins/TsForm/TsForm.vue b/src/resources/plugins/TsForm/TsForm.vue
index 1f5453c581c16e7bbe42b17b90e0bcbe55589921..2752f51aae58d5ef6cb50bc0e967b445c4f25e29 100755
--- a/src/resources/plugins/TsForm/TsForm.vue
+++ b/src/resources/plugins/TsForm/TsForm.vue
@@ -212,7 +212,8 @@ export default {
       handler(val) {
         this.$emit('update:textConfig', val);
       },
-      deep: true
+      deep: true,
+      immediate: true
     },
     dataConfig: {
       handler(currentval) {
diff --git a/src/views/pages/autoexec/components/common/filter-search.vue b/src/views/pages/autoexec/components/common/filter-search.vue
index 081458d9ede60b7f91c584fd167d158a18d1bc3e..072e33572cae4c9decd9627e6f57f465c0fe90b1 100644
--- a/src/views/pages/autoexec/components/common/filter-search.vue
+++ b/src/views/pages/autoexec/components/common/filter-search.vue
@@ -31,7 +31,7 @@
       :isRequired="isRequired"
       :readonly="readonly"
       :showSearchNumber="showSearchNumber"
-      @confirm="simpleModeSearch"
+      @change="simpleModeSearch"
       @switchMode="switchMode"
     >
     </CombineSearcher>
diff --git a/src/views/pages/cmdb/asset/asset-manage.vue b/src/views/pages/cmdb/asset/asset-manage.vue
index 4e5922726f1628fdd24089e8b574e1cb756d8aa9..57620e105852d4d398ec34e7949d2a014d84a89f 100644
--- a/src/views/pages/cmdb/asset/asset-manage.vue
+++ b/src/views/pages/cmdb/asset/asset-manage.vue
@@ -48,14 +48,20 @@
             ref="combineSearcher"
             v-model="searchVal"
             v-bind="searchConfig"
-            @confirm="changeCombineSearcher"
-            @change-label="changeLabelCombineSearcher"
+            @change="changeCombineSearcher"
             @switchMode="switchMode"
           >
-            <template v-slot:batchSearchList="{ valueConfig }">
+            <template v-slot:batchSearchList="{valueConfig, textConfig}">
               <div>
                 <TsFormItem :label="$t('page.batchsearch')" :tooltip="$t('term.cmdb.resourcebatchsearchtooltip')" labelPosition="left">
-                  <TsFormRadio v-model="valueConfig.searchField" :dataList="searchFieldRadioDataList"></TsFormRadio>
+                  <TsFormRadio
+                    v-model="valueConfig.searchField"
+                    :dataList="searchFieldRadioDataList"
+                    @change="() => {
+                      $set(valueConfig, 'batchSearchList', '')
+                      $delete(textConfig, 'batchSearchList');
+                    }"
+                  ></TsFormRadio>
                 </TsFormItem>
                 <TsFormItem :label="$t('page.batchsearchvalue')" labelWidth="0px" labelPosition="left">
                   <TsFormInput
@@ -63,6 +69,14 @@
                     type="textarea"
                     :placeholder="'192.168.0.1\n192.168.0.2\n192.168.0.*'"
                     :autoSize="{ minRows: 4 }"
+                    @change="(val) => {
+                      if(val) {
+                        $set(textConfig, 'batchSearchList', val.split('\n'));
+                      } else {
+                        $delete(textConfig, 'batchSearchList');
+                        $delete(valueConfig, 'batchSearchList');
+                      }
+                    }"
                   ></TsFormInput>
                 </TsFormItem>
               </div>
@@ -803,11 +817,11 @@ export default {
         return;
       }
       let params = {
-        batchSearchList: [],
         currentPage: this.tableConfig.currentPage,
         pageSize: this.tableConfig.pageSize,
         ...this.searchVal,
-        ...this.selectType
+        ...this.selectType,
+        batchSearchList: this.searchVal.batchSearchList ? this.searchVal.batchSearchList : []
       };
       if (!this.$utils.isEmpty(params.batchSearchList)) {
         params.batchSearchList = params.batchSearchList.split('\n');
@@ -1031,11 +1045,6 @@ export default {
       }
       this.changeCurrent();
     },
-    changeLabelCombineSearcher(val) {
-      if (!this.$utils.isEmpty(this.searchVal.batchSearchList)) {
-        this.$set(val, 'batchSearchList', this.searchVal.batchSearchList.split('\n'));
-      }
-    },
     editTree() {
       this.isShowTreeEdit = true;
     },
diff --git a/src/views/pages/inspect/recentIssues/recent-issues.vue b/src/views/pages/inspect/recentIssues/recent-issues.vue
index 54412c2831713a2fc0d8289b9d52a4f2e851441d..f55634491677cd4077dbc5248df26967915fbb0d 100644
--- a/src/views/pages/inspect/recentIssues/recent-issues.vue
+++ b/src/views/pages/inspect/recentIssues/recent-issues.vue
@@ -36,23 +36,41 @@
           ref="combineSearcher"
           v-model="searchVal"
           v-bind="searchConfig"
-          @confirm="searchCondition"
-          @change-label="changeLabelCombineSearcher"
+          @change="searchCondition"
         >   
-          <template v-slot:batchSearchList="{valueConfig}">
+          <template v-slot:batchSearchList="{textConfig, valueConfig}">
             <div>
               <TsFormItem :label="$t('page.batchsearch')" :tooltip="$t('term.cmdb.resourcebatchsearchtooltip')" labelPosition="left">
                 <TsFormRadio
                   v-model="valueConfig.searchField"
                   :dataList="[{value: 'ip',text: 'IP'},{value: 'name',text: $t('page.name')}]"
+                  @change="() => {
+                    $delete(valueConfig, 'batchSearchList');
+                    $delete(textConfig, 'batchSearchList');
+                  }"
                 ></TsFormRadio>
               </TsFormItem>
               <TsFormItem :label="$t('page.batchsearchvalue')" labelWidth="0px" labelPosition="left">
+                <!-- change-label主要用于存储的数据回显，value值回显不会触发@change方法 -->
                 <TsFormInput
                   v-model="valueConfig.batchSearchList"
                   type="textarea"
                   :placeholder="'192.168.0.1\n192.168.0.2\n192.168.0.*'"
                   :autoSize="{minRows: 4}"
+                  @change="(val) => {
+                    if(val) {
+                      $set(textConfig, 'batchSearchList', val.split('\n'));
+                    } else {
+                      $delete(textConfig, 'batchSearchList');
+                    }
+                  }"
+                  @change-label="(val) => {
+                    if(val) {
+                      $set(textConfig, 'batchSearchList', val.split('\n'));
+                    } else {
+                      $delete(textConfig, 'batchSearchList');
+                    }
+                  }"
                 >
                 </TsFormInput>
               </TsFormItem>
@@ -485,8 +503,7 @@ export default {
       });
     },
     searchTableData() {
-      this.$refs.combineSearcher.refreshTextConfig();
-      this.closeCombineSearchPanel();
+      this.$refs.combineSearcher.doSearch();
       this.getTableData(1);
     },
     searchCondition(searchVal) {
@@ -497,7 +514,7 @@ export default {
     },
     closeCombineSearchPanel() {
       // 关闭搜索面板
-      this.$refs.combineSearcher.handleToggleOpen(); // 关闭搜索面板
+      this.$refs.combineSearcher.handleCancel(); // 关闭搜索面板
     },
     dealInspectStatusDataByUrl(nodeList) {
       // 处理巡检状态下拉列表数据
@@ -814,11 +831,6 @@ export default {
     closeRuleOfThresholdDialog() {
       this.isShowRuleThresholdDialog = false;
     },
-    changeLabelCombineSearcher(val) {
-      if (!this.$utils.isEmpty(this.searchVal.batchSearchList)) {
-        this.$set(val, 'batchSearchList', this.searchVal.batchSearchList.split('\n'));
-      }
-    },
     gotoAssetManagePage() {
       window.open(HOME + '/cmdb.html#/asset-manage', '_blank');
     }
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 a8d0e47aab631725e73aab19f66bd216f3dcb062..e9c5441219b03ff7797421deeb9f0d66f71c75f8 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,7 @@
           v-if="canSearch && isShowCombineSearcher"
           v-model="searchValue"
           v-bind="searchConfig"
-          @confirm="searchIssue(1)"
+          @change="searchIssue(1)"
         >
           <template v-slot:createDate="{ valueConfig, textConfig }">
             <TsFormDatePicker