@steedos/objectql 2.2.55-beta.7 → 2.3.0-beta.10

package/lib/formula/recompute.js

@@ -9,15 +9,14 @@ var core_1 = require("./core");
 var summary_1 = require("../summary");
 var runCurrentFieldFormulas = function (fieldFormulaConfig, userSession) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var currentUserId, fieldName, objectName, formulaVarFields, docs, docs_1, docs_1_1, doc, value, setDoc, e_1_1;
+        var fieldName, objectName, formulaVarFields, docs, docs_1, docs_1_1, doc, value, setDoc, e_1_1;
         var e_1, _a;
         return tslib_1.__generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    currentUserId = userSession ? userSession.userId : undefined;
                     fieldName = fieldFormulaConfig.field_name, objectName = fieldFormulaConfig.object_name;
                     formulaVarFields = (0, core_1.pickFieldFormulaVarFields)(fieldFormulaConfig);
-                    return [4 /*yield*/, (0, index_1.getSteedosSchema)().getObject(objectName).find({ filters: [], fields: formulaVarFields })];
+                    return [4, (0, index_1.getSteedosSchema)().getObject(objectName).find({ filters: [], fields: formulaVarFields })];
                 case 1:
                     docs = _b.sent();
                     _b.label = 2;
@@ -26,38 +25,38 @@ var runCurrentFieldFormulas = function (fieldFormulaConfig, userSession) {
                     docs_1 = tslib_1.__values(docs), docs_1_1 = docs_1.next();
                     _b.label = 3;
                 case 3:
-                    if (!!docs_1_1.done) return [3 /*break*/, 8];
+                    if (!!docs_1_1.done) return [3, 8];
                     doc = docs_1_1.value;
-                    return [4 /*yield*/, (0, core_1.computeFieldFormulaValue)(doc, fieldFormulaConfig, currentUserId)];
+                    return [4, (0, core_1.computeFieldFormulaValue)(doc, fieldFormulaConfig, userSession)];
                 case 4:
                     value = _b.sent();
                     setDoc = {};
                     setDoc[fieldName] = value;
-                    return [4 /*yield*/, (0, index_1.getSteedosSchema)().getObject(objectName).directUpdate(doc._id, setDoc)];
+                    return [4, (0, index_1.getSteedosSchema)().getObject(objectName).directUpdate(doc._id, setDoc)];
                 case 5:
                     _b.sent();
-                    return [4 /*yield*/, runQuotedFieldFormulas(doc._id, fieldFormulaConfig, userSession)];
+                    return [4, runQuotedFieldFormulas(doc._id, fieldFormulaConfig, userSession)];
                 case 6:
                     _b.sent();
                     _b.label = 7;
                 case 7:
                     docs_1_1 = docs_1.next();
-                    return [3 /*break*/, 3];
-                case 8: return [3 /*break*/, 11];
+                    return [3, 3];
+                case 8: return [3, 11];
                 case 9:
                     e_1_1 = _b.sent();
                     e_1 = { error: e_1_1 };
-                    return [3 /*break*/, 11];
+                    return [3, 11];
                 case 10:
                     try {
                         if (docs_1_1 && !docs_1_1.done && (_a = docs_1.return)) _a.call(docs_1);
                     }
                     finally { if (e_1) throw e_1.error; }
-                    return [7 /*endfinally*/];
-                case 11: return [4 /*yield*/, runQuotedFieldSummaries(fieldFormulaConfig, userSession)];
+                    return [7];
+                case 11: return [4, runQuotedFieldSummaries(fieldFormulaConfig, userSession)];
                 case 12:
                     _b.sent();
-                    return [2 /*return*/];
+                    return [2];
             }
         });
     });
@@ -68,7 +67,7 @@ var runQuotedFieldFormulas = function (recordId, fieldFormulaConfig, userSession
         var e_2, _c;
         return tslib_1.__generator(this, function (_d) {
             switch (_d.label) {
-                case 0: return [4 /*yield*/, (0, field_formula_1.getQuotedByFieldFormulaConfigs)(fieldFormulaConfig)];
+                case 0: return [4, (0, field_formula_1.getQuotedByFieldFormulaConfigs)(fieldFormulaConfig)];
                 case 1:
                     formulaQuotedBys = _d.sent();
                     _d.label = 2;
@@ -77,43 +76,38 @@ var runQuotedFieldFormulas = function (recordId, fieldFormulaConfig, userSession
                     _a = tslib_1.__values(formulaQuotedBys.allConfigs), _b = _a.next();
                     _d.label = 3;
                 case 3:
-                    if (!!_b.done) return [3 /*break*/, 6];
+                    if (!!_b.done) return [3, 6];
                     config = _b.value;
-                    return [4 /*yield*/, (0, core_1.updateQuotedByObjectFieldFormulaValue)(fieldFormulaConfig.object_name, recordId, config, userSession)];
+                    return [4, (0, core_1.updateQuotedByObjectFieldFormulaValue)(fieldFormulaConfig.object_name, recordId, config, userSession)];
                 case 4:
                     _d.sent();
                     _d.label = 5;
                 case 5:
                     _b = _a.next();
-                    return [3 /*break*/, 3];
-                case 6: return [3 /*break*/, 9];
+                    return [3, 3];
+                case 6: return [3, 9];
                 case 7:
                     e_2_1 = _d.sent();
                     e_2 = { error: e_2_1 };
-                    return [3 /*break*/, 9];
+                    return [3, 9];
                 case 8:
                     try {
                         if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                     }
                     finally { if (e_2) throw e_2.error; }
-                    return [7 /*endfinally*/];
-                case 9: return [2 /*return*/];
+                    return [7];
+                case 9: return [2];
             }
         });
     });
 };
