diff --git a/yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue b/yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue index 332ff2538..bc261fb8f 100644 --- a/yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue +++ b/yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue @@ -316,7 +316,9 @@ const openListenerForm = (listener, index) => { // 打开侧边栏并清楚验证状态 listenerFormModelVisible.value = true nextTick(() => { - if (listenerFormRef.value) listenerFormRef.value.clearValidate() + if (listenerFormRef.value) { + listenerFormRef.value.clearValidate() + } }) } // 打开监听器字段编辑弹窗 @@ -325,7 +327,9 @@ const openListenerFieldForm = (field, index) => { editingListenerFieldIndex.value = field ? index : -1 listenerFieldFormModelVisible.value = true nextTick(() => { - if (listenerFieldFormRef.value) listenerFieldFormRef.value.clearValidate() + if (listenerFieldFormRef.value) { + listenerFieldFormRef.value.clearValidate() + } }) } // 保存监听器注入字段 @@ -345,7 +349,7 @@ const saveListenerFiled = async () => { }) } // 移除监听器字段 -const removeListenerField = (field, index) => { +const removeListenerField = (index) => { ElMessageBox.confirm('确认移除该字段吗?', '提示', { confirmButtonText: '确 认', cancelButtonText: '取 消' @@ -357,7 +361,7 @@ const removeListenerField = (field, index) => { .catch(() => console.info('操作取消')) } // 移除监听器 -const removeListener = (listener, index) => { +const removeListener = (index) => { ElMessageBox.confirm('确认移除该监听器吗?', '提示', { confirmButtonText: '确 认', cancelButtonText: '取 消' diff --git a/yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue b/yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue index ce973b635..d187684d1 100644 --- a/yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue +++ b/yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue @@ -87,8 +87,8 @@ const defaultLoopInstanceForm = ref({ exclusive: false }) const loopInstanceForm = ref({}) -const bpmnElement = ref() -const multiLoopInstance = ref() +const bpmnElement = ref(null) +const multiLoopInstance = ref(null) const getElementLoop = (businessObject) => { if (!businessObject.loopCharacteristics) { @@ -158,7 +158,7 @@ const changeLoopCharacteristicsType = (type) => { ) } window.bpmnInstances.modeling.updateProperties(toRaw(bpmnElement.value), { - loopCharacteristics: multiLoopInstance.value + loopCharacteristics: toRaw(multiLoopInstance.value) }) } // 循环基数 @@ -245,7 +245,7 @@ onBeforeUnmount(() => { }) watch( - () => props.type, + () => props.businessObject, (val) => { bpmnElement.value = window.bpmnInstances.bpmnElement getElementLoop(val) diff --git a/yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/task/ElementTask.vue b/yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/task/ElementTask.vue index b5f6f1c21..946daaeab 100644 --- a/yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/task/ElementTask.vue +++ b/yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/task/ElementTask.vue @@ -21,7 +21,7 @@