@kontur.candy/generator 5.5.0-multiuploadefs.2 → 5.5.0-ndflinquiryredisign.1

package/dist/index.js

@@ -60452,7 +60452,7 @@ let PatchFufSteps = /*#__PURE__*/function (PatchFufSteps) {
   PatchFufSteps[PatchFufSteps["SelectFiles"] = 1] = "SelectFiles";
   PatchFufSteps[PatchFufSteps["ErrorMessage"] = 2] = "ErrorMessage";
   PatchFufSteps[PatchFufSteps["LoadToForm"] = 3] = "LoadToForm";
-  PatchFufSteps[PatchFufSteps["ConfirmMerge"] = 4] = "ConfirmMerge";
+  PatchFufSteps[PatchFufSteps["ShowCombineResult"] = 4] = "ShowCombineResult";
   return PatchFufSteps;
 }({});
 let TableType = /*#__PURE__*/function (TableType) {
@@ -81208,22 +81208,15 @@ class FormulaExpressionToFlangExpressionConverter {
     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));
   }
   compileGroupSumExpressionWithCustomValueExpression(prefix, target, targetKeyPath, sourceKeyPath, sourceValueExpression, addPrecalculationRule) {
-    const iterationEntries = [...(0,_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_3__.reverseArray)((0,_Common_ModelPath_BuildIterationSequence__WEBPACK_IMPORTED_MODULE_4__.buildIterationSequence)(sourceKeyPath))];
-    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)));
-    const getWrapReduceFunction = innerReduceCall => 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)], innerReduceCall);
-    const createReduceExpression = (iterablePath, initialValue, innerReduce) => {
-      const reduceBody = innerReduce != undefined ? getWrapReduceFunction(innerReduce) : finalAnonymousFunction;
-      const reduceExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ReduceCallExpression(iterablePath.toCurrentIteration(), reduceBody, initialValue);
-      return reduceExpression;
-    };
-    const reduceExpression = iterationEntries.reduce((prevReduceExpr, curr, index) => {
-      const initialValue = index === iterationEntries.length - 1 ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.DictLiteralExpression() : new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ArgumentReferenceExpression("result");
-      const reduceExpr = createReduceExpression(curr.iterable, initialValue, prevReduceExpr);
-      return reduceExpr;
-    }, undefined);
-    if (reduceExpression == undefined) {
-      throw new _Common_Errors__WEBPACK_IMPORTED_MODULE_2__.NotSupportedError("Target and source must be in different collections! " + "\n" + `Target: ${target}` + "\n" + `SourceKey: ${sourceKeyPath}`);
-    }
+    const matchPaths = (0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_5__.getMatchedAndDifferentModelPaths)(target.path, sourceKeyPath);
+    const sourceKeyParts = sourceKeyPath.getPathPartsAsArray();
+    const firstPart = matchPaths.matchedPath.toCurrentIteration();
+    const firstPartLength = _Common_IterableUtils__WEBPACK_IMPORTED_MODULE_3__.IterUtils.count(firstPart.getPathParts());
+    const secondPartParts = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createRelativeFromTokens)(sourceKeyParts.slice(firstPartLength)).getPathPartsAsArray();
+    const lastStarIndexSecondPart = secondPartParts.lastIndexOf(_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.PathTokens.each);
+    const secondPartFinalParts = secondPartParts.slice(0, lastStarIndexSecondPart);
+    const finalIterPath = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_1__.createAbsoluteFromTokens)([...firstPart.getPathParts(), ...secondPartFinalParts]).trimLastStarIfLastToken();
+    const reduceExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ReduceCallExpression(finalIterPath, 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))), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.DictLiteralExpression());
     const finalValueExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.GetExpression(reduceExpression, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_8__.ValueReferenceExpression(targetKeyPath.toCurrentIteration(), "value"));
     return finalValueExpression;
   }
@@ -83398,11 +83391,11 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8;
 
 
 
