From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-form.vue |   10 ++++++++--
 1 files changed, 8 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 81f8707..b181b70 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
@@ -164,7 +164,9 @@
         btmName: this.currentDefineVO.btmType,
         btmType: this.currentDefineVO.btmType,
         formDefineId: this.currentDefineVO.id,
-        formDefineOid: 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;
@@ -179,7 +181,11 @@
       }
       if (Object.keys(this.sourceData).length > 0 && this.isShow && this.actionType != "add") {
         this.loading = true;
-        dataForm(this.params, this.paramVOS.getdataurl, this.paramVOS.getdatamethod).then(res => {
+        let url=''
+        if(this.componentVO.bsDataModel && this.componentVO.bsDataModel.indexOf('/')!=-1){
+          url=this.componentVO.bsDataModel
+        }
+        dataForm(this.params,  this.paramVOS.getdataurl || url, this.paramVOS.getdatamethod).then(res => {
           this.form = res.data.obj.data;
           this.loading = false;
         }).catch(error => {

--
Gitblit v1.9.3