Browse Source

feat: 更新依赖版本

master
tony 3 years ago
parent
commit
ffe870872f
  1. 7
      ruoyi-ui/package.json
  2. 1
      ruoyi-ui/src/components/Process/PropertyPanel.vue
  3. 11
      ruoyi-ui/src/components/Process/common/parseElement.js
  4. 1
      ruoyi-ui/src/components/Process/flowable/showConfig.js

7
ruoyi-ui/package.json

@ -38,10 +38,10 @@
"dependencies": { "dependencies": {
"@riophae/vue-treeselect": "0.4.0", "@riophae/vue-treeselect": "0.4.0",
"axios": "0.24.0", "axios": "0.24.0",
"bpmn-js": "^11.1.0", "bpmn-js": "7.5.0",
"clipboard": "2.0.8", "clipboard": "2.0.8",
"core-js": "3.25.3", "core-js": "3.25.3",
"diagram-js": "^5.0.0", "diagram-js": "5.1.1",
"echarts": "5.4.0", "echarts": "5.4.0",
"element-ui": "2.15.10", "element-ui": "2.15.10",
"file-saver": "2.0.5", "file-saver": "2.0.5",
@ -62,7 +62,8 @@
"vue-router": "3.4.9", "vue-router": "3.4.9",
"vuedraggable": "2.24.3", "vuedraggable": "2.24.3",
"vuex": "3.6.0", "vuex": "3.6.0",
"xcrud": "^0.4.19" "xcrud": "0.4.1",
"bpmn-moddle": "7.0.4"
}, },
"devDependencies": { "devDependencies": {
"@babel/parser": "^7.20.5", "@babel/parser": "^7.20.5",

1
ruoyi-ui/src/components/Process/PropertyPanel.vue

@ -124,7 +124,6 @@ export default {
}) })
this.modeler.on('element.click', e => { this.modeler.on('element.click', e => {
const { element } = e const { element } = e
// console.log(element)
if (element.type === 'bpmn:Process') { if (element.type === 'bpmn:Process') {
this.element = element this.element = element
} }

11
ruoyi-ui/src/components/Process/common/parseElement.js

@ -41,19 +41,10 @@ export function userTaskParse(obj) {
for (const key in obj) { for (const key in obj) {
if (key === 'candidateUsers') { if (key === 'candidateUsers') {
obj.userType = 'candidateUsers' obj.userType = 'candidateUsers'
// if (obj[key].toString().indexOf(",") !== -1) { obj[key] = obj[key]?.split(',') || []
//
// }else {
// obj[key] = obj[key].toString()?.split(',') || []
// }
} else if (key === 'candidateGroups') { } else if (key === 'candidateGroups') {
obj.userType = 'candidateGroups' obj.userType = 'candidateGroups'
obj[key] = obj[key]?.split(',') || [] obj[key] = obj[key]?.split(',') || []
// if (obj[key].toString().indexOf(",") !== -1) {
//
// }else {
// obj[key] = obj[key].toString()?.split(',') || []
// }
} else if (key === 'assignee') { } else if (key === 'assignee') {
obj.userType = 'assignee' obj.userType = 'assignee'
} }

1
ruoyi-ui/src/components/Process/flowable/showConfig.js

@ -6,7 +6,6 @@ export default {
}, },
'bpmn:UserTask': { 'bpmn:UserTask': {
userType: true, userType: true,
dataType: true,
assignee: true, assignee: true,
candidateUsers: true, candidateUsers: true,
candidateGroups: true, candidateGroups: true,

Loading…
Cancel
Save