DeXun/double-rack
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!21 （1）fix：切换流程表单无法正常显示问题 ；修改流程标识保存后无效问题（2）优化：流程设计页面，节点之间切换时控制台警告 ；候选人姓名相同时警告；无效函数

Browse Source 
Merge pull request !21 from 顾北清/master
This commit is contained in:
tony
2025-06-05 11:54:58 +00:00
committed by Gitee
parent f5adad16b4 df87ebbc83
commit 30764b5854
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-ui/src/components/Process/index.vue
View File

@@ -280,7 +280,6 @@ export default {
goBack() { goBack() {
const obj = {path: "/flowable/definition", query: {t: Date.now()}}; const obj = {path: "/flowable/definition", query: {t: Date.now()}};
this.$tab.closeOpenPage(obj); this.$tab.closeOpenPage(obj);
this.toggleSideBar();
}, },
} }
} }

4
ruoyi-ui/src/components/Process/panel/commonPanel.vue
View File

@@ -1,8 +1,8 @@
<template> <template>
<div> <div>
<el-form :model="bpmnFormData" label-width="80px" :rules="rules" size="small"> <el-form :model="bpmnFormData" label-width="80px" :rules="rules" size="small">
<el-form-item :label="bpmnFormData.$type === 'bpmn:Process'? '流程标识': '节点ID'" prop="id" @change="updateElementTask('id')"> <el-form-item :label="bpmnFormData.$type === 'bpmn:Process'? '流程标识': '节点ID'" prop="id">
<el-input v-model="bpmnFormData.id"/> <el-input v-model="bpmnFormData.id" @change="updateElementTask('id')"/>
</el-form-item> </el-form-item>
<el-form-item :label="bpmnFormData.$type === 'bpmn:Process'? '流程名称': '节点名称'" prop="name"> <el-form-item :label="bpmnFormData.$type === 'bpmn:Process'? '流程名称': '节点名称'" prop="name">
<el-input v-model="bpmnFormData.name" @change="updateElementTask('name')"/> <el-input v-model="bpmnFormData.name" @change="updateElementTask('name')"/>

4
ruoyi-ui/src/components/Process/panel/formPanel.vue
View File

@@ -31,7 +31,9 @@ export default {
data() { data() {
return { return {
formList: [], // 表单数据 formList: [], // 表单数据
bpmnFormData: {} bpmnFormData: {
formKey: ''
}
} }
}, },

2
ruoyi-ui/src/components/Process/panel/taskPanel.vue
View File

@@ -272,7 +272,7 @@ export default {
const newArr = this.modelerStore.userList?.filter(i => val.toString().split(',').includes(i.userId.toString())) const newArr = this.modelerStore.userList?.filter(i => val.toString().split(',').includes(i.userId.toString()))
this.bpmnFormData[key] = newArr.map(item => item.nickName).join(','); this.bpmnFormData[key] = newArr.map(item => item.nickName).join(',');
if ('assignee' === key) { if ('assignee' === key) {
this.selectData[key] = newArr.find(item => item.userId.toString() === val).userId; this.selectData[key] = newArr.find(item => item.userId.toString() === val.toString()).userId;
} else { } else {
this.selectData[key] = newArr.map(item => item.userId); this.selectData[key] = newArr.map(item => item.userId);
} }

2
ruoyi-ui/src/components/flow/ElInputTag/index.vue
View File

@@ -6,7 +6,7 @@
<el-tag <el-tag
v-for="(tag, idx) in innerTags" v-for="(tag, idx) in innerTags"
v-bind="$attrs" v-bind="$attrs"
:key="tag" :key="idx"
:size="size" :size="size"
effect="dark" effect="dark"
closable closable