cloud-module-bpm 6.4.0 → 6.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloud-module-bpm",
-  "version": "6.4.0",
+  "version": "6.4.3",
   "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.4.0",
+    "cloud-module-base": "^6.4.0",
     "core-js": "^3.4.4",
     "css-loader": "^3.4.1",
     "element-ui": "^2.13.2",

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

@@ -89,8 +89,8 @@ export default {
       bpmBtn: {},
       ruleEngine: {
         businessId: '', //流程业务数据id
-        procInstId: undefined,//流程实例id
-        undoId:''//待办业务id
+        procInstId: undefined, //流程实例id
+        undoId: '' //待办业务id
       }
     };
   },
@@ -104,11 +104,13 @@ export default {
   created() {
     Object.assign(this.ruleEngine, { procDefKey: this.procDefKey });
     let id = MeritBPM.getUrlParameter('id') || '';
-    let undoId = MeritBPM.getUrlParameter('undoId') || '';//截取表单url中undoId, add by zhangyan,
+    let undoId = MeritBPM.getUrlParameter('undoId') || ''; //截取表单url中undoId, add by zhangyan,
+    let params = MeritBPM.getUrlParameter('params') || ''; // 截取路径中传入的参数
     //打开表单之前，触发外层的init事件。业务模块获取业务数据对象
     this.$emit('init', {
       id: id.replace('businessId', ''),
-      undoId: undoId.replace('undoId', ''),  //add by zhangyan
+      undoId: undoId.replace('undoId', ''), //add by zhangyan
+      params: params.replace('params', ''),
       callback: this.bpmInit
     });
   },
@@ -121,7 +123,7 @@ export default {
         this.MeritBPM.initRuleEngine(this);
       } else {
         this.ruleEngine.businessId = businessData.id;
-        this.ruleEngine.undoId = businessData.undoId;  //add by zhangyan
+        this.ruleEngine.undoId = businessData.undoId; //add by zhangyan
         this.MeritBPM.runRuleEngine(this, {}, {});
       }
     },
