@kontur.candy/generator 5.73.1 → 5.74.0-forminform.0

package/dist/index.js

@@ -74360,7 +74360,7 @@ class ValidationRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MODULE_9
   }
   buildKcValidationRuleCheck(condition) {
     const prefix = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createModelPath)(condition.match.replace(/\@/g, ""), true).normalize();
-    const target = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createModelPath)(condition.target.replace(/\@/g, ""), "auto");
+    const target = (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_0__.createModelPath)(condition.target.replace(/\@/g, ""), false);
     const fullTarget = this.adjustPathMultiplicity(prefix.joinWith(target).normalize());
     const precalculationRules = [];
     return {
@@ -78880,8 +78880,8 @@ class AttachmentFormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODU
   doConvert(context) {
     const attachmentFormNode = this.getCurrentNodeAs(_AttachmentFormNode__WEBPACK_IMPORTED_MODULE_7__.AttachmentFormNode);
     const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__.componentMarkupBuilder)("AttachmentFormUnit");
-    markupBuilder.prop("data-tid").set("attachment-" + attachmentFormNode.gfv);
-    markupBuilder.prop(x => x.unitId).set((0,_Engine_src_Controls_FormParts_Unit_UnitId_UnitId__WEBPACK_IMPORTED_MODULE_3__.createUnitId)("attachment-" + attachmentFormNode.gfv));
+    markupBuilder.prop("data-tid").set("attachment" + attachmentFormNode.gfv);
+    markupBuilder.prop(x => x.unitId).set((0,_Engine_src_Controls_FormParts_Unit_UnitId_UnitId__WEBPACK_IMPORTED_MODULE_3__.createUnitId)("attachment" + attachmentFormNode.gfv));
     markupBuilder.prop(x => x.gfv).set(attachmentFormNode.gfv);
     markupBuilder.prop(x => x.caption).set(attachmentFormNode.name);
     markupBuilder.prop(x => x.description).set(attachmentFormNode.description);
@@ -78910,11 +78910,13 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _babel_runtime_helpers_initializerWarningHelper__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/initializerWarningHelper */ "./node_modules/@babel/runtime/helpers/initializerWarningHelper.js");
 /* harmony import */ var _babel_runtime_helpers_initializerWarningHelper__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_initializerWarningHelper__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../Serializer/SugarSerializer */ "./Generator/src/generators/markupGenerator/Serializer/SugarSerializer.ts");
+/* harmony import */ var _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../../../../../Common/ModelPath/ModelPath */ "./Common/ModelPath/ModelPath.ts");
 
 
 
 var _dec, _dec2, _dec3, _dec4, _dec5, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4;
 
+
 let AttachmentFormNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.sugarNode)("attachmentform", `Встроенный редактор для формализованного приложения`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/FormParts/AttachmentForm sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("gfv", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string.required, `ГФВ приложения`), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("name", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string.required, `Крактое название раздела, в который поместить форму`), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("description", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string.required, `Описание формы приложения`), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attr)("path", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.attrType.string.required, `Путь до поля с именем приложения`), _dec(_class = (_class2 = class AttachmentFormNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_3__.SugarNodeBase {
   constructor(...args) {
     super(...args);
@@ -78923,6 +78925,9 @@ let AttachmentFormNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTE
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "description", _descriptor3, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "path", _descriptor4, this);
   }
+  getOwnPath() {
+    return this.path != undefined ? (0,_Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_4__.createFromMask)(this.path, "auto", _Common_ModelPath_ModelPath__WEBPACK_IMPORTED_MODULE_4__.PathTokens.each) : undefined;
+  }
 }, (_descriptor = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "gfv", [_dec2], {
   configurable: true,
   enumerable: true,
@@ -79703,6 +79708,7 @@ class FormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_7__.Sug
     const entrySections = ["default"];
     const optionalSections = this.findOptionalSections(node);
     const allSections = this.findAllSingleSections(node);
+    const allAttachmentSections = this.findAllAttachmentSections(node);
     if (node.requisite) {
       entrySections.push(_Common_CommonConstants_SectionNames__WEBPACK_IMPORTED_MODULE_12__.SectionNames.requisitesSection);
     }
@@ -79716,6 +79722,11 @@ class FormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_7__.Sug
         allSingleSections: allSections
       }
     };
+    allAttachmentSections.forEach(attachmentSection => {
+      result[`${attachmentSection.path}/attachment`] = {
+        section: [attachmentSection.id]
+      };
+    });
     return result;
   }
   buildChildrenDataDeclaration(context) {
@@ -79767,7 +79778,19 @@ class FormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_7__.Sug
         dependsOnSection: this.findNearestOptionalSection(page.id, allSinglePagesWithParent)
       };
     }).filter(x => (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.isNotNullOrUndefined)(x.id)).toArray();
