@@ -67,12 +67,13 @@ import {
ApproveMethodType,
AssignEmptyHandlerType,
AssignStartUserHandlerType,
+ ConditionType,
NODE_DEFAULT_NAME,
NodeType,
RejectHandlerType,
SimpleFlowNode
} from './consts'
-import { generateUUID } from '@/utils'
+import {generateUUID} from '@/utils'
defineOptions({
name: 'NodeHandler'
@@ -164,9 +165,24 @@ const addNode = (type: number) => {
type: NodeType.CONDITION_NODE,
childNode: undefined,
conditionSetting: {
- defaultFlow: false
- },
-
+ defaultFlow: false,
+ conditionType: ConditionType.RULE,
+ conditionGroups: {
+ and: true,
+ conditions: [
+ {
+ and: true,
+ rules: [
+ {
+ opCode: '==',
+ leftSide: '',
+ rightSide: ''
+ }
+ ]
+ }
+ ]
+ }
+ }
},
{
id: 'Flow_' + generateUUID(),
@@ -221,9 +237,24 @@ const addNode = (type: number) => {
type: NodeType.CONDITION_NODE,
childNode: undefined,
conditionSetting: {
- defaultFlow: false
+ defaultFlow: false,
+ conditionType: ConditionType.RULE,
+ conditionGroups: {
+ and: true,
+ conditions: [
+ {
+ and: true,
+ rules: [
+ {
+ opCode: '==',
+ leftSide: '',
+ rightSide: ''
+ }
+ ]
+ }
+ ]
+ }
}
-
},
{
id: 'Flow_' + generateUUID(),
@@ -249,14 +280,13 @@ const addNode = (type: number) => {
}
emits('update:childNode', data)
}
- if (type === NodeType.ROUTE_BRANCH_NODE) {
+ if (type === NodeType.ROUTER_BRANCH_NODE) {
const data: SimpleFlowNode = {
id: 'GateWay_' + generateUUID(),
- name: NODE_DEFAULT_NAME.get(NodeType.ROUTE_BRANCH_NODE) as string,
+ name: NODE_DEFAULT_NAME.get(NodeType.ROUTER_BRANCH_NODE) as string,
showText: '',
- type: NodeType.ROUTE_BRANCH_NODE,
- childNode: props.childNode,
- defaultFlowId: 'Flow_' + generateUUID()
+ type: NodeType.ROUTER_BRANCH_NODE,
+ childNode: props.childNode
}
emits('update:childNode', data)
}
diff --git a/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue b/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue
index 4c87d5b07..26ef13dd5 100644
--- a/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue
+++ b/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue
@@ -45,8 +45,8 @@
@update:flow-node="handleModelValueUpdate"
/>
-
@@ -73,7 +73,7 @@ import ExclusiveNode from './nodes/ExclusiveNode.vue'
import ParallelNode from './nodes/ParallelNode.vue'
import InclusiveNode from './nodes/InclusiveNode.vue'
import DelayTimerNode from './nodes/DelayTimerNode.vue'
-import RouteNode from './nodes/RouteNode.vue'
+import RouterNode from './nodes/RouterNode.vue'
import { SimpleFlowNode, NodeType } from './consts'
import { useWatchNode } from './node'
defineOptions({
diff --git a/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue b/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue
index a6c7a37ed..70eade33f 100644
--- a/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue
+++ b/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue
@@ -40,7 +40,7 @@ defineOptions({
name: 'SimpleProcessDesigner'
})
-const emits = defineEmits(['success', 'init-finished']) // 保存成功事件
+const emits = defineEmits(['success']) // 保存成功事件
const props = defineProps({
modelId: {
@@ -59,13 +59,10 @@ const props = defineProps({
startUserIds: {
type: Array,
required: false
- },
- value: {
- type: [String, Object],
- required: false
}
})
+const processData = inject('processData') as Ref
const loading = ref(false)
const formFields = ref
([])
const formType = ref(20)
@@ -76,9 +73,6 @@ const deptOptions = ref([]) // 部门列表
const deptTreeOptions = ref()
const userGroupOptions = ref([]) // 用户组列表
-// 添加当前值的引用
-const currentValue = ref()
-
provide('formFields', formFields)
provide('formType', formType)
provide('roleList', roleOptions)
@@ -88,7 +82,8 @@ provide('deptList', deptOptions)
provide('userGroupList', userGroupOptions)
provide('deptTree', deptTreeOptions)
provide('startUserIds', props.startUserIds)
-
+provide('tasks', [])
+provide('processInstance', {})
const message = useMessage() // 国际化
const processNodeTree = ref()
provide('processNodeTree', processNodeTree)
@@ -113,70 +108,13 @@ const updateModel = () => {
}
}
-// 加载流程数据
-const loadProcessData = async (data: any) => {
- try {
- if (data) {
- const parsedData = typeof data === 'string' ? JSON.parse(data) : data
- processNodeTree.value = parsedData
- currentValue.value = parsedData
- // 确保数据加载后刷新视图
- await nextTick()
- if (simpleProcessModelRef.value?.refresh) {
- await simpleProcessModelRef.value.refresh()
- }
- }
- } catch (error) {
- console.error('加载流程数据失败:', error)
- }
-}
-
-// 监听属性变化
-watch(
- () => props.value,
- async (newValue, oldValue) => {
- if (newValue && newValue !== oldValue) {
- await loadProcessData(newValue)
- }
- },
- { immediate: true, deep: true }
-)
-
-// 监听流程节点树变化，自动保存
-watch(
- () => processNodeTree.value,
- async (newValue, oldValue) => {
- if (newValue && oldValue && JSON.stringify(newValue) !== JSON.stringify(oldValue)) {
- await saveSimpleFlowModel(newValue)
- }
- },
- { deep: true }
-)
-
const saveSimpleFlowModel = async (simpleModelNode: SimpleFlowNode) => {
if (!simpleModelNode) {
return
}
- // 校验节点
- errorNodes = []
- validateNode(simpleModelNode, errorNodes)
- if (errorNodes.length > 0) {
- errorDialogVisible.value = true
- return
- }
-
try {
- if (props.modelId) {
- // 编辑模式
- const data = {
- id: props.modelId,
- simpleModel: simpleModelNode
- }
- await updateBpmSimpleModel(data)
- }
- // 无论是编辑还是新建模式，都更新当前值并触发事件
- currentValue.value = simpleModelNode
+ processData.value = simpleModelNode
emits('success', simpleModelNode)
} catch (error) {
console.error('保存失败:', error)
@@ -247,61 +185,18 @@ onMounted(async () => {
deptTreeOptions.value = handleTree(deptOptions.value as DeptApi.DeptVO[], 'id')
// 获取用户组列表
userGroupOptions.value = await UserGroupApi.getUserGroupSimpleList()
-
// 加载流程数据
- if (props.modelId) {
- // 获取 SIMPLE 设计器模型
- const result = await getBpmSimpleModel(props.modelId)
- if (result) {
- await loadProcessData(result)
- } else {
- updateModel()
- }
- } else if (props.value) {
- await loadProcessData(props.value)
+ if (processData.value) {
+ processNodeTree.value = processData?.value
} else {
updateModel()
}
} finally {
loading.value = false
- emits('init-finished')
}
})
const simpleProcessModelRef = ref()
-/** 获取当前流程数据 */
-const getCurrentFlowData = async () => {
- try {
- if (simpleProcessModelRef.value) {
- const data = await simpleProcessModelRef.value.getCurrentFlowData()
- if (data) {
- currentValue.value = data
- return data
- }
- }
- return currentValue.value
- } catch (error) {
- console.error('获取流程数据失败:', error)
- return currentValue.value
- }
-}
-
-// 刷新方法
-const refresh = async () => {
- try {
- if (currentValue.value) {
- await loadProcessData(currentValue.value)
- }
- } catch (error) {
- console.error('刷新失败:', error)
- }
-}
-
-defineExpose({
- getCurrentFlowData,
- updateModel,
- loadProcessData,
- refresh
-})
+defineExpose({})
diff --git a/src/components/SimpleProcessDesignerV2/src/SimpleProcessModel.vue b/src/components/SimpleProcessDesignerV2/src/SimpleProcessModel.vue
index ccd1f10d2..8f0a2916b 100644
--- a/src/components/SimpleProcessDesignerV2/src/SimpleProcessModel.vue
+++ b/src/components/SimpleProcessDesignerV2/src/SimpleProcessModel.vue
@@ -3,6 +3,22 @@
+
+ 导出
+
+
+ 导入
+
+
+
{{ scaleValue }}%
@@ -34,6 +50,8 @@ import ProcessNodeTree from './ProcessNodeTree.vue'
import { SimpleFlowNode, NodeType, NODE_DEFAULT_TEXT } from './consts'
import { useWatchNode } from './node'
import { ZoomOut, ZoomIn, ScaleToOriginal } from '@element-plus/icons-vue'
+import { isString } from '@/utils/is'
+import download from '@/utils/download'
defineOptions({
name: 'SimpleProcessModel'
@@ -52,7 +70,7 @@ const props = defineProps({
})
const emits = defineEmits<{
- 'save': [node: SimpleFlowNode | undefined]
+ save: [node: SimpleFlowNode | undefined]
}>()
const processNodeTree = useWatchNode(props)
@@ -85,6 +103,16 @@ const processReZoom = () => {
const errorDialogVisible = ref(false)
let errorNodes: SimpleFlowNode[] = []
+const saveSimpleFlowModel = async () => {
+ errorNodes = []
+ validateNode(processNodeTree.value, errorNodes)
+ if (errorNodes.length > 0) {
+ errorDialogVisible.value = true
+ return
+ }
+ emits('save', processNodeTree.value)
+}
+
// 校验节点设置。 暂时以 showText 为空 未节点错误配置
const validateNode = (node: SimpleFlowNode | undefined, errorNodes: SimpleFlowNode[]) => {
if (node) {
@@ -143,6 +171,28 @@ const getCurrentFlowData = async () => {
defineExpose({
getCurrentFlowData
})
+
+/** 导出 JSON */
+const exportJson = () => {
+ download.json(new Blob([JSON.stringify(processNodeTree.value)]), 'model.json')
+}
+
+/** 导入 JSON */
+const refFile = ref()
+const importJson = () => {
+ refFile.value.click()
+}
+const importLocalFile = () => {
+ const file = refFile.value.files[0]
+ const reader = new FileReader()
+ reader.readAsText(file)
+ reader.onload = function () {
+ if (isString(this.result)) {
+ processNodeTree.value = JSON.parse(this.result)
+ emits('save', processNodeTree.value)
+ }
+ }
+}
diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts
index ffc37b800..089a63924 100644
--- a/src/components/SimpleProcessDesignerV2/src/consts.ts
+++ b/src/components/SimpleProcessDesignerV2/src/consts.ts
@@ -48,7 +48,7 @@ export enum NodeType {
/**
* 路由分支节点
*/
- ROUTE_BRANCH_NODE = 54
+ ROUTER_BRANCH_NODE = 54
}
export enum NodeId {
@@ -110,10 +110,12 @@ export interface SimpleFlowNode {
// 延迟设置
delaySetting?: DelaySetting
// 路由分支
- routerGroups?: RouteCondition[]
+ routerGroups?: RouterCondition[]
defaultFlowId?: string
// 签名
signEnable?: boolean
+ // 审批意见
+ reasonRequire?: boolean
}
// 候选人策略枚举 （ 用于审批节点。抄送节点 )
export enum CandidateStrategy {
@@ -447,8 +449,6 @@ export enum OperationButtonType {
* 条件规则结构定义
*/
export type ConditionRule = {
- type: number
- opName: string
opCode: string
leftSide: string
rightSide: string
@@ -479,7 +479,7 @@ NODE_DEFAULT_TEXT.set(NodeType.COPY_TASK_NODE, '请配置抄送人')
NODE_DEFAULT_TEXT.set(NodeType.CONDITION_NODE, '请设置条件')
NODE_DEFAULT_TEXT.set(NodeType.START_USER_NODE, '请设置发起人')
NODE_DEFAULT_TEXT.set(NodeType.DELAY_TIMER_NODE, '请设置延迟器')
-NODE_DEFAULT_TEXT.set(NodeType.ROUTE_BRANCH_NODE, '请设置路由节点')
+NODE_DEFAULT_TEXT.set(NodeType.ROUTER_BRANCH_NODE, '请设置路由节点')
export const NODE_DEFAULT_NAME = new Map()
NODE_DEFAULT_NAME.set(NodeType.USER_TASK_NODE, '审批人')
@@ -487,7 +487,7 @@ NODE_DEFAULT_NAME.set(NodeType.COPY_TASK_NODE, '抄送人')
NODE_DEFAULT_NAME.set(NodeType.CONDITION_NODE, '条件')
NODE_DEFAULT_NAME.set(NodeType.START_USER_NODE, '发起人')
NODE_DEFAULT_NAME.set(NodeType.DELAY_TIMER_NODE, '延迟器')
-NODE_DEFAULT_NAME.set(NodeType.ROUTE_BRANCH_NODE, '路由分支')
+NODE_DEFAULT_NAME.set(NodeType.ROUTER_BRANCH_NODE, '路由分支')
// 候选人策略。暂时不从字典中取。 后续可能调整。控制显示顺序
export const CANDIDATE_STRATEGY: DictDataVO[] = [
@@ -668,7 +668,7 @@ export const DELAY_TYPE = [
/**
* 路由分支结构定义
*/
-export type RouteCondition = {
+export type RouterCondition = {
nodeId: string
conditionType: ConditionType
conditionExpression: string
diff --git a/src/components/SimpleProcessDesignerV2/src/node.ts b/src/components/SimpleProcessDesignerV2/src/node.ts
index ea983ce91..bc8d8a112 100644
--- a/src/components/SimpleProcessDesignerV2/src/node.ts
+++ b/src/components/SimpleProcessDesignerV2/src/node.ts
@@ -148,6 +148,7 @@ export type UserTaskFormType = {
taskCompleteListenerHeader?: ListenerParam[]
taskCompleteListenerBody?: ListenerParam[]
signEnable: boolean
+ reasonRequire: boolean
}
export type CopyTaskFormType = {
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue
index 7c45e1bf6..f22168bd0 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue
@@ -26,127 +26,11 @@
-
- 未满足其它条件时，将进入此分支（该分支不可编辑和删除）
-
+
未满足其它条件时，将进入此分支（该分支不可编辑和删除）
-
-
-
-
- {{ dict.label }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+