From e973fb747f0d1a382fb9e4cdb20383a0a546ef67 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 03 十二月 2024 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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 069d2d4..f890ffe 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]
}
}
@@ -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,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) {
@@ -250,9 +253,14 @@
}
} else {
delete params.queryRoot;
+ if(this.paramVOS.querytemplate){
+ //璇存槑鏄�氳繃鎸夐挳鐐瑰嚮鎵撳紑鐨勶紝Action鍙傛暟涓厤缃湁this.paramVOS.querytemplate
+ delete params.queryTemplate;
+ delete params.linkTypeFlag;
+ }
}
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