Commit 905d3a21 authored by jingnan's avatar jingnan 👀

合并底层代码【6636】,解决流程模板表单配置bug

parent 38b0dcc8
......@@ -47,8 +47,8 @@
v-else-if="name && name.type && name.type === 'formConfig'&&basicData.businessObject"
:ref="name.refKey"
:lay-config="{
typeName: name.modelName,
layKey: name.keyName
typeName: name.webServerName,
layKey: name.configName
}"
editor-immediately
:basic-data="basicData.businessObject"
......@@ -121,6 +121,18 @@
:process-instance-id="processInstanceId"
:basic-data="basicData.businessObject"
/>
<dee-as-com
v-else-if="currTab && currTab.comType && currTab.comType === 'formConfig'"
:key="'formConfig' + id"
:ref="currTab.configName"
v-bind="currTab.configParams ? JSON.parse(currTab.configParams) : {}"
:component-prop="{...currTab, selfComponentPath: currTab.configName}"
:lay-config="{
typeName:currTab.webServerName,
layKey: currTab.configName
}"
:basic-data="basicData.businessObject"
/>
<component :is="currTab.comName" v-else-if="currTab && currTab.comName" :ref="currTab.name" v-bind="currTab.configParams ? JSON.parse(currTab.configParams) : {}" :process-instance-id="processInstanceId" :basic-data="basicData" />
<component :is="currTab.configName" v-else-if="currTab && currTab.configName" :ref="currTab.name" v-bind="currTab.configParams ? JSON.parse(currTab.configParams) : {}" :process-instance-id="processInstanceId" :basic-data="basicData" />
</div>
......@@ -768,7 +780,7 @@ export default {
validateArray.push(vm.validate())
} else if (vm.$refs.asCom && vm.$refs.asCom.hasOwnProperty('validate')) {
validateArray.push(vm.$refs.asCom.validate())
} else if (vm.$refs.asCom.$refs && vm.$refs.asCom.$refs.deeForm && vm.$refs.asCom.$refs.deeForm.hasOwnProperty('validate')) {
} else if (vm.$refs.asCom && vm.$refs.asCom.$refs && vm.$refs.asCom.$refs.deeForm && vm.$refs.asCom.$refs.deeForm.hasOwnProperty('validate')) {
validateArray.push(vm.$refs.asCom.$refs.deeForm.validate())
}
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment