From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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 509bdb6..475998f 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,16 +179,19 @@
}
for (let i in this.sourceData) {
const item = this.sourceData[i]
- if (item && item.constructor === Object) continue;
- if (i == 'type' || i == 'context' || i == 'content') continue;
- sourceDataMap['sourceData["' + i + '"]'] = item
+ if (['type', 'context', 'content', 'querytemplate', 'querytype'].includes(i)) continue;
+ if (item && item.constructor === Object) {
+ sourceDataMap['sourceData["' + i + '"]'] = JSON.stringify(item)
+ }else {
+ sourceDataMap['sourceData["' + i + '"]'] = item
+ }
}
}
if (Object.keys(this.paramVOS).length > 0) {
for (let j in this.paramVOS) {
if (this.paramVOS[j] && this.paramVOS[j].constructor === Object) continue;
- if (j == 'type' || j == 'context' || j == 'content' || j == "getdataurl" || j == "getdatamethod" || j == "url" || j == "method" || j == "uploadfileurl" || j == "title") continue;
+ if (['type', 'context', 'content', "getdataurl", "getdatamethod", "url", "method", "uploadfileurl", "title", 'querytemplate', 'querytype', 'usesourcedata','component'].includes(j)) continue;
sourceDataMap['sourceData["' + j + '"]'] = this.paramVOS[j]
}
}
@@ -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',
@@ -215,7 +218,7 @@
textField: this.componentVO.treeDefineVO.treeNodeExpression,
queryTemplate: queryTemplate,
linkTypeFlag: linkTypeFlag,
- rootExpress: this.componentVO.treeDefineVO.rootExpress || ''
+ rootExpress: this.componentVO.treeDefineVO.rootContent || ''
}
const sourceDataMapList = this.sourceDataMapParams;
@@ -239,9 +242,18 @@
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 && node.data.attributes.part.btmname)
+ || (node.data.attributes.folder && node.data.attributes.folder.btmname)
+ || (node.data.attributes && node.data.attributes.btmname)
+ || '';
const params = this.params;
let url='';
+ if(this.componentVO.bsDataModel && this.componentVO.bsDataModel.indexOf('/')!=-1){
+ url=this.componentVO.bsDataModel;
+ }
if (node.level === 0) {
params.queryRoot = true;
if(this.paramVOS.querytemplate){
@@ -257,7 +269,7 @@
}
}
getTree(parentOid, parentBtmName, params,url).then(res => {
- resolve(res.data.treeData )
+ resolve(res.data.treeData || res.data.obj || [])
this.$nextTick(()=>{
if (this.isRefresh) {
this.$refs.tree.setCurrentKey(this.currentClickNode.data.oid);
--
Gitblit v1.9.3