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 | 49 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 13 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 613a9a8..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();
@@ -112,27 +119,41 @@
methods: {
sourceDataMap: function () {
const sourceDataMap = {};
- if (Object.keys(this.sourceData).length > 0) {
- if (this.sourceData.oid) {
- if (this.sourceData.oid.indexOf('@vcitreesep@') > -1) {
- this.sourceData.oid = this.sourceData.oid.split('@vcitreesep@')[1];
+ if (Object.keys(this.sourceData).length>0) {
+ if(this.sourceData.part && Object.keys(this.sourceData.part).length>0){
+ //璇存槑婧愭暟鎹槸鏍戣妭鐐�
+ if(this.sourceData.part.oid ) {
+ if (this.sourceData.part.oid.indexOf('@vcitreesep@') > -1) {
+ this.sourceData.part.oid = this.sourceData.oid.split('@vcitreesep@')[1];
+ }
+ sourceDataMap.sourceBtmName = this.sourceBtmType;
+ sourceDataMap.sourceOid = this.sourceData.part.oid;
}
- sourceDataMap.sourceBtmName = this.sourceBtmType;
- ;
- sourceDataMap.sourceOid = this.sourceData.oid;
+ }else {
+ if(this.sourceData.oid ) {
+ if (this.sourceData.oid.indexOf('@vcitreesep@') > -1) {
+ this.sourceData.oid = this.sourceData.oid.split('@vcitreesep@')[1];
+ }
+ sourceDataMap.sourceBtmName = this.sourceBtmType;
+ sourceDataMap.sourceOid = this.sourceData.oid;
+ }
}
+
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
+ }
}
}
if (Object.keys(this.paramVOS).length > 0) {
for (let j in this.paramVOS) {
if (this.paramVOS[j] && this.paramVOS[j].constructor === Object) continue;
- if (['type', 'context', 'content', "getdataurl", "getdatamethod", "url", "method", "uploadfileurl", "title", 'querytemplate', 'querytype', 'usesourcedata'].includes(j)) continue;
+ if (['type', 'context', 'content', "getdataurl", "getdatamethod", "url", "method", "uploadfileurl", "title", 'querytemplate', 'querytype', 'usesourcedata','component'].includes(j)) continue;
sourceDataMap['sourceData["' + j + '"]'] = this.paramVOS[j]
}
}
@@ -140,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