@kontur.candy/generator 4.298.0-documentsPeriod.2 → 4.298.0-fs-7964-multiple-keys-groupsum.2

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.
Files changed (2) hide show
  1. package/dist/index.js +225 -82
  2. package/package.json +1 -1
package/dist/index.js CHANGED
@@ -115551,7 +115551,8 @@ __webpack_require__.r(__webpack_exports__);
115551
115551
  /* harmony export */ "groupCountKCLangFunction": () => (/* binding */ groupCountKCLangFunction),
115552
115552
  /* harmony export */ "concatKCLangFunction": () => (/* binding */ concatKCLangFunction),
115553
115553
  /* harmony export */ "newlineKCLangFunction": () => (/* binding */ newlineKCLangFunction),
115554
- /* harmony export */ "dateNowKCLangFunction": () => (/* binding */ dateNowKCLangFunction)
115554
+ /* harmony export */ "dateNowKCLangFunction": () => (/* binding */ dateNowKCLangFunction),
115555
+ /* harmony export */ "listOfKCLangFunction": () => (/* binding */ listOfKCLangFunction)
115555
115556
  /* harmony export */ });
115556
115557
  class ArgumentValidationError {
115557
115558
  constructor(validationMessage) {
@@ -115933,18 +115934,22 @@ const groupSumKCLangFunction = params => {
115933
115934
  return new FunctionValidationErrorCollection(errors);
115934
115935
  }
115935
115936
 
115936
- const targetKeyPathParam = (_params$20 = params[0]) === null || _params$20 === void 0 ? void 0 : _params$20.value;
115937
+ const targetKeysParam = (_params$20 = params[0]) === null || _params$20 === void 0 ? void 0 : _params$20.value;
115937
115938
  const sourceKeyPathParam = (_params$21 = params[1]) === null || _params$21 === void 0 ? void 0 : _params$21.value;
115938
115939
  const sourceValuePathParam = (_params$22 = params[2]) === null || _params$22 === void 0 ? void 0 : _params$22.value;
115939
115940
 
115940
- if ((targetKeyPathParam === null || targetKeyPathParam === void 0 ? void 0 : targetKeyPathParam.type) !== "argument" || (sourceKeyPathParam === null || sourceKeyPathParam === void 0 ? void 0 : sourceKeyPathParam.type) !== "argument" || (sourceValuePathParam === null || sourceValuePathParam === void 0 ? void 0 : sourceValuePathParam.type) !== "argument") {
115941
- const argumentsValidationError = new ArgumentValidationError("Expected 3 paths as arguments: targetKeyPath, sourceKeyPath, sourceValuePath");
115941
+ if (targetKeysParam == undefined || (sourceKeyPathParam === null || sourceKeyPathParam === void 0 ? void 0 : sourceKeyPathParam.type) !== "argument" || (sourceValuePathParam === null || sourceValuePathParam === void 0 ? void 0 : sourceValuePathParam.type) !== "argument") {
115942
+ const argumentsValidationError = new ArgumentValidationError("Expected 3 paths as arguments: targetKeys, sourceKeyPath, sourceValuePath");
115942
115943
  return new FunctionValidationErrorCollection([argumentsValidationError]);
115943
115944
  }
115944
115945
 
115946
+ const targetKeys = targetKeysParam.type === "array" ? targetKeysParam : {
115947
+ type: "array",
115948
+ items: [targetKeysParam]
115949
+ };
115945
115950
  return {
115946
115951
  type: "groupSum",
115947
- targetKeyPath: targetKeyPathParam.select,
115952
+ targetKeys: targetKeys,
115948
115953
  sourceKeyPath: sourceKeyPathParam.select,
115949
115954
  sourceValuePath: sourceValuePathParam.select
115950
115955
  };
@@ -115958,17 +115963,21 @@ const groupCountKCLangFunction = params => {
115958
115963
  return new FunctionValidationErrorCollection(errors);
115959
115964
  }
115960
115965
 
115961
- const targetKeyPathParam = (_params$23 = params[0]) === null || _params$23 === void 0 ? void 0 : _params$23.value;
115966
+ const targetKeysParam = (_params$23 = params[0]) === null || _params$23 === void 0 ? void 0 : _params$23.value;
115962
115967
  const sourceKeyPathParam = (_params$24 = params[1]) === null || _params$24 === void 0 ? void 0 : _params$24.value;
115963
115968
 
115964
- if ((targetKeyPathParam === null || targetKeyPathParam === void 0 ? void 0 : targetKeyPathParam.type) !== "argument" || (sourceKeyPathParam === null || sourceKeyPathParam === void 0 ? void 0 : sourceKeyPathParam.type) !== "argument") {
115969
+ if (targetKeysParam == undefined || (sourceKeyPathParam === null || sourceKeyPathParam === void 0 ? void 0 : sourceKeyPathParam.type) !== "argument") {
115965
115970
  const argumentsValidationError = new ArgumentValidationError("Expected 2 paths as arguments: targetKeyPath, sourceKeyPath");
115966
115971
  return new FunctionValidationErrorCollection([argumentsValidationError]);
115967
115972
  }
115968
115973
 
115974
+ const targetKeys = targetKeysParam.type === "array" ? targetKeysParam : {
115975
+ type: "array",
115976
+ items: [targetKeysParam]
115977
+ };
115969
115978
  return {
115970
115979
  type: "groupCount",
115971
- targetKeyPath: targetKeyPathParam.select,
115980
+ targetKeys: targetKeys,
115972
115981
  sourceKeyPath: sourceKeyPathParam.select
115973
115982
  };
115974
115983
  };
@@ -116006,6 +116015,18 @@ const dateNowKCLangFunction = params => {
116006
116015
  type: "dateNow"
116007
116016
  };
116008
116017
  };
116018
+ const listOfKCLangFunction = params => {
116019
+ const errors = Array.from(validateParams(params, 0, 1000));
116020
+
116021
+ if (errors.length > 0) {
116022
+ return new FunctionValidationErrorCollection(errors);
116023
+ }
116024
+
116025
+ return {
116026
+ type: "array",
116027
+ items: params.map(x => x.value)
116028
+ };
116029
+ };
116009
116030
 
116010
116031
  /***/ }),
116011
116032
 
@@ -116052,7 +116073,8 @@ const getKCLangGlobalFunctionBuilders = () => ({
116052
116073
  groupCount: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.groupCountKCLangFunction],
116053
116074
  concat: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.concatKCLangFunction],
116054
116075
  newline: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.newlineKCLangFunction],
116055
- dateNow: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.dateNowKCLangFunction]
116076
+ dateNow: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.dateNowKCLangFunction],
116077
+ listOf: [_KCLangAntlrFunctions__WEBPACK_IMPORTED_MODULE_2__.listOfKCLangFunction]
116056
116078
  });
116057
116079
 
116058
116080
  class ErrorListener {
@@ -121849,6 +121871,9 @@ function traverseKCLangExpression(node, visitor) {
121849
121871
  visitor.visitDateNowKCLangNode(node);
121850
121872
  break;
121851
121873
 
121874
+ case "array":
121875
+ break;
121876
+
121852
121877
  default:
121853
121878
  (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.ensureNever)(node);
121854
121879
  break;
@@ -121948,6 +121973,9 @@ class DefaultKCLangExpressionVisitor {
121948
121973
  visitDateNowKCLangNode(node) {// default empty implementation
121949
121974
  }
121950
121975
 
121976
+ visitArrayKCLangNode(node) {// default empty implementation
121977
+ }
121978
+
121951
121979
  }
121952
121980
 
121953
121981
  /***/ }),
@@ -122349,6 +122377,9 @@ const getGenerateJsExpressionFunc = options => {
122349
122377
  case "dateNow":
122350
122378
  return `${utilsName}.dateNow()`;
122351
122379
 
122380
+ case "array":
122381
+ throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_1__.NotImplementedError();
122382
+
122352
122383
  default:
122353
122384
  (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.ensureNever)(expression);
122354
122385
  }
