diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts index dab96080..4c8c67d4 100644 --- a/src/components/SimpleProcessDesignerV2/src/consts.ts +++ b/src/components/SimpleProcessDesignerV2/src/consts.ts @@ -510,8 +510,8 @@ export const APPROVE_METHODS: DictDataVO[] = [ ] export const CONDITION_CONFIG_TYPES: DictDataVO[] = [ - { label: '条件表达式', value: ConditionType.EXPRESSION }, - { label: '条件规则', value: ConditionType.RULE } + { label: '条件规则', value: ConditionType.RULE }, + { label: '条件表达式', value: ConditionType.EXPRESSION } ] // 时间单位类型 diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/RouteNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/RouteNodeConfig.vue index 389754f5..79ad364e 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/RouteNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/RouteNodeConfig.vue @@ -42,123 +42,7 @@ > - - - - {{ dict.label }} - - - - - - - - -
-
-
条件组关系
- -
-
- - -
- -
- - -
-
- - - -
-
- - - -
-
- -
-
- -
-
- -
-
-
-
-
- -
-
+ @@ -177,18 +61,9 @@ - - diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue new file mode 100644 index 00000000..ca4b9a39 --- /dev/null +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue @@ -0,0 +1,242 @@ + + + + +