fix: assetselectpage改为q搜索参数
This commit is contained in:
@@ -34,7 +34,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item :label="$t('asset.asset')" prop="ChartTemplate">
|
<el-form-item :label="$t('asset.asset')" prop="ChartTemplate">
|
||||||
<v-selectpage
|
<v-selectpage
|
||||||
:data="assetDataList"
|
:data="'/asset/asset'"
|
||||||
:tb-columns="columns"
|
:tb-columns="columns"
|
||||||
:params="{
|
:params="{
|
||||||
varType: 2, dashboardId: 0,
|
varType: 2, dashboardId: 0,
|
||||||
@@ -45,6 +45,7 @@
|
|||||||
title="ChartSearch"
|
title="ChartSearch"
|
||||||
key-field="id"
|
key-field="id"
|
||||||
show-field="name"
|
show-field="name"
|
||||||
|
search-field="q"
|
||||||
:width="640"
|
:width="640"
|
||||||
v-model="batchEndpoint.assetIds"
|
v-model="batchEndpoint.assetIds"
|
||||||
class="form-control"
|
class="form-control"
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
<!-- asset -->
|
<!-- asset -->
|
||||||
<el-form-item :label='$t("asset.asset")' label-width="125px" prop="assetId" v-if="!disabled">
|
<el-form-item :label='$t("asset.asset")' label-width="125px" prop="assetId" v-if="!disabled">
|
||||||
<v-selectpage
|
<v-selectpage
|
||||||
:data="assetList"
|
:data="'/asset/asset'"
|
||||||
:tb-columns="columns"
|
:tb-columns="columns"
|
||||||
:params="{
|
:params="{
|
||||||
varType: 2, dashboardId: 0,
|
varType: 2, dashboardId: 0,
|
||||||
@@ -34,6 +34,7 @@
|
|||||||
title="ChartSearch"
|
title="ChartSearch"
|
||||||
key-field="id"
|
key-field="id"
|
||||||
show-field="name"
|
show-field="name"
|
||||||
|
search-field="q"
|
||||||
:width="626"
|
:width="626"
|
||||||
v-model="editSoftwareAsset.assetId"
|
v-model="editSoftwareAsset.assetId"
|
||||||
class="form-control"
|
class="form-control"
|
||||||
|
|||||||
@@ -229,7 +229,18 @@ export default {
|
|||||||
if (!initPicked) { // load new page data list
|
if (!initPicked) { // load new page data list
|
||||||
this.list = tmpObj.list
|
this.list = tmpObj.list
|
||||||
this.totalRows = tmpObj.totalRow
|
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]]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,12 +9,13 @@
|
|||||||
<div class="talon-select">
|
<div class="talon-select">
|
||||||
<span>{{$t('asset.asset')}}</span>
|
<span>{{$t('asset.asset')}}</span>
|
||||||
<v-selectpage
|
<v-selectpage
|
||||||
:data="assetList"
|
:data="'/asset/asset'"
|
||||||
:tb-columns="assetColumns"
|
:tb-columns="assetColumns"
|
||||||
:multiple="false"
|
:multiple="false"
|
||||||
:language="language"
|
:language="language"
|
||||||
key-field="id"
|
key-field="id"
|
||||||
show-field="name"
|
show-field="name"
|
||||||
|
search-field="q"
|
||||||
:width="640"
|
:width="640"
|
||||||
v-model="assetId"
|
v-model="assetId"
|
||||||
class="form-control"
|
class="form-control"
|
||||||
|
|||||||
Reference in New Issue
Block a user