cloud-module-bpm 6.4.1 → 6.4.2

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "cloud-module-bpm",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": " bpm base lib",
   "main": "dist/cloud-module-bpm.umd.min.js",
   "author": "wujx",
   "private": false,
   "license": "MIT",
-  
   "scripts": {
     "serve": "vue-cli-service serve --port 8089 ",
     "build": "vue-cli-service build",

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

@@ -165,7 +165,7 @@ export default {
               );
             } else {
               //业务应用保存数据的方法，保存后回调方法
-              _this.$emit('save', _this.bpmSaveAfter);
+              _this.$emit('save', _this.bpmSaveAfter, bpmBtn);
             }
           })
           .catch(function(err) {
@@ -173,7 +173,7 @@ export default {
           });
       } else {
         //业务应用保存数据的方法，保存后回调方法
-        _this.$emit('save', _this.bpmSaveAfter);
+        _this.$emit('save', _this.bpmSaveAfter, bpmBtn);
       }
     },
 

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/utils/merit-bpm.js

@@ -644,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);
+    });
   });
 };