From 4a2835ddadb796c69f180097b95f971dbab4687d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 13 九月 2023 09:09:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 11fe9d4..66e133e 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -158,22 +158,35 @@
label: '鑻辨枃鍚嶇О',
sortable: true,
width: 150,
- search: true
+ search: true,
+ formatter:function (d){
+ return d.id || d.data.id
+ }
}, {
prop: 'name',
label: '涓枃鍚嶇О',
sortable: true,
width: 150,
- search: true
+ search: true,
+ formatter:function (d){
+ return d.name || d.data.name
+ }
}, {
prop: 'description',
label: '鎻忚堪',
- width: 250
+ width: 250,
+ formatter:function (d){
+ return d.description || d.data.description
+ }
}, {
prop: 'secretGradeText',
label: '瀵嗙骇',
width: 60,
- hidden: (!this.controllerSecret)
+ hidden: (!this.controllerSecret),
+ hide: (!this.controllerSecret),
+ formatter:function (d){
+ return d.secretGradeText || d.data.secretGradeText
+ }
}];
} else {
this.option.column = this.options.tableConfig.cols.map(item => {
@@ -181,12 +194,24 @@
let formatter=item.template || item.templet;
if(typeof formatter == "string" && formatter !=''){
formatter=eval("(" + formatter + ")")
+ }else{
+ formatter=function (d){
+ if(d[item.field]!=undefined){
+ return d[item.field]
+ }else if(d.data[item.field] !=undefined){
+ return d.data[item.field]
+ }else {
+ return ''
+ }
+ }
}
return {
...item,
label: item.title,
prop: item.field,
formatter:formatter,
+ sortable:item.sort,
+ hide:item.hidden,
search:this.options.tableConfig.queryColumns.some(qItem=>{
return qItem.field==item.field
})
@@ -222,19 +247,19 @@
this.selectionList.forEach((item,_index) =>{
if(isMutiValue){
var valueFieldArray = _that.props.value.split(",");
- valueFieldArray.forEach((_indexField,_itemField)=>{
- value.push( item[_itemField] + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
+ valueFieldArray.forEach((_itemField,_indexFiel)=>{
+ value.push( (item[_itemField] || item['data'][_itemField]) + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
})
}else {
- value.push(item[_that.props.value]);
+ value.push(item[_that.props.value] || item['data'][_that.props.value]);
}
if(isMutiRaw) {
var rawFieldArray = _that.props.label.split(",");
- rawFieldArray.forEach((_indexField,_itemField)=>{
- text.push(item[_itemField] + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
+ rawFieldArray.forEach((_itemField,_indexField)=>{
+ text.push((item[_itemField] || item['data'][_itemField]) + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
})
}else{
- text.push(item[_that.props.label]);
+ text.push(item[_that.props.label] || item['data'][_that.props.label]);
}
})
@@ -295,6 +320,12 @@
this.data = res.data.data.records;
this.page.total=res.data.data.total;
}
+ this.data=this.data.map(item => {
+ item.data=item.data || {}
+ return {
+ ...item
+ }
+ })
this.loading = false;
this.selectionClear();
}).catch(error=>{
--
Gitblit v1.9.3