From eddd1e5e67af55017fa5255b3d19f6ee02646121 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 十一月 2024 10:12:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 629106e..509bdb6 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
@@ -241,13 +241,23 @@
}
const parentBtmName = (node.level === 0) ? '' : node.data.attributes.btmname;
const params = this.params;
+ let url='';
if (node.level === 0) {
params.queryRoot = true;
+ if(this.paramVOS.querytemplate){
+ //璇存槑鏄�氳繃鎸夐挳鐐瑰嚮鎵撳紑鐨勶紝Action鍙傛暟涓厤缃湁this.paramVOS.querytemplate
+ url="/api/uiDataController/getDataByTemp";
+ }
} else {
delete params.queryRoot;
+ if(this.paramVOS.querytemplate){
+ //璇存槑鏄�氳繃鎸夐挳鐐瑰嚮鎵撳紑鐨勶紝Action鍙傛暟涓厤缃湁this.paramVOS.querytemplate
+ delete params.queryTemplate;
+ delete params.linkTypeFlag;
+ }
}
- getTree(parentOid, parentBtmName, params).then(res => {
- resolve(res.data.treeData)
+ getTree(parentOid, parentBtmName, params,url).then(res => {
+ resolve(res.data.treeData )
this.$nextTick(()=>{
if (this.isRefresh) {
this.$refs.tree.setCurrentKey(this.currentClickNode.data.oid);
--
Gitblit v1.9.3