From ded3890236e8d2371afc44c48631bb0fb9101d76 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 07 五月 2024 18:34:37 +0800
Subject: [PATCH] 表单展示
---
Source/ProjectWeb/src/actions/base/BaseAction.js | 1 -
Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue | 4 ++--
Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue | 15 +++++++--------
Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue | 15 +++++++--------
Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue | 15 +++++++--------
5 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/Source/ProjectWeb/src/actions/base/BaseAction.js b/Source/ProjectWeb/src/actions/base/BaseAction.js
index 6fbbc0b..528de61 100644
--- a/Source/ProjectWeb/src/actions/base/BaseAction.js
+++ b/Source/ProjectWeb/src/actions/base/BaseAction.js
@@ -18,7 +18,6 @@
values.forEach((item,i) => {
if(isShow){
item = item.replace(':', '=');
- debugger;
if (item.indexOf('${') > -1) {
if (item.split('=')[1].indexOf('.') > -1) {
//initvaluenull=true鍏佽鍒濆鍊间负绌�
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue
index 1792005..d8deb39 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue
@@ -127,19 +127,18 @@
sourceDataMap.sourceOid = this.sourceData.oid;
}
for (let i in this.sourceData) {
- let item = this.sourceData[i]
- if (item && item.constructor === Object) return;
- if (i == 'type' || i == 'context' || i == 'content') return;
+ const item = this.sourceData[i]
+ if (item && item.constructor === Object) continue;
+ if (i == 'type' || i == 'context' || i == 'content') continue;
sourceDataMap['sourceData["' + i + '"]'] = item
}
}
if (Object.keys(this.paramVOS).length>0) {
- for (let i in this.paramVOS) {
- let item = this.paramVOS[i]
- if (item && item.constructor === Object) return;
- if (i == 'type' || i == 'context' || i == 'content') return;
- sourceDataMap['sourceData["' + i + '"]'] = item
+ for (let j in this.paramVOS) {
+ if (this.paramVOS[j] && this.paramVOS[j].constructor === Object) continue;
+ if (j == 'type' || j == 'context' || j == 'content') continue;
+ sourceDataMap['sourceData["' + j + '"]'] = this.paramVOS[j]
}
}
return sourceDataMap;
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
index f5693d6..23ebb62 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
@@ -256,19 +256,18 @@
sourceDataMap.sourceOid = this.sourceData.oid;
}
for (let i in this.sourceData) {
- let item = this.sourceData[i]
- if (item && item.constructor === Object) return;
- if (i == 'type' || i == 'context' || i == 'content') return;
+ const item = this.sourceData[i]
+ if (item && item.constructor === Object) continue;
+ if (i == 'type' || i == 'context' || i == 'content') continue;
sourceDataMap['sourceData["' + i + '"]'] = item
}
}
if (Object.keys(this.paramVOS).length>0) {
- for (let i in this.paramVOS) {
- let item = this.paramVOS[i]
- if (item && item.constructor === Object) return;
- if (i == 'type' || i == 'context' || i == 'content') return;
- sourceDataMap['sourceData["' + i + '"]'] = item
+ for (let j in this.paramVOS) {
+ if (this.paramVOS[j] && this.paramVOS[j].constructor === Object) continue;
+ if (j == 'type' || j == 'context' || j == 'content') continue;
+ sourceDataMap['sourceData["' + j + '"]'] = this.paramVOS[j]
}
}
return sourceDataMap;
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
index 0e77ec6..3a11502 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
@@ -178,19 +178,18 @@
sourceDataMap.sourceOid = this.sourceData.oid;
}
for (let i in this.sourceData) {
- let item = this.sourceData[i]
- if (item && item.constructor === Object) return;
- if (i == 'type' || i == 'context' || i == 'content') return;
+ const item = this.sourceData[i]
+ if (item && item.constructor === Object) continue;
+ if (i == 'type' || i == 'context' || i == 'content') continue;
sourceDataMap['sourceData["' + i + '"]'] = item
}
}
if (Object.keys(this.paramVOS).length > 0) {
- for (let i in this.paramVOS) {
- let item = this.paramVOS[i]
- if (item && item.constructor === Object) return;
- if (i == 'type' || i == 'context' || i == 'content') return;
- sourceDataMap['sourceData["' + i + '"]'] = item
+ for (let j in this.paramVOS) {
+ if (this.paramVOS[j] && this.paramVOS[j].constructor === Object) continue;
+ if (j == 'type' || j == 'context' || j == 'content') continue;
+ sourceDataMap['sourceData["' + j + '"]'] = this.paramVOS[j]
}
}
return sourceDataMap;
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
index 2b4043b..e213ef3 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
@@ -48,8 +48,8 @@
:paramVOS="paramVOS"
:inDialog="inDialog"
:canEdit="canEdit"
- :sourceData="checkedData.westAreaInDialog.data[checkedData.westAreaInDialog.data.length-1]"
- :sourceBtmType="checkedData.westAreaInDialog.DefineVOBtmType"
+ :sourceData="(uiDefineVO.westAreas && uiDefineVO.westAreas.length>0)?checkedData.westAreaInDialog.data[checkedData.westAreaInDialog.data.length-1]:sourceData"
+ :sourceBtmType="(uiDefineVO.westAreas && uiDefineVO.westAreas.length>0)?checkedData.westAreaInDialog.DefineVOBtmType:btmType"
areas-name="centerAreaInDialog"
cradStyle=""
@setData="setData"
--
Gitblit v1.9.3