@@ -122431,10 +122462,10 @@ function generateKCXmlExpression(expression) {
122431
122462
  return `<m:${expression.type} bik="${expression.bik}" account="${expression.account}" />`;
122432
122463
 
122433
122464
  case "groupSum":
122434
- return `<m:${expression.type} targetKeyPath="${expression.targetKeyPath}" sourceKeyPath="${expression.sourceKeyPath}" sourceValuePath="${expression.sourceValuePath}" />`;
122465
+ return [`<m:${expression.type} sourceKeyPath="${expression.sourceKeyPath}" sourceValuePath="${expression.sourceValuePath}" >`, (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(generateKCXmlExpression(expression.targetKeys), 1), `</m:${expression.type}>`].join("\n");
122435
122466
 
122436
122467
  case "groupCount":
122437
- return `<m:${expression.type} targetKeyPath="${expression.targetKeyPath}" sourceKeyPath="${expression.sourceKeyPath}" />`;
122468
+ return [`<m:${expression.type} sourceKeyPath="${expression.sourceKeyPath}" >`, (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(generateKCXmlExpression(expression.targetKeys), 1), `</m:${expression.type}>`].join("\n");
122438
122469
 
122439
122470
  case "cast":
122440
122471
  if (expression.expression.type === "argument") {
@@ -122521,6 +122552,12 @@ function generateKCXmlExpression(expression) {
122521
122552
  return [`<m:oneof>`, (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(testExpr, 1), [`<m:oneofitems>`, enumerationItems.map(x => (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(x, 1)), `</m:oneofitems>`].flat().map(x => (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(x, 1)).join("\n"), `</m:oneof>`].join("\n");
122522
122553
  }
122523
122554
 
122555
+ case "array":
122556
+ {
122557
+ const enumerationItems = expression.items.map(generateKCXmlExpression);
122558
+ return [`<m:oneofitems>`, enumerationItems.map(x => (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(x, 1)), `</m:oneofitems>`].flat().map(x => (0,_Common_IndentString__WEBPACK_IMPORTED_MODULE_2__.indent)(x, 1)).join("\n");
122559
+ }
122560
+
122524
122561
  default:
122525
122562
  // @ts-ignore
122526
122563
  throw new Error(`Expression of type '${expression.type}' is not supported`);
@@ -128609,12 +128646,12 @@ __webpack_require__.r(__webpack_exports__);
128609
128646
  /* harmony export */ "FormulaWhenExpression": () => (/* binding */ FormulaWhenExpression),
128610
128647
  /* harmony export */ "DummyContent": () => (/* binding */ DummyContent),
128611
128648
  /* harmony export */ "FormulaSumExpression": () => (/* binding */ FormulaSumExpression),
128649
+ /* harmony export */ "FormulaOneOfItemsExpression": () => (/* binding */ FormulaOneOfItemsExpression),
128612
128650
  /* harmony export */ "FormulaGroupSumExpression": () => (/* binding */ FormulaGroupSumExpression),
128613
128651
  /* harmony export */ "FormulaGroupCountExpression": () => (/* binding */ FormulaGroupCountExpression),
128614
128652
  /* harmony export */ "FormulaAndExpression": () => (/* binding */ FormulaAndExpression),
128615
128653
  /* harmony export */ "FormulaOrExpression": () => (/* binding */ FormulaOrExpression),
128616
128654
  /* harmony export */ "FormulaGtExpression": () => (/* binding */ FormulaGtExpression),
128617
- /* harmony export */ "FormulaOneOfItemsExpression": () => (/* binding */ FormulaOneOfItemsExpression),
128618
128655
  /* harmony export */ "FormulaOneOfExpression": () => (/* binding */ FormulaOneOfExpression),
128619
128656
  /* harmony export */ "FormulaRegexMatchExpression": () => (/* binding */ FormulaRegexMatchExpression),
128620
128657
  /* harmony export */ "FormulaLengthExpression": () => (/* binding */ FormulaLengthExpression),
@@ -128668,7 +128705,7 @@ __webpack_require__.r(__webpack_exports__);
128668
128705
 
128669
128706
 
128670
128707
 
128671
- var _dec, _dec2, _class, _class2, _descriptor, _dec3, _class4, _dec4, _dec5, _class5, _class6, _descriptor2, _dec6, _dec7, _dec8, _dec9, _class8, _class9, _descriptor3, _descriptor4, _descriptor5, _dec10, _dec11, _dec12, _class11, _class12, _descriptor6, _descriptor7, _dec13, _dec14, _class14, _class15, _descriptor8, _dec15, _dec16, _class17, _class18, _descriptor9, _dec17, _dec18, _class20, _class21, _descriptor10, _dec19, _dec20, _class23, _class24, _descriptor11, _dec21, _dec22, _dec23, _class26, _class27, _descriptor12, _descriptor13, _dec24, _dec25, _dec26, _class29, _class30, _descriptor14, _descriptor15, _dec27, _dec28, _class32, _class33, _descriptor16, _dec29, _dec30, _class35, _class36, _descriptor17, _dec31, _dec32, _class38, _class39, _descriptor18, _dec33, _dec34, _class41, _class42, _descriptor19, _dec35, _dec36, _class44, _class45, _descriptor20, _dec37, _dec38, _class47, _class48, _descriptor21, _dec39, _dec40, _class50, _class51, _descriptor22, _dec41, _dec42, _class53, _class54, _descriptor23, _dec43, _dec44, _class56, _class57, _descriptor24, _dec45, _dec46, _dec47, _dec48, _class59, _class60, _descriptor25, _descriptor26, _descriptor27, _dec49, _dec50, _class62, _class63, _descriptor28, _dec51, _dec52, _class65, _class66, _descriptor29, _dec53, _dec54, _dec55, _class68, _class69, _descriptor30, _descriptor31, _dec56, _dec57, _class71, _class72, _descriptor32, _dec58, _dec59, _class74, _class75, _descriptor33, _dec60, _dec61, _class77, _class78, _descriptor34, _dec62, _dec63, _class80, _class81, _descriptor35, _dec64, _dec65, _dec66, _class83, _class84, _descriptor36, _descriptor37, _dec67, _dec68, _dec69, _dec70, _class86, _class87, _descriptor38, _descriptor39, _descriptor40, _dec71, _dec72, _dec73, _class89, _class90, _descriptor41, _descriptor42, _dec74, _class92, _dec75, _dec76, _class93, _class94, _descriptor43, _dec77, _dec78, _class96, _class97, _descriptor44, _dec79, _dec80, _class99, _class100, _descriptor45, _dec81, _dec82, _dec83, _class102, _class103, _descriptor46, _descriptor47, _dec84, _dec85, _dec86, _class105, _class106, _descriptor48, _descriptor49, _dec87, _dec88, _class108, _class109, _descriptor50, _dec89, _dec90, _class111, _class112, _descriptor51, _dec91, _dec92, _dec93, _class114, _class115, _descriptor52, _descriptor53, _dec94, _dec95, _class117, _class118, _descriptor54, _dec96, _class120, _dec97, _dec98, _dec99, _dec100, _class121, _class122, _descriptor55, _descriptor56, _descriptor57, _dec101, _dec102, _class124, _class125, _descriptor58, _dec103, _dec104, _dec105, _dec106, _dec107, _dec108, _class127, _class128, _descriptor59, _descriptor60, _descriptor61, _descriptor62, _descriptor63, _dec109, _dec110, _class130, _class131, _descriptor64, _dec111, _dec112, _dec113, _class133, _class134, _descriptor65, _descriptor66;
128708
+ var _dec, _dec2, _class, _class2, _descriptor, _dec3, _class4, _dec4, _dec5, _class5, _class6, _descriptor2, _dec6, _dec7, _class8, _class9, _descriptor3, _dec8, _dec9, _dec10, _dec11, _class11, _class12, _descriptor4, _descriptor5, _descriptor6, _dec12, _dec13, _dec14, _class14, _class15, _descriptor7, _descriptor8, _dec15, _dec16, _class17, _class18, _descriptor9, _dec17, _dec18, _class20, _class21, _descriptor10, _dec19, _dec20, _class23, _class24, _descriptor11, _dec21, _dec22, _dec23, _class26, _class27, _descriptor12, _descriptor13, _dec24, _dec25, _dec26, _class29, _class30, _descriptor14, _descriptor15, _dec27, _dec28, _class32, _class33, _descriptor16, _dec29, _dec30, _class35, _class36, _descriptor17, _dec31, _dec32, _class38, _class39, _descriptor18, _dec33, _dec34, _class41, _class42, _descriptor19, _dec35, _dec36, _class44, _class45, _descriptor20, _dec37, _dec38, _class47, _class48, _descriptor21, _dec39, _dec40, _class50, _class51, _descriptor22, _dec41, _dec42, _class53, _class54, _descriptor23, _dec43, _dec44, _class56, _class57, _descriptor24, _dec45, _dec46, _dec47, _dec48, _class59, _class60, _descriptor25, _descriptor26, _descriptor27, _dec49, _dec50, _class62, _class63, _descriptor28, _dec51, _dec52, _class65, _class66, _descriptor29, _dec53, _dec54, _dec55, _class68, _class69, _descriptor30, _descriptor31, _dec56, _dec57, _class71, _class72, _descriptor32, _dec58, _dec59, _class74, _class75, _descriptor33, _dec60, _dec61, _class77, _class78, _descriptor34, _dec62, _dec63, _class80, _class81, _descriptor35, _dec64, _dec65, _dec66, _class83, _class84, _descriptor36, _descriptor37, _dec67, _dec68, _dec69, _dec70, _class86, _class87, _descriptor38, _descriptor39, _descriptor40, _dec71, _dec72, _dec73, _class89, _class90, _descriptor41, _descriptor42, _dec74, _class92, _dec75, _dec76, _class93, _class94, _descriptor43, _dec77, _dec78, _class96, _class97, _descriptor44, _dec79, _dec80, _class99, _class100, _descriptor45, _dec81, _dec82, _dec83, _class102, _class103, _descriptor46, _descriptor47, _dec84, _dec85, _dec86, _class105, _class106, _descriptor48, _descriptor49, _dec87, _dec88, _class108, _class109, _descriptor50, _dec89, _dec90, _class111, _class112, _descriptor51, _dec91, _dec92, _dec93, _class114, _class115, _descriptor52, _descriptor53, _dec94, _dec95, _class117, _class118, _descriptor54, _dec96, _class120, _dec97, _dec98, _dec99, _dec100, _class121, _class122, _descriptor55, _descriptor56, _descriptor57, _dec101, _dec102, _class124, _class125, _descriptor58, _dec103, _dec104, _dec105, _dec106, _dec107, _dec108, _class127, _class128, _descriptor59, _descriptor60, _descriptor61, _descriptor62, _descriptor63, _dec109, _dec110, _class130, _class131, _descriptor64, _dec111, _dec112, _dec113, _class133, _class134, _descriptor65, _descriptor66;
128672
128709
 
128673
128710
 
128674
128711
 
@@ -128721,71 +128758,67 @@ let FormulaSumExpression = (_dec4 = (0,_markupGenerator_Serializer_SugarSerializ
128721
128758
  writable: true,
128722
128759
  initializer: null
128723
128760
  })), _class6)) || _class5);
128724
- let FormulaGroupSumExpression = (_dec6 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("groupsum", `Вычисление суммы с группировкой в разных множественностях`), _dec7 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("targetKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в целевой множественности`), _dec8 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в суммируемой множественности`), _dec9 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceValuePath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь в суммируемой множественности откуда берем значение для свёртки`), _dec6(_class8 = (_class9 = class FormulaGroupSumExpression extends FormulaExpression {
128761
+ let FormulaOneOfItemsExpression = (_dec6 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("oneofitems", `TODO`), _dec7 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec6(_class8 = (_class9 = class FormulaOneOfItemsExpression extends FormulaExpression {
128725
128762
  constructor(...args) {
128726
128763
  super(...args);
128727
128764
 
128728
- _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeyPath", _descriptor3, this);
128729
-
128730
- _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor4, this);
128731
-
128732
- _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceValuePath", _descriptor5, this);
128765
+ _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expressions", _descriptor3, this);
128733
128766
  }
128734
128767
 
128735
- }, (_descriptor3 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class9.prototype, "targetKeyPath", [_dec7], {
128736
- configurable: true,
128737
- enumerable: true,
128738
- writable: true,
128739
- initializer: null
128740
- }), _descriptor4 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class9.prototype, "sourceKeyPath", [_dec8], {
128741
- configurable: true,
128742
- enumerable: true,
128743
- writable: true,
128744
- initializer: null
128745
- }), _descriptor5 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class9.prototype, "sourceValuePath", [_dec9], {
128768
+ }, (_descriptor3 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class9.prototype, "expressions", [_dec7], {
128746
128769
  configurable: true,
128747
128770
  enumerable: true,
128748
128771
  writable: true,
128749
128772
  initializer: null
128750
128773
  })), _class9)) || _class8);
128751
- let FormulaGroupCountExpression = (_dec10 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("groupcount", `Вычисление количества элементов по группам в разных множественностях`), _dec11 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("targetKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в целевой множественности`), _dec12 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в суммируемой множественности`), _dec10(_class11 = (_class12 = class FormulaGroupCountExpression extends FormulaExpression {
128774
+ let FormulaGroupSumExpression = (_dec8 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("groupsum", `Вычисление суммы с группировкой в разных множественностях`), _dec9 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("oneofitems", [FormulaOneOfItemsExpression]), _dec10 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в суммируемой множественности`), _dec11 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceValuePath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь в суммируемой множественности откуда берем значение для свёртки`), _dec8(_class11 = (_class12 = class FormulaGroupSumExpression extends FormulaExpression {
128752
128775
  constructor(...args) {
128753
128776
  super(...args);
128754
128777
 
128755
- _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeyPath", _descriptor6, this);
128778
+ _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeys", _descriptor4, this);
128779
+
128780
+ _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor5, this);
128756
128781
 
128757
- _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor7, this);
128782
+ _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceValuePath", _descriptor6, this);
128758
128783
  }
128759
128784
 
128760
- }, (_descriptor6 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class12.prototype, "targetKeyPath", [_dec11], {
128785
+ }, (_descriptor4 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class12.prototype, "targetKeys", [_dec9], {
128786
+ configurable: true,
128787
+ enumerable: true,
128788
+ writable: true,
128789
+ initializer: null
128790
+ }), _descriptor5 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class12.prototype, "sourceKeyPath", [_dec10], {
128761
128791
  configurable: true,
128762
128792
  enumerable: true,
128763
128793
  writable: true,
128764
128794
  initializer: null
128765
- }), _descriptor7 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class12.prototype, "sourceKeyPath", [_dec12], {
128795
+ }), _descriptor6 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class12.prototype, "sourceValuePath", [_dec11], {
128766
128796
  configurable: true,
128767
128797
  enumerable: true,
128768
128798
  writable: true,
128769
128799
  initializer: null
128770
128800
  })), _class12)) || _class11);
