From baa4116697c5fc93ad4a3abd1a5b07eb84e02b2f Mon Sep 17 00:00:00 2001 From: jason <2667446@qq.com> Date: Mon, 13 Jan 2025 12:59:16 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E5=AE=A1=E6=89=B9=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=8F=B0=E8=AD=A6?= =?UTF-8?q?=E5=91=8A=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SimpleProcessDesignerV2/src/node.ts | 19 +++++++++---------- .../src/nodes/EndEventNode.vue | 2 +- .../src/nodes/StartUserNode.vue | 4 ++-- .../src/nodes/UserTaskNode.vue | 2 +- .../detail/ProcessInstanceSimpleViewer.vue | 14 +------------- src/views/bpm/simple/SimpleModelDesign.vue | 3 +-- 6 files changed, 15 insertions(+), 29 deletions(-) diff --git a/src/components/SimpleProcessDesignerV2/src/node.ts b/src/components/SimpleProcessDesignerV2/src/node.ts index e5d51663..79bb5d38 100644 --- a/src/components/SimpleProcessDesignerV2/src/node.ts +++ b/src/components/SimpleProcessDesignerV2/src/node.ts @@ -1,4 +1,3 @@ -import { cloneDeep } from 'lodash-es' import { TaskStatusEnum } from '@/api/bpm/task' import * as RoleApi from '@/api/system/role' import * as DeptApi from '@/api/system/dept' @@ -47,9 +46,9 @@ export function useFormFieldsPermission(defaultPermission: FieldPermissionType) // 字段权限配置. 需要有 field, title, permissioin 属性 const fieldsPermissionConfig = ref>>([]) - const formType = inject>('formType') // 表单类型 + const formType = inject>('formType', ref()) // 表单类型 - const formFields = inject>('formFields') // 流程表单字段 + const formFields = inject>('formFields', ref([])) // 流程表单字段 const getNodeConfigFormFields = (nodeFormFields?: Array>) => { nodeFormFields = toRaw(nodeFormFields) @@ -170,13 +169,13 @@ export type CopyTaskFormType = { * @description 节点表单数据。 用于审批节点、抄送节点 */ export function useNodeForm(nodeType: NodeType) { - const roleOptions = inject>('roleList') // 角色列表 - const postOptions = inject>('postList') // 岗位列表 - const userOptions = inject>('userList') // 用户列表 - const deptOptions = inject>('deptList') // 部门列表 - const userGroupOptions = inject>('userGroupList') // 用户组列表 - const deptTreeOptions = inject('deptTree') // 部门树 - const formFields = inject>('formFields') // 流程表单字段 + const roleOptions = inject>('roleList', ref([])) // 角色列表 + const postOptions = inject>('postList', ref([])) // 岗位列表 + const userOptions = inject>('userList', ref([])) // 用户列表 + const deptOptions = inject>('deptList', ref([])) // 部门列表 + const userGroupOptions = inject>('userGroupList',ref([])) // 用户组列表 + const deptTreeOptions = inject('deptTree', ref()) // 部门树 + const formFields = inject>('formFields', ref([])) // 流程表单字段 const configForm = ref() if (nodeType === NodeType.USER_TASK_NODE) { configForm.value = { diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/EndEventNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/EndEventNode.vue index 63aa24e4..0af03106 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes/EndEventNode.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes/EndEventNode.vue @@ -77,7 +77,7 @@ const props = defineProps({ const currentNode = useWatchNode(props) // 是否只读 const readonly = inject('readonly') -const processInstance = inject>('processInstance') +const processInstance = inject>('processInstance', ref({})) // 审批信息的弹窗显示，用于只读模式 const dialogVisible = ref(false) // 弹窗可见性 const processInstanceInfos = ref([]) // 流程的审批信息 diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue index 89a57d04..4abe38f0 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue @@ -13,7 +13,7 @@ > ('readonly') // 是否只读 -const tasks = inject>('tasks') +const tasks = inject>('tasks', ref([])) // 定义事件，更新父组件。 const emits = defineEmits<{ 'update:modelValue': [node: SimpleFlowNode | undefined] diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue index 761a6743..47ef540c 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue @@ -131,7 +131,7 @@ const emits = defineEmits<{ // 是否只读 const readonly = inject('readonly') -const tasks = inject>('tasks') +const tasks = inject>('tasks', ref([])) // 监控节点变化 const currentNode = useWatchNode(props) // 节点名称编辑 diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue b/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue index 66d653c8..14c93eb3 100644 --- a/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue +++ b/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue @@ -4,7 +4,6 @@ :flow-node="simpleModel" :tasks="tasks" :process-instance="processInstance" - class="process-viewer" /> @@ -20,7 +19,7 @@ const props = defineProps({ modelView: propTypes.object, simpleJson: propTypes.string // Simple 模型结构数据 (json 格式) }) -const simpleModel = ref() +const simpleModel = ref({}) // 用户任务 const tasks = ref([]) // 流程实例 @@ -161,15 +160,4 @@ const setSimpleModelNodeTaskStatus = ( diff --git a/src/views/bpm/simple/SimpleModelDesign.vue b/src/views/bpm/simple/SimpleModelDesign.vue index eed00997..e07a04c9 100644 --- a/src/views/bpm/simple/SimpleModelDesign.vue +++ b/src/views/bpm/simple/SimpleModelDesign.vue @@ -23,7 +23,7 @@ const props = defineProps<{ modelId?: string modelKey?: string modelName?: string - value?: string + value?: any startUserIds?: number[] }>() @@ -34,7 +34,6 @@ const currentValue = ref('') // 初始化或更新当前值 const initOrUpdateValue = async () => { - console.log('initOrUpdateValue', props.value) if (props.value) { currentValue.value = props.value // 如果设计器已经初始化，立即加载数据