From c6aa8e0dae3c87100d51e962229e05752d937092 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 05 十二月 2024 20:47:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-form.vue |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 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 5926188..19a7c3b 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
@@ -104,7 +104,14 @@
       },
       deep: true,
       immediate: true
-    }
+    },
+    isShow: {
+      handler(newval) {
+        if(newval){
+          this.handleRefresh();
+        }
+      }
+    },
   },
   created() {
     this.getParams();
@@ -134,9 +141,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
+          }
         }
       }
 
@@ -151,10 +161,12 @@
     },
     getParams: function () {
       const formParams = {
-        btmname: this.currentDefineVO.btmType,
+        btmName: this.currentDefineVO.btmType,
         btmType: this.currentDefineVO.btmType,
         formDefineId: this.currentDefineVO.id,
-        oid: this.currentDefineVO.oid
+        formDefineOid: this.currentDefineVO.oid,
+        componentOid: this.componentVO.oid,
+        uiDefineId: this.uiContext,
       };
       if (this.dataStore[0] && this.dataStore[0].oid) {
         formParams.oid = this.dataStore[0].oid;

--
Gitblit v1.9.3