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 | 14 ++++++++++----
1 files changed, 10 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 9b5b6fe..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
@@ -242,11 +242,17 @@
if (parentOid != 0 && parentOid.indexOf('@vcitreesep@') > -1) {
parentOid = parentOid.split('@vcitreesep@')[1];
}
- const parentBtmName = (node.level === 0) ? '' : (node.data.attributes.part.btmName || 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='';debugger;
- if(this.componentVO.bsCustQueryCLsOrUrl && this.componentVO.bsCustQueryCLsOrUrl.indexOf('/')!=-1){
- url=this.componentVO.bsCustQueryCLsOrUrl;
+ let url='';
+ if(this.componentVO.bsDataModel && this.componentVO.bsDataModel.indexOf('/')!=-1){
+ url=this.componentVO.bsDataModel;
}
if (node.level === 0) {
params.queryRoot = true;
--
Gitblit v1.9.3