!654 Simple设计器功能完善

Merge pull request !654 from Lesan/feature/bpm-n

Author: YunaiV

package.json

@@ -73,6 +73,7 @@
     "vue-i18n": "9.10.2",
     "vue-router": "4.4.5",
     "vue-types": "^5.1.1",
+    "vue3-signature": "^0.2.4",
     "vuedraggable": "^4.1.0",
     "web-storage-cache": "^1.1.1",
     "xml-js": "^1.6.11"

src/components/ESign/index.ts

@@ -242,7 +242,6 @@ const addNode = (type: number) => {
     emits('update:childNode', data)
   }
   if (type === NodeType.ROUTE_BRANCH_NODE) {
-    // TODO @lesan：高亮那边，需要考虑下。
     const data: SimpleFlowNode = {
       id: 'GateWay_' + generateUUID(),
       name: NODE_DEFAULT_NAME.get(NodeType.ROUTE_BRANCH_NODE) as string,

src/components/ESign/src/ESign.vue

@@ -116,8 +116,10 @@ export interface SimpleFlowNode {
   // 延迟设置
   delaySetting?: DelaySetting
   // 路由分支
-  routeGroup?: RouteCondition[]
+  routerGroups?: RouteCondition[]
   defaultFlowId?: string
+  // 签名
+  signEnable?: boolean
 }
 // 候选人策略枚举 （ 用于审批节点。抄送节点 )
 export enum CandidateStrategy {
@@ -241,15 +243,15 @@ export type AssignEmptyHandler = {
 export type ListenerHandler = {
   enable: boolean
   path?: string
-  header?: ListenerMap[]
-  body?: ListenerMap[]
+  header?: ListenerParam[]
+  body?: ListenerParam[]
 }
-export type ListenerMap = {
+export type ListenerParam = {
   key: string
   type: number
   value: string
 }
-export enum ListenerMapTypeEnum {
+export enum ListenerParamTypeEnum {
   /**
    * 固定值
    */
@@ -510,8 +512,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 }
 ]
 
 // 时间单位类型
@@ -660,7 +662,7 @@ export const DELAY_TYPE = [
  */
 export type RouteCondition = {
   nodeId: string
-  conditionType: number // TODO @lesan：ConditionType
+  conditionType: ConditionType
   conditionExpression: string
   conditionGroups: ConditionGroup
 }

src/components/SimpleProcessDesignerV2/src/NodeHandler.vue

@@ -15,7 +15,7 @@ import {
   AssignStartUserHandlerType,
   AssignEmptyHandlerType,
   FieldPermissionType,
-  ListenerMap
+  ListenerParam
 } from './consts'
 import { parseFormFields } from '@/components/FormCreate/src/utils/index'
 export function useWatchNode(props: { flowNode: SimpleFlowNode }): Ref<SimpleFlowNode> {
@@ -139,16 +139,17 @@ export type UserTaskFormType = {
   buttonsSetting: any[]
   taskCreateListenerEnable?: boolean
   taskCreateListenerPath?: string
-  taskCreateListenerHeader?: ListenerMap[]
-  taskCreateListenerBody?: ListenerMap[]
+  taskCreateListenerHeader?: ListenerParam[]
+  taskCreateListenerBody?: ListenerParam[]
   taskAssignListenerEnable?: boolean
   taskAssignListenerPath?: string
-  taskAssignListenerHeader?: ListenerMap[]
-  taskAssignListenerBody?: ListenerMap[]
+  taskAssignListenerHeader?: ListenerParam[]
+  taskAssignListenerBody?: ListenerParam[]
   taskCompleteListenerEnable?: boolean
   taskCompleteListenerPath?: string
-  taskCompleteListenerHeader?: ListenerMap[]
-  taskCompleteListenerBody?: ListenerMap[]
+  taskCompleteListenerHeader?: ListenerParam[]
+  taskCompleteListenerBody?: ListenerParam[]
+  signEnable: boolean
 }
 
 export type CopyTaskFormType = {