adtec-core-package 0.5.7 → 0.5.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -543,7 +543,7 @@ defineExpose({
|
|
|
543
543
|
<!-- <template v-if="props.bpmnView && props.bpmnXml">-->
|
|
544
544
|
<!-- <process-diagram :xml="bpmnXml"></process-diagram>-->
|
|
545
545
|
<!-- </template>-->
|
|
546
|
-
<template
|
|
546
|
+
<!-- <template>-->
|
|
547
547
|
<el-flex
|
|
548
548
|
width="300px"
|
|
549
549
|
height="30px"
|
|
@@ -598,7 +598,7 @@ defineExpose({
|
|
|
598
598
|
</el-scrollbar>
|
|
599
599
|
<!--属性面板-->
|
|
600
600
|
<Panel v-model="penalVisible" :active-data="activeData" />
|
|
601
|
-
</template
|
|
601
|
+
<!-- </template>-->
|
|
602
602
|
</div>
|
|
603
603
|
</template>
|
|
604
604
|
|
|
@@ -9,7 +9,7 @@ import type {
|
|
|
9
9
|
import workflowApi from '../../../api/workflow/workflow'
|
|
10
10
|
import { ElMessage } from 'element-plus'
|
|
11
11
|
import type { SysWorkflowVerType } from '../../../interface/workflow/workflow'
|
|
12
|
-
import { onMounted, ref, watch } from 'vue'
|
|
12
|
+
import { onMounted, onUnmounted, ref, watch } from 'vue'
|
|
13
13
|
import { useEventBus } from '@vueuse/core'
|
|
14
14
|
const props = withDefaults(
|
|
15
15
|
defineProps<{
|
|
@@ -183,6 +183,7 @@ const saveVer = async () => {
|
|
|
183
183
|
}
|
|
184
184
|
}
|
|
185
185
|
const init = async (verId: string) => {
|
|
186
|
+
console.log('workflowDesign:', verId)
|
|
186
187
|
if (!verId) {
|
|
187
188
|
ver.value = undefined
|
|
188
189
|
process.value = { ...initProcess }
|
|
@@ -208,13 +209,14 @@ const init = async (verId: string) => {
|
|
|
208
209
|
}
|
|
209
210
|
}
|
|
210
211
|
const bus = useEventBus<string>('workflow_design_init')
|
|
211
|
-
|
|
212
|
-
console.log('workflow_design_init', verId)
|
|
213
|
-
init(verId)
|
|
214
|
-
})
|
|
212
|
+
|
|
215
213
|
onMounted(async () => {
|
|
214
|
+
bus.on(init)
|
|
216
215
|
await init(props.verId)
|
|
217
216
|
})
|
|
217
|
+
onUnmounted(() => {
|
|
218
|
+
bus.off(init)
|
|
219
|
+
})
|
|
218
220
|
defineExpose({
|
|
219
221
|
init,
|
|
220
222
|
})
|
|
@@ -40,9 +40,11 @@ onUnmounted(() => {
|
|
|
40
40
|
//@ts-ignore
|
|
41
41
|
window.$wujie?.bus.$off(applicationModule + 'WorkflowTodoBus')
|
|
42
42
|
})
|
|
43
|
+
//待办展现逻辑
|
|
43
44
|
const initTodoDialog = async (params: IParameter[]) => {
|
|
44
45
|
showComp.value = false
|
|
45
46
|
let linkModelPath = params?.find((x: IParameter) => x.code === 'nodeTag')?.value
|
|
47
|
+
//去除应用前缀
|
|
46
48
|
if (linkModelPath.indexOf(':') > -1) {
|
|
47
49
|
linkModelPath = linkModelPath.split(':')[1]
|
|
48
50
|
}
|
|
@@ -69,7 +71,7 @@ const initTodoDialog = async (params: IParameter[]) => {
|
|
|
69
71
|
compRef.value?.initByWorkflow(wParam)
|
|
70
72
|
}
|
|
71
73
|
})
|
|
72
|
-
} else {
|
|
74
|
+
} else { //菜单
|
|
73
75
|
const bus = useEventBus<IParameter[]>(linkModelPath + '_message')
|
|
74
76
|
bus.emit(params)
|
|
75
77
|
}
|