-/**
- * 找到公式字段被哪些汇总字段引用，并重新计算汇总字段值（相当于点击一次界面上的“批量重算汇总值”按钮）
- * @param fieldFormulaConfig
- * @param userSession
- */
 var runQuotedFieldSummaries = function (fieldFormulaConfig, userSession) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var summaryQuotedBys, summaryQuotedBys_1, summaryQuotedBys_1_1, config, e_3_1;
         var e_3, _a;
         return tslib_1.__generator(this, function (_b) {
             switch (_b.label) {
-                case 0: return [4 /*yield*/, (0, summary_1.getQuotedByFieldSummaryConfigs)(fieldFormulaConfig)];
+                case 0: return [4, (0, summary_1.getQuotedByFieldSummaryConfigs)(fieldFormulaConfig)];
                 case 1:
                     summaryQuotedBys = _b.sent();
                     _b.label = 2;
@@ -122,68 +116,58 @@ var runQuotedFieldSummaries = function (fieldFormulaConfig, userSession) {
                     summaryQuotedBys_1 = tslib_1.__values(summaryQuotedBys), summaryQuotedBys_1_1 = summaryQuotedBys_1.next();
                     _b.label = 3;
                 case 3:
-                    if (!!summaryQuotedBys_1_1.done) return [3 /*break*/, 6];
+                    if (!!summaryQuotedBys_1_1.done) return [3, 6];
                     config = summaryQuotedBys_1_1.value;
-                    return [4 /*yield*/, (0, summary_1.recomputeFieldSummaryValues)(config, userSession)];
+                    return [4, (0, summary_1.recomputeFieldSummaryValues)(config, userSession)];
                 case 4:
                     _b.sent();
                     _b.label = 5;
                 case 5:
                     summaryQuotedBys_1_1 = summaryQuotedBys_1.next();
-                    return [3 /*break*/, 3];
-                case 6: return [3 /*break*/, 9];
+                    return [3, 3];
+                case 6: return [3, 9];
                 case 7:
                     e_3_1 = _b.sent();
                     e_3 = { error: e_3_1 };
-                    return [3 /*break*/, 9];
+                    return [3, 9];
                 case 8:
                     try {
                         if (summaryQuotedBys_1_1 && !summaryQuotedBys_1_1.done && (_a = summaryQuotedBys_1.return)) _a.call(summaryQuotedBys_1);
                     }
                     finally { if (e_3) throw e_3.error; }
-                    return [7 /*endfinally*/];
-                case 9: return [2 /*return*/];
+                    return [7];
+                case 9: return [2];
             }
         });
     });
 };
-/**
- * 重算指定公式字段Id对应的公式值
- * @param fieldId : ${objectApiName}.${fieldApiName}
- */
 var recomputeFormulaValues = function (fieldId, userSession) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
     var config;
     return tslib_1.__generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, field_formula_1.getFieldFormulaConfig)(fieldId)];
+            case 0: return [4, (0, field_formula_1.getFieldFormulaConfig)(fieldId)];
             case 1:
                 config = _a.sent();
                 if (!config) {
                     throw new Error("recomputeFormulaValues:".concat(fieldId, " not found in field_formula configs."));
                 }
-                return [4 /*yield*/, (0, exports.recomputeFieldFormulaValues)(config, userSession)];
-            case 2: return [2 /*return*/, _a.sent()];
+                return [4, (0, exports.recomputeFieldFormulaValues)(config, userSession)];
+            case 2: return [2, _a.sent()];
         }
     });
 }); };
 exports.recomputeFormulaValues = recomputeFormulaValues;
-/**
- * 重算指定公式字段的公式值
- * @param fieldFormulaConfig
- */
 var recomputeFieldFormulaValues = function (fieldFormulaConfig, userSession) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var currentUserId;
     return tslib_1.__generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                currentUserId = userSession ? userSession.userId : undefined;
