diff --git a/src/api/bpm/model/index.ts b/src/api/bpm/model/index.ts index 67b1f2ad6dc61a3c2ac3feadb79ed98e46cdf98e..63b6af6add35259acad654833d9253c63716cc13 100644 --- a/src/api/bpm/model/index.ts +++ b/src/api/bpm/model/index.ts @@ -31,7 +31,6 @@ export const getModelList = async (name: string | undefined) => { } export const getModel = async (id: string) => { - debugger return await request.get({ url: '/bpm/model/get?id=' + id }) } diff --git a/src/components/FormCreate/src/utils/index.ts b/src/components/FormCreate/src/utils/index.ts index a2b3e67f856f095c2c065c118455417d7b63e726..96f196272f49a30832521b76f1411cfd5a78db3a 100644 --- a/src/components/FormCreate/src/utils/index.ts +++ b/src/components/FormCreate/src/utils/index.ts @@ -35,10 +35,11 @@ export const parseFormFields = ( if (parentTitle) { title = `${parentTitle}.${tempTitle}` } - let required = false - if ($required) { - required = true - } + // TODO @芋艿 simple设计器,只显示必填字段时,会出现流程配置问题。场景:某个字段非发起时必填,而是在某个审批节点必填并且作为条件分支参数 + // let required = false + // if ($required) { + // required = true + // } fields.push({ field, title, diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue index d72165460a37305a6895164e2b5d7b69e85889f1..62733376677eace090a8f393d10a5c96ce267066 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue @@ -12,7 +12,10 @@ - +
条件组关系
@@ -67,7 +70,7 @@ trigger: 'change' }" > - +