From 35a0e69cd4380324fb67593eb0374651d1f7b3ea Mon Sep 17 00:00:00 2001 From: Lesan <1960681385@qq.com> Date: Wed, 8 Jan 2025 10:51:47 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E9=83=A8=E5=88=86=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9B=B4=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SimpleProcessDesignerV2/src/consts.ts | 10 ++++---- .../SimpleProcessDesignerV2/src/node.ts | 14 +++++------ .../src/nodes-config/RouteNodeConfig.vue | 24 +++++++++---------- .../src/nodes-config/UserTaskNodeConfig.vue | 22 ++++++++--------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts index 47edc8bc..91f06322 100644 --- a/src/components/SimpleProcessDesignerV2/src/consts.ts +++ b/src/components/SimpleProcessDesignerV2/src/consts.ts @@ -116,7 +116,7 @@ export interface SimpleFlowNode { // 延迟设置 delaySetting?: DelaySetting // 路由分支 - routeGroups?: RouteCondition[] + routerGroups?: RouteCondition[] defaultFlowId?: string } // 候选人策略枚举 （ 用于审批节点。抄送节点 ) @@ -241,15 +241,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 { /** * 固定值 */ diff --git a/src/components/SimpleProcessDesignerV2/src/node.ts b/src/components/SimpleProcessDesignerV2/src/node.ts index 4be76867..11f1f01f 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,16 @@ 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[] } export type CopyTaskFormType = { diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/RouteNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/RouteNodeConfig.vue index 79ad364e..42b3524e 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/RouteNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/RouteNodeConfig.vue @@ -25,7 +25,7 @@
- + - + @@ -81,7 +81,7 @@ const { settingVisible, closeDrawer, openDrawer } = useDrawer() const currentNode = useWatchNode(props) // 节点名称 const { nodeName, showInput, clickIcon, blurEvent } = useNodeName(NodeType.ROUTE_BRANCH_NODE) -const routeGroups = ref([]) +const routerGroups = ref([]) const nodeOptions = ref() // 保存配置 @@ -90,26 +90,26 @@ const saveConfig = async () => { if (!showText) return false currentNode.value.name = nodeName.value! currentNode.value.showText = showText - currentNode.value.routeGroups = routeGroups.value + currentNode.value.routerGroups = routerGroups.value settingVisible.value = false return true } // 显示路由分支节点配置， 由父组件传过来 const showRouteNodeConfig = (node: SimpleFlowNode) => { getRoutableNode() - routeGroups.value = [] + routerGroups.value = [] nodeName.value = node.name - if (node.routeGroups) { - routeGroups.value = node.routeGroups + if (node.routerGroups) { + routerGroups.value = node.routerGroups } } const getShowText = () => { - if (!routeGroups.value || !Array.isArray(routeGroups.value) || routeGroups.value.length <= 0) { + if (!routerGroups.value || !Array.isArray(routerGroups.value) || routerGroups.value.length <= 0) { message.warning('请配置路由！') return '' } - for (const route of routeGroups.value) { + for (const route of routerGroups.value) { if (!route.nodeId || !route.conditionType) { message.warning('请完善路由配置项！') return '' @@ -129,11 +129,11 @@ const getShowText = () => { } } } - return `${routeGroups.value.length}条路由分支` + return `${routerGroups.value.length}条路由分支` } const addRouteGroup = () => { - routeGroups.value.push({ + routerGroups.value.push({ nodeId: '', conditionType: ConditionType.RULE, conditionExpression: '', @@ -158,7 +158,7 @@ const addRouteGroup = () => { } const deleteRouteGroup = (index) => { - routeGroups.value.splice(index, 1) + routerGroups.value.splice(index, 1) } const getRoutableNode = () => { diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue index 962ce9cc..66887a7e 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue @@ -482,12 +482,12 @@
@@ -505,7 +505,7 @@ icon="ep:delete" :size="18" @click=" - deleteTaskListenerMap( + deleteTaskListenerParam( configForm[`task${listener.type}ListenerHeader`], index ) @@ -516,7 +516,7 @@ 添加一行 @@ -542,12 +542,12 @@
@@ -565,7 +565,7 @@ icon="ep:delete" :size="18" @click=" - deleteTaskListenerMap( + deleteTaskListenerParam( configForm[`task${listener.type}ListenerBody`], index ) @@ -576,7 +576,7 @@ 添加一行 @@ -623,7 +623,7 @@ import { FieldPermissionType, ProcessVariableEnum, LISTENER_MAP_TYPES, - ListenerMapTypeEnum + ListenerParamTypeEnum } from '../consts' import { @@ -1032,14 +1032,14 @@ function useTimeoutHandler() { } } -const addTaskListenerMap = (arr) => { +const addTaskListenerParam = (arr) => { arr.push({ key: '', type: 1, value: '' }) } -const deleteTaskListenerMap = (arr, index) => { +const deleteTaskListenerParam = (arr, index) => { arr.splice(index, 1) }