diff --git a/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue b/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue index cb38320..678cdcc 100644 --- a/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue +++ b/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue @@ -29,13 +29,11 @@ import { FORM_DESIGN_APP_COMPONENTS } from '/@/enums/microAppEnum'; interface TableState { - tag: string; formDesignApp: MicroApp; form: Partial; } const state = reactive({ - tag: '', formDesignApp: undefined!, form: { id: undefined!, @@ -69,23 +67,14 @@ changeLoading(false); }); // 处理清除脏数据 - state.form = {}; formDesignProps.options = {}; - state.tag = data._tag; - const id = data.record?.id; - state.form.formDefinitionId = data.record?.formDefinitionId; + const id = data.id; // 处理设置数据 const props: Partial = { confirmLoading: false }; - switch (state.tag) { - case 'add': - props.title = '新增流程表单'; - break; - case 'edit': - props.title = '编辑流程表单'; - state.form = await getFormDefinitionJson(id); - state.form?.json && (formDesignProps.options = state.form.json); - break; - } + props.title = '流程表单设计'; + state.form = await getFormDefinitionJson(id) || {}; + state.form?.json && (formDesignProps.options = state.form.json); + state.form.formDefinitionId = data.formDefinitionId; setModalProps(props); }); @@ -103,14 +92,10 @@ state.form.isPrimary = '1'; // 处理提交之前逻辑 setModalProps({ confirmLoading: true }); - // 采用tag标签区分操作 - switch (state.tag) { - case 'add': - await addFormDefinitionJson(state.form); - break; - case 'edit': - await editFormDefinitionJson(state.form); - break; + if (state.form?.id != undefined) { + await editFormDefinitionJson(state.form); + } else { + await addFormDefinitionJson(state.form); } // 处理提交完成之后逻辑 closeModal(); diff --git a/src/views/workflow/extension/form/index.vue b/src/views/workflow/extension/form/index.vue index 2987091..33b8902 100644 --- a/src/views/workflow/extension/form/index.vue +++ b/src/views/workflow/extension/form/index.vue @@ -284,8 +284,8 @@ /** 处理工作流表单设计 */ function handleWorkFlowFormDesign(row: Recordable) { - const record = row.formDefinitionJson || {}; - openWorkflowFormModal(true, { _tag: 'edit', record }); + const formDefinitionJson = row.formDefinitionJson || {}; + openWorkflowFormModal(true, { id: formDefinitionJson.id, formDefinitionId: row.id }); } /** 处理打开工作流版本管理 */