From cf4aa0287e4c46610df97753f3250f5e48f32254 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Thu, 1 Feb 2024 11:09:06 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E4=BD=9C=E4=B8=9A=E6=89=A7=E8=A1=8C=E7=9B=AE=E6=A0=87?=
 =?UTF-8?q?=EF=BC=8C=E7=AD=9B=E9=80=89=E6=96=B9=E5=BC=8F=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=EF=BC=8C=E7=BF=BB=E9=A1=B5=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1081685?=
 =?UTF-8?q?678981120]=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=9B=AE=E6=A0=87=EF=BC=8C=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E9=80=89=E6=8B=A9=E8=8A=82=E7=82=B9=EF=BC=8C?=
 =?UTF-8?q?=E7=BF=BB=E9=A1=B5=E7=BB=93=E6=9E=9C=E5=BC=82=E5=B8=B8=20http:/?=
 =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93?=
 =?UTF-8?q?9050947543057/1081685678981120?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/addTarget/add-node.vue  | 65 ++++++++++++-------
 1 file changed, 43 insertions(+), 22 deletions(-)

diff --git a/src/views/pages/autoexec/components/common/addTarget/add-node.vue b/src/views/pages/autoexec/components/common/addTarget/add-node.vue
index b040e357..e478786b 100644
--- a/src/views/pages/autoexec/components/common/addTarget/add-node.vue
+++ b/src/views/pages/autoexec/components/common/addTarget/add-node.vue
@@ -30,7 +30,7 @@
               :defaultValue="defaultSearchValue"
               :defaultSearchValue="defaultSearchValue"
               @changeValue="changeValue"
-              @advancedModeSearch="advancedModeSearch"
+              @advancedModeSearch="(value) => advancedModeSearch(value, 1, 10)"
             ></FilterSearch>
           </div>
           <template v-if="!loadingShow">
@@ -44,8 +44,8 @@
               height="500"
               multiple
               @getSelected="getSelected"
-              @changeCurrent="getDataList('currentPage',...arguments)"
-              @changePageSize="getDataList('pageSize',...arguments)"
+              @changeCurrent="changeCurrent"
+              @changePageSize="changePageSize"
             >
               <template v-slot:appModuleName="{row}">
                 <span v-if="row.appModuleName || row.appModuleAbbrName">
@@ -137,7 +137,11 @@ export default {
   created() {},
   beforeMount() {},
   mounted() {
-    this.searchNodeList(this.defaultSearchValue);
+    if (!this.$utils.isEmpty(this.defaultSearchValue) && this.defaultSearchValue.hasOwnProperty('conditionGroupList')) {
+      this.advancedModeSearch(this.defaultSearchValue);
+    } else {
+      this.searchNodeList();
+    }
   },
   beforeUpdate() {},
   updated() {},
@@ -146,15 +150,36 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
-    searchNodeList(param) {
+    changeCurrent(currentPage = 1) {
+      this.currentPage = currentPage;
+      this.handlePageChange();
+    },
+    changePageSize(pageSize = 10) {
+      this.currentPage = 1;
+      this.pageSize = pageSize;
+      this.handlePageChange();
+    },
+    handlePageChange() {
+      const hasConditionGroupList = 
+    (!this.$utils.isEmpty(this.defaultSearchValue) &&
+      this.defaultSearchValue.hasOwnProperty('conditionGroupList')) ||
+    (!this.$utils.isEmpty(this.searchVal) &&
+      this.searchVal.hasOwnProperty('conditionGroupList'));
+
+      if (hasConditionGroupList) {
+        this.advancedModeSearch(this.searchVal);
+      } else {
+        this.searchNodeList();
+      }
+    },
+    searchNodeList() {
       let data = {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        cmdbGroupType: this.opType
+        cmdbGroupType: this.opType,
+        ...this.searchVal,
+        ...this.defaultSearchValue
       };
-      if (param) {
-        Object.assign(data, param);
-      }
       this.$api.autoexec.action.getNodeList(data).then(res => {
         if (res.Status == 'OK') {
           this.tableData = res.Return;
@@ -163,16 +188,6 @@ export default {
         this.loadingShow = false;
       });
     },
-    getDataList(type, value) {
-      type == 'pageSize' && (this.pageSize = value);
-      let param = {
-        currentPage: type == 'currentPage' ? value : this.currentPage,
-        pageSize: type == 'pageSize' ? value : this.pageSize,
-        cmdbGroupType: this.opType
-      };
-      param = Object.assign(param, this.searchVal);
-      this.searchNodeList(param);
-    },
     getSelected(indexList, itemList) {
       if (itemList && itemList.length > 0) {
         itemList.forEach(item => {
@@ -232,11 +247,17 @@ export default {
     },
     changeValue(val) {
       this.searchVal = this.$utils.deepClone(val);
-      this.getDataList('currentPage', 1);
+      this.changePageSize();
     },
-    advancedModeSearch(searchVal) {
+    advancedModeSearch(searchVal, currentPage = 1, pageSize = 10) {
       // 复杂模式搜索
-      let params = Object.assign({currentPage: 1, pageSize: 10, cmdbGroupType: this.opType}, searchVal);
+      let params = {
+        currentPage: currentPage || this.currentPage,
+        pageSize: pageSize || this.pageSize,
+        cmdbGroupType: this.opType,
+        ...this.defaultSearchValue,
+        ...searchVal
+      };
       this.loadingShow = true;
       this.$api.autoexec.action.searchResourceCustomList(params).then(res => {
         if (res.Status == 'OK') {
-- 
Gitee