Skip to content

Commit 91c3b94

Browse files
committed
Merge branch 'feature/bpm' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feature/bpm
2 parents 7652c41 + 9994059 commit 91c3b94

File tree

5 files changed

+290
-75
lines changed

5 files changed

+290
-75
lines changed

src/components/SimpleProcessDesignerV2/src/NodeHandler.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,9 @@ const addNode = (type: number) => {
306306
},
307307
timeoutSetting: {
308308
enable: false
309+
},
310+
multiInstanceSetting: {
311+
enable: false
309312
}
310313
}
311314
}

src/components/SimpleProcessDesignerV2/src/consts.ts

Lines changed: 71 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -814,26 +814,84 @@ export const TRIGGER_TYPES: DictDataVO[] = [
814814
export type ChildProcessSetting = {
815815
calledProcessDefinitionKey: string
816816
calledProcessDefinitionName: string
817-
async: boolean,
818-
inVariables?: IOParameter[],
819-
outVariables?: IOParameter[],
820-
skipStartUserNode: boolean,
821-
startUserSetting: StartUserSetting,
822-
timeoutSetting: TimeoutSetting,
817+
async: boolean
818+
inVariables?: IOParameter[]
819+
outVariables?: IOParameter[]
820+
skipStartUserNode: boolean
821+
startUserSetting: StartUserSetting
822+
timeoutSetting: TimeoutSetting
823+
multiInstanceSetting: MultiInstanceSetting
823824
}
824825
export type IOParameter = {
825826
source: string
826-
sourceExpression: string
827827
target: string
828-
targetExpression: string
829828
}
830829
export type StartUserSetting = {
831-
type: number
830+
type: ChildProcessStartUserTypeEnum
832831
formField?: string
833-
emptyType?: number
832+
emptyType?: ChildProcessStartUserEmptyTypeEnum
834833
}
835834
export type TimeoutSetting = {
836-
enable: boolean,
837-
type?: DelayTypeEnum,
838-
timeExpression?: string,
835+
enable: boolean
836+
type?: DelayTypeEnum
837+
timeExpression?: string
838+
}
839+
export type MultiInstanceSetting = {
840+
enable: boolean
841+
sequential?: boolean
842+
completeRatio?: number
843+
sourceType?: ChildProcessMultiInstanceSourceTypeEnum
844+
source?: string
845+
}
846+
export enum ChildProcessStartUserTypeEnum {
847+
/**
848+
* 同主流程发起人
849+
*/
850+
MAIN_PROCESS_START_USER = 1,
851+
/**
852+
* 表单
853+
*/
854+
FROM_FORM = 2
855+
}
856+
export const CHILD_PROCESS_START_USER_TYPE = [
857+
{ label: '同主流程发起人', value: ChildProcessStartUserTypeEnum.MAIN_PROCESS_START_USER },
858+
{ label: '表单', value: ChildProcessStartUserTypeEnum.FROM_FORM }
859+
]
860+
export enum ChildProcessStartUserEmptyTypeEnum {
861+
/**
862+
* 同主流程发起人
863+
*/
864+
MAIN_PROCESS_START_USER = 1,
865+
/**
866+
* 子流程管理员
867+
*/
868+
CHILD_PROCESS_ADMIN = 2,
869+
/**
870+
* 主流程管理员
871+
*/
872+
MAIN_PROCESS_ADMIN = 3
873+
}
874+
export const CHILD_PROCESS_START_USER_EMPTY_TYPE = [
875+
{ label: '同主流程发起人', value: ChildProcessStartUserEmptyTypeEnum.MAIN_PROCESS_START_USER },
876+
{ label: '子流程管理员', value: ChildProcessStartUserEmptyTypeEnum.CHILD_PROCESS_ADMIN },
877+
{ label: '主流程管理员', value: ChildProcessStartUserEmptyTypeEnum.MAIN_PROCESS_ADMIN }
878+
]
879+
export enum ChildProcessMultiInstanceSourceTypeEnum {
880+
/**
881+
* 固定数量
882+
*/
883+
FIXED_QUANTITY = 1,
884+
/**
885+
* 数字表单
886+
*/
887+
DIGITAL_FORM = 2,
888+
/**
889+
* 多项表单
890+
*/
891+
MULTI_FORM = 3
839892
}
893+
export const CHILD_PROCESS_MULTI_INSTANCE_SOURCE_TYPE = [
894+
{ label: '固定数量', value: ChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY },
895+
{ label: '数字表单', value: ChildProcessMultiInstanceSourceTypeEnum.DIGITAL_FORM }, // TODO @lesan:DIGITAL 改成 NUMBER,和 Element plus 更接近?
896+
{ label: '多项表单', value: ChildProcessMultiInstanceSourceTypeEnum.MULTI_FORM } // TODO @lesan:多选表单?multiple 是这个解释。另外 MULTI => MULTIPLE
897+
]

0 commit comments

Comments
 (0)