Commit b700b316cda80690f4f04a63c69075eecd9c1692
1 parent
1e8a379e
bug
Showing
4 changed files
with
15 additions
and
11 deletions
yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue
| @@ -316,7 +316,9 @@ const openListenerForm = (listener, index) => { | @@ -316,7 +316,9 @@ const openListenerForm = (listener, index) => { | ||
| 316 | // 打开侧边栏并清楚验证状态 | 316 | // 打开侧边栏并清楚验证状态 |
| 317 | listenerFormModelVisible.value = true | 317 | listenerFormModelVisible.value = true |
| 318 | nextTick(() => { | 318 | nextTick(() => { |
| 319 | - if (listenerFormRef.value) listenerFormRef.value.clearValidate() | 319 | + if (listenerFormRef.value) { |
| 320 | + listenerFormRef.value.clearValidate() | ||
| 321 | + } | ||
| 320 | }) | 322 | }) |
| 321 | } | 323 | } |
| 322 | // 打开监听器字段编辑弹窗 | 324 | // 打开监听器字段编辑弹窗 |
| @@ -325,7 +327,9 @@ const openListenerFieldForm = (field, index) => { | @@ -325,7 +327,9 @@ const openListenerFieldForm = (field, index) => { | ||
| 325 | editingListenerFieldIndex.value = field ? index : -1 | 327 | editingListenerFieldIndex.value = field ? index : -1 |
| 326 | listenerFieldFormModelVisible.value = true | 328 | listenerFieldFormModelVisible.value = true |
| 327 | nextTick(() => { | 329 | nextTick(() => { |
| 328 | - if (listenerFieldFormRef.value) listenerFieldFormRef.value.clearValidate() | 330 | + if (listenerFieldFormRef.value) { |
| 331 | + listenerFieldFormRef.value.clearValidate() | ||
| 332 | + } | ||
| 329 | }) | 333 | }) |
| 330 | } | 334 | } |
| 331 | // 保存监听器注入字段 | 335 | // 保存监听器注入字段 |
| @@ -345,7 +349,7 @@ const saveListenerFiled = async () => { | @@ -345,7 +349,7 @@ const saveListenerFiled = async () => { | ||
| 345 | }) | 349 | }) |
| 346 | } | 350 | } |
| 347 | // 移除监听器字段 | 351 | // 移除监听器字段 |
| 348 | -const removeListenerField = (field, index) => { | 352 | +const removeListenerField = (index) => { |
| 349 | ElMessageBox.confirm('确认移除该字段吗？', '提示', { | 353 | ElMessageBox.confirm('确认移除该字段吗？', '提示', { |
| 350 | confirmButtonText: '确 认', | 354 | confirmButtonText: '确 认', |
| 351 | cancelButtonText: '取 消' | 355 | cancelButtonText: '取 消' |
| @@ -357,7 +361,7 @@ const removeListenerField = (field, index) => { | @@ -357,7 +361,7 @@ const removeListenerField = (field, index) => { | ||
| 357 | .catch(() => console.info('操作取消')) | 361 | .catch(() => console.info('操作取消')) |
| 358 | } | 362 | } |
| 359 | // 移除监听器 | 363 | // 移除监听器 |
| 360 | -const removeListener = (listener, index) => { | 364 | +const removeListener = (index) => { |
| 361 | ElMessageBox.confirm('确认移除该监听器吗？', '提示', { | 365 | ElMessageBox.confirm('确认移除该监听器吗？', '提示', { |
| 362 | confirmButtonText: '确 认', | 366 | confirmButtonText: '确 认', |
| 363 | cancelButtonText: '取 消' | 367 | cancelButtonText: '取 消' |
yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
| @@ -87,8 +87,8 @@ const defaultLoopInstanceForm = ref({ | @@ -87,8 +87,8 @@ const defaultLoopInstanceForm = ref({ | ||
| 87 | exclusive: false | 87 | exclusive: false |
| 88 | }) | 88 | }) |
| 89 | const loopInstanceForm = ref({}) | 89 | const loopInstanceForm = ref({}) |
| 90 | -const bpmnElement = ref() | ||
| 91 | -const multiLoopInstance = ref() | 90 | +const bpmnElement = ref(null) |
| 91 | +const multiLoopInstance = ref(null) | ||
| 92 | 92 | ||
| 93 | const getElementLoop = (businessObject) => { | 93 | const getElementLoop = (businessObject) => { |
| 94 | if (!businessObject.loopCharacteristics) { | 94 | if (!businessObject.loopCharacteristics) { |
| @@ -158,7 +158,7 @@ const changeLoopCharacteristicsType = (type) => { | @@ -158,7 +158,7 @@ const changeLoopCharacteristicsType = (type) => { | ||
| 158 | ) | 158 | ) |
| 159 | } | 159 | } |
| 160 | window.bpmnInstances.modeling.updateProperties(toRaw(bpmnElement.value), { | 160 | window.bpmnInstances.modeling.updateProperties(toRaw(bpmnElement.value), { |
| 161 | - loopCharacteristics: multiLoopInstance.value | 161 | + loopCharacteristics: toRaw(multiLoopInstance.value) |
| 162 | }) | 162 | }) |
| 163 | } | 163 | } |
| 164 | // 循环基数 | 164 | // 循环基数 |
| @@ -245,7 +245,7 @@ onBeforeUnmount(() => { | @@ -245,7 +245,7 @@ onBeforeUnmount(() => { | ||
| 245 | }) | 245 | }) |
| 246 | 246 | ||
| 247 | watch( | 247 | watch( |
| 248 | - () => props.type, | 248 | + () => props.businessObject, |
| 249 | (val) => { | 249 | (val) => { |
| 250 | bpmnElement.value = window.bpmnInstances.bpmnElement | 250 | bpmnElement.value = window.bpmnInstances.bpmnElement |
| 251 | getElementLoop(val) | 251 | getElementLoop(val) |
yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/task/ElementTask.vue
| @@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
| 21 | </template> | 21 | </template> |
| 22 | 22 | ||
| 23 | <script setup lang="ts" name="ElementTaskConfig"> | 23 | <script setup lang="ts" name="ElementTaskConfig"> |
| 24 | -import { ref, watch, shallowRef } from 'vue' | 24 | +import { ref, watch } from 'vue' |
| 25 | import { ElForm, ElFormItem, ElCheckbox } from 'element-plus' | 25 | import { ElForm, ElFormItem, ElCheckbox } from 'element-plus' |
| 26 | import UserTask from './task-components/UserTask.vue' | 26 | import UserTask from './task-components/UserTask.vue' |
| 27 | import ScriptTask from './task-components/ScriptTask.vue' | 27 | import ScriptTask from './task-components/ScriptTask.vue' |
| @@ -36,7 +36,7 @@ const taskConfigForm = ref({ | @@ -36,7 +36,7 @@ const taskConfigForm = ref({ | ||
| 36 | asyncBefore: false, | 36 | asyncBefore: false, |
| 37 | exclusive: false | 37 | exclusive: false |
| 38 | }) | 38 | }) |
| 39 | -const witchTaskComponent = shallowRef() | 39 | +const witchTaskComponent = ref() |
| 40 | const installedComponent = ref({ | 40 | const installedComponent = ref({ |
| 41 | // 手工任务与普通任务一致，不需要其他配置 | 41 | // 手工任务与普通任务一致，不需要其他配置 |
| 42 | // 接收消息任务，需要在全局下插入新的消息实例，并在该节点下的 messageRef 属性绑定该实例 | 42 | // 接收消息任务，需要在全局下插入新的消息实例，并在该节点下的 messageRef 属性绑定该实例 |
yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue
| @@ -112,7 +112,7 @@ onBeforeUnmount(() => { | @@ -112,7 +112,7 @@ onBeforeUnmount(() => { | ||
| 112 | watch( | 112 | watch( |
| 113 | () => props.id, | 113 | () => props.id, |
| 114 | () => { | 114 | () => { |
| 115 | - bpmnElement.value = window.bpmnInstances.bpmnElement | 115 | + // bpmnElement.value = window.bpmnInstances.bpmnElement |
| 116 | nextTick(() => { | 116 | nextTick(() => { |
| 117 | getBindMessage() | 117 | getBindMessage() |
| 118 | }) | 118 | }) |