!21 (1)fix:切换流程表单无法正常显示问题 ;修改流程标识保存后无效问题(2)优化:流程设计页面,节点之间切换时控制台警告 ;候选人姓名相同时警告;无效函数
Merge pull request !21 from 顾北清/master
This commit is contained in:
@@ -280,7 +280,6 @@ export default {
|
||||
goBack() {
|
||||
const obj = {path: "/flowable/definition", query: {t: Date.now()}};
|
||||
this.$tab.closeOpenPage(obj);
|
||||
this.toggleSideBar();
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<div>
|
||||
<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-input v-model="bpmnFormData.id"/>
|
||||
<el-form-item :label="bpmnFormData.$type === 'bpmn:Process'? '流程标识': '节点ID'" prop="id">
|
||||
<el-input v-model="bpmnFormData.id" @change="updateElementTask('id')"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label="bpmnFormData.$type === 'bpmn:Process'? '流程名称': '节点名称'" prop="name">
|
||||
<el-input v-model="bpmnFormData.name" @change="updateElementTask('name')"/>
|
||||
|
||||
@@ -31,7 +31,9 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
formList: [], // 表单数据
|
||||
bpmnFormData: {}
|
||||
bpmnFormData: {
|
||||
formKey: ''
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
@@ -272,7 +272,7 @@ export default {
|
||||
const newArr = this.modelerStore.userList?.filter(i => val.toString().split(',').includes(i.userId.toString()))
|
||||
this.bpmnFormData[key] = newArr.map(item => item.nickName).join(',');
|
||||
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 {
|
||||
this.selectData[key] = newArr.map(item => item.userId);
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<el-tag
|
||||
v-for="(tag, idx) in innerTags"
|
||||
v-bind="$attrs"
|
||||
:key="tag"
|
||||
:key="idx"
|
||||
:size="size"
|
||||
effect="dark"
|
||||
closable
|
||||
|
||||
Reference in New Issue
Block a user