From d2008fc35a45ff00b0f37939a13b792ab12e8c6f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 十一月 2024 10:25:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue | 6 +++---
1 files changed, 3 insertions(+), 3 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 509bdb6..ed18af1 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
@@ -180,7 +180,7 @@
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;
+ if (['type', 'context', 'content', "title", 'querytemplate', 'querytype'].includes(i)) continue;
sourceDataMap['sourceData["' + i + '"]'] = item
}
}
@@ -188,7 +188,7 @@
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'].includes(j)) continue;
sourceDataMap['sourceData["' + j + '"]'] = this.paramVOS[j]
}
}
@@ -215,7 +215,7 @@
textField: this.componentVO.treeDefineVO.treeNodeExpression,
queryTemplate: queryTemplate,
linkTypeFlag: linkTypeFlag,
- rootExpress: this.componentVO.treeDefineVO.rootExpress || ''
+ rootExpress: this.componentVO.treeDefineVO.rootContent || ''
}
const sourceDataMapList = this.sourceDataMapParams;
--
Gitblit v1.9.3