@steedos/service-metadata-objects 2.1.54 → 2.1.58
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/formula/formulaActionHandler.js +14 -0
- package/lib/formula/formulaActionHandler.js.map +1 -1
- package/lib/formula/type.d.ts +1 -0
- package/lib/formula/type.js.map +1 -1
- package/lib/objects/index.js +0 -1
- package/lib/objects/index.js.map +1 -1
- package/package.json +2 -2
- package/src/formula/formulaActionHandler.ts +14 -0
- package/src/formula/type.ts +2 -1
- package/src/objects/index.ts +0 -1
|
@@ -65,6 +65,7 @@ class FormulaActionHandler {
|
|
|
65
65
|
computeFormulaVarAndQuotes(formulaVar, objectConfig, quotes, vars) {
|
|
66
66
|
var e_1, _a;
|
|
67
67
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
68
|
+
let isSimpleVar = objectConfig === null; //明确传入null时表示要计算的是普通变量。
|
|
68
69
|
// 公式变量以FormulaUserSessionKey（即$user）值开头，说明是userSession变量
|
|
69
70
|
let isUserVar = new RegExp(`^${type_1.FormulaUserKey.replace("$", "\\$")}\\b`).test(formulaVar);
|
|
70
71
|
let varItems = formulaVar.split(".");
|
|
@@ -73,6 +74,19 @@ class FormulaActionHandler {
|
|
|
73
74
|
key: formulaVar,
|
|
74
75
|
paths: paths
|
|
75
76
|
};
|
|
77
|
+
if (isUserVar) {
|
|
78
|
+
// user var不可以按普通变量处理，因为其变量值依赖paths属性
|
|
79
|
+
isSimpleVar = false;
|
|
80
|
+
objectConfig = "space_users";
|
|
81
|
+
}
|
|
82
|
+
if (isSimpleVar) {
|
|
83
|
+
// 只要不是user var则标记为普通变量，后续取参数值时直接通过key取值，而不用走变量上的paths属性。
|
|
84
|
+
// 普通变量直接跳后后面所有代码即可，因为不需要处理paths和公式关系链等逻辑。
|
|
85
|
+
// 注意普通公式也是支持$user全局变量的，但是isSimpleVar是false，所以下面所有逻辑
|
|
86
|
+
formulaVarItem.is_simple_var = true;
|
|
87
|
+
vars.push(formulaVarItem);
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
76
90
|
if (isUserVar) {
|
|
77
91
|
// 如果是userSession变量，则不需要计算quotes引用，但是其paths值需要正常记录下来
|
|
78
92
|
formulaVarItem.is_user_var = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formulaActionHandler.js","sourceRoot":"","sources":["../../src/formula/formulaActionHandler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"formulaActionHandler.js","sourceRoot":"","sources":["../../src/formula/formulaActionHandler.ts"],"names":[],"mappings":";;;;AAAA,iCAAmM;AACnM,iCAAyC;AACzC,+CAA+C;AAE/C,4BAA4B;AAC5B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;AAE9B,OAAO;AACP,MAAM,YAAY,GAAG,CAAC,aAAa,EAAC,EAAE;IAClC,OAAO,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;AACvC,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,mBAAmB,CAAC;AAGvC,SAAS,0BAA0B,CAAC,aAAqB,EAAE,iBAAyB;IAChF,OAAO,qBAAqB,aAAa,IAAI,iBAAiB,EAAE,CAAA;AACpE,CAAC;AAED,MAAa,oBAAoB;IAE7B,YAAY,MAAM;QADlB,WAAM,GAAQ,IAAI,CAAC;QAEf,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAEK,SAAS,CAAC,YAAY;;YACxB,IAAI;gBACA,IAAI,CAAC,YAAY,EAAE;oBACf,OAAO;iBACV;gBACD,6EAA6E;gBAC7E,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAC,EAAE,EAAC,IAAI,EAAE,EAAE,EAAC,CAAC,CAAA;gBAC3G,OAAO,IAAI,CAAA;aACd;YAAC,OAAO,KAAK,EAAE;gBACZ,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACnC;YACD,OAAO,KAAK,CAAA;QAChB,CAAC;KAAA;IAEK,eAAe,CAAC,aAAqB;;YACvC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,EAAC,aAAa,EAAE,aAAa,EAAC,CAAC,CAAA;YAClF,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;QACvC,CAAC;KAAA;IAED,2BAA2B,CAAC,KAAyC,EAAE,MAAiD;QACpH,IAAG,KAAK,CAAC,UAAU,KAAK,KAAK,EAAC;YAC1B,+CAA+C;YAC/C,OAAO;SACV;QACD,IAAI,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YAClC,OAAO,IAAI,CAAC,UAAU,KAAK,KAAK,CAAC,UAAU,IAAI,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC,WAAW,CAAA;QACzF,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,EAAE;YACb,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACtB;IACL,CAAC;IAED;;;;;;;OAOG;IACG,0BAA0B,CAAC,UAAkB,EAAE,YAAiB,EAAG,MAAiD,EAAE,IAAwC;;;YAChK,IAAI,WAAW,GAAG,YAAY,KAAK,IAAI,CAAC,CAAA,uBAAuB;YAC/D,yDAAyD;YACzD,IAAI,SAAS,GAAG,IAAI,MAAM,CAAC,IAAI,qBAAc,CAAC,OAAO,CAAC,GAAG,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACxF,IAAI,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACrC,IAAI,KAAK,GAA2C,EAAE,CAAC;YACvD,IAAI,cAAc,GAAgC;gBAC9C,GAAG,EAAE,UAAU;gBACf,KAAK,EAAE,KAAK;aACf,CAAC;YACF,IAAI,SAAS,EAAE;gBACX,qCAAqC;gBACrC,WAAW,GAAG,KAAK,CAAC;gBACpB,YAAY,GAAG,aAAa,CAAC;aAChC;YACD,IAAG,WAAW,EAAC;gBACX,yDAAyD;gBACzD,0CAA0C;gBAC1C,oDAAoD;gBACpD,cAAc,CAAC,aAAa,GAAG,IAAI,CAAC;gBACpC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBAC1B,OAAO;aACV;YACD,IAAI,SAAS,EAAE;gBACX,oDAAoD;gBACpD,cAAc,CAAC,WAAW,GAAG,IAAI,CAAC;gBAClC,6BAA6B;gBAC7B,UAAU;aACb;iBACG;gBACA,IAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,EAAC;oBAC1B,MAAM,IAAI,KAAK,CAAC,+CAA+C,UAAU,yEAAyE,CAAC,CAAC;iBACvJ;gBACD,IAAG,CAAC,YAAY,EAAC;oBACb,gCAAgC;oBAChC,MAAM,IAAI,KAAK,CAAC,kFAAkF,UAAU,GAAG,CAAC,CAAC;iBACpH;aACJ;YACD,IAAI,gBAAgB,GAAG,YAAY,CAAC;YACpC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;;gBACX,KAA0B,IAAA,aAAA,sBAAA,QAAQ,CAAA,cAAA;oBAAvB,IAAI,OAAO,qBAAA,CAAA;oBAClB,CAAC,EAAE,CAAC;oBACJ,8CAA8C;oBAC9C,6BAA6B;oBAC7B,IAAI,eAAoB,CAAC;oBACzB,MAAM,SAAS,GAAG,OAAO,KAAK,qBAAc,CAAC;oBAC7C,IAAG,OAAO,KAAK,KAAK,EAAC;wBACjB,UAAU;wBACV,eAAe,GAAG;4BACd,IAAI,EAAE,OAAO;4BACb,IAAI,EAAE,MAAM;yBACf,CAAA;qBACJ;yBACI,IAAG,SAAS,EAAC;wBACd,oBAAoB;wBACpB,eAAe,GAAG;4BACd,IAAI,EAAE,OAAO;4BACb,IAAI,EAAE,QAAQ;4BACd,YAAY,EAAE,aAAa;yBAC9B,CAAA;qBACJ;yBACG;wBACA,eAAe,GAAG,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;qBACtD;oBACD,IAAI,CAAC,eAAe,EAAE;wBAClB,0FAA0F;wBAC1F,gKAAgK;wBAChK,OAAQ;qBACX;oBACD,IAAI,aAAa,GAAG,eAAe,CAAC,IAAI,KAAK,SAAS,CAAC;oBACvD,IAAG,CAAC,SAAS,EAAC;wBACV,IAAI,uBAAuB,GAAoC;4BAC3D,UAAU,EAAE,OAAO;4BACnB,cAAc,EAAE,gBAAgB,CAAC,IAAI;yBACxC,CAAC;wBACF,IAAI,aAAa,EAAE;4BACf,uBAAuB,CAAC,UAAU,GAAG,IAAI,CAAC;yBAC7C;wBACD,yCAAyC;wBACzC,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;qBACvC;oBACD,IAAI,CAAC,SAAS,EAAE;wBACZ,gDAAgD;wBAChD,0BAA0B;wBAC1B,IAAI,qBAAqB,GAAuC;4BAC5D,WAAW,EAAE,gBAAgB,CAAC,IAAI;4BAClC,UAAU,EAAE,eAAe,CAAC,IAAI;yBACnC,CAAC;wBACF,IAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;4BACpC,wBAAwB;4BACxB,qBAAqB,CAAC,MAAM,GAAG,IAAI,CAAC;yBACvC;wBACD,IAAI,aAAa,EAAE;4BACf,qBAAqB,CAAC,UAAU,GAAG,IAAI,CAAC;yBAC3C;wBACD,IAAI,CAAC,2BAA2B,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;qBACnE;oBACD,IAAI,eAAe,CAAC,IAAI,KAAK,QAAQ,IAAI,eAAe,CAAC,IAAI,KAAK,eAAe,EAAE;wBAC/E,SAAS;wBACT,IAAI,eAAe,CAAC,QAAQ,EAAE;4BAC1B,kDAAkD;4BAClD,MAAM,IAAI,KAAK,CAAC,yCAAyC,eAAe,CAAC,IAAI,0BAA0B,UAAU,mBAAmB,eAAe,CAAC,IAAI,iCAAiC,CAAC,CAAC;yBAC9L;wBACD,IAAI,CAAC,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;4BAC3B,gCAAgC;4BAChC,MAAM,IAAI,KAAK,CAAC,yCAAyC,eAAe,CAAC,IAAI,0BAA0B,UAAU,UAAU,eAAe,CAAC,IAAI,gDAAgD,CAAC,CAAC;yBACpM;qBACJ;yBACI;wBACD,iBAAiB;wBACjB,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;4BACzB,yEAAyE;4BACzE,MAAM,IAAI,KAAK,CAAC,yCAAyC,eAAe,CAAC,IAAI,0BAA0B,UAAU,8EAA8E,CAAC,CAAC;yBACpM;wBACD,MAAM;qBACT;oBACD,IAAI,OAAO,eAAe,CAAC,YAAY,KAAK,QAAQ,EAAE;wBAClD,mCAAmC;wBACnC,MAAM,IAAI,KAAK,CAAC,SAAS,eAAe,CAAC,IAAI,eAAe,UAAU,oGAAoG,CAAC,CAAC;qBAC/K;oBACD,gBAAgB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;oBAC5E,IAAI,CAAC,gBAAgB,EAAE;wBACnB,iBAAiB;wBACjB,8CAA8C;wBAC9C,IAAG,YAAY,CAAC,eAAe,CAAC,YAAY,CAAC,EAAC;4BAC1C,MAAM,IAAI,KAAK,CAAC,kEAAkE,eAAe,CAAC,YAAY,mBAAmB,eAAe,CAAC,IAAI,0BAA0B,UAAU,GAAG,CAAC,CAAC;yBACjM;6BACG;4BACA,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,EAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,0BAA0B,CAAC,eAAe,CAAC,YAAY,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAC,aAAa,EAAE,YAAY,CAAC,IAAI,EAAC,EAAC,EAAE,EAAC,IAAI,EAAE,EAAE,EAAC,CAAC,CAAA;4BAChM,OAAO;yBACV;qBACJ;iBACJ;;;;;;;;;YACD,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;;KAC7B;IAED;;;;OAIG;IACG,2BAA2B,CAAC,OAAe,EAAE,YAAiB;;;YAChE,IAAI,MAAM,GAA8C,EAAE,CAAC;YAC3D,IAAI,IAAI,GAAuC,EAAE,CAAC;YAClD,IAAI,WAAW,GAAQ,EAAE,CAAC;YAC1B,IAAG;gBACC,WAAW,GAAG,sBAAe,CAAC,OAAO,CAAC,CAAC;aAC1C;YACD,OAAM,EAAE,EAAC;gBACL,MAAM,IAAI,KAAK,CAAC,mCAAmC,EAAE,uCAAuC,OAAO,UAAU,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;aACjJ;;gBACD,KAA8B,IAAA,gBAAA,sBAAA,WAAW,CAAA,iBAAA;oBAA/B,MAAM,UAAU,wBAAA,CAAA;oBACtB,MAAM,IAAI,CAAC,0BAA0B,CAAC,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;iBACjF;;;;;;;;;YACD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;;KAC3B;IAED,SAAS,CAAC,OAAe;QACrB,OAAO,qBAAqB,OAAO,EAAE,CAAA;IACzC,CAAC;IAEK,2BAA2B,CAAC,WAAgB,EAAE,YAAiB;;YACjE,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;YACpC,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAC3E,IAAI,aAAa,GAAkC;gBAC/C,GAAG,EAAE,GAAG,YAAY,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,EAAE;gBAC/C,WAAW,EAAE,YAAY,CAAC,IAAI;gBAC9B,UAAU,EAAE,WAAW,CAAC,IAAI;gBAC5B,OAAO,EAAE,OAAO;gBAChB,SAAS,EAAE,WAAW,CAAC,SAAS;gBAChC,mBAAmB,EAA4B,WAAW,CAAC,mBAAmB;gBAC9E,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,IAAI,EAAE,MAAM,CAAC,IAAI;aACpB,CAAC;YAEF,OAAO,aAAa,CAAC;QACzB,CAAC;KAAA;IAEK,4BAA4B,CAAC,MAAW,EAAE,UAAkB;;;YAC9D,MAAM,yBAAyB,GAAG,EAAE,CAAC;;gBACrC,KAA0B,IAAA,KAAA,sBAAA,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA,IAAA;oBAAtC,MAAM,KAAK,WAAA,CAAA;oBAClB,2BAA2B;oBAC3B,mCAAmC;oBACnC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;wBAC1B,IAAG,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAK,SAAS,EAAC;4BACnD,MAAM,IAAI,KAAK,CAAC,0BAA0B,KAAK,CAAC,IAAI,oBAAoB,MAAM,CAAC,IAAI,oEAAoE,CAAC,CAAC;yBAC5J;wBACD,IAAI;4BACA,kDAAkD;4BAClD,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAA;4BACvF,yBAAyB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;yBACtD;wBAAC,OAAO,KAAK,EAAE;4BACZ,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;yBACxB;qBACJ;iBACJ;;;;;;;;;YACD,OAAO,yBAAyB,CAAC;;KACpC;IAED,eAAe,CAAC,IAAI,EAAE,IAAI;QACtB,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,SAAS,iBAAiB,CAAC,KAAK;YAC5B,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,UAAS,IAAI;gBACtB,IAAG,IAAI,CAAC,KAAK,KAAK,KAAK,EAAC;oBACpB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACpB,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;iBAC9B;YACL,CAAC,CAAC,CAAA;QACN,CAAC;QACD,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC3B,IAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,UAAS,GAAG,IAAE,OAAO,GAAG,KAAK,IAAI,CAAC,KAAK,CAAA,CAAA,CAAC,CAAC,EAAC;YACtD,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC7D;IACL,CAAC;IAEK,uBAAuB,CAAC,MAAW;;YACrC,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,EAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAC,EAAE,EAAC,IAAI,EAAE,EAAE,EAAC,CAAC,CAAC;QAC5F,CAAC;KAAA;IACK,uBAAuB,CAAC,MAAW,EAAE,GAAW,EAAE,KAAa;;YACjE,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YACtE,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,IAAG,QAAQ,EAAC;gBACR,IAAI,GAAG,QAAQ,CAAC;aACnB;YAED,IAAI,IAAI,GAAG;gBACP,GAAG,EAAE,GAAG;gBACR,KAAK,EAAE,KAAK;aACf,CAAA;YAED,WAAW;YACX,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChB,MAAM,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,EAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,IAAI,EAAC,EAAE,EAAC,IAAI,EAAE,EAAE,EAAC,CAAC,CAAA;QAChG,CAAC;KAAA;IAEK,kBAAkB,CAAC,MAAW,EAAE,UAAkB;;;YACpD,MAAM,yBAAyB,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;;gBAC9F,KAAiC,IAAA,8BAAA,sBAAA,yBAAyB,CAAA,+BAAA;oBAA/C,MAAM,YAAY,sCAAA,CAAA;;wBACzB,KAA0B,IAAA,oBAAA,sBAAA,YAAY,CAAC,MAAM,CAAA,CAAA,IAAA;4BAAlC,MAAM,KAAK,WAAA,CAAA;4BAClB,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,YAAY,CAAC,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;yBACtH;;;;;;;;;oBACD,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,EAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,YAAY,EAAC,EAAE,EAAC,IAAI,EAAE,EAAE,EAAC,CAAC,CAAA;iBAClH;;;;;;;;;YACD,OAAO,IAAI,CAAC;;KACf;IAEK,8BAA8B,CAAC,aAAa;;YAC9C,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,0BAA0B,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,EAAC,EAAE,EAAC,IAAI,EAAE,EAAE,EAAC,CAAC,CAAC;QACxI,CAAC;KAAA;IAEK,uBAAuB,CAAC,YAAY;;;;YACtC,MAAM,aAAa,GAAG,EAAE,CAAC;YACzB,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;;gBAC3F,KAAyB,IAAA,0BAAA,sBAAA,qBAAqB,CAAA,2BAAA;oBAAnC,MAAM,IAAI,kCAAA,CAAA;oBACjB,MAAM,mBAAmB,SAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,0CAAE,aAAa,CAAC;oBAC1D,IAAG,mBAAmB,EAAC;wBACnB,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC;wBAC3E,IAAG,kBAAkB,EAAC;4BAClB,aAAa,CAAC,mBAAmB,CAAC,GAAG,kBAAkB,CAAA;yBAC1D;qBACJ;iBACJ;;;;;;;;;YAED,KAAK,MAAM,UAAU,IAAI,aAAa,EAAE;gBACpC,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,EAAE;oBACjE,MAAM,kBAAkB,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;oBACrD,MAAM,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC;oBACjF,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,0BAA0B,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,EAAC,EAAE,EAAC,IAAI,EAAE,EAAE,EAAC,CAAC,CAAA;iBAC1I;aACJ;;KACJ;IAEK,GAAG,CAAC,YAAY;;YAClB,IAAI;gBACA,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;gBACrE,OAAO,IAAI,CAAC;aACf;YAAC,OAAO,KAAK,EAAE;gBACZ,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACnC;YACD,OAAO,KAAK,CAAA;QAChB,CAAC;KAAA;IAEK,MAAM,CAAC,GAAG;;YACZ,IAAI,EAAC,aAAa,EAAE,YAAY,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;YAC/C,IAAG,CAAC,aAAa,EAAC;gBACd,aAAa,GAAG,GAAG,CAAC;aACvB;YACD,IAAG,CAAC,YAAY,EAAC;gBACb,YAAY,GAAG,GAAG,CAAC;aACtB;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,aAAa,IAAI,YAAY,EAAE,CAAC,CAAA;YAC9D,MAAM,OAAO,GAAG,EAAE,CAAC;YACnB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAC,GAAG,EAAE,GAAG,EAAC,EAAE,EAAC,IAAI,EAAE,EAAE,EAAC,CAAC,CAAA;YAC7E,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,EAAC,EAAE;gBACnB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAC/B,CAAC,CAAC,CAAA;YACF,OAAO,OAAO,CAAC;QACnB,CAAC;KAAA;IAEK,GAAG,CAAC,GAAG;;YACT,IAAI,EAAC,gBAAgB,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;YACpC,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAA;YAC5C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,EAAC,GAAG,EAAE,GAAG,EAAC,EAAE,EAAC,IAAI,EAAE,EAAE,EAAC,CAAC,CAAC;YAC3E,OAAO,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ,CAAC;QACzB,CAAC;KAAA;IAEK,8BAA8B,CAAC,GAAG;;;YACpC,IAAI,EAAC,WAAW,EAAE,YAAY,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;YAE7C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;YACvF,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YAC1E,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,IAAG,QAAQ,EAAC;gBACR,IAAI,GAAG,QAAQ,CAAC;aACnB;;gBAED,KAA0B,IAAA,KAAA,sBAAA,YAAY,CAAC,MAAM,CAAA,IAAA;oBAAlC,MAAM,KAAK,WAAA,CAAA;oBAClB,IAAI,IAAI,GAAG;wBACP,GAAG,EAAE,YAAY,CAAC,GAAG;wBACrB,KAAK,EAAE,GAAG,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,UAAU,EAAE;qBACpD,CAAA;oBACD,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;iBACpC;;;;;;;;;YAED,OAAO,MAAM,IAAI,CAAC,2BAA2B,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;;KAC5E;IAEK,uBAAuB,CAAC,GAAG;;YAC7B,IAAI,EAAC,OAAO,EAAE,YAAY,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;YACzC,OAAO,MAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACzE,CAAC;KAAA;CACJ;AA1XD,oDA0XC"}
|
package/lib/formula/type.d.ts
CHANGED
package/lib/formula/type.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/formula/type.ts"],"names":[],"mappings":";;;AAAA,2BAA2B;AACd,QAAA,cAAc,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/formula/type.ts"],"names":[],"mappings":";;;AAAA,2BAA2B;AACd,QAAA,cAAc,GAAG,OAAO,CAAC;AA2FtC;;GAEG;AACH,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAChC,6CAAiB,CAAA;IACjB,6CAAiB,CAAA;AACrB,CAAC,EAHW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAGnC"}
|
package/lib/objects/index.js
CHANGED
|
@@ -121,7 +121,6 @@ function refreshObject(ctx, objectApiName) {
|
|
|
121
121
|
}
|
|
122
122
|
}
|
|
123
123
|
if (!mainConfig) {
|
|
124
|
-
console.log(`refreshObject mainConfig`, mainConfigs.length, mainConfig);
|
|
125
124
|
return null;
|
|
126
125
|
}
|
|
127
126
|
objectConfig = _.defaultsDeep({}, ..._.sortBy(objectConfigs, function (o) {
|
package/lib/objects/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/objects/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/objects/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/service-metadata-objects",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.58",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/objects.service.js",
|
|
6
6
|
"scripts": {
|
|
@@ -41,5 +41,5 @@
|
|
|
41
41
|
"publishConfig": {
|
|
42
42
|
"access": "public"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "d89a3267977beaf7c9da5172008a31abef82219a"
|
|
45
45
|
}
|
|
@@ -64,6 +64,7 @@ export class FormulaActionHandler{
|
|
|
64
64
|
* @param quotes
|
|
65
65
|
*/
|
|
66
66
|
async computeFormulaVarAndQuotes(formulaVar: string, objectConfig: any, quotes: Array<SteedosFieldFormulaQuoteTypeConfig>, vars: Array<SteedosFormulaVarTypeConfig>){
|
|
67
|
+
let isSimpleVar = objectConfig === null;//明确传入null时表示要计算的是普通变量。
|
|
67
68
|
// 公式变量以FormulaUserSessionKey（即$user）值开头，说明是userSession变量
|
|
68
69
|
let isUserVar = new RegExp(`^${FormulaUserKey.replace("$","\\$")}\\b`).test(formulaVar);
|
|
69
70
|
let varItems = formulaVar.split(".");
|
|
@@ -72,6 +73,19 @@ export class FormulaActionHandler{
|
|
|
72
73
|
key: formulaVar,
|
|
73
74
|
paths: paths
|
|
74
75
|
};
|
|
76
|
+
if (isUserVar) {
|
|
77
|
+
// user var不可以按普通变量处理，因为其变量值依赖paths属性
|
|
78
|
+
isSimpleVar = false;
|
|
79
|
+
objectConfig = "space_users";
|
|
80
|
+
}
|
|
81
|
+
if(isSimpleVar){
|
|
82
|
+
// 只要不是user var则标记为普通变量，后续取参数值时直接通过key取值，而不用走变量上的paths属性。
|
|
83
|
+
// 普通变量直接跳后后面所有代码即可，因为不需要处理paths和公式关系链等逻辑。
|
|
84
|
+
// 注意普通公式也是支持$user全局变量的，但是isSimpleVar是false，所以下面所有逻辑
|
|
85
|
+
formulaVarItem.is_simple_var = true;
|
|
86
|
+
vars.push(formulaVarItem);
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
75
89
|
if (isUserVar) {
|
|
76
90
|
// 如果是userSession变量，则不需要计算quotes引用，但是其paths值需要正常记录下来
|
|
77
91
|
formulaVarItem.is_user_var = true;
|
package/src/formula/type.ts
CHANGED
|
@@ -63,7 +63,8 @@ export type SteedosFormulaParamTypeConfig = {
|
|
|
63
63
|
export type SteedosFormulaVarTypeConfig = {
|
|
64
64
|
key: string,
|
|
65
65
|
paths: Array<SteedosFormulaVarPathTypeConfig>,
|
|
66
|
-
is_user_var?: boolean
|
|
66
|
+
is_user_var?: boolean,
|
|
67
|
+
is_simple_var?: boolean //当不传入objectApiName时变量上设置该属性表示一个普通的变量
|
|
67
68
|
}
|
|
68
69
|
|
|
69
70
|
export type SteedosFieldFormulaTypeConfig = {
|