128771
- let FormulaAndExpression = (_dec13 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("and", `TODO`), _dec14 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec13(_class14 = (_class15 = class FormulaAndExpression extends FormulaExpression {
128801
+ let FormulaGroupCountExpression = (_dec12 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("groupcount", `Вычисление количества элементов по группам в разных множественностях`), _dec13 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("oneofitems", [FormulaOneOfItemsExpression]), _dec14 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("sourceKeyPath", _markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Путь откуда брать ключ группы в суммируемой множественности`), _dec12(_class14 = (_class15 = class FormulaGroupCountExpression extends FormulaExpression {
128772
128802
  constructor(...args) {
128773
128803
  super(...args);
128774
128804
 
128775
- _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor8, this);
128776
- }
128805
+ _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "targetKeys", _descriptor7, this);
128777
128806
 
128778
- getLegacyExpressionTypeForFunctionName() {
128779
- return "and";
128807
+ _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "sourceKeyPath", _descriptor8, this);
128780
128808
  }
128781
128809
 
128782
- }, (_descriptor8 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class15.prototype, "arguments", [_dec14], {
128810
+ }, (_descriptor7 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class15.prototype, "targetKeys", [_dec13], {
128811
+ configurable: true,
128812
+ enumerable: true,
128813
+ writable: true,
128814
+ initializer: null
128815
+ }), _descriptor8 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class15.prototype, "sourceKeyPath", [_dec14], {
128783
128816
  configurable: true,
128784
128817
  enumerable: true,
128785
128818
  writable: true,
128786
128819
  initializer: null
128787
128820
  })), _class15)) || _class14);
128788
- let FormulaOrExpression = (_dec15 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("or", `TODO`), _dec16 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec15(_class17 = (_class18 = class FormulaOrExpression extends FormulaExpression {
128821
+ let FormulaAndExpression = (_dec15 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("and", `TODO`), _dec16 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec15(_class17 = (_class18 = class FormulaAndExpression extends FormulaExpression {
128789
128822
  constructor(...args) {
128790
128823
  super(...args);
128791
128824
 
@@ -128793,7 +128826,7 @@ let FormulaOrExpression = (_dec15 = (0,_markupGenerator_Serializer_SugarSerializ
128793
128826
  }
128794
128827
 
128795
128828
  getLegacyExpressionTypeForFunctionName() {
128796
- return "or";
128829
+ return "and";
128797
128830
  }
128798
128831
 
128799
128832
  }, (_descriptor9 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class18.prototype, "arguments", [_dec16], {
@@ -128802,7 +128835,7 @@ let FormulaOrExpression = (_dec15 = (0,_markupGenerator_Serializer_SugarSerializ
128802
128835
  writable: true,
128803
128836
  initializer: null
128804
128837
  })), _class18)) || _class17);
128805
- let FormulaGtExpression = (_dec17 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("gt", `TODO`), _dec18 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec17(_class20 = (_class21 = class FormulaGtExpression extends FormulaExpression {
128838
+ let FormulaOrExpression = (_dec17 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("or", `TODO`), _dec18 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec17(_class20 = (_class21 = class FormulaOrExpression extends FormulaExpression {
128806
128839
  constructor(...args) {
128807
128840
  super(...args);
128808
128841
 
@@ -128810,7 +128843,7 @@ let FormulaGtExpression = (_dec17 = (0,_markupGenerator_Serializer_SugarSerializ
128810
128843
  }
128811
128844
 
128812
128845
  getLegacyExpressionTypeForFunctionName() {
128813
- return "gt";
128846
+ return "or";
128814
128847
  }
128815
128848
 
128816
128849
  }, (_descriptor10 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class21.prototype, "arguments", [_dec18], {
@@ -128819,14 +128852,18 @@ let FormulaGtExpression = (_dec17 = (0,_markupGenerator_Serializer_SugarSerializ
128819
128852
  writable: true,
128820
128853
  initializer: null
128821
128854
  })), _class21)) || _class20);
128822
- let FormulaOneOfItemsExpression = (_dec19 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("oneofitems", `TODO`), _dec20 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec19(_class23 = (_class24 = class FormulaOneOfItemsExpression extends FormulaExpression {
128855
+ let FormulaGtExpression = (_dec19 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("gt", `TODO`), _dec20 = (0,_markupGenerator_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec19(_class23 = (_class24 = class FormulaGtExpression extends FormulaExpression {
128823
128856
  constructor(...args) {
128824
128857
  super(...args);
128825
128858
 
128826
- _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "expressions", _descriptor11, this);
128859
+ _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "arguments", _descriptor11, this);
128860
+ }
128861
+
128862
+ getLegacyExpressionTypeForFunctionName() {
128863
+ return "gt";
128827
128864
  }
128828
128865
 
128829
- }, (_descriptor11 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class24.prototype, "expressions", [_dec20], {
128866
+ }, (_descriptor11 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class24.prototype, "arguments", [_dec20], {
128830
128867
  configurable: true,
128831
128868
  enumerable: true,
128832
128869
  writable: true,
@@ -129515,7 +129552,7 @@ let MathContainer = (_dec111 = (0,_markupGenerator_Serializer_SugarSerializer__W
129515
129552
  writable: true,
129516
129553
  initializer: null
129517
129554
  })), _class134)) || _class133);
129518
- const formulaExpressions = [FormulaSumExpression, FormulaArgumentExpression, FormulaConstExpression, FormulaMultySumExpression, FormulaRoundExpression, FormulaFloorExpression, FormulaAbsExpression, FormulaDivisionExpression, FormulaMinusExpression, FormulaMultiplyExpression, FormulaChooseExpression, FormulaEqExpression, FormulaGtExpression, FormulaLtExpression, FormulaGeExpression, FormulaLeExpression, FormulaAndExpression, FormulaOrExpression, FormulaNotExpression, FormulaRegexMatchExpression, FormulaSubstringExpression, FormulaXAbsExpression, FormulaExistsExpression, FormulaLengthExpression, FormulaWhenExpression, FormulaCountExpression, FormulaDateNowExpression, FormulaIsSnilsExpression, FormulaIsInnExpression, FormulaIsValidAccountNumberExpression, FormulaIsValidMirCardNumberExpression, FormulaCastExpression, FormulaConcatExpression, FormulaGroupSumExpression, FormulaGroupCountExpression, FormulaNewLineExpression, FormulaOneOfExpression];
129555
+ const formulaExpressions = [FormulaSumExpression, FormulaArgumentExpression, FormulaConstExpression, FormulaMultySumExpression, FormulaRoundExpression, FormulaFloorExpression, FormulaAbsExpression, FormulaDivisionExpression, FormulaMinusExpression, FormulaMultiplyExpression, FormulaChooseExpression, FormulaEqExpression, FormulaGtExpression, FormulaLtExpression, FormulaGeExpression, FormulaLeExpression, FormulaAndExpression, FormulaOrExpression, FormulaNotExpression, FormulaRegexMatchExpression, FormulaSubstringExpression, FormulaXAbsExpression, FormulaExistsExpression, FormulaLengthExpression, FormulaWhenExpression, FormulaCountExpression, FormulaDateNowExpression, FormulaIsSnilsExpression, FormulaIsInnExpression, FormulaIsValidAccountNumberExpression, FormulaIsValidMirCardNumberExpression, FormulaCastExpression, FormulaConcatExpression, FormulaGroupSumExpression, FormulaGroupCountExpression, FormulaNewLineExpression, FormulaOneOfExpression, FormulaOneOfItemsExpression];
129519
129556
 
129520
129557
  /***/ }),
129521
129558
 
@@ -131893,25 +131930,29 @@ class KCXmlGeneratorBase {
131893
131930
  return `expression.sum([${compiledExpressions}])`;
131894
131931
  }
131895
131932
 
131933
+ if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaOneOfItemsExpression) {
131934
+ const itemsText = expression.expressions.map(x => this.compileExpression(prefix, targetFullPath, x, deps)).join(", ");
131935
+ return `JSON.stringify([${itemsText}])`;
131936
+ }
131937
+
131896
131938
  if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaGroupSumExpression) {
131897
- const targetKeyPath = this.getModelPath(prefix, expression.targetKeyPath);
131898
- deps.push(new DependencyWithoutChecks(targetKeyPath));
131939
+ const targetKeys = this.compileExpression(prefix, targetFullPath, expression.targetKeys, deps);
131899
131940
  const sourceKeyPath = this.getModelPath(prefix, expression.sourceKeyPath);
131900
- const sourceKeyDeps = this.calculatedGroupSumDependencyForSourcePath(targetKeyPath, sourceKeyPath);
131941
+ const sourceKeyDeps = this.calculatedGroupSumDependencyForSourcePath(targetFullPath, sourceKeyPath);
131901
131942
  deps.push(new DependencyWithoutChecks(sourceKeyDeps.currentDepsPath, sourceKeyDeps.eachDepsPath));
131902
131943
  const sourceValuePath = this.getModelPath(prefix, expression.sourceValuePath);
131903
- const sourceValueDeps = this.calculatedGroupSumDependencyForSourcePath(targetKeyPath, sourceValuePath);
131944
+ const sourceValueDeps = this.calculatedGroupSumDependencyForSourcePath(targetFullPath, sourceValuePath);
131904
131945
  deps.push(new DependencyWithoutChecks(sourceValueDeps.currentDepsPath, sourceValueDeps.eachDepsPath));
131905
- return gcf(x => x.groupSum, `"${targetKeyPath}", "${sourceKeyPath}", "${sourceValuePath}"`);
131946
+ return gcf(x => x.groupSum, `${targetKeys}, "${sourceKeyPath}", "${sourceValuePath}"`);
131906
131947
  }
131907
131948
 
131908
131949
  if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaGroupCountExpression) {
131909
- const targetKeyPath = this.getModelPath(prefix, expression.targetKeyPath);
131910
- deps.push(new DependencyWithoutChecks(targetKeyPath));
131950
+ const targetKeys = this.compileExpression(prefix, targetFullPath, expression.targetKeys, deps);
131951
+ deps.push(new DependencyWithoutChecks(targetFullPath));
131911
131952
  const sourceKeyPath = this.getModelPath(prefix, expression.sourceKeyPath);
131912
- const sourceKeyDeps = this.calculatedGroupSumDependencyForSourcePath(targetKeyPath, sourceKeyPath);
131953
+ const sourceKeyDeps = this.calculatedGroupSumDependencyForSourcePath(targetFullPath, sourceKeyPath);
131913
131954
  deps.push(new DependencyWithoutChecks(sourceKeyDeps.currentDepsPath, sourceKeyDeps.eachDepsPath));
131914
- return gcf(x => x.groupCount, `"${targetKeyPath}", "${sourceKeyPath}"`);
131955
+ return gcf(x => x.groupCount, `${targetKeys}, "${sourceKeyPath}"`);
131915
131956
  }
131916
131957
 
131917
131958
  if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_1__.FormulaConcatExpression) {
@@ -133486,6 +133527,7 @@ __webpack_require__.r(__webpack_exports__);
133486
133527
  /* harmony export */ "NullCoalesceExpression": () => (/* binding */ NullCoalesceExpression),
133487
133528
  /* harmony export */ "OneOfExpression": () => (/* binding */ OneOfExpression),
133488
133529
  /* harmony export */ "NoDepsExpression": () => (/* binding */ NoDepsExpression),
133530
+ /* harmony export */ "ArrayStringExpression": () => (/* binding */ ArrayStringExpression),
133489
133531
  /* harmony export */ "FLangStatement": () => (/* binding */ FLangStatement),
133490
133532
  /* harmony export */ "SetStatement": () => (/* binding */ SetStatement)
133491
133533
  /* harmony export */ });
@@ -134486,6 +134528,27 @@ class NoDepsExpression extends FLangExpression {
134486
134528
  return `nodeps(${this.expression.convertToString()})`;
134487
134529
  }
134488
134530
 
134531
+ }
134532
+ class ArrayStringExpression extends FLangExpression {
134533
+ constructor(expressions) {
134534
+ super();
134535
+ this.expressions = void 0;
134536
+ this.expressions = expressions;
134537
+ }
134538
+
134539
+ *getChildNodes() {
134540
+ yield* this.expressions;
134541
+ }
134542
+
134543
+ getType() {
134544
+ return BuildInTypeExpression.string;
134545
+ }
134546
+
134547
+ convertToString() {
134548
+ const stringItems = this.expressions.map(x => x.convertToString()).join(", ");
134549
+ return `"[" ${stringItems} "]"`;
134550
+ }
134551
+
134489
134552
  }
134490
134553
  class FLangStatement extends FLangNode {}
134491
134554
  class SetStatement extends FLangStatement {
@@ -135092,6 +135155,11 @@ class FormulaExpressionToFlangExpressionConverter {
135092
135155
  return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.OneOfExpression(arg, items);
135093
135156
  }
135094
135157
 
135158
+ if (expression instanceof _AutoCalculationsGenerator_AutoCalculationsFromFormulas_KCXmlContract_Formula__WEBPACK_IMPORTED_MODULE_0__.FormulaOneOfItemsExpression) {
135159
+ const items = expression.expressions.map(item => this.compileExpressionToFlangExpressionInternal(item, prefix, target, addPrecalculationRule));
135160
+ return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArrayStringExpression(items);
135161
+ }
135162
+
135095
135163
  throw new Error(`Unsupported type of node: ${expression.constructor.name}`);
135096
135164
  }
135097
135165
 
@@ -135107,7 +135175,7 @@ class FormulaExpressionToFlangExpressionConverter {
135107
135175
  return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.EqExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.castOperandToStringIfNeed)(left), (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.castOperandToStringIfNeed)(right));
135108
135176
  }
135109
135177
 
135110
- compileGroupSumExpressionWithCustomValueExpression(prefix, target, targetKeyPath, sourceKeyPath, sourceValueExpression, addPrecalculationRule) {
135178
+ compileGroupSumExpressionWithCustomValueExpression(prefix, target, targetKeys, sourceKeyPath, sourceValueExpression, addPrecalculationRule) {
135111
135179
  const iterationEntries = [...(0,_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_3__.reverseArray)((0,_Common_ModelPath_BuildIterationSequence__WEBPACK_IMPORTED_MODULE_4__.buildIterationSequence)(sourceKeyPath))];
135112
135180
  const finalAnonymousFunction = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.AnonymousFunctionDeclarationExpression(_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.BuildInTypeExpression.dict, [new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArgumentDeclarationExpression("result", _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.BuildInTypeExpression.dict)], new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.AddSumExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArgumentReferenceExpression("result"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ValueReferenceExpression(sourceKeyPath.toCurrentIteration(), "value"), (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_7__.castOperandToDecimalIfNeed)(sourceValueExpression)));
135113
135181
 
@@ -135129,23 +135197,29 @@ class FormulaExpressionToFlangExpressionConverter {
135129
135197
  throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_2__.NotSupportedError("Target and source must be in different collections! " + "\n" + `Target: ${target}` + "\n" + `SourceKey: ${sourceKeyPath}`);
135130
135198
  }
135131
135199
 
135132
- const finalValueExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.GetExpression(reduceExpression, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ValueReferenceExpression(targetKeyPath.toCurrentIteration(), "value"));
135133
- return finalValueExpression;
135200
+ if (targetKeys instanceof _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArrayStringExpression && targetKeys.expressions.length === 1) {
135201
+ var _targetKeys$expressio;
135202
+
135203
+ const finalValueExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.GetExpression(reduceExpression, (_targetKeys$expressio = targetKeys.expressions[0]) !== null && _targetKeys$expressio !== void 0 ? _targetKeys$expressio : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_6__.reject)());
135204
+ return finalValueExpression;
135205
+ } else {
135206
+ throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_2__.NotSupportedError("Server normalization does not support multiple keys in groupSum operator");
135207
+ }
135134
135208
  }
135135
135209
 
135136
135210
  compileGroupSumExpression(prefix, target, expression, addPrecalculationRule) {
135137
- const targetKeyPath = this.preparePathAndAdjustMultiplicity(prefix, expression.targetKeyPath);
135211
+ const targetKeys = this.compileExpressionToFlangExpressionInternal(expression.targetKeys, prefix, target, addPrecalculationRule);
135138
135212
  const sourceKeyPath = this.preparePathAndAdjustMultiplicity(prefix, expression.sourceKeyPath);
135139
135213
  const sourceValuePath = this.preparePathAndAdjustMultiplicity(prefix, expression.sourceValuePath);
135140
135214
  const sourceValueExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ValueReferenceExpression(sourceValuePath.toCurrentIteration(), "value");
135141
- return this.compileGroupSumExpressionWithCustomValueExpression(prefix, target, targetKeyPath, sourceKeyPath, sourceValueExpression, addPrecalculationRule);
135215
+ return this.compileGroupSumExpressionWithCustomValueExpression(prefix, target, targetKeys, sourceKeyPath, sourceValueExpression, addPrecalculationRule);
135142
135216
  }
135143
135217
 
135144
135218
  compileGroupCountExpression(prefix, target, expression, addPrecalculationRule) {
135145
- const targetKeyPath = this.preparePathAndAdjustMultiplicity(prefix, expression.targetKeyPath);
135219
+ const targetKeys = this.compileExpressionToFlangExpressionInternal(expression.targetKeys, prefix, target, addPrecalculationRule);
135146
135220
  const sourceKeyPath = this.preparePathAndAdjustMultiplicity(prefix, expression.sourceKeyPath);
135147
135221
  const sourceValueExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.DecimalLiteralExpression(1);
135148
- return this.compileGroupSumExpressionWithCustomValueExpression(prefix, target, targetKeyPath, sourceKeyPath, sourceValueExpression, addPrecalculationRule);
135222
+ return this.compileGroupSumExpressionWithCustomValueExpression(prefix, target, targetKeys, sourceKeyPath, sourceValueExpression, addPrecalculationRule);
135149
135223
  }
135150
135224
 
135151
135225
  compiledArgumentExpression(prefix, target, selectPath, selectType, addPrecalculationRule, aggregationFunction = "Sum") {
@@ -135208,7 +135282,18 @@ class FormulaExpressionToFlangExpressionConverter {
135208
135282
  }
135209
135283
 
135210
135284
  return result;
135211
- }
135285
+ } // private makeConcat(expressions: FLangExpression[]) {
135286
+ // const result = expressions.reduce<FLangExpression | undefined>((acc, curr) => {
135287
+ // const currExpr = castOperandToStringIfNeed(curr);
135288
+ // return acc != undefined ? new ConcatStringsExpression(acc, currExpr) : currExpr;
135289
+ // }, undefined);
135290
+ //
135291
+ // if (result == undefined) {
135292
+ // throw new InvalidProgramStateError();
135293
+ // }
135294
+ // return result;
135295
+ // }
135296
+
135212
135297
 
135213
135298
  compileOrExpression(expression, prefix, target, addPrecalculationRule) {
135214
135299
  const result = expression.arguments.reduce((acc, curr) => {
@@ -142464,7 +142549,22 @@ var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11
142464
142549
 
142465
142550
 
142466
142551
 
142467
- let PageNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("page", `Страница (раздел)`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/Page sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("id", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Уникальный идентификатор странцы. Все страницы в форме должны иметь уникальный идентификатор.`), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("template", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("default", "title", "multiple", "diadoc"), 'Для множественных разделов необходимо указать `template="multiple"`, для обычных разделов `template="default"`'), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("path", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_6__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_6__.bindingPathLink)} данного элемента`), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("headerpanel", [_UnitParts_HeaderPanel_HeaderPanelNode__WEBPACK_IMPORTED_MODULE_3__.HeaderPanelNode]), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.deprecatedAttr)("title", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_4__.DeprecationReason.Removed), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.deprecatedAttr)("formName", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_4__.DeprecationReason.Removed), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("showOnDemand", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.boolean, `Раздел не будет отображаться на странице, пока не будет вызван явно. Например, через механизм отображения раздела в разделе.`), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("onNavigateFromErrorLog", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется перед попыткой навигации в контрол внутри раздела"), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("onMount", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется после загрузки раздела"), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("onUnmount", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется перед выгрузкой раздела"), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("orientation", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("landscape"), `Ориентация страницы. При значении landscape станницы займёт всю доступную ширину экрана`), _dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("navigationName", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.localizedString, `Название Раздела в меню, если в сахаре есть отдельное описание навигации (unitList), то указывать не нужно`), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("height", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.number, `Начальная высота раздела`), _dec15 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("minHeight", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.number, `Минимальная высота раздела`), _dec16 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("multiple", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.boolean, `Обозначение множественного раздела`), _dec17 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("unitsCountForPaging", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.number, `Количество инстансов множественного раздела на котором включается паджинация раздела`), _dec18 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("multipleAppearance", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("nested", "flat"), "Представление множественных разделов: вложенное или плоское"), _dec19 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("optional", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.boolean, `Опциональный раздел`), _dec20 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("pageActions", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.objectLiteral(), `Атрибут для кастомизации действий с разделом`), _dec21 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("clearConfirmationSettings", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.objectLiteral(), `Атрибут для кастомизации сообщений лайтбоксов очистки и удаления раздела.
142552
+ let PageNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.sugarNode)("page", `Страница (раздел)`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/Page sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("id", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string.required, `Уникальный идентификатор странцы. Все страницы в форме должны иметь уникальный идентификатор.`), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("template", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("default", "title", "multiple", "diadoc"), 'Для множественных разделов необходимо указать `template="multiple"`, для обычных разделов `template="default"`'), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("path", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.string, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_6__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_6__.bindingPathLink)} данного элемента`), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("headerpanel", [_UnitParts_HeaderPanel_HeaderPanelNode__WEBPACK_IMPORTED_MODULE_3__.HeaderPanelNode]), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.deprecatedAttr)("title", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_4__.DeprecationReason.Removed), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.deprecatedAttr)("formName", _Serializer_DeprecationReason__WEBPACK_IMPORTED_MODULE_4__.DeprecationReason.Removed), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("showOnDemand", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.boolean, `Раздел не будет отображаться на странице, пока не будет вызван явно. Например, через механизм отображения раздела в разделе.`), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("onNavigateFromErrorLog", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется перед попыткой навигации в контрол внутри раздела"), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("onMount", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется после загрузки раздела"), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("onUnmount", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется перед выгрузкой раздела"), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("orientation", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("landscape"), `Ориентация страницы. При значении landscape станницы займёт всю доступную ширину экрана`), _dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("navigationName", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.localizedString, `Название Раздела в меню, если в сахаре есть отдельное описание навигации (unitList), то указывать не нужно`), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("height", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.number, `Начальная высота раздела`), _dec15 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("minHeight", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.number, `Минимальная высота раздела`), _dec16 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("multiple", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.boolean, `Обозначение множественного раздела`), _dec17 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("unitsCountForPaging", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.number, `Количество инстансов множественного раздела на котором включается паджинация раздела`), _dec18 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("multipleAppearance", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType["enum"]("nested", "flat"), "Представление множественных разделов: вложенное или плоское"), _dec19 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("optional", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.boolean, `Опциональный раздел`), _dec20 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("pageActions", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.objectLiteral(), `Атрибут для кастомизации действий с разделом.
142553
+
142554
+ Объект с опциональным полями: caption: string, disableButton: boolean, hideButton: boolean,
142555
+ showInsertButtons: boolean, lastButtonName: string, intermediateButtonName: string,
142556
+ actions: {}.
142557
+
142558
+ actions: {
142559
+ [actionName: string]: {
142560
+ description?: string;
142561
+ disableAction?: boolean;
142562
+ hideAction?: boolean;
142563
+ };
142564
+ };
142565
+
142566
+ actionName: enableAutoValues, clear, remove, copy
142567
+ `), _dec21 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("clearConfirmationSettings", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.objectLiteral(), `Атрибут для кастомизации сообщений лайтбоксов очистки и удаления раздела.
142468
142568
  - removeChildrenText: дополнительный (красный) текст про вложенные разделы (если они есть) в лайтбоксе подтверждения удаления. По умолчанию: "Все вложенные разделы также будут удалены."
142469
142569
  - keepChildrenCustomText: название вложенных разделов и данных в радио-баттоне _Оставить_ в лайтбоксе очистки. По умолчанию: "вложенные разделы и данные в них"
142470
142570
  - clearChildrenCustomText: название вложенных разделов в радио-баттоне _Удалить_ в лайтбоксе очистки. По умолчанию: "вложенные разделы"`), _dec22 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("hideEnableAutoValues", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.boolean, `Всегда скрывать кнопку "Включить авторасчет", даже при включенной серверной нормализации`), _dec23 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("navigationLimit", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.number, `Количество экземпляров множественного раздела после которого в левом меню будет включаться компактный режим отображения разделов. По умолчанию: 15. Используется только для множественных разделов`), _dec24 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("addingHint", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.localizedString, `Подсказка на кнопке добавления раздела в боковом меню. Используется только для множественных разделов`), _dec25 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)("page"), _dec26 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.children)(), _dec27 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.singleChild)("title", [_PageTitleNode__WEBPACK_IMPORTED_MODULE_8__.PageTitleNode]), _dec28 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attr)("visible", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.attrType.javascriptExpression, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_6__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_6__.javaScriptExpressionLink)} для условного скрытия раздела`), _dec(_class = (_class2 = class PageNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_5__.SugarNodeBase {
@@ -148082,6 +148182,8 @@ class AddRowButtonConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE
148082
148182
  markupBuilder.prop(x => x.validationPath).set(validationPath);
148083
148183
  markupBuilder.prop(x => x.type).set(node.type);
148084
148184
  markupBuilder.prop(x => x.text).set(node.text);
148185
+ markupBuilder.prop(x => x.filteredUniqKey).set(node.filteredUniqKey);
148186
+ markupBuilder.prop("data-tid").set(node.tid);
148085
148187
 
148086
148188
  if (node.maxOccurs != undefined) {
148087
148189
  const maxOccursWithDependencies = (0,_common_ConditionUtils__WEBPACK_IMPORTED_MODULE_5__.convertConditionToJsOrFailWithFriendlySugarError)(node.maxOccurs, "path", _Common_KCLangRuntimeUtils__WEBPACK_IMPORTED_MODULE_6__.KCLangRuntimeUtils.kcLangUtilsName, node, "maxOccurs");
@@ -148134,14 +148236,15 @@ __webpack_require__.r(__webpack_exports__);
148134
148236
 
148135
148237
 
148136
148238
 
148137
- var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7;
148239
+ var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9;
148138
148240
 
148139
148241
 
148140
148242
 
148141
148243
 
148142
148244
 
148143
148245
 
148144
- let AddRowButtonNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.sugarNode)("addrowbutton", `Кнопка добавления новой строки в мультилайн`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/MultiControls/AddRowButton sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_3__.DataReferenceMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrMixin)(_CommonNodeProperties_ValidationInfoNode__WEBPACK_IMPORTED_MODULE_6__.ValidationInfoNode), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrMixin)(_CommonNodeProperties_FocusManagementNode__WEBPACK_IMPORTED_MODULE_7__.FocusManagementNode), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("maxOccurs", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.javascriptExpression, `Максмальное возможное количество элементов в заданном множественном элементе. Может быть ${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_5__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_5__.javaScriptExpressionLink)}.`), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("type", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType["enum"]("link", "button"), `Тип кнопки. default: link`), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("text", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.localizedString, `Текст в кнопке. default: "Добавить строку"`), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("validationPath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.bindingPath, `Путь для валидации, если она нужна"`), _dec(_class = (_class2 = class AddRowButtonNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.SugarNodeBase {
148246
+ let AddRowButtonNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.sugarNode)("addrowbutton", `Кнопка добавления новой строки в мультилайн`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/MultiControls/AddRowButton sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_3__.DataReferenceMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrMixin)(_CommonNodeProperties_ValidationInfoNode__WEBPACK_IMPORTED_MODULE_6__.ValidationInfoNode), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrMixin)(_CommonNodeProperties_FocusManagementNode__WEBPACK_IMPORTED_MODULE_7__.FocusManagementNode), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("maxOccurs", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.javascriptExpression, `Максимальное возможное количество элементов в заданном множественном элементе. Может быть ${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_5__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_5__.javaScriptExpressionLink)}.`), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("type", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType["enum"]("link", "button"), `Тип кнопки. default: link`), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("text", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.localizedString, `Текст в кнопке. default: "Добавить строку"`), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("validationPath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.bindingPath, `Путь для валидации, если она нужна"`), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("filteredUniqKey", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.string, `Уникальный ключ фильтрации multirow, используется, для фильтраций одних и тех же путей иннера
148247
+ разными фильтрами. Задается произвольной строкой. Фильтры с одинаковым ключом фильтрации получают одинаковый результат фильтрации`), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attr)("tid", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.attrType.string, "Возможность установки произвольных data-tid атрибутов, может пригодиться другим командам, или для идентификации элемента в тестах"), _dec(_class = (_class2 = class AddRowButtonNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_4__.SugarNodeBase {
148145
148248
  constructor(...args) {
148146
148249
  super(...args);
148147
148250
 
@@ -148158,6 +148261,10 @@ let AddRowButtonNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_
148158
148261
  _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "text", _descriptor6, this);
148159
148262
 
148160
148263
  _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "validationPath", _descriptor7, this);
148264
+
148265
+ _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filteredUniqKey", _descriptor8, this);
148266
+
148267
+ _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "tid", _descriptor9, this);
148161
148268
  }
148162
148269
 
148163
148270
  getOwnPath() {
@@ -148199,6 +148306,16 @@ let AddRowButtonNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_
148199
148306
  enumerable: true,
148200
148307
  writable: true,
148201
148308
  initializer: null
148309
+ }), _descriptor8 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "filteredUniqKey", [_dec9], {
148310
+ configurable: true,
148311
+ enumerable: true,
148312
+ writable: true,
148313
+ initializer: null
148314
+ }), _descriptor9 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "tid", [_dec10], {
148315
+ configurable: true,
148316
+ enumerable: true,
148317
+ writable: true,
148318
+ initializer: null
148202
148319
  })), _class2)) || _class);
148203
148320
 
148204
148321
  /***/ }),
@@ -152870,6 +152987,9 @@ class Table2MultirowConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODU
152870
152987
  this.ensurePathExists(node, node.dataScope.path);
152871
152988
  markupBuilder.prop(x => x.bindingPath).set((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_0__.getNewBindingPathExpression)(node));
152872
152989
  markupBuilder.prop(x => x.deferredInit).set(node.deferredInit);
152990
+ markupBuilder.prop(x => x.filteredUniqKey).set(node.filteredUniqKey);
152991
+ markupBuilder.prop(x => x.defaultFilter).set(node.defaultFilter);
152992
+ markupBuilder.prop(x => x.debounceDisable).set(node.debounceDisable);
152873
152993
  markupBuilder.appendChild(context.convertChildNodes(node.columns));
152874
152994
  return markupBuilder.buildConverterResult();
152875
152995
  }
@@ -152917,7 +153037,7 @@ __webpack_require__.r(__webpack_exports__);
152917
153037
 
152918
153038
 
152919
153039
 
152920
- var _dec, _dec2, _dec3, _dec4, _dec5, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _dec6, _dec7, _dec8, _class4, _class5, _descriptor5, _descriptor6, _dec9, _dec10, _dec11, _dec12, _class7, _class8, _descriptor7, _descriptor8, _descriptor9, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _class10, _class11, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _dec19, _dec20, _dec21, _dec22, _dec23, _class13, _class14, _descriptor15, _descriptor16, _descriptor17, _descriptor18;
153040
+ var _dec, _dec2, _dec3, _dec4, _dec5, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _dec6, _dec7, _dec8, _class4, _class5, _descriptor5, _descriptor6, _dec9, _dec10, _dec11, _dec12, _class7, _class8, _descriptor7, _descriptor8, _descriptor9, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _dec19, _dec20, _dec21, _class10, _class11, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _descriptor16, _descriptor17, _dec22, _dec23, _dec24, _dec25, _dec26, _class13, _class14, _descriptor18, _descriptor19, _descriptor20, _descriptor21;
152921
153041
 
152922
153042
 
152923
153043
 
@@ -153014,7 +153134,9 @@ let Table2RowNode = (_dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MO
153014
153134
  writable: true,
153015
153135
  initializer: null
153016
153136
  })), _class8)) || _class7);
153017
- let Table2MultirowNode = (_dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("multirow", ``, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/MultiControls/Table2 sync recursive .md$")), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_4__.DataBindingScopeMixinNode), _dec15 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("optional", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, ``), _dec16 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("deferredInit", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `Имеет смысл только c optional="true". Всегда отображать на форме детей, несмотря на опциональность. Инициализация в иннере произойдет в момент загрузки контрола.`), _dec17 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("maxOccurs", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.number, `Масмальное возможное количество элементов в заданном множественном элементе.`), _dec18 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)(["column", "verticalcolumn"], [Table2VerticalColumnNode, Table2ColumnNode]), _dec13(_class10 = (_class11 = class Table2MultirowNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
153137
+ let Table2MultirowNode = (_dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("multirow", ``, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/MultiControls/Table2 sync recursive .md$")), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_4__.DataBindingScopeMixinNode), _dec15 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("optional", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, ``), _dec16 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("deferredInit", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `Имеет смысл только c optional="true". Всегда отображать на форме детей, несмотря на опциональность. Инициализация в иннере произойдет в момент загрузки контрола.`), _dec17 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("maxOccurs", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.number, `Максимальное возможное количество элементов в заданном множественном элементе.`), _dec18 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("debounceDisable", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, `см. описание debounceDisable в multiline`), _dec19 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("filteredUniqKey", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, `Уникальный ключ фильтрации multirow, используется, для фильтраций одних и тех же путей иннера
153138
+ разными фильтрами. Задается произвольной строкой. Фильтры с одинаковым ключом фильтрации получают одинаковый результат фильтрации
153139
+ В случае применения с таблицы с AddRowButton в нем нужно указать такой же filteredUniqKey`), _dec20 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("defaultFilter", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.objectLiteral(), `Дает возможность изначально фильтровать multirow по определенному выражению`), _dec21 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)(["column", "verticalcolumn"], [Table2VerticalColumnNode, Table2ColumnNode]), _dec13(_class10 = (_class11 = class Table2MultirowNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
153018
153140
  constructor(...args) {
153019
153141
  super(...args);
153020
153142
 
@@ -153026,7 +153148,13 @@ let Table2MultirowNode = (_dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPOR
153026
153148
 
153027
153149
  _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "maxOccurs", _descriptor13, this);
153028
153150
 
153029
- _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "columns", _descriptor14, this);
153151
+ _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "debounceDisable", _descriptor14, this);
153152
+
153153
+ _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "filteredUniqKey", _descriptor15, this);
153154
+
153155
+ _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "defaultFilter", _descriptor16, this);
153156
+
153157
+ _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "columns", _descriptor17, this);
153030
153158
  }
153031
153159
 
153032
153160
  getOwnPath() {
@@ -153057,45 +153185,60 @@ let Table2MultirowNode = (_dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPOR
153057
153185
  enumerable: true,
153058
153186
  writable: true,
153059
153187
  initializer: null
153060
- }), _descriptor14 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class11.prototype, "columns", [_dec18], {
153188
+ }), _descriptor14 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class11.prototype, "debounceDisable", [_dec18], {
153189
+ configurable: true,
153190
+ enumerable: true,
153191
+ writable: true,
153192
+ initializer: null
153193
+ }), _descriptor15 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class11.prototype, "filteredUniqKey", [_dec19], {
153194
+ configurable: true,
153195
+ enumerable: true,
153196
+ writable: true,
153197
+ initializer: null
153198
+ }), _descriptor16 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class11.prototype, "defaultFilter", [_dec20], {
153199
+ configurable: true,
153200
+ enumerable: true,
153201
+ writable: true,
153202
+ initializer: null
153203
+ }), _descriptor17 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class11.prototype, "columns", [_dec21], {
153061
153204
  configurable: true,
153062
153205
  enumerable: true,
153063
153206
  writable: true,
153064
153207
  initializer: null
153065
153208
  })), _class11)) || _class10);
153066
- let Table2Node = (_dec19 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("table2", ``, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/MultiControls/Table2 sync recursive .md$")), _dec20 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_4__.DataBindingScopeMixinNode), _dec21 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("columnWidths", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.delimitedStringArray, ``), _dec22 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("columnPadding", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, ``), _dec23 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)(["row", "multirow"], [Table2MultirowNode, Table2RowNode]), _dec19(_class13 = (_class14 = class Table2Node extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
153209
+ let Table2Node = (_dec22 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("table2", ``, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/MultiControls/Table2 sync recursive .md$")), _dec23 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_4__.DataBindingScopeMixinNode), _dec24 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("columnWidths", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.delimitedStringArray, ``), _dec25 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("columnPadding", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, ``), _dec26 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)(["row", "multirow"], [Table2MultirowNode, Table2RowNode]), _dec22(_class13 = (_class14 = class Table2Node extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
153067
153210
  constructor(...args) {
153068
153211
  super(...args);
153069
153212
 
153070
- _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "dataScope", _descriptor15, this);
153213
+ _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "dataScope", _descriptor18, this);
153071
153214
 
153072
- _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "columnWidths", _descriptor16, this);
153215
+ _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "columnWidths", _descriptor19, this);
153073
153216
 
153074
- _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "columnPadding", _descriptor17, this);
153217
+ _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "columnPadding", _descriptor20, this);
153075
153218
 
153076
- _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "rows", _descriptor18, this);
153219
+ _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "rows", _descriptor21, this);
153077
153220
  }
153078
153221
 
153079
153222
  getOwnPath() {
153080
153223
  return this.dataScope.getOwnPath();
153081
153224
  }
153082
153225
 
153083
- }, (_descriptor15 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class14.prototype, "dataScope", [_dec20], {
153226
+ }, (_descriptor18 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class14.prototype, "dataScope", [_dec23], {
153084
153227
  configurable: true,
153085
153228
  enumerable: true,
153086
153229
  writable: true,
153087
153230
  initializer: null
153088
- }), _descriptor16 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class14.prototype, "columnWidths", [_dec21], {
153231
+ }), _descriptor19 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class14.prototype, "columnWidths", [_dec24], {
153089
153232
  configurable: true,
153090
153233
  enumerable: true,
153091
153234
  writable: true,
153092
153235
  initializer: null
153093
- }), _descriptor17 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class14.prototype, "columnPadding", [_dec22], {
153236
+ }), _descriptor20 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class14.prototype, "columnPadding", [_dec25], {
153094
153237
  configurable: true,
153095
153238
  enumerable: true,
153096
153239
  writable: true,
153097
153240
  initializer: null
153098
- }), _descriptor18 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class14.prototype, "rows", [_dec23], {
153241
+ }), _descriptor21 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class14.prototype, "rows", [_dec26], {
153099
153242
  configurable: true,
153100
153243
  enumerable: true,
153101
153244
  writable: true,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kontur.candy/generator",
3
- "version": "4.298.0-documentsPeriod.2",
3
+ "version": "4.298.0-fs-7964-multiple-keys-groupsum.2",
4
4
  "description": "Candy forms generator",
5
5
  "author": "SKBKontur Candy Team",
6
6
  "private": false,