Merge branch 'feature/bpm' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feature/bpm

This commit is contained in:
YunaiV
2025-01-15 19:08:03 +08:00
6 changed files with 15 additions and 29 deletions

View File

@ -4,7 +4,6 @@
:flow-node="simpleModel"
:tasks="tasks"
:process-instance="processInstance"
class="process-viewer"
/>
</div>
</template>
@ -20,7 +19,7 @@ const props = defineProps({
modelView: propTypes.object,
simpleJson: propTypes.string // Simple 模型结构数据 (json 格式)
})
const simpleModel = ref()
const simpleModel = ref<any>({})
// 用户任务
const tasks = ref([])
// 流程实例
@ -161,15 +160,4 @@ const setSimpleModelNodeTaskStatus = (
</script>
<style lang="scss" scoped>
.process-viewer-container {
width: 100%;
height: 100%;
:deep(.process-viewer) {
width: 100%;
height: 100% !important;
min-height: 100%;
overflow: auto;
}
}
</style>

View File

@ -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
// 如果设计器已经初始化,立即加载数据