From fcdc4ef3b6ad8bb6b85333325387b4fcce417167 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期五, 27 十二月 2024 17:05:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue |   46 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 34 insertions(+), 12 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 0e751cd..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
@@ -167,7 +167,7 @@
       if (!value) return true;
       return data[this.defaultProps.label].indexOf(value) !== -1;
     },
-    sourceDataMap: function () {debugger;
+    sourceDataMap: function () {
       const sourceDataMap = {};
       if (Object.keys(this.sourceData).length > 0) {
         if (this.sourceData.oid) {
@@ -179,35 +179,38 @@
         }
         for (let i in this.sourceData) {
           const item = this.sourceData[i]
-          if (item && item.constructor === Object) continue;
-          if (i == 'type' || i == 'context' || i == 'content') continue;
-          sourceDataMap['sourceData["' + i + '"]'] = item
+          if (['type', 'context', 'content', 'querytemplate', 'querytype'].includes(i)) continue;
+          if (item && item.constructor === Object) {
+            sourceDataMap['sourceData["' + i + '"]'] = JSON.stringify(item)
+          }else {
+            sourceDataMap['sourceData["' + i + '"]'] = item
+          }
         }
       }
 
       if (Object.keys(this.paramVOS).length > 0) {
         for (let j in this.paramVOS) {
           if (this.paramVOS[j] && this.paramVOS[j].constructor === Object) continue;
-          if (j == 'type' || j == 'context' || j == 'content' || j == "getdataurl" || j == "getdatamethod" || j == "url" || j == "method" || j == "uploadfileurl" || j == "title") continue;
+          if (['type', 'context', 'content', "getdataurl", "getdatamethod", "url", "method", "uploadfileurl", "title", 'querytemplate', 'querytype', 'usesourcedata','component'].includes(j)) continue;
           sourceDataMap['sourceData["' + j + '"]'] = this.paramVOS[j]
         }
       }
       return sourceDataMap;
     },
-    getParams: function () {debugger;
+    getParams: function () {
       let parentFieldName = "";
       if (this.componentVO.treeDefineVO.showLinkAbs) {
         parentFieldName = this.componentVO.treeDefineVO.showLinkAbs.split(",")[0];
       }
       const queryTemplate=this.sourceData.querytemplate || this.paramVOS.querytemplate;
-      const linkTypeFlag=this.sourceData.queryType==0?false:(!validatenull(this.sourceData.linkType)?true:(this.paramVOS.querytype==0?false:true));
+      const linkTypeFlag=this.sourceData.querytype==0?false:(!validatenull(this.sourceData.linktype)?true:(this.paramVOS.querytype==0?false:true));
       const treeParams = {
         queryAllLevel: !this.lazy,
         loadType: this.componentVO.treeDefineVO.loadType,
         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',
@@ -215,7 +218,7 @@
         textField: this.componentVO.treeDefineVO.treeNodeExpression,
         queryTemplate: queryTemplate,
         linkTypeFlag: linkTypeFlag,
-        rootExpress: this.componentVO.treeDefineVO.rootExpress || ''
+        rootExpress: this.componentVO.treeDefineVO.rootContent || ''
       }
       const sourceDataMapList = this.sourceDataMapParams;
 
@@ -239,15 +242,34 @@
       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){
+          //璇存槑鏄�氳繃鎸夐挳鐐瑰嚮鎵撳紑鐨勶紝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 || res.data.obj || [])
         this.$nextTick(()=>{
           if (this.isRefresh) {
             this.$refs.tree.setCurrentKey(this.currentClickNode.data.oid);

--
Gitblit v1.9.3