From 9c06f1650313b76c8e1c06ac35a18dce44664320 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 十一月 2024 15:05:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-form.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-form.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-form.vue
index 4cadbbc..613a9a8 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-form.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-form.vue
@@ -124,7 +124,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', 'querytemplate', 'querytype'].includes(i)) continue;
           sourceDataMap['sourceData["' + i + '"]'] = item
         }
       }
@@ -132,7 +132,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]
         }
       }

--
Gitblit v1.9.3