From 221918bba28d2384d03c596a68256d7832e4a0e0 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 06 一月 2025 13:30:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue | 213 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 170 insertions(+), 43 deletions(-)
diff --git a/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue b/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue
index 6b5ff99..22e6073 100644
--- a/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue
+++ b/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue
@@ -1,6 +1,7 @@
<template>
<div v-loading="loading" class="overflow-auto">
<SimpleProcessModel
+ ref="simpleProcessModelRef"
v-if="processNodeTree"
:flow-node="processNodeTree"
:readonly="false"
@@ -38,12 +39,30 @@
defineOptions({
name: 'SimpleProcessDesigner'
})
-const emits = defineEmits(['success']) // 保存成功事件
+
+const emits = defineEmits(['success', 'init-finished']) // 保存成功事件
const props = defineProps({
modelId: {
type: String,
- required: true
+ required: false
+ },
+ modelKey: {
+ type: String,
+ required: false
+ },
+ modelName: {
+ type: String,
+ required: false
+ },
+ // 可发起流程的人员编号
+ startUserIds : {
+ type: Array,
+ required: false
+ },
+ value: {
+ type: [String, Object],
+ required: false
}
})
@@ -56,6 +75,10 @@
const deptOptions = ref<DeptApi.DeptVO[]>([]) // 部门列表
const deptTreeOptions = ref()
const userGroupOptions = ref<UserGroupApi.UserGroupVO[]>([]) // 用户组列表
+
+// 添加当前值的引用
+const currentValue = ref<SimpleFlowNode | undefined>()
+
provide('formFields', formFields)
provide('formType', formType)
provide('roleList', roleOptions)
@@ -64,33 +87,101 @@
provide('deptList', deptOptions)
provide('userGroupList', userGroupOptions)
provide('deptTree', deptTreeOptions)
+provide('startUserIds', props.startUserIds)
const message = useMessage() // 国际化
const processNodeTree = ref<SimpleFlowNode | undefined>()
const errorDialogVisible = ref(false)
let errorNodes: SimpleFlowNode[] = []
-const saveSimpleFlowModel = async (simpleModelNode: SimpleFlowNode) => {
- if (!simpleModelNode) {
- message.error('模型数据为空')
- return
- }
- try {
- loading.value = true
- const data = {
- id: props.modelId,
- simpleModel: simpleModelNode
+
+// 添加更新模型的方法
+const updateModel = () => {
+ if (!processNodeTree.value) {
+ processNodeTree.value = {
+ name: '发起人',
+ type: NodeType.START_USER_NODE,
+ id: NodeId.START_USER_NODE_ID,
+ childNode: {
+ id: NodeId.END_EVENT_NODE_ID,
+ name: '结束',
+ type: NodeType.END_EVENT_NODE
+ }
}
- const result = await updateBpmSimpleModel(data)
- if (result) {
- message.success('修改成功')
- emits('success')
- } else {
- message.alert('修改失败')
- }
- } finally {
- loading.value = false
+ // 初始化时也触发一次保存
+ saveSimpleFlowModel(processNodeTree.value)
}
}
+
+// 加载流程数据
+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
+ emits('success', simpleModelNode)
+ } catch (error) {
+ console.error('保存失败:', error)
+ }
+}
+
// 校验节点设置。 暂时以 showText 为空 未节点错误配置
const validateNode = (node: SimpleFlowNode | undefined, errorNodes: SimpleFlowNode[]) => {
if (node) {
@@ -134,12 +225,14 @@
try {
loading.value = true
// 获取表单字段
- const bpmnModel = await getModel(props.modelId)
- if (bpmnModel) {
- formType.value = bpmnModel.formType
- if (formType.value === 10) {
- const bpmnForm = (await getForm(bpmnModel.formId)) as unknown as FormVO
- formFields.value = bpmnForm?.fields
+ if (props.modelId) {
+ const bpmnModel = await getModel(props.modelId)
+ if (bpmnModel) {
+ formType.value = bpmnModel.formType
+ if (formType.value === 10) {
+ const bpmnForm = (await getForm(bpmnModel.formId)) as unknown as FormVO
+ formFields.value = bpmnForm?.fields
+ }
}
}
// 获得角色列表
@@ -150,30 +243,64 @@
userOptions.value = await UserApi.getSimpleUserList()
// 获得部门列表
deptOptions.value = await DeptApi.getSimpleDeptList()
-
deptTreeOptions.value = handleTree(deptOptions.value as DeptApi.DeptVO[], 'id')
// 获取用户组列表
userGroupOptions.value = await UserGroupApi.getUserGroupSimpleList()
- //获取 SIMPLE 设计器模型
- const result = await getBpmSimpleModel(props.modelId)
- if (result) {
- processNodeTree.value = result
- } else {
- // 初始值
- processNodeTree.value = {
- name: '发起人',
- type: NodeType.START_USER_NODE,
- id: NodeId.START_USER_NODE_ID,
- childNode: {
- id: NodeId.END_EVENT_NODE_ID,
- name: '结束',
- type: NodeType.END_EVENT_NODE
- }
+ // 加载流程数据
+ 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)
+ } 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
+})
</script>
--
Gitblit v1.9.3