cloud-module-bpm 6.7.0 → 6.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloud-module-bpm",
-  "version": "6.7.0",
+  "version": "6.9.0",
   "description": " bpm base lib",
   "main": "dist/cloud-module-bpm.umd.min.js",
   "author": "wujx",
@@ -16,7 +16,7 @@
     "axios": "0.19.0",
     "babel-loader": "^8.0.6",
     "babel-polyfill": "^6.26.0",
-    "cloud-module-base": "6.7.0",
+    "cloud-module-base": "^6.9.0",
     "core-js": "^3.4.4",
     "css-loader": "^3.4.1",
     "element-ui": "^2.15.7",

package/packages/bpm-form-tools/bpm-form-tools.vue

@@ -5,10 +5,10 @@
       v-for="bpmBtn in MeritBPM.bpmBtns"
       :key="bpmBtn.id"
       :type="bpmBtn.type"
+      v-prevent-re-click
       :class="bpmBtn.id"
       @click="BPMEventBus('doSend', bpmBtn)"
-      >{{ bpmBtn.name }}</el-button
-    >
+    >{{ bpmBtn.name }}</el-button>
     <bpm-user-select
       :dialogVisible="MeritBPM.userSelectDialogVisible"
       :ruleEngine="ruleEngine"
@@ -81,10 +81,12 @@
 <script>
 import { MeritBPM, BPMEventBus } from '../utils/merit-bpm.js';
 import axios from 'cloud-module-base/packages/httpConfig/http';
+import { preventReClick } from 'cloud-module-base/static/js/utils/preventReClick';
 export default {
   name: 'bpm-form-tools',
-  data() {
+  data () {
     return {
+      // repetFlag: true,
       MeritBPM,
       bpmBtn: {},
       ruleEngine: {
@@ -101,7 +103,7 @@ export default {
       required: true
     }
   },
-  created() {
+  created () {
     Object.assign(this.ruleEngine, { procDefKey: this.procDefKey });
     let id = MeritBPM.getUrlParameter('id') || '';
     let undoId = MeritBPM.getUrlParameter('undoId') || ''; //截取表单url中undoId, add by zhangyan,
@@ -117,7 +119,7 @@ export default {
   methods: {
     BPMEventBus,
     //初始化表单，返回值为业务数据对象
-    bpmInit(businessData) {
+    bpmInit (businessData) {
       Object.assign(this.ruleEngine, businessData);
       if (businessData.id == null || businessData.id == '') {
         this.MeritBPM.initRuleEngine(this);
@@ -127,15 +129,15 @@ export default {
         this.MeritBPM.runRuleEngine(this, {}, {});
       }
     },
-    getEventSendRead() {},
+    getEventSendRead () { },
 
-    getBpmVar() {
+    getBpmVar () {
       return this.ruleEngine;
     },
-    opinionCallback() {
+    opinionCallback () {
       this.$emit('opinion-Callback');
     },
-    bpmAddOrUpdate(bpmBtn) {
+    bpmAddOrUpdate (bpmBtn) {
       var _this = this;
       // 初始化
       if (_this.ruleEngine.procInstId != null) {
@@ -146,12 +148,12 @@ export default {
           .post(
             '/api/engine/bpm/process/version/' + businessId + '/' + bpmVersion
           )
-          .then(function(res) {
+          .then(function (res) {
             if (res.data.isDifferent == 'NoBusinessData') {
               _this.$alert('业务数据不存在!', '警告', {
                 confirmButtonText: '确定',
                 type: 'warning',
-                callback: action => {}
+                callback: action => { }
               });
             } else if (res.data.isDifferent) {
               _this.$alert(
@@ -160,7 +162,7 @@ export default {
                 {
                   confirmButtonText: '确定',
                   type: 'warning',
-                  callback: action => {}
+                  callback: action => { }
                 }
               );
             } else {
@@ -168,7 +170,7 @@ export default {
               _this.$emit('save', _this.bpmSaveAfter);
             }
           })
-          .catch(function(err) {
+          .catch(function (err) {
             console.log(err);
           });
       } else {
@@ -177,11 +179,14 @@ export default {
       }
     },
 
-    bpmSaveAfter(data, Func) {
+    bpmSaveAfter (data, Func) {
       let _this = this;
       this.customFun = Func;
       Object.assign(this.ruleEngine, data);
       this.ruleEngine.businessId = data.id;
+      // if (!this.ruleEngine.procInstId && !_this.repetFlag) {
+      //   return;
+      // }
       //如果没有流程实例id 创建流程
       if (this.bpmBtn.id == 'bpmSaveOrUpdateBtn') {
         this.$message.success(_this.$t('base.operation.save_success'));
@@ -190,10 +195,11 @@ export default {
         this.ruleEngine.procInstId == undefined ||
         this.ruleEngine.procInstId == ''
       ) {
-        this.MeritBPM.startProcess(this, this.bpmBtn, function(params) {
+        this.MeritBPM.startProcess(this, this.bpmBtn, function (params) {
           _this.bpmBtn.isSave = '1';
           _this.MeritBPM.doSend(_this, _this.bpmBtn);
         });
+        // this.repetFlag = false;
       } else {
         if (this.bpmBtn.id == 'bpmSaveOrUpdateBtn') {
           // 点击保存按钮
@@ -207,13 +213,13 @@ export default {
     },
 
     // 判断是否存在回调函数,如果存在,回调
-    bpmCustomFunction() {
+    bpmCustomFunction () {
       if (this.customFun != undefined && typeof this.customFun == 'function') {
         this.customFun.apply();
       }
     },
     //关闭按钮事件
-    bpmClose() {
+    bpmClose () {
       //关闭按钮事件，如果有父窗口，则调用父窗口的监听事件
       if (window.opener && window.opener.refreshBpmGrid) {
         window.opener.refreshBpmGrid();