Skip to content

Commit

Permalink
当申请单状态非草稿,但是在草稿箱时不暂存
Browse files Browse the repository at this point in the history
  • Loading branch information
sunhaolin committed Apr 22, 2024
1 parent d25e1d8 commit ed314a3
Show file tree
Hide file tree
Showing 24 changed files with 283 additions and 263 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ InstanceManager.getInstanceFormValue = function(){
autoFormValue = _.extend(instanceformValues.insertDoc, instanceformValues.updateDoc.$unset);
// 指定分析特定流程字段值异常问题
const instance = WorkflowManager.getInstance();
if (instance && 'draft' != instance.state && !autoFormValue["文件标题"] && ("4c0acf34-aaa2-4834-a189-dd742e987382" == instance.flow || "fd456ae72001cb119a7a9076" == instance.flow)) {
if (instance && "draft" == Session.get("box") && 'draft' != instance.state && !autoFormValue["文件标题"] && ("4c0acf34-aaa2-4834-a189-dd742e987382" == instance.flow || "fd456ae72001cb119a7a9076" == instance.flow)) {
const currentApprove = InstanceManager.getCurrentApprove();
Sentry.captureMessage("申请单值丢失", {
contexts: {
Expand Down
4 changes: 3 additions & 1 deletion creator/packages/steedos-workflow/client/router.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,9 @@ workflowSpaceRoutes.route '/:box/:instanceId',
triggersExit: [(context, redirect) ->
# ins发生变化 并且 是传阅 || ins发生变化 并且 表单不是只读
if (Session.get("box") == "draft" || Session.get("box") == "inbox") && Session.get("instance_change") && (InstanceManager.isCC(WorkflowManager.getInstance()) || !ApproveManager.isReadOnly())
InstanceManager.saveIns();
ins = WorkflowManager.getInstance()
if !("draft" != ins.state && "draft" == Session.get("box"))
InstanceManager.saveIns();
Session.set("instanceId", null);
Session.set('flow_selected_opinion', undefined);
]
17 changes: 10 additions & 7 deletions server/bundle/programs/server/packages/aldeed_autoform.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,24 @@ var MongoObject = Package['aldeed:simple-schema'].MongoObject;
var check = Package.check.check;
var Match = Package.check.Match;

/* Package-scope variables */
var AutoForm, globalDefaultTemplate, setDefaults, ArrayTracker, FormData, form_version, Hooks, getFlatDocOfFieldValues, getInputValue, getInputData, updateTrackedFieldValue, updateAllTrackedFieldValues, getAllFieldsInForm, validateField, arrayTracker, defaultTypeTemplates, deps, FormPreserve, res, Utility, year, month, date;

(function(){

///////////////////////////////////////////////////////////////////////
// //
// packages/aldeed_autoform/autoform-common.js //
// //
///////////////////////////////////////////////////////////////////////
//
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// //
// packages/aldeed_autoform/autoform-common.js //
// //
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// This is the only file that is run on the server, too

// Extend the schema options allowed by SimpleSchema
SimpleSchema.extendOptions({
autoform: Match.Optional(Object)
});
///////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

}).call(this);

Expand Down
2 changes: 1 addition & 1 deletion server/bundle/programs/server/packages/aldeed_tabular.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var Deps = Package.tracker.Deps;
var HTML = Package.htmljs.HTML;

/* Package-scope variables */
var Tabular;
var Tabular, getPubSelector, tableInit, Util;

(function(){

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(function () {

/* Package-scope variables */
var I18n, clone, _regEx, local_reg;



/* Exports */
Expand Down
114 changes: 57 additions & 57 deletions server/bundle/programs/server/packages/matb33_collection-hooks.js

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions server/bundle/programs/server/packages/modules.js
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.6.11-beta.1",
"version": "2.6.11-beta.3",
"main": "lib/index.js"
};

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

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

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

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

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

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

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

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

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

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

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

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

Expand Down
14 changes: 7 additions & 7 deletions server/bundle/programs/server/packages/steedos_autoform-file.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(function () {

/* Package-scope variables */
var __coffeescriptShare;



/* Exports */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(function () {

/* Package-scope variables */
var __coffeescriptShare;



/* Exports */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(function () {

/* Package-scope variables */
var val, ordered_val, createFunction, _getOptions, options, _val, isReadonly, ref, data, UniSelectize, values, cf;



/* Exports */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var EJSON = Package.ejson.EJSON;
var HTTP = Package['steedos:cfs-http-methods'].HTTP;

/* Package-scope variables */
var rootUrlPathPrefix, baseUrl, getHeaders, getHeadersByCollection, _existingMountPoints, mountUrls;
var rootUrlPathPrefix, baseUrl, getHeaders, getHeadersByCollection, _existingMountPoints, mountUrls, Images;

(function(){

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(function () {

/* Package-scope variables */
var __coffeescriptShare, SteedosTable, CreatorTable, trs, label, thead, fieldValues, str, keyLength, addItemTr, defaultValue;



/* Exports */
Expand Down
16 changes: 8 additions & 8 deletions server/bundle/programs/server/packages/tap_i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ var HTTP = Package['cfs:http-methods'].HTTP;
var Promise = Package.promise.Promise;

/* Package-scope variables */
var TAPi18n;
var TAPi18n, __coffeescriptShare, language_names, TAPi18next;

(function(){

///////////////////////////////////////////////////////////////////////////////
// //
// packages/tap_i18n/lib/globals.js //
// //
///////////////////////////////////////////////////////////////////////////////
//
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// //
// packages/tap_i18n/lib/globals.js //
// //
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// The globals object will be accessible to the build plugin, the server and
// the client

Expand Down Expand Up @@ -50,7 +50,7 @@ TAPi18n.getLanguage = function(){
console.log('TAPi18n.getLanguage');
};

///////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

}).call(this);

Expand Down

Large diffs are not rendered by default.

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": 4303407,
"totalMinifiedGzipBytes": 1084213,
"totalMinifiedBytes": 4303572,
"totalMinifiedGzipBytes": 1084234,
"minifiedBytesByPackage": {
"packages/meteor.js": 9504,
"packages/coffeescript.js": 32,
Expand Down Expand Up @@ -1784,7 +1784,7 @@
"packages/fourseven_scss.js": 34,
"packages/raix_eventemitter.js": 2215,
"packages/meteorspark_util.js": 495,
"packages/tap_i18n.js": 725,
"packages/tap_i18n.js": 731,
"packages/raix_eventstate.js": 1009,
"packages/raix_push.js": [
7764,
Expand Down Expand Up @@ -2044,7 +2044,7 @@
"packages/dburles_collection-helpers.js": 557,
"packages/mrt_moment.js": 30,
"packages/steedos_loaders-css.js": 39,
"packages/matb33_collection-hooks.js": 9263,
"packages/matb33_collection-hooks.js": 9265,
"packages/steedos_smsqueue.js": 36,
"packages/flemay_less-autoprefixer.js": 44,
"packages/steedos_ui.js": [
Expand Down Expand Up @@ -2224,7 +2224,7 @@
}
],
"packages/steedos_cfs-http-publish.js": 503,
"packages/steedos_cfs-access-point.js": 2584,
"packages/steedos_cfs-access-point.js": 2579,
"packages/steedos_cfs-reactive-property.js": 756,
"packages/steedos_cfs-reactive-list.js": 2470,
"packages/steedos_cfs-power-queue.js": 6357,
Expand Down Expand Up @@ -2382,7 +2382,7 @@
}
}
],
"packages/steedos_mailqueue.js": 37,
"packages/steedos_mailqueue.js": 60,
"packages/steedos_webhookqueue.js": 40,
"packages/lamhieu_meteorx.js": 73,
"packages/lamhieu_unblock.js": 35,
Expand Down Expand Up @@ -2659,11 +2659,11 @@
}
}
],
"packages/steedos_object-webhooks-queue.js": 49,
"packages/steedos_object-webhooks-queue.js": 72,
"packages/steedos_autoform-modals.js": 20485,
"packages/steedos_slipjs.js": 15081,
"packages/steedos_workflow.js": [
715562,
715678,
{
"node_modules": {
"meteor": {
Expand Down Expand Up @@ -2702,7 +2702,7 @@
"1_form_formula.js": 7787,
"2_steedos_data_format.js": 6022,
"approve_manager.js": 14090,
"instance_manager.js": 31048,
"instance_manager.js": 31077,
"uuflow_api.js": 13949,
"workflow_manager.js": 13054,
"node_manager.js": 5745,
Expand Down Expand Up @@ -2888,7 +2888,7 @@
}
},
"admin_menu.coffee": 363,
"router.coffee": 3574,
"router.coffee": 3661,
"subscribe.coffee": 3489,
"methods": {
"call_statistics.coffee": 442
Expand Down
Loading

0 comments on commit ed314a3

Please sign in to comment.