cloud-module-bpm 6.4.3 → 6.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloud-module-bpm",
-  "version": "6.4.3",
+  "version": "6.6.0",
   "description": " bpm base lib",
   "main": "dist/cloud-module-bpm.umd.min.js",
   "author": "wujx",
@@ -16,10 +16,10 @@
     "axios": "0.19.0",
     "babel-loader": "^8.0.6",
     "babel-polyfill": "^6.26.0",
-    "cloud-module-base": "^6.4.0",
+    "cloud-module-base": "^6.6.0",
     "core-js": "^3.4.4",
     "css-loader": "^3.4.1",
-    "element-ui": "^2.13.2",
+    "element-ui": "^2.15.7",
     "less": "3.10.3",
     "less-loader": "^5.0.0",
     "moment": "^2.24.0",

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

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

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

@@ -203,7 +203,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;
       }
@@ -248,7 +248,7 @@ export default {
     },
     handlePublish() {
       let _this = this;
-      if (_this.procOpinion.content.length > 200) {
+      if (_this.procOpinion.content.length > 255) {
         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 + opinion.length < 200) {
+      if (this.procOpinion.content.length < 255) {
         this.procOpinion.content += ';' + opinion;
         return;
       }

package/packages/utils/merit-bpm.js

@@ -644,36 +644,30 @@ MeritBPM.openProcTrackWindow = function(that, params) {
   axios['bpm-engine'].post('/api/engine/track/port', {}).then(function(res) {
     var port = res.data;
     var url = '';
-
-    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);
-    });
+    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);
   });
 };
 
@@ -816,7 +810,7 @@ MeritBPM.validatePermit = function(that, procDefKey, callback) {
  */
 MeritBPM.getUrlParameter = function(name) {
   var query = window.location.href.substring(
-    window.location.hash.indexOf('?') + 1
+    window.location.href.indexOf('?') + 1
   );
   var vars = query.split('&');
   for (var i = 0; i < vars.length; i++) {