Browse Source

chore: workflow design compose

master
wangxiang 2 years ago
parent
commit
73e273a019
No known key found for this signature in database
GPG Key ID: 1BA7946AB6B232E4
  1. 8
      src/components/Modeler/flowable-designer/index.vue
  2. 9
      src/utils/request.js
  3. 2
      src/views/Chart.vue
  4. 7
      src/views/Design.vue
  5. 2
      src/views/Preview.vue

8
src/components/Modeler/flowable-designer/index.vue

@ -316,7 +316,7 @@ export default { @@ -316,7 +316,7 @@ export default {
/** 处理模型提交 */
handleSubmitModel (code) {
new Promise((resolve, reject) => {
// todo:
// fixme:
if (this.bpmnModeler) {
const definitions = this.bpmnModeler.getDefinitions()
const rootElements = lodash.get(definitions, 'rootElements', [])
@ -357,7 +357,7 @@ export default { @@ -357,7 +357,7 @@ export default {
resolve({ rootElements, canvasProcess })
} else reject('bpmn建模对象不存在,请检查!')
}).then(({ rootElements, canvasProcess }) => {
// todo:
// fixme:
const processRelationIds = []
const collaboration = rootElements.find(item => item.$type === 'bpmn:Collaboration')
if (collaboration) {
@ -387,14 +387,14 @@ export default { @@ -387,14 +387,14 @@ export default {
} else resolve({ rootElements, canvasProcess, processRelationIds })
})
}).then(({ rootElements, canvasProcess, processRelationIds }) => {
// todo:bpmnXml
// fixme:bpmnXml
return this.bpmnModeler.saveXML({
format: true
}).then(result => {
return Promise.resolve({ rootElements, canvasProcess, processRelationIds, result })
})
}).then(({ rootElements, canvasProcess, processRelationIds, result }) => {
// todo:
// fixme:
return editModel(this.modelData.id, {
key: processRelationIds.join(),
name: canvasProcess.name,

9
src/utils/request.js

@ -45,10 +45,11 @@ axios.interceptors.request.use(config => { @@ -45,10 +45,11 @@ axios.interceptors.request.use(config => {
})
axios.interceptors.response.use(config => {
const message = config.data.msg
if (config.data?.code !== 200) {
createMessage.error(message)
return Promise.reject(new Error(message))
const msg = config.data?.msg || config.data?.message|| '系统未知错误,请反馈给管理员'
const status = Number(config.status) || 200
if (status !== 200 || config.data?.code === 1) {
createMessage.error(msg)
return Promise.reject(new Error(msg))
}
return config.data
}, error => {

2
src/views/Chart.vue

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
<template>
<div id="app">
<flowable-chart :options="chat" style="height:100vh"/>
<flowable-chart ref="workflow-chart" :options="chat"/>
</div>
</template>

7
src/views/Design.vue

@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
<template>
<flowable-designer ref="flowableDesigner"
style="height:100vh"
@refresh="handleSubmit"
/>
<flowable-designer ref="workflow-design"
:style="innerProps.style"
@refresh="handleSubmit"/>
</template>
<script>

2
src/views/Preview.vue

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
<template>
<div id="app">
<flowable-preview :options="chat" style="height:100vh"/>
<flowable-preview ref="workflow-preview" :options="chat"/>
</div>
</template>

Loading…
Cancel
Save