-                if (!currentUserId) {
-                    (0, util_1.checkCurrentUserIdNotRequiredForFieldFormulas)(fieldFormulaConfig);
+                if (!userSession) {
+                    (0, util_1.checkUserSessionNotRequiredForFieldFormulas)(fieldFormulaConfig);
                 }
-                return [4 /*yield*/, runCurrentFieldFormulas(fieldFormulaConfig, userSession)];
+                return [4, runCurrentFieldFormulas(fieldFormulaConfig, userSession)];
             case 1:
                 _a.sent();
-                return [2 /*return*/, true];
+                return [2, true];
         }
     });
 }); };

package/lib/formula/recompute.js.map

@@ -1 +1 @@
-{"version":3,"file":"recompute.js","sourceRoot":"","sources":["../../src/formula/recompute.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"recompute.js","sourceRoot":"","sources":["../../src/formula/recompute.ts"],"names":[],"mappings":"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"}

package/lib/formula/simple_params.js

@@ -11,27 +11,27 @@ function getSubstitutionDataType(value) {
     }
     switch (valueType) {
         case 'string':
-            dateType = "text" /* Text */;
+            dateType = "text";
             break;
         case 'number':
-            dateType = "number" /* Number */;
+            dateType = "number";
             break;
         case 'boolean':
-            dateType = "checkbox" /* Checkbox */;
+            dateType = "checkbox";
             break;
         case 'object':
             if (value === null) {
-                dateType = "null" /* Null */;
+                dateType = "null";
             }
             else if (value instanceof Date) {
-                dateType = "datetime" /* Datetime */;
+                dateType = "datetime";
             }
             else {
                 throw new Error("runFormula:Catch an error the param type \"".concat(valueType, "\" is not supported while eval formula with the params value: \"").concat(value, "\""));
             }
             break;
         case 'undefined':
-            dateType = "null" /* Null */;
+            dateType = "null";
             break;
         default:
             break;
@@ -40,7 +40,7 @@ function getSubstitutionDataType(value) {
 }
 function getSubstitutionOptions(dataType, value) {
     switch (dataType) {
-        case "number" /* Number */:
+        case "number":
             var scale = 0;
             var str = value.toString();
             var dotStr = str.toString().split(".")[1];
@@ -49,7 +49,7 @@ function getSubstitutionOptions(dataType, value) {
                 scale = dotCount;
             }
             return { scale: scale };
-        case "text" /* Text */:
+        case "text":
             return { length: Number.MAX_VALUE };
         default:
             return;
@@ -57,12 +57,12 @@ function getSubstitutionOptions(dataType, value) {
 }
 function getSubstitutionValue(dataType, value, blankValue) {
     switch (dataType) {
-        case "text" /* Text */:
+        case "text":
             if (value === null || value === undefined) {
                 return '';
             }
             break;
-        case "number" /* Number */:
+        case "number":
             if (value === null || value === undefined) {
                 if (blankValue === type_1.SteedosFormulaBlankValue.blanks) {
                     return null;

package/lib/formula/simple_params.js.map

@@ -1 +1 @@
-{"version":3,"file":"simple_params.js","sourceRoot":"","sources":["../../src/formula/simple_params.ts"],"names":[],"mappings":";;;AAAA,+BAAkD;AAGlD,IAAM,yBAAyB,GAAG,CAAC,UAAU,CAAC,CAAC;AAE/C,SAAS,uBAAuB,CAAC,KAAU;IACvC,IAAM,SAAS,GAAG,OAAO,KAAK,CAAC;IAC/B,IAAI,QAA0B,CAAC;IAC/B,IAAG,yBAAyB,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAC;QAChD,MAAM,IAAI,KAAK,CAAC,qDAA6C,SAAS,6EAAiE,KAAK,OAAG,CAAC,CAAC;KACpJ;IACD,QAAQ,SAAS,EAAE;QACf,KAAK,QAAQ;YACT,QAAQ,oBAAwB,CAAC;YACjC,MAAM;QACV,KAAK,QAAQ;YACT,QAAQ,wBAA0B,CAAC;YACnC,MAAM;QACV,KAAK,SAAS;YACV,QAAQ,4BAA4B,CAAC;YACrC,MAAM;QACV,KAAK,QAAQ;YACT,IAAG,KAAK,KAAK,IAAI,EAAC;gBACd,QAAQ,oBAAwB,CAAC;aACpC;iBACI,IAAI,KAAK,YAAY,IAAI,EAAC;gBAC3B,QAAQ,4BAA4B,CAAC;aACxC;iBACG;gBACA,MAAM,IAAI,KAAK,CAAC,qDAA6C,SAAS,6EAAiE,KAAK,OAAG,CAAC,CAAC;aACpJ;YACD,MAAM;QACV,KAAK,WAAW;YACZ,QAAQ,oBAAwB,CAAC;YACjC,MAAM;QACV;YACI,MAAM;KACb;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,SAAS,sBAAsB,CAAC,QAAgB,EAAE,KAAU;IACxD,QAAQ,QAAQ,EAAE;QACd;YACI,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,IAAI,GAAG,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC3B,IAAI,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,IAAI,QAAQ,GAAG,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC;YACvC,IAAG,QAAQ,GAAG,CAAC,EAAC;gBACZ,KAAK,GAAG,QAAQ,CAAC;aACpB;YACD,OAAO,EAAE,KAAK,OAAA,EAAE,CAAC;QACrB;YACI,OAAO,EAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAC,CAAC;QACtC;YACI,OAAQ;KACf;AACL,CAAC;AAED,SAAS,oBAAoB,CAAC,QAAgB,EAAE,KAAU,EAAE,UAAoC;IAC5F,QAAQ,QAAQ,EAAE;QACd;YACI,IAAG,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAC;gBACrC,OAAO,EAAE,CAAC;aACb;YACD,MAAM;QACV;YACI,IAAG,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAC;gBACrC,IAAG,UAAU,KAAK,+BAAwB,CAAC,MAAM,EAAC;oBAC9C,OAAO,IAAI,CAAC;iBACf;qBACG;oBACA,OAAO,CAAC,CAAC;iBACZ;aACJ;YACD,MAAM;QACV;YACI,MAAM;KACb;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAgB,0BAA0B,CAAC,KAAU,EAAE,UAAoC;IACvF,IAAI,iBAAiB,GAAQ;QACzB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,KAAK;KACf,CAAA;IACD,iBAAiB,CAAC,QAAQ,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;IAC5D,iBAAiB,CAAC,OAAO,GAAG,sBAAsB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACtF,iBAAiB,CAAC,KAAK,GAAI,oBAAoB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IAC/F,OAAO,iBAAiB,CAAC;AAC7B,CAAC;AATD,gEASC"}
+{"version":3,"file":"simple_params.js","sourceRoot":"","sources":["../../src/formula/simple_params.ts"],"names":[],"mappings":";;;AAAA,+BAAkD;AAGlD,IAAM,yBAAyB,GAAG,CAAC,UAAU,CAAC,CAAC;AAE/C,SAAS,uBAAuB,CAAC,KAAU;IACvC,IAAM,SAAS,GAAG,OAAO,KAAK,CAAC;IAC/B,IAAI,QAA0B,CAAC;IAC/B,IAAG,yBAAyB,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAC;QAChD,MAAM,IAAI,KAAK,CAAC,qDAA6C,SAAS,6EAAiE,KAAK,OAAG,CAAC,CAAC;KACpJ;IACD,QAAQ,SAAS,EAAE;QACf,KAAK,QAAQ;YACT,QAAQ,SAAwB,CAAC;YACjC,MAAM;QACV,KAAK,QAAQ;YACT,QAAQ,WAA0B,CAAC;YACnC,MAAM;QACV,KAAK,SAAS;YACV,QAAQ,aAA4B,CAAC;YACrC,MAAM;QACV,KAAK,QAAQ;YACT,IAAG,KAAK,KAAK,IAAI,EAAC;gBACd,QAAQ,SAAwB,CAAC;aACpC;iBACI,IAAI,KAAK,YAAY,IAAI,EAAC;gBAC3B,QAAQ,aAA4B,CAAC;aACxC;iBACG;gBACA,MAAM,IAAI,KAAK,CAAC,qDAA6C,SAAS,6EAAiE,KAAK,OAAG,CAAC,CAAC;aACpJ;YACD,MAAM;QACV,KAAK,WAAW;YACZ,QAAQ,SAAwB,CAAC;YACjC,MAAM;QACV;YACI,MAAM;KACb;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,SAAS,sBAAsB,CAAC,QAAgB,EAAE,KAAU;IACxD,QAAQ,QAAQ,EAAE;QACd;YACI,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,IAAI,GAAG,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC3B,IAAI,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,IAAI,QAAQ,GAAG,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC;YACvC,IAAG,QAAQ,GAAG,CAAC,EAAC;gBACZ,KAAK,GAAG,QAAQ,CAAC;aACpB;YACD,OAAO,EAAE,KAAK,OAAA,EAAE,CAAC;QACrB;YACI,OAAO,EAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAC,CAAC;QACtC;YACI,OAAQ;KACf;AACL,CAAC;AAED,SAAS,oBAAoB,CAAC,QAAgB,EAAE,KAAU,EAAE,UAAoC;IAC5F,QAAQ,QAAQ,EAAE;QACd;YACI,IAAG,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAC;gBACrC,OAAO,EAAE,CAAC;aACb;YACD,MAAM;QACV;YACI,IAAG,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAC;gBACrC,IAAG,UAAU,KAAK,+BAAwB,CAAC,MAAM,EAAC;oBAC9C,OAAO,IAAI,CAAC;iBACf;qBACG;oBACA,OAAO,CAAC,CAAC;iBACZ;aACJ;YACD,MAAM;QACV;YACI,MAAM;KACb;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAgB,0BAA0B,CAAC,KAAU,EAAE,UAAoC;IACvF,IAAI,iBAAiB,GAAQ;QACzB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,KAAK;KACf,CAAA;IACD,iBAAiB,CAAC,QAAQ,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;IAC5D,iBAAiB,CAAC,OAAO,GAAG,sBAAsB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACtF,iBAAiB,CAAC,KAAK,GAAI,oBAAoB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IAC/F,OAAO,iBAAiB,CAAC;AAC7B,CAAC;AATD,gEASC"}

package/lib/formula/type.d.ts

@@ -1,65 +1,26 @@
 export declare const FormulaUserKey = "$user";
-/**
- * 记录公式字段中引用的本对象或其他对象上的字段
- * 用于相关引用字段值变更时，能找到哪些公式字段需要级联变更
- * is_formula指field_name是否是公式字段
- * is_own指field_name是否引用的是本对象自身的字段（字段属于对象本身，且所对应的公式变量只有唯一一层引用，即直接引用当前对象自身上的字段）
- */
 export declare type SteedosFieldFormulaQuoteTypeConfig = {
     object_name: string;
     field_name: string;
     is_formula?: boolean;
     is_own?: boolean;
 };
-/**
- * 公式中的{}括起来的单个变量中的执行路径
- * {}中第一个reference_from肯定是指向当前对象
- * is_formula指field_name是否是公式字段
- */
 export declare type SteedosFormulaVarPathTypeConfig = {
     field_name: string;
     reference_from: string;
     reference_to_field?: string;
     is_formula?: boolean;
 };
-/**
- * 运行公式时，要注入的参数，经过计算每个SteedosFieldFormulaVarTypeConfig最终会转换为该结构作为参数注入公式中
- * 比如contacts对象中有公式{account.website}
- * 解析后的SteedosFieldFormulaVarTypeConfig为：
- * {
- *  key: "account.website",
- *  paths: [
- *   {field_name: "account", reference_from:"contacts"},
- *   {field_name: "website", reference_from:"accounts"},
- *  ]
- * }
- * 最终转换成的SteedosFieldFormulaParamTypeConfig为：
- * {
- *  key: "account.website",
- *  value: "www.abc.com"
- * }
- */
 export declare type SteedosFormulaParamTypeConfig = {
     key: string;
     path?: any;
     value: any;
 };
-/**
- * 公式中的{}括起来的单个变量
- * 比如contacts对象中有公式{account.website}
- * 则解析为：
- * {
- *  key: "account.website",
- *  paths: [
- *   {field_name: "account", reference_from:"contacts"},
- *   {field_name: "website", reference_from:"accounts"},
- *  ]
- * }
- */
 export declare type SteedosFormulaVarTypeConfig = {
     key: string;
     paths?: Array<SteedosFormulaVarPathTypeConfig>;
     is_user_var?: boolean;
+    is_user_session_var?: boolean;
     is_simple_var?: boolean;
 };
 export declare type SteedosFieldFormulaTypeConfig = {
@@ -72,27 +33,15 @@ export declare type SteedosFieldFormulaTypeConfig = {
     quotes: Array<SteedosFieldFormulaQuoteTypeConfig>;
     vars: Array<SteedosFormulaVarTypeConfig>;
 };
-/**
- * 获取对象在哪些字段公式中被引用时的返回结果
- * ownConfigs为引用关系为当前对象上的自身引用自身（即引用关系is_own为true）
- * otherConfigs为引用关系中排除ownConfigs后的其他引用关系（包括当前对象上is_own为false的引用关系）
- * allConfigs = ownConfigs + otherConfigs
- */
 export declare type SteedosQuotedByFieldFormulasTypeConfig = {
     ownConfigs: Array<SteedosFieldFormulaTypeConfig>;
     otherConfigs: Array<SteedosFieldFormulaTypeConfig>;
     allConfigs: Array<SteedosFieldFormulaTypeConfig>;
 };
-/**
- * 空白字段处理，只在公式类型返回值为number和currency类型时有效，默认为zeroes
- */
 export declare enum SteedosFormulaBlankValue {
     zeroes = "zeroes",
     blanks = "blanks"
 }
-/**
- * 内核函数runFormula的额外参数
- */
 export declare type SteedosFormulaOptions = {
     returnType?: string;
     blankValue?: SteedosFormulaBlankValue;

package/lib/formula/type.js

@@ -1,11 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SteedosFormulaBlankValue = exports.FormulaUserKey = void 0;
-// 公式内容中表示userSession变量的占位符
 exports.FormulaUserKey = "$user";
-/**
- * 空白字段处理，只在公式类型返回值为number和currency类型时有效，默认为zeroes
- */
 var SteedosFormulaBlankValue;
 (function (SteedosFormulaBlankValue) {
     SteedosFormulaBlankValue["zeroes"] = "zeroes";

package/lib/formula/type.js.map

@@ -1 +1 @@
-{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/formula/type.ts"],"names":[],"mappings":";;;AAAA,2BAA2B;AACd,QAAA,cAAc,GAAG,OAAO,CAAC;AA4FtC;;GAEG;AACH,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAChC,6CAAiB,CAAA;IACjB,6CAAiB,CAAA;AACrB,CAAC,EAHW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAGnC"}
+{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/formula/type.ts"],"names":[],"mappings":";;;AACa,QAAA,cAAc,GAAG,OAAO,CAAC;AAgGtC,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAChC,6CAAiB,CAAA;IACjB,6CAAiB,CAAA;AACrB,CAAC,EAHW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAGnC"}

package/lib/formula/util.d.ts

@@ -1,80 +1,11 @@
 import { SteedosFieldFormulaTypeConfig, SteedosFormulaVarPathTypeConfig, SteedosFormulaVarTypeConfig } from './type';
-/**
- * 从参数sourceConfigs中找到参数config中引用过的公式字段配置
- * @param config
- * @param sourceConfigs
- */
 export declare const getQuotedFieldFormulaConfigs: (config: SteedosFieldFormulaTypeConfig, sourceConfigs: Array<SteedosFieldFormulaTypeConfig>) => Array<SteedosFieldFormulaTypeConfig>;
-/**
- * 参数configA中是否引用了参数configB
- * @param configA
- * @param configB
- */
 export declare const isFieldFormulaConfigQuoted: (configA: SteedosFieldFormulaTypeConfig, configB: SteedosFieldFormulaTypeConfig) => boolean;
-/**
- * 公式字段配置是否引用了某个对象和字段
- * @param config 公式字段配置
- * @param object_name 是否引用了该对象
- * @param field_name 是否引用了该字段
- */
 export declare const isFieldFormulaConfigQuotingObjectAndFields: (config: SteedosFieldFormulaTypeConfig, objectName: string, fieldNames?: Array<string>) => boolean;
-/**
- * 参数config是否与sourceConfigs中任何一项有双向引用关系
- *
- * @param config
- * @param sourceConfigs
- */
 export declare const isFieldFormulaConfigQuotedTwoWays: (config: SteedosFieldFormulaTypeConfig, sourceConfigs: Array<SteedosFieldFormulaTypeConfig>) => boolean;
-/**
- * 参数configA与参数configB是否存在双向引用关系
- * @param configA
- * @param configB
- */
 export declare const isFieldFormulaConfigQuotedTwoWay: (configA: SteedosFieldFormulaTypeConfig, configB: SteedosFieldFormulaTypeConfig) => boolean;
-/**
- * 往参数configs中插入config，排除掉重复记录
- * @param config
- * @param configs
- */
 export declare const addToFieldFormulaConfigs: (config: SteedosFieldFormulaTypeConfig, configs: Array<SteedosFieldFormulaTypeConfig>) => void;
-/**
- * 根据公式引用关系对字段公式配置进行排序
- * 这里不能用sort函数，因为sort函数只支持两个数值或对象中两个数值属性对比
- * 规则是把其中被依赖的公式字段配置放前面
- * @param configs
- */
 export declare const sortFieldFormulaConfigs: (configs: Array<SteedosFieldFormulaTypeConfig>) => Array<SteedosFieldFormulaTypeConfig>;
-/**
- * 当currentUserId为空时，确认参数configs中没有引用$user变量
- * @param configs
- */
-export declare const checkCurrentUserIdNotRequiredForFieldFormulas: (configs: SteedosFieldFormulaTypeConfig | Array<SteedosFieldFormulaTypeConfig> | any) => void;
-/**
- * 当currentUserId为空时，判断参数vars中是否有引用$user变量
- * @param configs
- */
-export declare const isCurrentUserIdRequiredForFormulaVars: (vars: Array<SteedosFormulaVarTypeConfig>) => boolean;
-/**
- * 把公式变量中需要聚合查询的paths转换为aggregate函数级联查询需要的lookups，
- * 比如合同对象某个公式字段中有变量{company_id.organization.name}需要聚合查询的paths为：
- * [{"field_name":"company_id","reference_from":"contracts"},{"field_name":"organization","reference_from":"company"},{"field_name":"name","reference_from":"organizations"}]
- * 将转换返回：
-[{
-    $lookup: {
-        from: 'company',
-        localField: 'company_id',
-        foreignField: '_id',
-        as: '@lookup_company_id'
-    }
-},{
-    $lookup: {
-        from: 'organizations',
-        localField: '@lookup_company_id.organization',
-        foreignField: '_id',
-        as: '@lookup_company_id.organization'
-    }
-}]
-以上返回的lookup可用于当修改组织的名称时，找到合同中引用了该组织记录的记录，并重算其对应的公式字段值
- * @param paths 该参数最后一项的reference_from即为需要聚合查询的对象，亦即为当前正在修改对象（需要查找数据库中有哪些对象记录引用了该对象上的字段）
- */
+export declare const checkUserSessionNotRequiredForFieldFormulas: (configs: SteedosFieldFormulaTypeConfig | Array<SteedosFieldFormulaTypeConfig> | any) => void;
+export declare const isUserSessionRequiredForFormulaVars: (vars: Array<SteedosFormulaVarTypeConfig>) => boolean;
 export declare const getFormulaVarPathsAggregateLookups: (paths: Array<SteedosFormulaVarPathTypeConfig>) => any[];

package/lib/formula/util.js

@@ -1,13 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFormulaVarPathsAggregateLookups = exports.isCurrentUserIdRequiredForFormulaVars = exports.checkCurrentUserIdNotRequiredForFieldFormulas = exports.sortFieldFormulaConfigs = exports.addToFieldFormulaConfigs = exports.isFieldFormulaConfigQuotedTwoWay = exports.isFieldFormulaConfigQuotedTwoWays = exports.isFieldFormulaConfigQuotingObjectAndFields = exports.isFieldFormulaConfigQuoted = exports.getQuotedFieldFormulaConfigs = void 0;
+exports.getFormulaVarPathsAggregateLookups = exports.isUserSessionRequiredForFormulaVars = exports.checkUserSessionNotRequiredForFieldFormulas = exports.sortFieldFormulaConfigs = exports.addToFieldFormulaConfigs = exports.isFieldFormulaConfigQuotedTwoWay = exports.isFieldFormulaConfigQuotedTwoWays = exports.isFieldFormulaConfigQuotingObjectAndFields = exports.isFieldFormulaConfigQuoted = exports.getQuotedFieldFormulaConfigs = void 0;
 var tslib_1 = require("tslib");
 var _ = require("lodash");
-/**
- * 从参数sourceConfigs中找到参数config中引用过的公式字段配置
- * @param config
- * @param sourceConfigs
- */
 var getQuotedFieldFormulaConfigs = function (config, sourceConfigs) {
     var quotes = config.quotes;
     if (quotes && quotes.length) {
@@ -22,22 +17,11 @@ var getQuotedFieldFormulaConfigs = function (config, sourceConfigs) {
     }
 };
 exports.getQuotedFieldFormulaConfigs = getQuotedFieldFormulaConfigs;
-/**
- * 参数configA中是否引用了参数configB
- * @param configA
- * @param configB
- */
 var isFieldFormulaConfigQuoted = function (configA, configB) {
     var configAQuoteds = (0, exports.getQuotedFieldFormulaConfigs)(configA, [configB]);
     return !!configAQuoteds.length;
 };
 exports.isFieldFormulaConfigQuoted = isFieldFormulaConfigQuoted;
-/**
- * 公式字段配置是否引用了某个对象和字段
- * @param config 公式字段配置
- * @param object_name 是否引用了该对象
- * @param field_name 是否引用了该字段
- */
 var isFieldFormulaConfigQuotingObjectAndFields = function (config, objectName, fieldNames) {
     var quotes = config.quotes;
     if (quotes && quotes.length) {
@@ -55,12 +39,6 @@ var isFieldFormulaConfigQuotingObjectAndFields = function (config, objectName, f
     }
 };
 exports.isFieldFormulaConfigQuotingObjectAndFields = isFieldFormulaConfigQuotingObjectAndFields;
-/**
- * 参数config是否与sourceConfigs中任何一项有双向引用关系
- *
- * @param config
- * @param sourceConfigs
- */
 var isFieldFormulaConfigQuotedTwoWays = function (config, sourceConfigs) {
     var e_1, _a;
     var quotedConfigs = (0, exports.getQuotedFieldFormulaConfigs)(config, sourceConfigs);
@@ -87,20 +65,10 @@ var isFieldFormulaConfigQuotedTwoWays = function (config, sourceConfigs) {
     return false;
 };
 exports.isFieldFormulaConfigQuotedTwoWays = isFieldFormulaConfigQuotedTwoWays;
-/**
- * 参数configA与参数configB是否存在双向引用关系
- * @param configA
- * @param configB
- */
 var isFieldFormulaConfigQuotedTwoWay = function (configA, configB) {
     return (0, exports.isFieldFormulaConfigQuotedTwoWays)(configA, [configB]);
 };
 exports.isFieldFormulaConfigQuotedTwoWay = isFieldFormulaConfigQuotedTwoWay;
-/**
- * 往参数configs中插入config，排除掉重复记录
- * @param config
- * @param configs
- */
 var addToFieldFormulaConfigs = function (config, configs) {
     var existedConfig = configs.find(function (item) {
         return item._id === config._id;
@@ -117,15 +85,8 @@ var addSortedFieldFormulaConfig = function (config, sourceConfigs, sortedConfigs
     });
     (0, exports.addToFieldFormulaConfigs)(config, sortedConfigs);
 };
-/**
- * 根据公式引用关系对字段公式配置进行排序
- * 这里不能用sort函数，因为sort函数只支持两个数值或对象中两个数值属性对比
- * 规则是把其中被依赖的公式字段配置放前面
- * @param configs
- */
 var sortFieldFormulaConfigs = function (configs) {
     if (configs.length <= 1) {
-        // 只有一个时，不需要排序，直接返回
         return configs;
     }
     var sortedConfigs = [];
@@ -135,11 +96,7 @@ var sortFieldFormulaConfigs = function (configs) {
     return sortedConfigs;
 };
 exports.sortFieldFormulaConfigs = sortFieldFormulaConfigs;
-/**
- * 当currentUserId为空时，确认参数configs中没有引用$user变量
- * @param configs
- */
-var checkCurrentUserIdNotRequiredForFieldFormulas = function (configs) {
+var checkUserSessionNotRequiredForFieldFormulas = function (configs) {
     var e_2, _a;
     if (!_.isArray(configs)) {
         configs = [configs];
@@ -151,9 +108,9 @@ var checkCurrentUserIdNotRequiredForFieldFormulas = function (configs) {
         for (var configs_1 = tslib_1.__values(configs), configs_1_1 = configs_1.next(); !configs_1_1.done; configs_1_1 = configs_1.next()) {
             var config = configs_1_1.value;
             var vars = config.vars, objectName = config.object_name, fieldName = config.field_name, formula = config.formula;
-            var required = (0, exports.isCurrentUserIdRequiredForFormulaVars)(vars);
+            var required = (0, exports.isUserSessionRequiredForFormulaVars)(vars);
             if (required) {
-                throw new Error("The param 'currentUserId' is required while running the formula '".concat(formula.replace("$", "\\$"), "' of field '").concat(fieldName, "' on the object '").concat(objectName, "'"));
+                throw new Error("The param 'userSession' is required while running the formula '".concat(formula.replace("$", "\\$"), "' of field '").concat(fieldName, "' on the object '").concat(objectName, "'"));
             }
         }
     }
@@ -165,42 +122,15 @@ var checkCurrentUserIdNotRequiredForFieldFormulas = function (configs) {
         finally { if (e_2) throw e_2.error; }
     }
 };
-exports.checkCurrentUserIdNotRequiredForFieldFormulas = checkCurrentUserIdNotRequiredForFieldFormulas;
-/**
- * 当currentUserId为空时，判断参数vars中是否有引用$user变量
- * @param configs
- */
-var isCurrentUserIdRequiredForFormulaVars = function (vars) {
+exports.checkUserSessionNotRequiredForFieldFormulas = checkUserSessionNotRequiredForFieldFormulas;
+var isUserSessionRequiredForFormulaVars = function (vars) {
     var required = !!vars.find(function (_a) {
-        var isUserVar = _a.is_user_var;
-        return isUserVar;
+        var isUserVar = _a.is_user_var, isUserSessionVar = _a.is_user_session_var;
+        return isUserVar || isUserSessionVar;
     });
     return required;
 };
-exports.isCurrentUserIdRequiredForFormulaVars = isCurrentUserIdRequiredForFormulaVars;
-/**
- * 把公式变量中需要聚合查询的paths转换为aggregate函数级联查询需要的lookups，
- * 比如合同对象某个公式字段中有变量{company_id.organization.name}需要聚合查询的paths为：
- * [{"field_name":"company_id","reference_from":"contracts"},{"field_name":"organization","reference_from":"company"},{"field_name":"name","reference_from":"organizations"}]
- * 将转换返回：
-[{
-    $lookup: {
-        from: 'company',
-        localField: 'company_id',
-        foreignField: '_id',
-        as: '@lookup_company_id'
-    }
-},{
-    $lookup: {
-        from: 'organizations',
-        localField: '@lookup_company_id.organization',
-        foreignField: '_id',
-        as: '@lookup_company_id.organization'
-    }
-}]
-以上返回的lookup可用于当修改组织的名称时，找到合同中引用了该组织记录的记录，并重算其对应的公式字段值
- * @param paths 该参数最后一项的reference_from即为需要聚合查询的对象，亦即为当前正在修改对象（需要查找数据库中有哪些对象记录引用了该对象上的字段）
- */
+exports.isUserSessionRequiredForFormulaVars = isUserSessionRequiredForFormulaVars;
 var getFormulaVarPathsAggregateLookups = function (paths) {
     if (!paths.length) {
         return [];