From 17f7ed9c9a6a1ad78ee220b4046e72208db42f7d Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Tue, 23 Apr 2024 18:07:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20assetselectpage=E6=94=B9=E4=B8=BAq?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/rightBox/batchAddEndpoint.vue |  3 ++-
 .../common/rightBox/software/softwareAssetBox.vue   |  3 ++-
 .../components/common/v-selectpagenew/methods.js    | 13 ++++++++++++-
 .../page/integration/integration-tabs/automatic.vue |  3 ++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue b/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue
index 46e294d7b..955fd8c4d 100644
--- a/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue
+++ b/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue
@@ -34,7 +34,7 @@
           </el-form-item>
           <el-form-item :label="$t('asset.asset')" prop="ChartTemplate">
             <v-selectpage
-              :data="assetDataList"
+              :data="'/asset/asset'"
               :tb-columns="columns"
               :params="{
                 varType: 2, dashboardId: 0,
@@ -45,6 +45,7 @@
               title="ChartSearch"
               key-field="id"
               show-field="name"
+              search-field="q"
               :width="640"
               v-model="batchEndpoint.assetIds"
               class="form-control"
diff --git a/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue b/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue
index e8845b382..028e0dcd1 100644
--- a/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue
@@ -23,7 +23,7 @@
           <!-- asset -->
           <el-form-item :label='$t("asset.asset")' label-width="125px" prop="assetId" v-if="!disabled">
             <v-selectpage
-              :data="assetList"
+              :data="'/asset/asset'"
               :tb-columns="columns"
               :params="{
                 varType: 2, dashboardId: 0,
@@ -34,6 +34,7 @@
               title="ChartSearch"
               key-field="id"
               show-field="name"
+              search-field="q"
               :width="626"
               v-model="editSoftwareAsset.assetId"
               class="form-control"
diff --git a/nezha-fronted/src/components/common/v-selectpagenew/methods.js b/nezha-fronted/src/components/common/v-selectpagenew/methods.js
index cf853517b..88276a7db 100644
--- a/nezha-fronted/src/components/common/v-selectpagenew/methods.js
+++ b/nezha-fronted/src/components/common/v-selectpagenew/methods.js
@@ -229,7 +229,18 @@ export default {
                 if (!initPicked) { // load new page data list
                   this.list = tmpObj.list
                   this.totalRows = tmpObj.totalRow
-                } else this.picked = tmpObj.list// the selected item info
+                } else { // the selected item info
+                  // this.picked = tmpObj.list
+                  if (tmpObj.list != null && tmpObj.list != '' && Array.isArray(tmpObj.list)) {
+                    const arr = this.value.split(',')
+                    if (arr && arr.length) {
+                      const matchRows = tmpObj.list.filter(val => arr.includes(String(val[this.keyField])))
+                      if (matchRows.length) {
+                        this.picked = this.multiple ? matchRows : [matchRows[0]]
+                      }
+                    }
+                  }
+                }
               }
             }
           }
diff --git a/nezha-fronted/src/components/page/integration/integration-tabs/automatic.vue b/nezha-fronted/src/components/page/integration/integration-tabs/automatic.vue
index 3931db3d6..a2b7acb0d 100644
--- a/nezha-fronted/src/components/page/integration/integration-tabs/automatic.vue
+++ b/nezha-fronted/src/components/page/integration/integration-tabs/automatic.vue
@@ -9,12 +9,13 @@
         <div class="talon-select">
           <span>{{$t('asset.asset')}}</span>
           <v-selectpage
-            :data="assetList"
+            :data="'/asset/asset'"
             :tb-columns="assetColumns"
             :multiple="false"
             :language="language"
             key-field="id"
             show-field="name"
+            search-field="q"
             :width="640"
             v-model="assetId"
             class="form-control"