p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

部分绑定值问题

This commit is contained in:
gexinzhineng/gxzn27 2023-01-29 10:57:04 +08:00
parent 0d0554e76c
commit 548f8bc32c
7 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="panel-tab__content">
<el-form :model="flowConditionForm" label-width="90px" size="mini">
<el-form :model="flowConditionForm" label-width="90px" size="small">
<el-form-item label="流转类型">
<el-select v-model="flowConditionForm.type" @change="updateFlowType">
<el-option label="普通流转路径" value="normal" />

30
yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="panel-tab__content">
<el-table :data="elementListenersList" size="mini" border>
<el-table :data="elementListenersList" size="small" border>
<el-table-column label="序号" width="50px" type="index" />
<el-table-column label="事件类型" min-width="100px" prop="event" />
<el-table-column
@ -9,7 +9,7 @@
show-overflow-tooltip
:formatter="(row) => listenerTypeObject[row.listenerType]"
/>
<el-table-column label="操作" width="90px">
<el-table-column label="操作" width="130px">
<template #default="scope">
<el-button size="small" @click="openListenerForm(scope.row, scope.$index)"
>编辑</el-button
@ -141,7 +141,7 @@
</p>
<el-table
:data="fieldsListOfListener"
size="mini"
size="small"
max-height="240"
border
fit
@ -161,7 +161,7 @@
show-overflow-tooltip
:formatter="(row) => row.string || row.expression"
/>
<el-table-column label="操作" width="100px">
<el-table-column label="操作" width="130px">
<template #default="scope">
<el-button
size="small"
@ -394,8 +394,10 @@ const saveListenerConfig = async () => {
elementListenersList.value.splice(editingListenerIndex.value, 1, listenerForm.value)
}
// 保存其他配置
console.log(bpmnElement.value, 'bpmnElement.value')
otherExtensionList.value =
bpmnElement.value.businessObject?.extensionElements?.values?.filter(
bpmnElement.value.businessObject?.extensionElements?.filter(
// bpmnElement.value.businessObject?.extensionElements?.values?.filter(
(ex) => ex.$type !== `${prefix}:ExecutionListener`
) ?? []
console.log(bpmnElement.value, 'bpmnElement.value')
@ -404,10 +406,20 @@ const saveListenerConfig = async () => {
otherExtensionList.value.concat(bpmnElementListeners.value),
'otherExtensionList.value.concat(bpmnElementListeners.value).value'
)
updateElementExtensions(
toRaw(bpmnElement.value),
toRaw(otherExtensionList.value.concat(bpmnElementListeners.value))
)
// updateElementExtensions(
// bpmnElement.value,
// // toRaw(bpmnElement.value),
// otherExtensionList.value.concat(bpmnElementListeners.value)
// // toRaw(otherExtensionList.value.concat(bpmnElementListeners.value))
// )
const extensions = window.bpmnInstances.moddle.create('bpmn:ExtensionElements', {
values: otherExtensionList.value.concat(bpmnElementListeners.value)
})
console.log(extensions, 'extensionsextensionsextensions')
console.log(extensions.values, 'extensionsextensionsextensions')
window.bpmnInstances.modeling.updateProperties(toRaw(bpmnElement.value), {
extensionElements: extensions.values
})
// 4. 隐藏侧边栏
listenerFormModelVisible.value = false
listenerForm.value = {}

2
yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue
View File

@ -338,8 +338,8 @@ const resetListenersList = () => {
bpmnElement.value = window.bpmnInstances.bpmnElement
otherExtensionList.value = []
bpmnElementListeners.value =
// bpmnElement.value.businessObject?.extensionElements?.filter(
bpmnElement.value.businessObject?.extensionElements?.filter(
// bpmnElement.value.businessObject?.extensionElements?.values.filter(
(ex) => ex.$type === `${prefix}:TaskListener`
) ?? []
elementListenersList.value = bpmnElementListeners.value.map((listener) =>

18
yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/other/ElementOtherConfig.vue
View File

@ -25,22 +25,8 @@ const props = defineProps({
const documentation = ref('')
const bpmnElement = ref()
const updateDocumentation = () => {
console.log(props, 'props')
console.log(window, 'window')
console.log(
window.bpmnInstances.elementRegistry.get(props.id),
'window.bpmnInstances.elementRegistry.get(props.id)'
)
console.log(bpmnElement.value, 'bpmnElement.value ')
if (bpmnElement.value && bpmnElement.value.id === props.id) {
bpmnElement.value = window?.bpmnInstances.elementRegistry.get(props.id)
}
console.log(
bpmnElement.value,
'bpmnElement.value bpmnElement.value bpmnElement.value bpmnElement.value bpmnElement.value bpmnElement.value '
)
// (bpmnElement.value && bpmnElement.value.id === props.id) ||
// (bpmnElement.value = window.bpmnInstances.elementRegistry.get(props.id))
;(bpmnElement.value && bpmnElement.value.id === props.id) ||
(bpmnElement.value = (window as any).bpmnInstances.elementRegistry.get(props.id))
const documentations = window.bpmnInstances.bpmnFactory.create('bpmn:Documentation', {
text: documentation.value
})

4
yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue
View File

@ -86,8 +86,8 @@ const resetAttributesList = () => {
bpmnElement.value = window.bpmnInstances.bpmnElement
otherExtensionList.value = [] // 其他扩展配置
bpmnElementProperties.value =
// bpmnElement.value.businessObject?.extensionElements?.filter((ex) => {
bpmnElement.value.businessObject?.extensionElements?.values.filter((ex) => {
bpmnElement.value.businessObject?.extensionElements?.filter((ex) => {
// bpmnElement.value.businessObject?.extensionElements?.values.filter((ex) => {
if (ex.$type !== `${prefix}:Properties`) {
otherExtensionList.value.push(ex)
}

2
yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/task/ElementTask.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="panel-tab__content">
<el-form size="mini" label-width="90px">
<el-form size="small" label-width="90px">
<el-form-item label="异步延续">
<el-checkbox
v-model="taskConfigForm.asyncBefore"

4
yudao-ui-admin-vue3/src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue
View File

@ -34,7 +34,7 @@
append-to-body
destroy-on-close
>
<el-form :model="newMessageForm" size="mini" label-width="90px">
<el-form :model="newMessageForm" size="small" label-width="90px">
<el-form-item label="消息ID">
<el-input v-model="newMessageForm.id" clearable />
</el-form-item>
@ -43,7 +43,7 @@
</el-form-item>
</el-form>
<template #footer>
<el-button size="mini" type="primary" @click="createNewMessage">确 认</el-button>
<el-button size="small" type="primary" @click="createNewMessage">确 认</el-button>
</template>
</el-dialog>
</div>