-    return pages;
+    const attachmentForms = this.findAllAttachmentSections(node);
+    return pages.concat(attachmentForms);
+  }
+  findAllAttachmentSections(node) {
+    if (!node.attachmentForms) {
+      return [];
+    }
+    return node.attachmentForms.map(attachmentForm => ({
+      id: this.getAttachmentFormId(attachmentForm),
+      path: attachmentForm.getFullPath().toLegacyPath(),
+      optional: true,
+      dependsOnSection: undefined
+    })).filter(x => (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.isNotNullOrUndefined)(x.id));
   }
   getAllPages(pages, parentPage) {
     const allPages = pages.flatMap(page => this.getAllPages(page.pages, page)).map(x => ({
@@ -79975,12 +79998,12 @@ class FormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_7__.Sug
   }
   buildAttachmentFormUnit(node, attachmentFormNode, context) {
     const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_5__.componentMarkupBuilder)("AttachmentFormUnit");
-    markupBuilder.prop("data-tid").set("attachment-" + attachmentFormNode.gfv);
-    markupBuilder.prop(x => x.unitId).set((0,_Engine_src_Controls_FormParts_Unit_UnitId_UnitId__WEBPACK_IMPORTED_MODULE_13__.createUnitId)("attachment-" + attachmentFormNode.gfv));
+    markupBuilder.prop("data-tid").set(this.getAttachmentFormId(attachmentFormNode));
+    markupBuilder.prop(x => x.unitId).set((0,_Engine_src_Controls_FormParts_Unit_UnitId_UnitId__WEBPACK_IMPORTED_MODULE_13__.createUnitId)(this.getAttachmentFormId(attachmentFormNode)));
     markupBuilder.prop(x => x.gfv).set(attachmentFormNode.gfv);
     markupBuilder.prop(x => x.caption).set(attachmentFormNode.name);
     markupBuilder.prop(x => x.description).set(attachmentFormNode.description);
-    markupBuilder.prop(x => x.bindingPath).set((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_15__.getNewBindingPathExpression)(attachmentFormNode, attachmentFormNode.path));
+    markupBuilder.prop(x => x.bindingPath).set((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_15__.getNewBindingPathExpression)(attachmentFormNode));
     return markupBuilder;
   }
   isPageContainsTableWithStickyElements(pageNode) {
@@ -80021,18 +80044,24 @@ class FormConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_7__.Sug
     }
     return unitListBuilder;
   }
+  getAttachmentFormId(attachmentForm) {
+    return "attachment" + attachmentForm.gfv;
+  }
   buildUnitItemsFromAttachmentForms(formNode, attachmentFormNodes) {
     const unitItemBuilders = [];
     for (const attachmentForm of attachmentFormNodes) {
       const unitItemBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_5__.componentMarkupBuilder)("UnitItem");
-      unitItemBuilder.prop("data-tid").set("attachment-" + attachmentForm.gfv);
-      unitItemBuilder.prop(x => x.id).set((0,_Engine_src_Controls_FormParts_Unit_UnitId_UnitId__WEBPACK_IMPORTED_MODULE_13__.createUnitId)("attachment-" + attachmentForm.gfv));
+      unitItemBuilder.prop("data-tid").set(this.getAttachmentFormId(attachmentForm));
+      unitItemBuilder.prop(x => x.id).set((0,_Engine_src_Controls_FormParts_Unit_UnitId_UnitId__WEBPACK_IMPORTED_MODULE_13__.createUnitId)(this.getAttachmentFormId(attachmentForm)));
       unitItemBuilder.prop(x => x.name).set(attachmentForm.name);
       unitItemBuilder.prop(x => x.optional).set(true);
       unitItemBuilder.prop(x => x.multiple).set(false);
       unitItemBuilder.prop(x => x.multipleAppearance).set("flat");
       unitItemBuilder.prop(x => x.pages).set([]);
       unitItemBuilder.prop(x => x.clearConfirmationSettings).set({});
+      if (attachmentForm.path != undefined) {
+        unitItemBuilder.prop(x => x.unitPath).set((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_15__.getNewBindingPathExpression)(attachmentForm));
+      }
       unitItemBuilder.prop(x => x.evaluatorsContextPath).set((0,_getBindingPath__WEBPACK_IMPORTED_MODULE_15__.getNewBindingPathExpression)(formNode));
       unitItemBuilders.push(unitItemBuilder);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.73.1",
+  "version": "5.74.0-forminform.0",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,