@@ -141,7 +143,9 @@ export default {
         var bpmVersion = _this.ruleEngine.runtime.mainForm.bpmVersion;
         var businessId = _this.ruleEngine.businessId;
         axios['bpm-engine']
-          .post('/api/engine/bpm/process/version/' + businessId + '/' + bpmVersion)
+          .post(
+            '/api/engine/bpm/process/version/' + businessId + '/' + bpmVersion
+          )
           .then(function(res) {
             if (res.data.isDifferent == 'NoBusinessData') {
               _this.$alert('业务数据不存在!', '警告', {
@@ -150,14 +154,18 @@ export default {
                 callback: action => {}
               });
             } else if (res.data.isDifferent) {
-              _this.$alert('数据已被' + res.data.lockUserName + '修改!', '警告', {
-                confirmButtonText: '确定',
-                type: 'warning',
-                callback: action => {}
-              });
+              _this.$alert(
+                '数据已被' + res.data.lockUserName + '修改!',
+                '警告',
+                {
+                  confirmButtonText: '确定',
+                  type: 'warning',
+                  callback: action => {}
+                }
+              );
             } else {
               //业务应用保存数据的方法，保存后回调方法
-              _this.$emit('save', _this.bpmSaveAfter);
+              _this.$emit('save', _this.bpmSaveAfter, bpmBtn);
             }
           })
           .catch(function(err) {
@@ -165,7 +173,7 @@ export default {
           });
       } else {
         //业务应用保存数据的方法，保存后回调方法
-        _this.$emit('save', _this.bpmSaveAfter);
+        _this.$emit('save', _this.bpmSaveAfter, bpmBtn);
       }
     },
 
@@ -178,7 +186,10 @@ export default {
       if (this.bpmBtn.id == 'bpmSaveOrUpdateBtn') {
         this.$message.success(_this.$t('base.operation.save_success'));
       }
-      if (this.ruleEngine.procInstId == undefined || this.ruleEngine.procInstId == '') {
+      if (
+        this.ruleEngine.procInstId == undefined ||
+        this.ruleEngine.procInstId == ''
+      ) {
         this.MeritBPM.startProcess(this, this.bpmBtn, function(params) {
           _this.bpmBtn.isSave = '1';
           _this.MeritBPM.doSend(_this, _this.bpmBtn);

package/packages/bpm-grid-buttons/bpm-grid-buttons.vue

@@ -2,6 +2,7 @@
   <el-col :span="7" class="cloud-bpm-grid-buttons">
     <el-button
       v-if="MeritBPM.procCreatePermit"
+      :disabled="isDisabledAddButton"
       class="cloud-bpm-grid-button"
       type="primary"
       icon="el-icon-plus"
@@ -85,6 +86,15 @@ export default {
     isShowButton: {
       type: Boolean,
       default: true
+    },
+    isDisabledAddButton: {
+      type: Boolean,
+      default: false,
+      required: false
+    },
+    params: {
+      type: String,
+      required: false
     }
   },
   computed: {
@@ -126,7 +136,7 @@ export default {
     },
     //流程新建方法
     createBpm() {
-      MeritBPM.create(this, this.procDefKey, {});
+      MeritBPM.create(this, this.procDefKey, { params: this.params });
     },
     //删除流程方法
     deleteBpm() {

package/packages/bpm-grid-buttons-new/bpm-grid-buttons-new.vue

@@ -2,6 +2,7 @@
   <el-col :span="7" class="cloud-bpm-grid-buttons">
     <el-button
       v-if="MeritBPM.procCreatePermit"
+      :disabled="isDisabledAddButton"
       class="cloud-bpm-grid-button"
       type="primary"
       icon="el-icon-plus"
@@ -111,6 +112,15 @@ export default {
     isShowButton: {
       type: Boolean,
       default: true
+    },
+    isDisabledAddButton: {
+      type: Boolean,
+      default: false,
+      required: false
+    },
+    params: {
+      type: String,
+      required: false
     }
   },
   computed: {
@@ -159,7 +169,7 @@ export default {
     },
     //流程新建方法
     createBpm() {
-      MeritBPM.create(this, this.procDefKey, {});
+      MeritBPM.create(this, this.procDefKey, { params: this.params });
     },
     //删除流程方法
     deleteBpm() {

package/packages/bpm-opinion-dialog/bpm-opinion.vue

@@ -211,11 +211,12 @@ export default {
     //关闭人员选择对话框
     handleClose() {
       this.procOpinion.content = undefined;
+      this.$refs.procOpinion.resetFields();
       this.$emit('dialog-close', this.dialogVisible);
     },
     handleSave() {
       let _this = this;
-      if (_this.procOpinion.content.length > 255) {
+      if (_this.procOpinion.content.length > 200) {
         return this.$message.error(
           _this.$t('bpm.opinion.opinion_content_beyond')
         );
@@ -247,7 +248,7 @@ export default {
     },
     handlePublish() {
       let _this = this;
-      if (_this.procOpinion.content.length > 255) {
+      if (_this.procOpinion.content.length > 200) {
         return this.$message.error(
           _this.$t('bpm.opinion.opinion_content_beyond')
         );

package/packages/bpm-send-read-opinion-dialog/bpm-send-read-opinion.vue

@@ -206,7 +206,7 @@ export default {
         this.procOpinion.content = opinion;
         return;
       }
-      if (this.procOpinion.content.length < 255) {
+      if (this.procOpinion.content.length + opinion.length < 200) {
         this.procOpinion.content += ';' + opinion;
         return;
       }

package/packages/utils/merit-bpm.js

@@ -18,13 +18,16 @@ var MeritBPM = {
  */
 MeritBPM.create = function(that, procDefKey, params, callback) {
   axios['bpm-engine']
-    .post('/api/engine/bpm/ruleengine/init/' + procDefKey, params)
+    .post('/api/engine/bpm/ruleengine/init/' + procDefKey, {})
     .then(function(res) {
       if (res.success) {
         if (typeof callback == 'function') {
           callback(res);
         } else if (res.data != null) {
           let url = res.data.runtime.formLink;
+          if (params.params != null && params.params != '') {
+            url = url + '&params=' + params.params;
+          }
           // var iTop = (window.screen.availHeight - 30 - 700) / 2;
           // var iLeft = (window.screen.availWidth - 10 - 900) / 2;
           // var features =
@@ -641,30 +644,36 @@ MeritBPM.openProcTrackWindow = function(that, params) {
   axios['bpm-engine'].post('/api/engine/track/port', {}).then(function(res) {
     var port = res.data;
     var url = '';
-    if (port == '80') {
-      url =
-        'http://' +
-        window.location.hostname +
-        '/bpm/proctrack/index.html?procInstId=' +
-        params.procInstId +
-        '&procDefId=' +
-        params.procDefId +
-        '&IsShielding=' +
-        shielding;
-    } else {
-      url =
-        'http://' +
-        window.location.hostname +
-        ':' +
-        port +
-        '/bpm/proctrack/index.html?procInstId=' +
-        params.procInstId +
-        '&procDefId=' +
-        params.procDefId +
-        '&IsShielding=' +
-        shielding;
-    }
-    MeritBPM.openWindow(url, params);
+
+    axios['bpm-engine'].post('/api/engine/track/http', {}).then(function(res) {
+      var http = res.data;
+      if (port == '80') {
+        url =
+          http +
+          '://' +
+          window.location.hostname +
+          '/bpm/proctrack/index.html?procInstId=' +
+          params.procInstId +
+          '&procDefId=' +
+          params.procDefId +
+          '&IsShielding=' +
+          shielding;
+      } else {
+        url =
+          http +
+          '://' +
+          window.location.hostname +
+          ':' +
+          port +
+          '/bpm/proctrack/index.html?procInstId=' +
+          params.procInstId +
+          '&procDefId=' +
+          params.procDefId +
+          '&IsShielding=' +
+          shielding;
+      }
+      MeritBPM.openWindow(url, params);
+    });
   });
 };
 
@@ -806,7 +815,7 @@ MeritBPM.validatePermit = function(that, procDefKey, callback) {
  * 拼接参数/bpm-demo/example/index.html#/formEdit?id=businessId&undoId=undoId
  */
 MeritBPM.getUrlParameter = function(name) {
-  var query = window.location.hash.substring(
+  var query = window.location.href.substring(
     window.location.hash.indexOf('?') + 1
   );
   var vars = query.split('&');