From 41323bbb4fdd02bd60dfa627cf55a763079b3aba Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 九月 2023 08:48:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 222c3c0..c088933 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -286,8 +286,12 @@
text.push(itemText);
}
})
-
- let mapFields =Object.assign(this.referConfig.fieldMap,JSON.parse(this.options.mapFields)) ;
+ let mapFields;
+ if (this.options.mapFields == "") {
+ mapFields = this.referConfig.fieldMap;
+ } else {
+ mapFields = Object.assign(this.referConfig.fieldMap, JSON.parse(this.options.mapFields));
+ }
this.value=value.join(',');
this.text=text.join(',')
this.$emit("setValue", {field:this.referConfig.field,showField:this.referConfig.showField,value:this.value,text:this.text,rawData:this.selectionList,fieldMap:mapFields});
--
Gitblit v1.9.3