fix: 修复selectPage组件使用远程数据 初始化回显问题

nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue

@@ -508,7 +508,7 @@ export default {
   created () {
     this.isEdit = true
     this.getModuleList()
-    this.getAssetList()
+    // this.getAssetList()
   },
   watch: {
     'batchEndpoint.tableData': {

nezha-fronted/src/components/common/rightBox/dashboardTempBox.vue

@@ -31,10 +31,26 @@
             ></v-selectpage>
           </el-form-item>
           <!-- link -->
-          <el-form-item v-if="templateType" :label="templateType==1?$t('asset.asset'):$t('asset.endpoint')" prop="link" key="link">
+          <el-form-item v-if="templateType && templateType==1" :label="$t('asset.asset')" prop="link" key="asset">
             <v-selectpage
-              :data="dataList"
+              :data="'/asset/asset'"
-              :tb-columns="templateType==1?assetColumns:endpointColumns"
+              :tb-columns="assetColumns"
+              :multiple="false"
+              :language="language"
+              key-field="id"
+              show-field="name"
+              search-field="q"
+              :width="640"
+              v-model="editDashboard.link"
+              class="form-control"
+              :result-format="resultFormat"
+              @values="linkChange"
+            ></v-selectpage>
+          </el-form-item>
+          <el-form-item v-if="templateType && templateType==2" :label="$t('asset.endpoint')" prop="link" key="endpoint">
+            <v-selectpage
+              :data="endpointList"
+              :tb-columns="endpointColumns"
               :multiple="false"
               :language="language"
               key-field="id"
@@ -236,7 +252,8 @@ export default {
         description: ''
       },
       templateList: [],
-      dataList: [],
+      endpointList: [],
+      assetList: [],
       templateType: undefined // 选中模板的varType
     }
   },
@@ -255,6 +272,7 @@ export default {
       this.templateType = newValue
       // 判断varType是否变化
       if (oldValue != newValue) {
+        this.editDashboard.link = ''
         this.getTableData()
       }
       this.$refs.form.validateField('tmplId')
@@ -278,11 +296,8 @@ export default {
     },
     // 根据选中模板vartype请求数据
     getTableData () {
-      this.editDashboard.link = ''
+      this.endpointList = []
-      this.dataList = []
+      if (this.templateType === 2) {
-      if (this.templateType === 1) {
-        this.getAssetData()
-      } else if (this.templateType === 2) {
         this.getEndpointData()
       }
     },
@@ -290,7 +305,7 @@ export default {
     getAssetData () {
       this.$get('asset/asset', { pageSize: -1 }).then(response => {
         if (response.code === 200) {
-          this.dataList = response.data.list
+          this.assetList = response.data.list
         }
       })
     },
@@ -298,7 +313,7 @@ export default {
     getEndpointData () {
       this.$get('monitor/endpoint', { pageSize: -1 }).then(response => {
         if (response.code === 200) {
-          this.dataList = response.data.list
+          this.endpointList = response.data.list
         }
       })
     },

nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue

@@ -1882,7 +1882,7 @@ export default {
     this.getProjectList()
     this.getCredential()
     this.getWalkData()
-    this.getAsset()
+    // this.getAsset()
     this.ChartTemplateList()
   },
   computed: {

nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue

@@ -266,7 +266,7 @@ export default {
     }
   },
   created () {
-    this.getAsset()
+    // this.getAsset()
     this.getSoftwareTypeList()
   },
   mounted () {

nezha-fronted/src/components/common/v-selectpagenew/methods.js

@@ -170,7 +170,11 @@ export default {
            * search content filter
            */
           if (this.search) {
-            list = list.filter(val => new RegExp(this.search.toLowerCase()).test(val[this.searchColumn].toLowerCase()))
+            list = list.filter(val => {
+              console.log(val[this.searchColumn])
+              console.log(this.searchColumn)
+              return new RegExp(this.search.toLowerCase()).test(val[this.searchColumn].toLowerCase())
+            })
           }
           this.totalRows = list.length
 

nezha-fronted/src/entrance/app/main.js

@@ -99,6 +99,14 @@ Vue.use(vSelectPage, {
     if (params.pageNumber) {
       params.pageNo = params.pageNumber
     }
+
+    // 使用服务端数据 初始化选中数据（直接查询时 第一页可能不存在选中数据）
+    if (params.searchKey) {
+      params.ids = params.searchValue
+      delete params.searchKey
+      delete params.searchValue
+    }
+
     return new Promise((resolve, reject) => {
       get(url, params).then(res => {
         resolve(res)