cloud-module-bpm 6.4.5 → 6.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloud-module-bpm",
-  "version": "6.4.5",
+  "version": "6.4.6",
   "description": " bpm base lib",
   "main": "dist/cloud-module-bpm.umd.min.js",
   "author": "wujx",

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

@@ -217,13 +217,9 @@ export default {
       //关闭按钮事件，如果有父窗口，则调用父窗口的监听事件
       if (window.opener && window.opener.refreshBpmGrid) {
         window.opener.refreshBpmGrid();
-        window.opener = window;
-        var win = window.open(' ', '_self');
-        win.close();
+        window.close();
       } else {
-        window.opener = window;
-        var win = window.open(' ', '_self');
-        win.close();
+        window.close();
       }
     }
   }

package/packages/utils/merit-bpm.js

@@ -335,6 +335,7 @@ MeritBPM.finishTask = function(that, _ruleEngine) {
 };
 // 流程终止
 MeritBPM.bpmJumpBtnEnd = function(that, ruleEngine) {
+  ruleEngine.runtime = {};
   that
     .$confirm('此操作将终止该流程, 是否继续?', '提示', {
       confirmButtonText: '确定',
@@ -365,6 +366,7 @@ MeritBPM.bpmJumpBtnEnd = function(that, ruleEngine) {
 // 退回上一环节处理人
 (MeritBPM.bpmRetprenodeBtn = function(that, ruleEngine) {
   let businessId = that.ruleEngine.businessId;
+  ruleEngine.runtime = {};
   that
     .$confirm('此操作将退回到上一环节处理人, 是否继续?', '提示', {
       confirmButtonText: '确定',
@@ -392,6 +394,7 @@ MeritBPM.bpmJumpBtnEnd = function(that, ruleEngine) {
   //发送到退回人
   (MeritBPM.bpmDoBackBtn = function(that, ruleEngine) {
     let businessId = that.ruleEngine.businessId;
+    ruleEngine.runtime = {};
     that
       .$confirm('是否将流程直接发送给退回人', '发送提示', {
         confirmButtonText: '确定',
@@ -472,6 +475,7 @@ MeritBPM.bpmJumpBtnEnd = function(that, ruleEngine) {
   // 退回拟稿人
   (MeritBPM.bpmRetfirnodeBtn = function(that, ruleEngine) {
     let businessId = that.ruleEngine.businessId;
+    ruleEngine.runtime = {};
     that
       .$confirm('此操作将退回到拟稿人, 是否继续?', '提示', {
         confirmButtonText: '确定',
@@ -501,6 +505,7 @@ MeritBPM.bpmJumpBtnEnd = function(that, ruleEngine) {
     let businessId = that.ruleEngine.businessId;
     let receiver = ruleEngine.resultCodes;
     let toTaskDefKey = ruleEngine.resultToTaskDefKey;
+    ruleEngine.runtime = {};
     axios['bpm-engine']
       .post(
         '/api/engine/bpm/process/RetRandomNodeStatus/' +
@@ -526,6 +531,7 @@ MeritBPM.bpmJumpBtnEnd = function(that, ruleEngine) {
   // 流程收回
   (MeritBPM.bpmTakeBackBtn = function(that, ruleEngine) {
     let businessId = that.ruleEngine.businessId;
+    ruleEngine.runtime = {};
     that
       .$confirm('此操作将收回该流程, 是否继续?', '提示', {
         confirmButtonText: '确定',
@@ -554,6 +560,7 @@ MeritBPM.bpmJumpBtnEnd = function(that, ruleEngine) {
   (MeritBPM.JumpSave = function(that, ruleEngine) {
     let toTaskDefKey = ruleEngine.toTaskDefKey;
     let businessId = that.ruleEngine.businessId;
+    // ruleEngine.runtime = {};
     axios['bpm-engine']
       .post(
         '/api/engine/bpm/jump/process/' + businessId + '/' + toTaskDefKey,
@@ -575,6 +582,7 @@ MeritBPM.bpmJumpBtnEnd = function(that, ruleEngine) {
   (MeritBPM.JumpManagementSave = function(that, ruleEngine) {
     let toTaskDefKey = ruleEngine.toTaskDefKey;
     let businessId = that.ruleEngine.businessId;
+    // ruleEngine.runtime = {};
     axios['bpm-engine']
       .post(
         '/api/engine/bpm/jump/latest/process/' +
@@ -644,7 +652,6 @@ 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') {
@@ -674,7 +681,7 @@ MeritBPM.openProcTrackWindow = function(that, params) {
       }
       MeritBPM.openWindow(url, params);
     });
-  });
+    });
 };
 
 // 发送人员对话框关闭
@@ -815,7 +822,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.hash.substring(
     window.location.hash.indexOf('?') + 1
   );
   var vars = query.split('&');