From 5db4c4f167c5353c257c5b890b6ba6ccecbdfc07 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 02 十二月 2024 14:35:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
index 243aa33..35cbcb8 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
@@ -298,16 +298,28 @@
sourceDataMap: function () {
const sourceDataMap = {};
if (Object.keys(this.sourceData).length>0) {
- if(this.sourceData.oid ) {
- if (this.sourceData.oid.indexOf('@vcitreesep@') > -1) {
- this.sourceData.oid = this.sourceData.oid.split('@vcitreesep@')[1];
+ if(this.sourceData.part && Object.keys(this.sourceData.part).length>0){
+ //璇存槑婧愭暟鎹槸鏍戣妭鐐�
+ if(this.sourceData.part.oid ) {
+ if (this.sourceData.part.oid.indexOf('@vcitreesep@') > -1) {
+ this.sourceData.part.oid = this.sourceData.oid.split('@vcitreesep@')[1];
+ }
+ sourceDataMap.sourceBtmName = this.sourceBtmType;
+ sourceDataMap.sourceOid = this.sourceData.part.oid;
}
- sourceDataMap.sourceBtmName = this.sourceBtmType;;
- sourceDataMap.sourceOid = this.sourceData.oid;
+ }else {
+ if(this.sourceData.oid ) {
+ if (this.sourceData.oid.indexOf('@vcitreesep@') > -1) {
+ this.sourceData.oid = this.sourceData.oid.split('@vcitreesep@')[1];
+ }
+ sourceDataMap.sourceBtmName = this.sourceBtmType;
+ sourceDataMap.sourceOid = this.sourceData.oid;
+ }
}
+
for (let i in this.sourceData) {
const item = this.sourceData[i]
- if (item && item.constructor === Object) continue;
+ //if (item && item.constructor === Object) continue; //鏍戣妭鐐瑰瓙闆嗘槸瀵硅薄
if (['type', 'context', 'content', 'querytemplate', 'querytype'].includes(i)) continue;
sourceDataMap['sourceData["' + i + '"]'] = item
}
--
Gitblit v1.9.3