From 18c43123b51a1688ab4ae01fe3d171c7d92e619b Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期四, 16 一月 2025 18:19:34 +0800
Subject: [PATCH] 1、调整会话过期提示 2、流程设计器隐藏拓展按钮,隐藏右下角图标

---
 Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue |   20 ++++++++++++++++----
 1 files changed, 16 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 8db65f5..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
@@ -179,9 +179,12 @@
         }
         for (let i in this.sourceData) {
           const item = this.sourceData[i]
-          if (item && item.constructor === Object) continue;
           if (['type', 'context', 'content', 'querytemplate', 'querytype'].includes(i)) continue;
-          sourceDataMap['sourceData["' + i + '"]'] = item
+          if (item && item.constructor === Object) {
+            sourceDataMap['sourceData["' + i + '"]'] = JSON.stringify(item)
+          }else {
+            sourceDataMap['sourceData["' + i + '"]'] = item
+          }
         }
       }
 
@@ -207,7 +210,7 @@
         multipleSelect: this.isMuti,
         isMuti: this.isMuti,
         isQueryAllColumn: true,
-        btmname: this.componentVO.treeDefineVO.btmType,
+        btmName: this.componentVO.treeDefineVO.btmType,
         componentOid: this.componentVO.oid,
         uiDefineId: this.uiContext,
         valueField: this.componentVO.treeDefineVO.valueField || 'oid',
@@ -239,9 +242,18 @@
       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 && 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='';
+      if(this.componentVO.bsDataModel && this.componentVO.bsDataModel.indexOf('/')!=-1){
+        url=this.componentVO.bsDataModel;
+      }
       if (node.level === 0) {
         params.queryRoot = true;
         if(this.paramVOS.querytemplate){

--
Gitblit v1.9.3