diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/condition-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/condition-node-config.vue index 19aba8a8c..add81c941 100644 --- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/condition-node-config.vue +++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/condition-node-config.vue @@ -7,7 +7,7 @@ import { useVbenDrawer } from '@vben/common-ui'; import { IconifyIcon } from '@vben/icons'; import { cloneDeep } from '@vben/utils'; -import { Button, Input } from 'ant-design-vue'; +import { Input } from 'ant-design-vue'; import { ConditionType } from '../../consts'; import { @@ -91,13 +91,8 @@ const saveConfig = async () => { return true; }; -// 使用 useVbenDrawer 替代传统 Drawer const [Drawer, drawerApi] = useVbenDrawer({ title: currentNode.value.name, - class: 'w-[588px]', - onCancel: () => { - drawerApi.close(); - }, onConfirm: saveConfig, }); @@ -152,7 +147,7 @@ const blurEvent = () => { defineExpose({ open }); // 提供 open 方法,用于打开弹窗 diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/router-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/router-node-config.vue new file mode 100644 index 000000000..a1a553487 --- /dev/null +++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/router-node-config.vue @@ -0,0 +1,292 @@ + + diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/start-user-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/start-user-node-config.vue index 348a47317..f061b0768 100644 --- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/start-user-node-config.vue +++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/start-user-node-config.vue @@ -95,7 +95,7 @@ const [Drawer, drawerApi] = useVbenDrawer({ header: true, closable: true, onCancel() { - drawerApi.close(); + drawerApi.setState({ isOpen: false }); }, onConfirm() { saveConfig(); @@ -111,7 +111,7 @@ const saveConfig = async () => { currentNode.value.fieldsPermission = fieldsPermissionConfig.value; // 设置发起人的按钮权限 currentNode.value.buttonsSetting = START_USER_BUTTON_SETTING; - drawerApi.close(); + drawerApi.setState({ isOpen: false }); return true; }; diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/trigger-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/trigger-node-config.vue index 67096ae63..e0431edf3 100644 --- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/trigger-node-config.vue +++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/trigger-node-config.vue @@ -63,9 +63,6 @@ const [Drawer, drawerApi] = useVbenDrawer({ header: true, closable: true, title: '', - onCancel() { - drawerApi.close(); - }, onConfirm() { saveConfig(); }, @@ -678,12 +675,6 @@ onMounted(() => { - diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/parallel-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/parallel-node.vue new file mode 100644 index 000000000..f2424ca92 --- /dev/null +++ b/apps/web-antd/src/components/simple-process-design/components/nodes/parallel-node.vue @@ -0,0 +1,201 @@ + + diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes/router-node.vue b/apps/web-antd/src/components/simple-process-design/components/nodes/router-node.vue new file mode 100644 index 000000000..30014befc --- /dev/null +++ b/apps/web-antd/src/components/simple-process-design/components/nodes/router-node.vue @@ -0,0 +1,115 @@ + + + diff --git a/apps/web-antd/src/components/simple-process-design/components/process-node-tree.vue b/apps/web-antd/src/components/simple-process-design/components/process-node-tree.vue index fadf8b3ad..25516b7f7 100644 --- a/apps/web-antd/src/components/simple-process-design/components/process-node-tree.vue +++ b/apps/web-antd/src/components/simple-process-design/components/process-node-tree.vue @@ -4,9 +4,12 @@ import type { SimpleFlowNode } from '../consts'; import { NodeType } from '../consts'; import { useWatchNode } from '../helpers'; import CopyTaskNode from './nodes/copy-task-node.vue'; +import DelayTimerNode from './nodes/delay-timer-node.vue'; import EndEventNode from './nodes/end-event-node.vue'; import ExclusiveNode from './nodes/exclusive-node.vue'; import InclusiveNode from './nodes/inclusive-node.vue'; +import ParallelNode from './nodes/parallel-node.vue'; +import RouterNode from './nodes/router-node.vue'; import StartUserNode from './nodes/start-user-node.vue'; import TriggerNode from './nodes/trigger-node.vue'; import UserTaskNode from './nodes/user-task-node.vue'; @@ -94,12 +97,12 @@ const recursiveFindParentNode = ( @find-parent-node="findParentNode" /> - + @find-parent-node="findParentNode" + /> - + /> - + />