diff --git a/package.json b/package.json index 34417e8e..1c295de0 100644 --- a/package.json +++ b/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" diff --git a/src/components/ESign/index.ts b/src/components/ESign/index.ts deleted file mode 100644 index e7309d3f..00000000 --- a/src/components/ESign/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import ESign from './src/ESign.vue' - -export { ESign } diff --git a/src/components/ESign/src/ESign.vue b/src/components/ESign/src/ESign.vue deleted file mode 100644 index c42b6798..00000000 --- a/src/components/ESign/src/ESign.vue +++ /dev/null @@ -1,289 +0,0 @@ - - - - diff --git a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue index 4bb42919..25e54f6b 100644 --- a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue +++ b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue @@ -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, diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts index 63df615c..55808c96 100644 --- a/src/components/SimpleProcessDesignerV2/src/consts.ts +++ b/src/components/SimpleProcessDesignerV2/src/consts.ts @@ -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 } diff --git a/src/components/SimpleProcessDesignerV2/src/node.ts b/src/components/SimpleProcessDesignerV2/src/node.ts index 4be76867..e5d51663 100644 --- a/src/components/SimpleProcessDesignerV2/src/node.ts +++ b/src/components/SimpleProcessDesignerV2/src/node.ts @@ -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 { @@ -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 = { diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/RouteNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/RouteNodeConfig.vue index 2e502887..42b3524e 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/RouteNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/RouteNodeConfig.vue @@ -25,7 +25,7 @@
- + - - - - {{ dict.label }} - - - - - - - - -
-
-
条件组关系
- -
-
- - -
- -
- - -
-
- - - -
-
- - - -
-
- -
-
- -
-
- -
-
-
-
-
- -
-
+
@@ -177,18 +61,9 @@ - - diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue index 962ce9cc..4cf7db35 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue @@ -356,6 +356,15 @@
+ + 是否需要签名 + + + @@ -436,155 +445,161 @@ -
- -
- - {{ listener.name }} - + +
+ + {{ listener.name }} + + + + +
- -
- - - - - - - -
-
- -
-
- - - -
-
- - - - -
-
- -
+ + + + +
+
+
- - 添加一行 - - - -
-
- -
-
- - - -
-
- + + - - - -
-
- -
+
- - 添加一行 - -
-
+
+ + + + +
+
+ +
+
+ + 添加一行 + +
+ +
+
+ +
+
+ + + +
+
+ + + + +
+
+ +
+
+ + 添加一行 + +
- -
+
+