From eab19be5f39c7fb5f528be1340206fe789426552 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 08 九月 2023 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index d1cf586..8e83d4f 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -95,6 +95,9 @@
this.page.pageSize=this.referConfig.options.page.limit || this.referConfig.options.page.pageSize;
this.page.currentPage=this.referConfig.options.page.page || this.referConfig.options.page.currentPage;
}
+ this.$nextTick(() => {
+ this.$refs.referCrud.doLayout()
+ })
},
computed:{
@@ -284,18 +287,18 @@
if(isMutiValue){
var valueFieldArray = _that.props.value.split(",");
valueFieldArray.forEach((_itemField,_indexFiel)=>{
- value.push( item[_itemField] + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
+ 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((_itemField,_indexField)=>{
- text.push(item[_itemField] + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
+ 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]);
}
})
--
Gitblit v1.9.3