diff --git a/src/components/ProcessDesigner/package/penal/PropertiesPanel.vue b/src/components/ProcessDesigner/package/penal/PropertiesPanel.vue index 5925bf3a..ff1e2766 100644 --- a/src/components/ProcessDesigner/package/penal/PropertiesPanel.vue +++ b/src/components/ProcessDesigner/package/penal/PropertiesPanel.vue @@ -229,6 +229,7 @@ authFields: [], messageType: '', isInit: true, + formTitle: '', }; break; case 'bpmn:EndEvent': @@ -256,6 +257,7 @@ formRelations: [], formType: '1', formCode: '', + formTitle: '', formVerison: '', formRelationId: '', formUrl: '', diff --git a/src/components/ProcessDesigner/package/penal/startEvent/index.vue b/src/components/ProcessDesigner/package/penal/startEvent/index.vue index 5004707e..9b1d7b34 100644 --- a/src/components/ProcessDesigner/package/penal/startEvent/index.vue +++ b/src/components/ProcessDesigner/package/penal/startEvent/index.vue @@ -62,6 +62,9 @@ :options="data.formRelations" /> + + + @@ -73,6 +76,9 @@ @change="updateWfData('formUrl')" /> + + + { if (props.element.type == 'bpmn:StartEvent') { const currentNode = flowWfDataStore.getWfDataNode(props.element.id); + console.log(currentNode); if (currentNode) { node.value = currentNode; } else { @@ -285,6 +292,7 @@ function tabsChange() { data.formName = ''; node.value.formCode = ''; + node.value.formTitle = ''; node.value.formVerison = ''; node.value.formRelationId = ''; node.value.formUrl = ''; @@ -340,13 +348,13 @@ obj.label = `${optionsElement.label} - ${childrenElement.label}`; obj.fieldName = childrenElement.componentProps.fieldName; result.push(obj); - if(childrenElement.component === 'CardGroup'){ - result = cardComponentChild(childrenElement.componentProps.options, result) + if (childrenElement.component === 'CardGroup') { + result = cardComponentChild(childrenElement.componentProps.options, result); } }); }); - return result - } + return result; + }; function loadFormScheme(strScheme, isChange) { const scheme = JSON.parse(strScheme); let fields: any[] = []; @@ -462,7 +470,7 @@ obj.fieldName = element.componentProps.fieldName; obj.label = `卡片组-${element.label}`; fields.push(obj); - fields = cardComponentChild(element.componentProps.options, fields) + fields = cardComponentChild(element.componentProps.options, fields); } }, ); diff --git a/src/components/ProcessDesigner/package/penal/userTask/index.vue b/src/components/ProcessDesigner/package/penal/userTask/index.vue index 1552eddf..d923908e 100644 --- a/src/components/ProcessDesigner/package/penal/userTask/index.vue +++ b/src/components/ProcessDesigner/package/penal/userTask/index.vue @@ -206,6 +206,9 @@ :options="data.formRelations" /> + + + @@ -217,6 +220,9 @@ @change="updateWfData('formUrl')" /> + + + - + - + - + diff --git a/src/views/demo/workflow/task/process/audit.vue b/src/views/demo/workflow/task/process/audit.vue index 0e85939f..31d91160 100644 --- a/src/views/demo/workflow/task/process/audit.vue +++ b/src/views/demo/workflow/task/process/audit.vue @@ -10,7 +10,15 @@ - + - + diff --git a/src/views/demo/workflow/task/process/look.vue b/src/views/demo/workflow/task/process/look.vue index 6d00f950..79d7b3ad 100644 --- a/src/views/demo/workflow/task/process/look.vue +++ b/src/views/demo/workflow/task/process/look.vue @@ -13,7 +13,15 @@ - +