From 72fe11177f72ab0c6aa78fa10e374d3c0f2193ee Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 05 十二月 2024 10:33:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
index 8db65f5..e0e6f8f 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
@@ -179,9 +179,12 @@
}
for (let i in this.sourceData) {
const item = this.sourceData[i]
- if (item && item.constructor === Object) continue;
if (['type', 'context', 'content', 'querytemplate', 'querytype'].includes(i)) continue;
- sourceDataMap['sourceData["' + i + '"]'] = item
+ if (item && item.constructor === Object) {
+ sourceDataMap['sourceData["' + i + '"]'] = JSON.stringify(item)
+ }else {
+ sourceDataMap['sourceData["' + i + '"]'] = item
+ }
}
}
@@ -207,7 +210,7 @@
multipleSelect: this.isMuti,
isMuti: this.isMuti,
isQueryAllColumn: true,
- btmname: this.componentVO.treeDefineVO.btmType,
+ btmName: this.componentVO.treeDefineVO.btmType,
componentOid: this.componentVO.oid,
uiDefineId: this.uiContext,
valueField: this.componentVO.treeDefineVO.valueField || 'oid',
@@ -239,7 +242,7 @@
if (parentOid != 0 && parentOid.indexOf('@vcitreesep@') > -1) {
parentOid = parentOid.split('@vcitreesep@')[1];
}
- const parentBtmName = (node.level === 0) ? '' : node.data.attributes.btmname;
+ const parentBtmName = (node.level === 0) ? '' : (node.data.attributes.part.btmName || node.data.attributes.btmName);
const params = this.params;
let url='';
if (node.level === 0) {
--
Gitblit v1.9.3