chore: workflow design compose

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

@@ -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 {
           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 {
           } 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,

src/utils/request.js

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

src/views/Chart.vue

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

src/views/Design.vue

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

src/views/Preview.vue

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