-let ActionNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("action", `Элемент выпадашки/кнопки с выпадющим меню`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Action/Common sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_4__.DataReferenceMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("onClick", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при клике"), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("metricName", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, "Название метрики"), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("tid", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, "Возможность установки произвольных data-tid атрибутов, может пригодиться другим командам, или для идентификации элемента в тестах"), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("disabled", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, ""), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("disabled2", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.javascriptExpression, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_5__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_5__.javaScriptExpressionLink)} для условного задизейбливания контрола`), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("icon", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, `Название кастомной иконки`), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("menuSeparator", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, `Элемент разделителя меню`), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)(), _dec(_class = (_class2 = class ActionNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
+let ActionNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("action", `Элемент выпадашки/кнопки с выпадющим меню`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/Action/Common sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_4__.DataReferenceMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("onClick", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.helperFunctionName, "Имя кастомной helpers функции, которая вызовется при клике"), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("metricName", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, "Название метрики"), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("tid", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, "Возможность установки произвольных data-tid атрибутов, может пригодиться другим командам, или для идентификации элемента в тестах"), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("disabled", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.boolean, ""), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("disabled2", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.javascriptExpression, `${(0,_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_5__.docLink)(_Commons_DocumentationLinks__WEBPACK_IMPORTED_MODULE_5__.javaScriptExpressionLink)} для условного задизейбливания контрола`), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("icon", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string, `Название кастомной иконки`), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.children)(), _dec(_class = (_class2 = class ActionNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "dataReference", _descriptor, this);
@@ -83412,8 +83405,7 @@ let ActionNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "disabled", _descriptor5, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "disabled2", _descriptor6, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "icon", _descriptor7, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "menuSeparator", _descriptor8, this);
-    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "children", _descriptor9, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "children", _descriptor8, this);
   }
   getOwnPath() {
     return this.dataReference.getOwnPath();
@@ -83453,12 +83445,7 @@ let ActionNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor8 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "menuSeparator", [_dec9], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor9 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "children", [_dec10], {
+}), _descriptor8 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "children", [_dec9], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -83790,9 +83777,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../ComponentMarkupBuilder/ComponentMarkupBuilder */ "./Generator/src/generators/markupGenerator/ComponentMarkupBuilder/ComponentMarkupBuilder.ts");
 /* harmony import */ var _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../SugarNodeConverter */ "./Generator/src/generators/markupGenerator/SugarNodeConverter.ts");
 /* harmony import */ var _getBindingPath__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../getBindingPath */ "./Generator/src/generators/markupGenerator/getBindingPath.ts");
-/* harmony import */ var _SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../SugarNodes/SugarNodeUtils */ "./Generator/src/generators/markupGenerator/SugarNodes/SugarNodeUtils.ts");
-/* harmony import */ var _DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./DropdownButtonNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/Action/DropdownButton/DropdownButtonNode.ts");
-
+/* harmony import */ var _DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./DropdownButtonNode */ "./Generator/src/generators/markupGenerator/ElementProcessors/Action/DropdownButton/DropdownButtonNode.ts");
 
 
 
@@ -83800,27 +83785,27 @@ __webpack_require__.r(__webpack_exports__);
 
 class DropdownButtonConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_2__.SugarNodeConverterBase {
   static getAcceptNodeClass() {
-    return _DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__.DropdownButtonNode;
+    return _DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__.DropdownButtonNode;
   }
   get nodePaths() {
-    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__.DropdownButtonNode);
+    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__.DropdownButtonNode);
     return [(0,_getBindingPath__WEBPACK_IMPORTED_MODULE_3__.getNewBindingPathExpression)(node)];
   }
   doBuildDataDeclaration(context) {
     return _DataDeclarationGenerator_DataDeclarationGenerationContext__WEBPACK_IMPORTED_MODULE_0__.emptyDataDeclarationCollection;
   }
   buildChildrenDataDeclaration(context) {
-    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__.DropdownButtonNode);
+    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__.DropdownButtonNode);
     return context.mergeDataDeclaration(...node.items.map(item => context.processChildrenDataDeclaration(item.children)));
   }
   *doTraverseChildren() {
-    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__.DropdownButtonNode);
+    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__.DropdownButtonNode);
     for (const item of node.items) {
       yield* item.children;
     }
   }
   doConvert(context) {
-    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_5__.DropdownButtonNode);
+    const node = this.getCurrentNodeAs(_DropdownButtonNode__WEBPACK_IMPORTED_MODULE_4__.DropdownButtonNode);
     const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__.componentMarkupBuilder)("DropdownButton");
     markupBuilder.prop("data-tid").set(node.tid);
     markupBuilder.prop(x => x.width).set(node.width);
@@ -83832,13 +83817,6 @@ class DropdownButtonConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODU
       itemBuilder.prop("data-tid").set(item.tid);
       itemBuilder.prop(x => x.bindingPath).set((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_3__.getNewBindingPathExpression)(item));
       itemBuilder.prop(x => x.metricName).set(item.metricName);
-      itemBuilder.prop(x => x.menuSeparator).set(item.menuSeparator);
-      if (item.disabled2 != undefined) {
-        itemBuilder.prop(x => x.disabled2).set((0,_SugarNodes_SugarNodeUtils__WEBPACK_IMPORTED_MODULE_4__.buildExpressionPropValue)(item.disabled2));
-        if (this.getLegacyNode().getParent() != undefined) {
-          itemBuilder.prop(x => x.evaluatorsContextPath).set(this.getEvaluatorsContextPathExpression());
-        }
-      }
       itemBuilder.prop(x => x.onActionClick).set(context.generateHelperFunctionExpression(node, "onClick", item.onClick));
       itemBuilder.appendChild(context.convertChildNodes(item.children));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.5.0-multiuploadefs.2",
+  "version": "5.5.0-ndflinquiryredisign.1",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,