From f2fe62185f6be5228c35d073e46f6c9f65072ae6 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 09 十二月 2024 14:48:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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..90313c3 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,7 +242,13 @@
       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){

--
Gitblit v1.9.3