From 1b2642c615001b3435a9e99e478517a917f656af Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期五, 26 四月 2024 17:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
index ad9135f..5eb4afb 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
@@ -189,7 +189,7 @@
textField: this.componentVO.treeDefineVO.treeNodeExpression,
queryTemplate: this.sourceData.querytemplate,
linkTypeFlag: validatenull(this.sourceData.queryType) ? (validatenull(this.sourceData.linkType) ? false : true) : (this.sourceData.queryType == 0 ? false : true),
- rootExpress: this.componentVO.treeDefineVO.rootExpress
+ rootExpress: this.componentVO.treeDefineVO.rootExpress || ''
}
const sourceDataMapList = this.sourceDataMapParams;
@@ -213,7 +213,13 @@
parentOid = parentOid.split('@vcitreesep@')[1];
}
const parentBtmName = (node.level === 0) ? '' : node.data.attributes.btmname;
- getTree(parentOid, parentBtmName, this.params).then(res => {
+ const params=this.params;
+ if(node.level === 0){
+ params.queryRoot= true;
+ }else {
+ delete params.queryRoot;
+ }
+ getTree(parentOid, parentBtmName, params).then(res => {
resolve(res.data.treeData)
}).catch(error => {
this.$message.error(error);
--
Gitblit v1.9.3