Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/bpmprocess/index.vue

@@ -64,13 +64,11 @@
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
-        >搜索
-        </el-button
-        >
+          >搜索
+        </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-        >重置
-        </el-button
-        >
+          >重置
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -83,9 +81,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:process:add']"
-        >新增
-        </el-button
-        >
+          >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -96,9 +93,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:process:edit']"
-        >修改
-        </el-button
-        >
+          >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -109,9 +105,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:process:remove']"
-        >删除
-        </el-button
-        >
+          >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -121,9 +116,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:process:export']"
-        >导出
-        </el-button
-        >
+          >导出
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -133,9 +127,8 @@
           size="mini"
           @click="handleFileExport"
           v-hasPermi="['system:process:export']"
-        >导出流程文件
-        </el-button
-        >
+          >导出流程文件
+        </el-button>
       </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
@@ -148,16 +141,24 @@
       :data="processList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="主键" align="center" prop="processId"/>
-      <el-table-column label="流程名称" align="center" prop="processName"/>
-      <el-table-column label="流程别名" align="center" prop="processKey"/>
-      <el-table-column
-        label="流程状态"
-        align="center"
-        prop="processOpneState"
-      />
-      <el-table-column label="流程类型" align="center" prop="processType"/>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键" align="center" prop="processId" />
+      <el-table-column label="流程名称" align="center" prop="processName" />
+      <el-table-column label="流程别名" align="center" prop="processKey" />
+      <el-table-column label="流程状态" align="center" prop="processOpneState">
+        <template slot-scope="scope">
+          <span>{{
+            getDictLabel(scope.row.processOpneState, dict.type.bpm_state)
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="流程类型" align="center" prop="processType">
+        <template slot-scope="scope">
+          <span>{{
+            getDictLabel(scope.row.processType, dict.type.bpm_type)
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="流程部署时间"
         align="center"
@@ -166,24 +167,40 @@
       >
         <template slot-scope="scope">
           <span>{{
-              parseTime(scope.row.processDeployTime, "{y}-{m}-{d}")
-            }}</span>
+            parseTime(scope.row.processDeployTime, "{y}-{m}-{d}")
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column
         label="启动事件类型"
         align="center"
         prop="startEventType"
-      />
-      <el-table-column label="版本注释" align="center" prop="note"/>
-      <el-table-column label="版本状态" align="center" prop="processVersion"/>
+      >
+        <template slot-scope="scope">
+          <span>{{
+            getDictLabel(
+              scope.row.startEventType,
+              dict.type.bpm_start_event_type
+            )
+          }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="版本注释" align="center" prop="note" />
+      <el-table-column label="版本状态" align="center" prop="processVersion">
+        <template slot-scope="scope">
+          <span>{{
+            getDictLabel(scope.row.processVersion, dict.type.bpm_version)
+          }}</span>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="节点json串" align="center" prop="processJson" /> -->
       <!-- <el-table-column
         label="xml文件存放地址"
         align="center"
         prop="processXmlPath"
       /> -->
-      <el-table-column label="备注" align="center" prop="remark"/>
+      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column
         label="操作"
         align="center"
@@ -195,56 +212,45 @@
               处理<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item
-              >
+              <el-dropdown-item>
                 <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
                   @click="handleUpdate(scope.row)"
                   v-hasPermi="['system:user:edit']"
-                >修改
-                </el-button
-                >
-              </el-dropdown-item
-              >
-              <el-dropdown-item
-              >
+                  >修改
+                </el-button>
+              </el-dropdown-item>
+              <el-dropdown-item>
                 <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
                   @click="backupProcess(scope.row)"
                   v-hasPermi="['system:user:edit']"
-                >备份流程图
-                </el-button
-                >
-              </el-dropdown-item
-              >
-              <el-dropdown-item
-              >
+                  >备份流程图
+                </el-button>
+              </el-dropdown-item>
+              <el-dropdown-item>
                 <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
                   @click="handleEditbpmn(scope.row)"
                   v-hasPermi="['system:user:edit']"
-                >编辑流程图
-                </el-button
-                >
-              </el-dropdown-item
-              >
-              <el-dropdown-item
-              >
+                  >编辑流程图
+                </el-button>
+              </el-dropdown-item>
+              <el-dropdown-item>
                 <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"
                   v-hasPermi="['system:user:remove']"
-                >删除
-                </el-button
-                >
+                  >删除
+                </el-button>
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -264,10 +270,10 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="流程名称" prop="processName">
-          <el-input v-model="form.processName" placeholder="请输入流程名称"/>
+          <el-input v-model="form.processName" placeholder="请输入流程名称" />
         </el-form-item>
         <el-form-item label="流程别名" prop="processKey">
-          <el-input v-model="form.processKey" placeholder="请输入流程别名"/>
+          <el-input v-model="form.processKey" placeholder="请输入流程别名" />
         </el-form-item>
         <el-form-item label="流程开启状态" prop="processOpneState">
           <el-input
@@ -305,10 +311,10 @@
           />
         </el-form-item>
         <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志"/>
+          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注"/>
+          <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -327,11 +333,12 @@ import {
   addProcess,
   updateProcess,
   bpmBackups,
-  exportFileProcess
+  exportFileProcess,
 } from "@/api/bpmprocess/process";
 
 export default {
   name: "Process",
+  dicts: ["bpm_state", "bpm_type", "bpm_start_event_type", "bpm_version"],
   data() {
     return {
       // 遮罩层
@@ -508,8 +515,7 @@ export default {
           }
         },
       })
-        .then(({value}) => {
-        })
+        .then(({ value }) => {})
         .catch(() => {
           this.$message({
             type: "info",
@@ -549,13 +555,12 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        "system/process/export",
+        process.env.VUE_APP_BASE_API4 + "system/process/export",
         {
           ...this.queryParams,
         },
@@ -563,32 +568,14 @@ export default {
       );
     },
     handleFileExport() {
-      if (this.ids.length != 0) {
-        exportFileProcess(this.ids).then(res => {
-          const content = res;
-          const blob = new Blob([content], {type: "application/zip"})
-          const fileName = "流程文件"
-          if ("download" in document.createElement("a")) {
-            // 非IE下载
-            const elink = document.createElement("a");
-            elink.download = fileName;
-            elink.style.display = "none";
-            elink.href = URL.createObjectURL(blob);
-            document.body.appendChild(elink);
-            elink.click();
-            URL.revokeObjectURL(elink.href); // 释放URL 对象
-            document.body.removeChild(elink);
-            this.loading = false
-          } else {
-            // IE10+下载
-            navigator.msSaveBlob(blob, fileName);
-            this.loading = false
-          }
-        });
-      }else{
-        this.$message.warning("请勾选流程数据条！")
-      }
-    }
+      exportFileProcess(this.ids).then(() => {});
+    },
+    // 获取字典对应label
+    getDictLabel(value, dictLsit = []) {
+      return dictLsit.find((item) => {
+        return item.value == value;
+      })?.label;
+    },
   },
 };
 </script>

ruoyi-ui/src/views/system/bpmnPro/components/Toolbar/index.vue

@@ -23,7 +23,6 @@ import BpmnSave from "./tools/Save.vue";
 import BpmnAligns from "./tools/Aligns";
 import BpmnScales from "./tools/Scales";
 import BpmnCommands from "./tools/Commands";
-
 import BpmnExternals from "./tools/Externals";
 export default {
   name: "BpmnToolbar",