Skip to content

Commit

Permalink
[Bug]: 流程第一步发起后，页面显示信息有误 #6967
Browse files Browse the repository at this point in the history
  • Loading branch information
@sunhaolin
sunhaolin committed Jul 25, 2024
1 parent bfbb174 commit 691faeb
Show file tree
Hide file tree
Showing 12 changed files with 80 additions and 80 deletions.
42 changes: 21 additions & 21 deletions creator/packages/steedos-workflow/client/lib/uuflow_api.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ UUflow_api.post_submit = function (instance) {
dataType: "json",
processData: false,
contentType: "application/json",
beforeSend: function(request) {
beforeSend: function (request) {
request.setRequestHeader('Authorization', 'Bearer ' + Session.get("spaceId") + ',' + Accounts._storedLoginToken())
},

Expand All @@ -146,27 +146,27 @@ UUflow_api.post_submit = function (instance) {
}
});

if(instance.distribute_from_instance || instance.distribute_from_instances.length > 0) {
if (instance.distribute_from_instance || (instance.distribute_from_instances && instance.distribute_from_instances.length > 0)) {
window.goBack();
}else{
} else {
FlowRouter.go("/workflow/space/" + Session.get('spaceId') + "/draft/");
}
return;
}

if(instance.distribute_from_instance || instance.distribute_from_instances.length > 0) {
if (instance.distribute_from_instance || (instance.distribute_from_instances && instance.distribute_from_instances.length > 0)) {
window.goBack();
}else{
} else {
FlowRouter.go("/workflow/space/" + Session.get("spaceId") + "/" + Session.get("box"));
}

toastr.success(TAPi18n.__('Submitted successfully'));

Session.set("instance_submitting", false);

var scope = SteedosUI.refs["serviceSteedosKeyvaluesSubscribe"];
var button = scope && scope.getComponentByName("serviceSteedosKeyvaluesSubscribe.buttonTriggerDataChange");
if(button){
if (button) {
button.props.dispatchEvent('click', {});
}
},
Expand Down Expand Up @@ -206,7 +206,7 @@ UUflow_api.post_engine = function (approve) {
dataType: "json",
processData: false,
contentType: "application/json",
beforeSend: function(request) {
beforeSend: function (request) {
request.setRequestHeader('Authorization', 'Bearer ' + Session.get("spaceId") + ',' + Accounts._storedLoginToken())
},

Expand Down Expand Up @@ -262,7 +262,7 @@ UUflow_api.post_terminate = function (instance) {
dataType: "json",
processData: false,
contentType: "application/json",
beforeSend: function(request) {
beforeSend: function (request) {
request.setRequestHeader('Authorization', 'Bearer ' + Session.get("spaceId") + ',' + Accounts._storedLoginToken())
},

Expand All @@ -284,7 +284,7 @@ UUflow_api.post_terminate = function (instance) {

var scope = SteedosUI.refs["serviceSteedosKeyvaluesSubscribe"];
var button = scope && scope.getComponentByName("serviceSteedosKeyvaluesSubscribe.buttonTriggerDataChange");
if(button){
if (button) {
button.props.dispatchEvent('click', {});
}
},
Expand Down Expand Up @@ -324,7 +324,7 @@ UUflow_api.put_reassign = function (instance) {
dataType: "json",
processData: false,
contentType: "application/json",
beforeSend: function(request) {
beforeSend: function (request) {
request.setRequestHeader('Authorization', 'Bearer ' + Session.get("spaceId") + ',' + Accounts._storedLoginToken())
},

Expand Down Expand Up @@ -379,7 +379,7 @@ UUflow_api.put_relocate = function (instance) {
dataType: "json",
processData: false,
contentType: "application/json",
beforeSend: function(request) {
beforeSend: function (request) {
request.setRequestHeader('Authorization', 'Bearer ' + Session.get("spaceId") + ',' + Accounts._storedLoginToken())
},

Expand Down Expand Up @@ -478,7 +478,7 @@ UUflow_api.caculate_nextstep_users = function (deal_type, spaceId, body, nextSte
dataType: 'json',
processData: false,
contentType: "application/json",
beforeSend: function(request) {
beforeSend: function (request) {
request.setRequestHeader('Authorization', 'Bearer ' + spaceId + ',' + Accounts._storedLoginToken())
},
success: function (responseText, status) {
Expand Down Expand Up @@ -516,7 +516,7 @@ UUflow_api.caculateNextstepUsers = function (deal_type, spaceId, body, nextStepI
dataType: 'json',
processData: false,
contentType: "application/json",
beforeSend: function(request) {
beforeSend: function (request) {
request.setRequestHeader('Authorization', 'Bearer ' + spaceId + ',' + Accounts._storedLoginToken())
},
success: function (responseText, status) {
Expand Down Expand Up @@ -556,7 +556,7 @@ UUflow_api.getSpaceUsers = function (spaceId, userIds) {
dataType: 'json',
processData: false,
contentType: "application/json",
beforeSend: function(request) {
beforeSend: function (request) {
request.setRequestHeader('Authorization', 'Bearer ' + spaceId + ',' + Accounts._storedLoginToken())
},
success: function (responseText, status) {
Expand All @@ -569,16 +569,16 @@ UUflow_api.getSpaceUsers = function (spaceId, userIds) {

spaceUsers = [];

if(_.isArray(userIds)){
_.each(userIds, function(uid){
var stepApprove = _.find(_spaceUsers, function(su){
if (_.isArray(userIds)) {
_.each(userIds, function (uid) {
var stepApprove = _.find(_spaceUsers, function (su) {
return su.id == uid;
})
if(stepApprove){
if (stepApprove) {
spaceUsers.push(stepApprove)
}
})
}else{
} else {
spaceUsers = _spaceUsers
}

Expand Down Expand Up @@ -762,7 +762,7 @@ UUflow_api.post_forward = function (instance_id, space_id, flow_id, hasSaveInsta
if (action_type == "forward") {
toastr.success(TAPi18n.__("forward_instance_success"));
var new_ins_id = responseText && responseText.new_ins_ids && responseText.new_ins_ids[0];
if(new_ins_id && !Steedos.isMobile()){
if (new_ins_id && !Steedos.isMobile()) {
var newInstanceUrl = "/workflow/space/" + Steedos.getSpaceId() + "/inbox/" + new_ins_id;
newInstanceUrl = Steedos.absoluteUrl(newInstanceUrl);
Steedos.openWindow(newInstanceUrl);
Expand Down
26 changes: 13 additions & 13 deletions server/bundle/programs/server/packages/modules.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ module.useNode();
//
module.exports = {
"name": "@steedos/objectql",
"version": "2.7.4-beta.3",
"version": "2.7.4-beta.5",
"main": "lib/index.js"
};

Expand All @@ -490,7 +490,7 @@ module.useNode();
//
module.exports = {
"name": "@steedos/i18n",
"version": "2.7.4-beta.3",
"version": "2.7.4-beta.5",
"main": "lib/index.js"
};

Expand All @@ -517,7 +517,7 @@ module.useNode();
//
module.exports = {
"name": "@steedos/core",
"version": "2.7.4-beta.3",
"version": "2.7.4-beta.5",
"main": "lib/index.js"
};

Expand All @@ -544,7 +544,7 @@ module.useNode();
//
module.exports = {
"name": "@steedos/service-meteor-package-loader",
"version": "2.7.4-beta.3",
"version": "2.7.4-beta.5",
"main": "index.js"
};

Expand All @@ -571,7 +571,7 @@ module.useNode();
//
module.exports = {
"name": "@steedos/service-api",
"version": "2.7.4-beta.3",
"version": "2.7.4-beta.5",
"main": "index.js"
};

Expand All @@ -598,7 +598,7 @@ module.useNode();
//
module.exports = {
"name": "@steedos/service-metadata-server",
"version": "2.7.4-beta.3",
"version": "2.7.4-beta.5",
"main": "index.js"
};

Expand All @@ -625,7 +625,7 @@ module.useNode();
//
module.exports = {
"name": "@steedos/service-package-registry",
"version": "2.7.4-beta.3",
"version": "2.7.4-beta.5",
"main": "package.service.js"
};

Expand All @@ -652,7 +652,7 @@ module.useNode();
//
module.exports = {
"name": "@steedos/service-objectql",
"version": "2.7.4-beta.3",
"version": "2.7.4-beta.5",
"main": "package.service.js"
};

Expand All @@ -679,7 +679,7 @@ module.useNode();
//
module.exports = {
"name": "@steedos/service-ui",
"version": "2.7.4-beta.3",
"version": "2.7.4-beta.5",
"main": "package.service.js"
};

Expand All @@ -706,7 +706,7 @@ module.useNode();
//
module.exports = {
"name": "@steedos/service-pages",
"version": "2.7.4-beta.3",
"version": "2.7.4-beta.5",
"main": "package.service.js"
};

Expand All @@ -733,7 +733,7 @@ module.useNode();
//
module.exports = {
"name": "@steedos/router",
"version": "2.7.4-beta.3",
"version": "2.7.4-beta.5",
"main": "lib/index.js"
};

Expand All @@ -760,7 +760,7 @@ module.useNode();
//
module.exports = {
"name": "@steedos/auth",
"version": "2.7.4-beta.3",
"version": "2.7.4-beta.5",
"main": "lib/index.js"
};

Expand All @@ -787,7 +787,7 @@ module.useNode();
//
module.exports = {
"name": "@steedos/workflow",
"version": "2.7.4-beta.3",
"version": "2.7.4-beta.5",
"main": "index.js"
};

Expand Down
4 changes: 2 additions & 2 deletions ...9ab12571e71793224d8b37b7b721e34ca5f36d.js → ...05a92dcbed78459359c3c5eb628b0695147824.js
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions ...e71793224d8b37b7b721e34ca5f36d.stats.json → ...ed78459359c3c5eb628b0695147824.stats.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"name": "standard-minifier-js",
"version": "2.6.0"
},
"totalMinifiedBytes": 4306724,
"totalMinifiedGzipBytes": 1085076,
"totalMinifiedBytes": 4306782,
"totalMinifiedGzipBytes": 1085084,
"minifiedBytesByPackage": {
"packages/meteor.js": 9504,
"packages/coffeescript.js": 32,
Expand Down Expand Up @@ -2663,7 +2663,7 @@
"packages/steedos_autoform-modals.js": 20485,
"packages/steedos_slipjs.js": 15081,
"packages/steedos_workflow.js": [
717770,
717828,
{
"node_modules": {
"meteor": {
Expand Down Expand Up @@ -2703,7 +2703,7 @@
"2_steedos_data_format.js": 6179,
"approve_manager.js": 14090,
"instance_manager.js": 31032,
"uuflow_api.js": 14112,
"uuflow_api.js": 14170,
"workflow_manager.js": 13054,
"node_manager.js": 5745,
"instance_readonly_template.coffee": 36924,
Expand Down
18 changes: 9 additions & 9 deletions server/bundle/programs/web.browser.legacy/program.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
"format": "web-program-pre1",
"manifest": [
{
"path": "a49ab12571e71793224d8b37b7b721e34ca5f36d.js",
"path": "9505a92dcbed78459359c3c5eb628b0695147824.js",
"where": "client",
"type": "js",
"cacheable": true,
"url": "/a49ab12571e71793224d8b37b7b721e34ca5f36d.js?meteor_js_resource=true",
"size": 4306724,
"hash": "a49ab12571e71793224d8b37b7b721e34ca5f36d",
"sri": "1RXX0QyEqaBVBR6daLZQcE1wVwz+1pvtpM0zYT1icFkKzA+B7B5mePWUdQWtlHlxTzYvRd/j7GsZ56QTCH4TXA=="
"url": "/9505a92dcbed78459359c3c5eb628b0695147824.js?meteor_js_resource=true",
"size": 4306782,
"hash": "9505a92dcbed78459359c3c5eb628b0695147824",
"sri": "yrqOIf8GYciVuPINYAVLpe8U59ge7qfPgt/y99tUhHEY3vnvEdZNiNGqsNIeYUzQFkJ+ZwlP8uApFT6+ukyngg=="
},
{
"path": "a49ab12571e71793224d8b37b7b721e34ca5f36d.stats.json",
"path": "9505a92dcbed78459359c3c5eb628b0695147824.stats.json",
"where": "client",
"type": "json",
"cacheable": true,
"url": "/a49ab12571e71793224d8b37b7b721e34ca5f36d.stats.json?meteor_js_resource=true",
"url": "/9505a92dcbed78459359c3c5eb628b0695147824.stats.json?meteor_js_resource=true",
"size": 92684,
"hash": "8d9ce830ba5cec3b7a47efe50d22346a44e38cc1",
"sri": "RFTNV/xt9C8+v6WtcZEmZ7oKV+UUPwH1DFJDbglcgmJni03ht6rJIWezhna8JWuUwrDt8r6CjEVjAd4NGSlxuQ=="
"hash": "ba84d5c2c56ec183974b884d773038dbc7c3b0cc",
"sri": "JtQh+oGzTBX7gKOeHRsmXn/9wkqn/gy97rhKs676VIYNWjQAqeqXAioqTnqjxCohfM3CDdS1fRhPfKLejQkCXw=="
},
{
"path": "dynamic/node_modules/@steedos/form-builder/dist/form-builder.min.js",
Expand Down
4 changes: 2 additions & 2 deletions ...9ab12571e71793224d8b37b7b721e34ca5f36d.js → ...05a92dcbed78459359c3c5eb628b0695147824.js
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions ...e71793224d8b37b7b721e34ca5f36d.stats.json → ...ed78459359c3c5eb628b0695147824.stats.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"name": "standard-minifier-js",
"version": "2.6.0"
},
"totalMinifiedBytes": 4306724,
"totalMinifiedGzipBytes": 1085076,
"totalMinifiedBytes": 4306782,
"totalMinifiedGzipBytes": 1085084,
"minifiedBytesByPackage": {
"packages/meteor.js": 9504,
"packages/coffeescript.js": 32,
Expand Down Expand Up @@ -2663,7 +2663,7 @@
"packages/steedos_autoform-modals.js": 20485,
"packages/steedos_slipjs.js": 15081,
"packages/steedos_workflow.js": [
717770,
717828,
{
"node_modules": {
"meteor": {
Expand Down Expand Up @@ -2703,7 +2703,7 @@
"2_steedos_data_format.js": 6179,
"approve_manager.js": 14090,
"instance_manager.js": 31032,
"uuflow_api.js": 14112,
"uuflow_api.js": 14170,
"workflow_manager.js": 13054,
"node_manager.js": 5745,
"instance_readonly_template.coffee": 36924,
Expand Down
18 changes: 9 additions & 9 deletions server/bundle/programs/web.browser/program.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
"format": "web-program-pre1",
"manifest": [
{
"path": "a49ab12571e71793224d8b37b7b721e34ca5f36d.js",
"path": "9505a92dcbed78459359c3c5eb628b0695147824.js",
"where": "client",
"type": "js",
"cacheable": true,
"url": "/a49ab12571e71793224d8b37b7b721e34ca5f36d.js?meteor_js_resource=true",
"size": 4306724,
"hash": "a49ab12571e71793224d8b37b7b721e34ca5f36d",
"sri": "1RXX0QyEqaBVBR6daLZQcE1wVwz+1pvtpM0zYT1icFkKzA+B7B5mePWUdQWtlHlxTzYvRd/j7GsZ56QTCH4TXA=="
"url": "/9505a92dcbed78459359c3c5eb628b0695147824.js?meteor_js_resource=true",
"size": 4306782,
"hash": "9505a92dcbed78459359c3c5eb628b0695147824",
"sri": "yrqOIf8GYciVuPINYAVLpe8U59ge7qfPgt/y99tUhHEY3vnvEdZNiNGqsNIeYUzQFkJ+ZwlP8uApFT6+ukyngg=="
},
{
"path": "a49ab12571e71793224d8b37b7b721e34ca5f36d.stats.json",
"path": "9505a92dcbed78459359c3c5eb628b0695147824.stats.json",
"where": "client",
"type": "json",
"cacheable": true,
"url": "/a49ab12571e71793224d8b37b7b721e34ca5f36d.stats.json?meteor_js_resource=true",
"url": "/9505a92dcbed78459359c3c5eb628b0695147824.stats.json?meteor_js_resource=true",
"size": 92684,
"hash": "8d9ce830ba5cec3b7a47efe50d22346a44e38cc1",
"sri": "RFTNV/xt9C8+v6WtcZEmZ7oKV+UUPwH1DFJDbglcgmJni03ht6rJIWezhna8JWuUwrDt8r6CjEVjAd4NGSlxuQ=="
"hash": "ba84d5c2c56ec183974b884d773038dbc7c3b0cc",
"sri": "JtQh+oGzTBX7gKOeHRsmXn/9wkqn/gy97rhKs676VIYNWjQAqeqXAioqTnqjxCohfM3CDdS1fRhPfKLejQkCXw=="
},
{
"path": "dynamic/node_modules/@steedos/form-builder/dist/form-builder.min.js",
Expand Down
4 changes: 2 additions & 2 deletions ...9a498af1c19446aa0fc3945d17f70ef18ef2fa.js → ...6263914cb6e93f35cd21dc1fe7a66b031f44aa.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 691faeb

Please sign in to comment.