@kontur.candy/generator 6.2.0-highlighting-diffs.0 → 6.2.0

package/dist/index.js

@@ -86598,7 +86598,7 @@ class NormativeHelpConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODUL
     if (node.commonId != undefined && node.commonId !== "") {
       markupBuilder.prop(x => x.commonHelpId).set(node.commonId);
     } else {
-      markupBuilder.prop(x => x.helpCommonUrl).set(this.addLeadingSlash(node.commonUrl));
+      markupBuilder.prop(x => x.helpCommonUrl).set(node.commonUrl);
     }
     markupBuilder.prop(x => x.knd).set(node.knd);
     return markupBuilder.buildConverterResult();
@@ -88935,7 +88935,10 @@ class SimpleTableColumnConverter extends _MultiControls_Column_ColumnConverter__
   doBuildDataDeclaration(context) {
     const node = this.getCurrentNodeAs(_SimpleTableNode__WEBPACK_IMPORTED_MODULE_1__.SimpleTableColumnNode);
     if (node.multiple) {
-      return context.mergeDataDeclaration(context.addPathDeclEntry(node, [["children", context.initSequenceFactory.children(false)]]), context.addPathSectionDeclarationEntry(node), context.addVisibilityPathDeclEntryNew(node), context.maxOccurs(node.getFullPath(), node.maxOccurs));
+      return context.mergeDataDeclaration(context.addPathDeclEntry(node, [["children", context.initSequenceFactory.children(false)]]), context.addPathSectionDeclarationEntry(node), context.addVisibilityPathDeclEntryNew(node), context.maxOccurs(node.getFullPath(), node.maxOccurs), context.addSpecialFieldsEntry(node, {
+        optional: false,
+        disabled: node.disabled
+      }));
     } else {
       return context.addVisibilityPathDeclEntryNew(node);
     }
@@ -91351,7 +91354,10 @@ class CrossfitTableColumnConverter extends _Column_ColumnConverter__WEBPACK_IMPO
   doBuildDataDeclaration(context) {
     const node = this.getCurrentNodeAs(_CrossfitTableNode__WEBPACK_IMPORTED_MODULE_4__.CrossfitTableColumnNode);
     if (node.multiple) {
-      return context.mergeDataDeclaration(context.addPathDeclEntry(node, [["children", context.initSequenceFactory.children(false)]]), context.addPathSectionDeclarationEntry(node), context.maxOccurs(node.getFullPath(), node.maxOccurs));
+      return context.mergeDataDeclaration(context.addPathDeclEntry(node, [["children", context.initSequenceFactory.children(false)]]), context.addPathSectionDeclarationEntry(node), context.maxOccurs(node.getFullPath(), node.maxOccurs), context.addSpecialFieldsEntry(node, {
+        optional: false,
+        disabled: node.disabled
+      }));
     } else {
       return context.mergeDataDeclaration(_DataDeclarationGenerator_DataDeclarationGenerationContext__WEBPACK_IMPORTED_MODULE_1__.emptyDataDeclarationCollection, node.dataScope.path && context.addPathSectionDeclarationEntry(node));
     }
@@ -105601,7 +105607,7 @@ class FLangNormalizationRulesBuilder {
         var _this$fetchFunctions$, _this$fetchFunctions$2;
         const fetchFnText = (_this$fetchFunctions$ = (_this$fetchFunctions$2 = this.fetchFunctions.getFetchFunction(dataBinding.fetchfn + (fetchFunctionSuffix !== null && fetchFunctionSuffix !== void 0 ? fetchFunctionSuffix : ""))) === null || _this$fetchFunctions$2 === void 0 ? void 0 : _this$fetchFunctions$2.toString()) !== null && _this$fetchFunctions$ !== void 0 ? _this$fetchFunctions$ : (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_2__.reject)();
         const flangExpression = this.fetchFuncToFlangConverter.convert(`const x = ${fetchFnText}`);
-        return new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference, "value"), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NotEqExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.GetExternalInfoExpression("@settings/isReadOnly"), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("true")), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullCoalesceExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NotEqExpression(originalValueReference, new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullLiteralExpression()), sourceValueReference, flangExpression), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression(defaultValue)), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullCoalesceExpression(originalValueReference, new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression(defaultValue))), sourceSequenceType);
+        return new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(targetPathReference, "value"), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NotEqExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.GetExternalInfoExpression("@settings/isReadOnly"), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("true")), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullCoalesceExpression(disabled ? flangExpression : new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NotEqExpression(originalValueReference, new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullLiteralExpression()), sourceValueReference, flangExpression), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression(defaultValue)), new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullCoalesceExpression(originalValueReference, new _ServerSideFLangNormalization_FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression(defaultValue))), sourceSequenceType);
       } catch (e) {
         // eslint-disable-next-line no-console
         console.error(`fetchfn = "${dataBinding.fetchfn}". Не удалось преобразовать fetch-функцию во FLANG-выражение!`);

package/package.json

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