From 2f5fed6f44454cf25d86915e40cf3dd1b300872d Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Fri, 16 Dec 2022 21:52:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A8=E5=8D=95=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/package.json                             |  1 +
 ruoyi-ui/src/components/Process/index.vue         |  7 +++++++
 ruoyi-ui/src/utils/pluginsConfig.js               |  4 ++--
 ruoyi-ui/src/views/flowable/definition/index.vue  |  5 ++---
 .../views/flowable/task/finished/detail/index.vue |  2 +-
 .../src/views/flowable/task/finished/index.vue    |  8 ++++----
 ruoyi-ui/src/views/flowable/task/form/index.vue   |  6 +++---
 .../flowable/task/myProcess/detail/index.vue      |  2 +-
 .../src/views/flowable/task/myProcess/index.vue   |  8 ++++----
 .../views/flowable/task/myProcess/send/flow.vue   |  8 --------
 .../flowable/task/myProcess/send/flowview.vue     |  2 +-
 .../views/flowable/task/myProcess/send/index.vue  |  6 +++---
 ruoyi-ui/src/views/flowable/task/record/index.vue | 12 ++++++------
 .../src/views/flowable/task/todo/detail/index.vue |  5 ++---
 ruoyi-ui/src/views/flowable/task/todo/index.vue   |  2 +-
 ruoyi-ui/src/views/tool/build/JsonDrawer.vue      |  2 +-
 ruoyi-ui/src/views/tool/build/index.vue           | 15 ++++++---------
 17 files changed, 45 insertions(+), 50 deletions(-)

diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 6f8ec776..b2dc9e78 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -64,6 +64,7 @@
     "vkbeautify": "^0.99.3"
   },
   "devDependencies": {
+    "@babel/parser": "^7.20.5",
     "@vue/cli-plugin-babel": "4.4.6",
     "@vue/cli-plugin-eslint": "4.4.6",
     "@vue/cli-service": "4.4.6",
diff --git a/ruoyi-ui/src/components/Process/index.vue b/ruoyi-ui/src/components/Process/index.vue
index a395f364..607b5426 100644
--- a/ruoyi-ui/src/components/Process/index.vue
+++ b/ruoyi-ui/src/components/Process/index.vue
@@ -391,6 +391,13 @@ export default {
   .canvas {
     width: 100%;
     height: 100%;
+    //flex: 1;
+    //position: relative;
+    //background: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHBhdHRlcm4gaWQ9ImEiIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgcGF0dGVyblVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTTAgMTBoNDBNMTAgMHY0ME0wIDIwaDQwTTIwIDB2NDBNMCAzMGg0ME0zMCAwdjQwIiBmaWxsPSJub25lIiBzdHJva2U9IiNlMGUwZTAiIG9wYWNpdHk9Ii4yIi8+PHBhdGggZD0iTTQwIDBIMHY0MCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZTBlMGUwIi8+PC9wYXR0ZXJuPjwvZGVmcz48cmVjdCB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2EpIi8+PC9zdmc+")
+    //repeat !important;
+    //div.toggle-mode {
+    //  display: none;
+    //}
   }
   .panel {
     position: absolute;
diff --git a/ruoyi-ui/src/utils/pluginsConfig.js b/ruoyi-ui/src/utils/pluginsConfig.js
index e7f4882a..9dd656ab 100644
--- a/ruoyi-ui/src/utils/pluginsConfig.js
+++ b/ruoyi-ui/src/utils/pluginsConfig.js
@@ -7,7 +7,7 @@ function splicingPluginUrl(PluginName, version, fileName) {
 
 export default {
   beautifierUrl: splicingPluginUrl('js-beautify', '1.13.5', 'beautifier.min.js'),
-  // monacoEditorUrl: splicingPluginUrl('monaco-editor', '0.19.3', 'min/vs'), // 使用 monaco-editor CDN 链接
-  monacoEditorUrl: `${publicPath}libs/monaco-editor/vs`, // 使用 monaco-editor 本地代码
+  monacoEditorUrl: splicingPluginUrl('monaco-editor', '0.19.3', 'min/vs'), // 使用 monaco-editor CDN 链接
+  // monacoEditorUrl: `${publicPath}libs/monaco-editor/vs`, // 使用 monaco-editor 本地代码
   tinymceUrl: splicingPluginUrl('tinymce', '5.7.0', 'tinymce.min.js')
 }
diff --git a/ruoyi-ui/src/views/flowable/definition/index.vue b/ruoyi-ui/src/views/flowable/definition/index.vue
index 56354ede..7097b6da 100644
--- a/ruoyi-ui/src/views/flowable/definition/index.vue
+++ b/ruoyi-ui/src/views/flowable/definition/index.vue
@@ -102,7 +102,7 @@
       <el-table-column label="操作" width="250" fixed="right"class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button @click="handleLoadXml(scope.row)" icon="el-icon-edit-outline" type="text" size="small">编辑</el-button>
-          <el-button @click="handleAddForm(scope.row)" icon="el-icon-edit-outline" type="text" size="small" v-if="scope.row.formId == null">配置表单</el-button>
+          <el-button @click="handleAddForm(scope.row)" icon="el-icon-edit-el-icon-s-promotion" type="text" size="small" v-if="scope.row.formId == null">配置表单</el-button>
           <el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-pause" type="text" size="small" v-if="scope.row.suspensionState === 1">挂起</el-button>
           <el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-play" type="text" size="small" v-if="scope.row.suspensionState === 2">激活</el-button>
           <el-button @click="handleDelete(scope.row)" icon="el-icon-delete" type="text" size="small" v-hasPermi="['system:deployment:remove']">删除</el-button>
@@ -131,7 +131,6 @@
       </div>
     </el-dialog>
 
-
     <!-- bpmn20.xml导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload
@@ -232,7 +231,7 @@ import { listDefinition, updateState, delDeployment, addDeployment, updateDeploy
 import { getToken } from "@/utils/auth";
 import { getForm, addDeployForm ,listForm } from "@/api/flowable/form";
 import Parser from '@/components/parser/Parser'
-import flow from '@/views/flowable/task/record/flow'
+import flow from '@/views/flowable/task/myProcess/send/flow'
 
 export default {
   name: "Definition",
diff --git a/ruoyi-ui/src/views/flowable/task/finished/detail/index.vue b/ruoyi-ui/src/views/flowable/task/finished/detail/index.vue
index c03f1496..c942bf09 100644
--- a/ruoyi-ui/src/views/flowable/task/finished/detail/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/finished/detail/index.vue
@@ -29,7 +29,7 @@
                   <el-card :body-style="{ padding: '10px' }">
                     <el-descriptions class="margin-top" :column="1" size="small" border>
                       <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
-                        <template slot="label"><i class="el-icon-user"></i>实际办理</template>
+                        <template slot="label"><i class="el-icon-user"></i>办理人</template>
                         {{item.assigneeName}}
                         <el-tag type="info" size="mini">{{item.deptName}}</el-tag>
                       </el-descriptions-item>
diff --git a/ruoyi-ui/src/views/flowable/task/finished/index.vue b/ruoyi-ui/src/views/flowable/task/finished/index.vue
index 5eb18089..96cb0944 100644
--- a/ruoyi-ui/src/views/flowable/task/finished/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/finished/index.vue
@@ -217,7 +217,7 @@ export default {
         instanceId: row.procInsId
       }
       revokeProcess(params).then( res => {
-        this.msgSuccess(res.msg);
+       this.$modal.msgSuccess(res.msg);
         this.getList();
       });
     },
@@ -237,13 +237,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateDeployment(this.form).then(response => {
-              this.msgSuccess("修改成功");
+              this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addDeployment(this.form).then(response => {
-              this.msgSuccess("新增成功");
+              this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -262,7 +262,7 @@ export default {
         return delDeployment(ids);
       }).then(() => {
         this.getList();
-        this.msgSuccess("删除成功");
+       this.$modal.msgSuccess("删除成功");
       })
     },
     /** 导出按钮操作 */
diff --git a/ruoyi-ui/src/views/flowable/task/form/index.vue b/ruoyi-ui/src/views/flowable/task/form/index.vue
index ae39c5cd..ab17d858 100644
--- a/ruoyi-ui/src/views/flowable/task/form/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/form/index.vue
@@ -254,13 +254,13 @@ export default {
         if (valid) {
           if (this.form.formId != null) {
             updateForm(this.form).then(response => {
-              this.msgSuccess("修改成功");
+             this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addForm(this.form).then(response => {
-              this.msgSuccess("新增成功");
+             this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -279,7 +279,7 @@ export default {
         return delForm(formIds);
       }).then(() => {
         this.getList();
-        this.msgSuccess("删除成功");
+       this.$modal.msgSuccess("删除成功");
       })
     },
     /** 导出按钮操作 */
diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/detail/index.vue b/ruoyi-ui/src/views/flowable/task/myProcess/detail/index.vue
index 9493e387..69f7b4fe 100644
--- a/ruoyi-ui/src/views/flowable/task/myProcess/detail/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/myProcess/detail/index.vue
@@ -29,7 +29,7 @@
                   <el-card :body-style="{ padding: '10px' }">
                     <el-descriptions class="margin-top" :column="1" size="small" border>
                       <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
-                        <template slot="label"><i class="el-icon-user"></i>实际办理</template>
+                        <template slot="label"><i class="el-icon-user"></i>办理人</template>
                         {{item.assigneeName}}
                         <el-tag type="info" size="mini">{{item.deptName}}</el-tag>
                       </el-descriptions-item>
diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/index.vue b/ruoyi-ui/src/views/flowable/task/myProcess/index.vue
index 259881ce..d7433c5b 100644
--- a/ruoyi-ui/src/views/flowable/task/myProcess/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/myProcess/index.vue
@@ -311,7 +311,7 @@ export default {
         instanceId: row.procInsId
       }
       stopProcess(params).then( res => {
-        this.msgSuccess(res.msg);
+       this.$modal.msgSuccess(res.msg);
         this.getList();
       });
     },
@@ -340,13 +340,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateDeployment(this.form).then(response => {
-              this.msgSuccess("修改成功");
+             this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addDeployment(this.form).then(response => {
-              this.msgSuccess("新增成功");
+             this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -366,7 +366,7 @@ export default {
         return delDeployment(ids);
       }).then(() => {
         this.getList();
-        this.msgSuccess("删除成功");
+       this.$modal.msgSuccess("删除成功");
       })
     },
     /** 导出按钮操作 */
diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/send/flow.vue b/ruoyi-ui/src/views/flowable/task/myProcess/send/flow.vue
index 095d2547..35a6f6b4 100644
--- a/ruoyi-ui/src/views/flowable/task/myProcess/send/flow.vue
+++ b/ruoyi-ui/src/views/flowable/task/myProcess/send/flow.vue
@@ -1,22 +1,14 @@
 <template>
   <div>
-    <!--<bpmn-modeler
-      ref="refNode"
-      :xml="xmlData"
-      :is-view="true"
-      :taskList="taskData"
-    />-->
     <flow-view :xmlData="xmlData"/>
   </div>
 </template>
 <script>
-import bpmnModeler from '@/components/Process/index'
 import FlowView from './flowview'
 
 export default {
   name: "Flow",
   components: {
-    bpmnModeler,
     FlowView
   },
   props: {
diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/send/flowview.vue b/ruoyi-ui/src/views/flowable/task/myProcess/send/flowview.vue
index 96e14e67..a35594d9 100644
--- a/ruoyi-ui/src/views/flowable/task/myProcess/send/flowview.vue
+++ b/ruoyi-ui/src/views/flowable/task/myProcess/send/flowview.vue
@@ -48,7 +48,7 @@ export default {
     this.bpmnViewer && this.bpmnViewer.destroy();
     this.bpmnViewer = new BpmnViewer({
       container: this.$refs.flowCanvas,
-      height: 'calc(100vh - 200px)',
+      height: 'calc(85vh - 200px)',
     });
   },
   methods: {
diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue b/ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue
index df66fea9..3ed50b82 100644
--- a/ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue
@@ -17,7 +17,7 @@
         </el-tab-pane>
         <!--流程图-->
         <el-tab-pane label="流程图">
-              <flow :xmlData="xmlData"></flow>
+           <flow :xmlData="xmlData"/>
         </el-tab-pane>
       </el-tabs>
       <el-button style="position: absolute;right:35px;top:35px;"  type="primary" @click="goBack">关闭</el-button>
@@ -37,7 +37,7 @@
 <script>
 import Parser from '@/components/parser/Parser'
 import {definitionStart, readXml} from "@/api/flowable/definition";
-import flow from '@/views/flowable/task/myProcess/send/flow'
+import flow from './flow'
 import {flowFormData} from "@/api/flowable/process";
 import {getNextFlowNodeByStart} from "@/api/flowable/todo";
 import FlowUser from '@/components/flow/User'
@@ -174,7 +174,7 @@ export default {
         //     variables.variables = formData;
         //     // 启动流程并将表单数据加入流程变量
         //     definitionStart(this.taskForm.procDefId, JSON.stringify(variables)).then(res => {
-        //       this.msgSuccess(res.msg);
+        //      this.$modal.msgSuccess(res.msg);
         //       this.goBack();
         //     })
         //   }
diff --git a/ruoyi-ui/src/views/flowable/task/record/index.vue b/ruoyi-ui/src/views/flowable/task/record/index.vue
index d301ffa9..92e63f36 100644
--- a/ruoyi-ui/src/views/flowable/task/record/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/record/index.vue
@@ -47,7 +47,7 @@
                   <el-card :body-style="{ padding: '10px' }">
                     <el-descriptions class="margin-top" :column="1" size="small" border>
                       <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
-                        <template slot="label"><i class="el-icon-user"></i>实际办理</template>
+                        <template slot="label"><i class="el-icon-user"></i>办理人</template>
                         {{item.assigneeName}}
                         <el-tag type="info" size="mini">{{item.deptName}}</el-tag>
                       </el-descriptions-item>
@@ -455,7 +455,7 @@ export default {
         return;
       }
       complete(this.taskForm).then(response => {
-        this.msgSuccess(response.msg);
+       this.$modal.msgSuccess(response.msg);
         this.goBack();
       });
     },
@@ -506,7 +506,7 @@ export default {
           variables.variables = formData;
            // 启动流程并将表单数据加入流程变量
           definitionStart(this.taskForm.procDefId, JSON.stringify(variables)).then(res => {
-            this.msgSuccess(res.msg);
+           this.$modal.msgSuccess(res.msg);
             this.goBack();
           })
         }
@@ -522,7 +522,7 @@ export default {
       this.$refs["taskForm"].validate(valid => {
         if (valid) {
           rejectTask(this.taskForm).then(res => {
-            this.msgSuccess(res.msg);
+           this.$modal.msgSuccess(res.msg);
             this.goBack();
           });
         }
@@ -542,7 +542,7 @@ export default {
       this.$refs["taskForm"].validate(valid => {
         if (valid) {
           returnTask(this.taskForm).then(res => {
-            this.msgSuccess(res.msg);
+           this.$modal.msgSuccess(res.msg);
             this.goBack()
           });
         }
@@ -560,7 +560,7 @@ export default {
       this.$refs["taskForm"].validate(valid => {
         if (valid) {
           delegate(this.taskForm).then(response => {
-            this.msgSuccess(response.msg);
+           this.$modal.msgSuccess(response.msg);
             this.goBack();
           });
         }
diff --git a/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue b/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
index f6a8689d..275a6a80 100644
--- a/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
@@ -40,7 +40,7 @@
                   <el-card :body-style="{ padding: '10px' }">
                     <el-descriptions class="margin-top" :column="1" size="small" border>
                       <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
-                        <template slot="label"><i class="el-icon-user"></i>实际办理</template>
+                        <template slot="label"><i class="el-icon-user"></i>办理人</template>
                         {{item.assigneeName}}
                         <el-tag type="info" size="mini">{{item.deptName}}</el-tag>
                       </el-descriptions-item>
@@ -76,8 +76,7 @@
         <flow :xmlData="xmlData" :taskData="taskList"></flow>
       </el-tab-pane>
       </el-tabs>
-<!--      <el-button style="position: absolute;right:35px;top:35px;"  type="primary" @click="goBack">关闭</el-button>-->
-      <!--审批正常流程-->
+      <!--审批任务-->
       <el-dialog :title="completeTitle" :visible.sync="completeOpen" width="60%" append-to-body>
         <el-form ref="taskForm" :model="taskForm">
           <el-form-item prop="targetKey">
diff --git a/ruoyi-ui/src/views/flowable/task/todo/index.vue b/ruoyi-ui/src/views/flowable/task/todo/index.vue
index e4d0fcab..bddcbef3 100644
--- a/ruoyi-ui/src/views/flowable/task/todo/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/todo/index.vue
@@ -216,7 +216,7 @@ export default {
         return delDeployment(ids);
       }).then(() => {
         this.getList();
-        this.msgSuccess("删除成功");
+       this.$modal.msgSuccess("删除成功");
       })
     },
     /** 导出按钮操作 */
diff --git a/ruoyi-ui/src/views/tool/build/JsonDrawer.vue b/ruoyi-ui/src/views/tool/build/JsonDrawer.vue
index 8a4378d9..d1335a8b 100644
--- a/ruoyi-ui/src/views/tool/build/JsonDrawer.vue
+++ b/ruoyi-ui/src/views/tool/build/JsonDrawer.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import { beautifierConf } from '@/utils/index'
+import { beautifierConf } from '@/utils'
 import ClipboardJS from 'clipboard'
 import { saveAs } from 'file-saver'
 import loadMonaco from '@/utils/loadMonaco'
diff --git a/ruoyi-ui/src/views/tool/build/index.vue b/ruoyi-ui/src/views/tool/build/index.vue
index 37db40cd..7e481a30 100644
--- a/ruoyi-ui/src/views/tool/build/index.vue
+++ b/ruoyi-ui/src/views/tool/build/index.vue
@@ -41,12 +41,12 @@
 
     <div class="center-board">
       <div class="action-bar">
-        <el-button icon="el-icon-plus" type="text" @click="handleForm">
-          保存
-        </el-button>
         <el-button icon="el-icon-video-play" type="text" @click="run">
           运行
         </el-button>
+        <el-button icon="el-icon-plus" type="text" @click="handleForm">
+          保存
+        </el-button>
         <el-button icon="el-icon-view" type="text" @click="showJson">
           查看json
         </el-button>
@@ -274,9 +274,6 @@ export default {
       that.drawingList = drawingDefault
     }
     this.activeFormItem(that.drawingList[0])
-    // // if (formConfInDB) {
-    // //   this.formConf = formConfInDB
-    // // }
     that.drawingList = [];
     const formId =  that.$route.query && that.$route.query.formId;
     if (formId) {
@@ -534,11 +531,11 @@ export default {
         if (valid) {
           if (this.form.formId != null) {
             updateForm(this.form).then(response => {
-              this.msgSuccess("修改成功");
+              this.$modal.msgSuccess("修改成功");
             });
           } else {
             addForm(this.form).then(response => {
-              this.msgSuccess("新增成功");
+              this.$modal.msgSuccess("新增成功");
             });
           }
           this.drawingList = []
@@ -555,5 +552,5 @@ export default {
 </script>
 
 <style lang='scss'>
-@import '@/styles/home';
+@import '@/styles/home.scss';
 </style>