@kontur.candy/generator 5.68.0 → 5.68.1-init-value-by-formula-if-absent.2

package/dist/index.js

@@ -63913,6 +63913,7 @@ class AutoCalculationsCalculator2Generator extends _KCXmlGenerator_KCXmlGenerato
     const defaultValue = this.dataDeclarationHelper.getDefaultValue(target.toLegacyPath());
     const autoField = this.dataDeclarationHelper.isNodeHasAutoFlagEntry(target.toLegacyPath());
     const disabled = this.dataDeclarationHelper.isNodeHasDisabledEntry(target.toLegacyPath());
+    const optional = this.dataDeclarationHelper.isNodeOptional(target);
     const compiledTarget = this.modelPathInstance(target);
     const dependencyModelPaths = Array.from(_Common_IterableUtils__WEBPACK_IMPORTED_MODULE_2__.IterUtils.distinctBy(dependencies.map(x => ({
       path: x.asDependencyModelPath(),
@@ -63923,7 +63924,7 @@ class AutoCalculationsCalculator2Generator extends _KCXmlGenerator_KCXmlGenerato
     const compiledExpressionWithCheck = this.compileAllItemsIsEmptyCheckBlock(compiledExpression, dependencyModelPaths.filter(x => !x.isIgnoreForChecks).map(x => x.path));
     const compiledDelegate = `context => KCCalculation.execute(context, expression => ${compiledExpressionWithCheck}, "${defaultValue}")`;
     return {
-      compiledFunction: `new CalculationFunction(${compiledTarget}, [${compiledDeps}], ${compiledDelegate}, ${autoField}, ${disabled})`,
+      compiledFunction: `new CalculationFunction(${compiledTarget}, [${compiledDeps}], ${compiledDelegate}, ${autoField}, ${disabled}, ${optional})`,
       dependencies: dependencies
     };
   }
@@ -72531,7 +72532,13 @@ class FormulaRulesBuilder extends _BaseRuleBuilder__WEBPACK_IMPORTED_MODULE_6__.
     return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "value"), getFormulaExpression("value"));
   }
   createValueRuleForAutoField(fullTarget, defaultValue, getFormulaExpression) {
-    return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_3__.makeNoDeps)((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_3__.makeStringValueReference)(fullTarget.toCurrentIteration(), "autoFlag")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("true")), getFormulaExpression("value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullCoalesceExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression(defaultValue))));
+    const valueRef = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget, "value");
+    const valueRefCurrentIteration = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "value");
+    const autoFlagRefCurrentIteration = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "autoFlag");
+    const isRequiredField = !this.dataDeclarationHelper.isNodeOptional(fullTarget);
+    const autoFlagIsTrueCondition = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.IsEqualsBinaryExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_3__.makeNoDeps)((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_3__.makeStringValueReference)(fullTarget.toCurrentIteration(), "autoFlag")), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression("true"));
+    const combinedCondition = isRequiredField ? new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.OrBinaryExpression(autoFlagIsTrueCondition, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.AndBinaryExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.EqExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_3__.makeNoDeps)(valueRefCurrentIteration), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullLiteralExpression()), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.EqExpression((0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_3__.makeNoDeps)(autoFlagRefCurrentIteration), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullLiteralExpression()))) : autoFlagIsTrueCondition;
+    return new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.SetStatement(valueRef, new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ConditionalExpression(combinedCondition, getFormulaExpression("value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.NullCoalesceExpression(new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.ValueReferenceExpression(fullTarget.toCurrentIteration(), "value"), new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_0__.StringLiteralExpression(defaultValue))));
   }
   adjustPathMultiplicity(path) {
     return (0,_DataSchema_DataSchemaUtils__WEBPACK_IMPORTED_MODULE_2__.adjustPathMultiplicityComplex)(path, this.formSchemaRng, this.dataDeclarationHelper);
@@ -96406,6 +96413,7 @@ class TreePicklistConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE
     markupBuilder.prop(x => x.display).set((_node$display = node.display) !== null && _node$display !== void 0 ? _node$display : []);
     markupBuilder.prop(x => x.childColumnName).set((_node$childColumnName = node.childColumnName) !== null && _node$childColumnName !== void 0 ? _node$childColumnName : "childof");
     markupBuilder.prop(x => x.parentColumnName).set((_node$parentColumnNam = node.parentColumnName) !== null && _node$parentColumnNam !== void 0 ? _node$parentColumnNam : "code");
+    markupBuilder.prop("data-tid").set(node.tid);
     const bindingForCurrentPath = binding.find(([path, _field]) => path === nodePath);
     if (bindingForCurrentPath == undefined) {
       throw new _common_XmlParser_XmlNode__WEBPACK_IMPORTED_MODULE_4__.SugarAttributeReadError("Значение пути в атрибуте binding должно в точности совпадать со значнием в path", node, "binding");
@@ -96460,14 +96468,14 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _dec19, _dec20, _dec21, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _descriptor16, _descriptor17, _descriptor18, _descriptor19, _descriptor20;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _dec19, _dec20, _dec21, _dec22, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _descriptor16, _descriptor17, _descriptor18, _descriptor19, _descriptor20, _descriptor21;
 
 
 
 
 
 
-let TreePicklistNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.sugarNode)("treepicklist", ``, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/ValueEditors/TreePicklist sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_3__.DataBindingMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrMixin)(_CommonNodeProperties_ValidationInfoNode__WEBPACK_IMPORTED_MODULE_4__.ValidationInfoNode), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("gId", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.picklistId, ``), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("multiple", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, ``), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("title", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.localizedString, ``), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("width", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.lengthUnit, ``), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("fields", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.array(_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string.required), ``), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("display", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.array(_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string).required, `Какие поля из таблицы отображать для пользователя на интерфейсе`), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("parentcolumnname", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string, `Название колонки родителя, на которую ссылается дочерний элемент. По умолчанию code`), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("hintFields", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.array(_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string), `Названия колонок для хинта (как в fields). По умолчанию name.`), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("hintWidth", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.number, `Ширина хинта.`), _dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("descriptionInModal", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string, `Текст подсказки, который покажется в модалке пиклиста над полем поиска. Поддерживает Markdown.`), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("childcolumnname", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string, `Название колонки дочернего элемента, которая ссылается на parentColumnName. По умолчанию childof`), _dec15 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("filter", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.javascriptExpression, `Фильтр значений из справочника, которые можно использовать для этого поля. Подробности в описании.`), _dec16 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("minPickLevel", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.number, `C какого минимального уровня иерархии возможен выбор значений из пиклиста. Доступен на multiple=false`), _dec17 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("path", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.bindingPath, `Путь до значения`), _dec18 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("help", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string, ``), _dec19 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("help", [_Helpers_Help_HelpNode__WEBPACK_IMPORTED_MODULE_7__.HelpNode]), _dec20 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("tooltipPosition", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.enum(..._Helpers_Help_PopupPosition__WEBPACK_IMPORTED_MODULE_8__.allPopupPositions), `Позиция тултипа.`), _dec21 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("binding", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.objectLiteral(), `Привязка какого-то значения из справочника с моделью в кенди (иннером).`), _dec(_class = (_class2 = class TreePicklistNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_5__.SugarNodeWithLegacyVisibility {
+let TreePicklistNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.sugarNode)("treepicklist", ``, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/ValueEditors/TreePicklist sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrMixin)(_CommonNodeProperties_DataBindingMixinNode__WEBPACK_IMPORTED_MODULE_3__.DataBindingMixinNode), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrMixin)(_CommonNodeProperties_ValidationInfoNode__WEBPACK_IMPORTED_MODULE_4__.ValidationInfoNode), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("gId", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.picklistId, ``), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("multiple", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.boolean, ``), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("title", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.localizedString, ``), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("width", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.lengthUnit, ``), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("fields", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.array(_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string.required), ``), _dec9 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("display", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.array(_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string).required, `Какие поля из таблицы отображать для пользователя на интерфейсе`), _dec10 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("parentcolumnname", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string, `Название колонки родителя, на которую ссылается дочерний элемент. По умолчанию code`), _dec11 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("hintFields", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.array(_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string), `Названия колонок для хинта (как в fields). По умолчанию name.`), _dec12 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("hintWidth", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.number, `Ширина хинта.`), _dec13 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("descriptionInModal", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string, `Текст подсказки, который покажется в модалке пиклиста над полем поиска. Поддерживает Markdown.`), _dec14 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("childcolumnname", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string, `Название колонки дочернего элемента, которая ссылается на parentColumnName. По умолчанию childof`), _dec15 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("filter", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.javascriptExpression, `Фильтр значений из справочника, которые можно использовать для этого поля. Подробности в описании.`), _dec16 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("minPickLevel", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.number, `C какого минимального уровня иерархии возможен выбор значений из пиклиста. Доступен на multiple=false`), _dec17 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("path", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.bindingPath, `Путь до значения`), _dec18 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("help", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string, ``), _dec19 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.children)("help", [_Helpers_Help_HelpNode__WEBPACK_IMPORTED_MODULE_7__.HelpNode]), _dec20 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("tooltipPosition", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.enum(..._Helpers_Help_PopupPosition__WEBPACK_IMPORTED_MODULE_8__.allPopupPositions), `Позиция тултипа.`), _dec21 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("binding", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.objectLiteral(), `Привязка какого-то значения из справочника с моделью в кенди (иннером).`), _dec22 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attr)("tid", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_6__.attrType.string, "Возможность установки произвольных data-tid атрибутов, может пригодиться другим командам, или для идентификации элемента в тестах."), _dec(_class = (_class2 = class TreePicklistNode extends _Serializer_SugarNodeWithLegacyVisibility__WEBPACK_IMPORTED_MODULE_5__.SugarNodeWithLegacyVisibility {
   constructor(...args) {
     super(...args);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "dataBinding", _descriptor, this);
@@ -96490,6 +96498,7 @@ let TreePicklistNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "helpNodes", _descriptor18, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "tooltipPosition", _descriptor19, this);
     _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "binding", _descriptor20, this);
+    _babel_runtime_helpers_initializerDefineProperty__WEBPACK_IMPORTED_MODULE_0___default()(this, "tid", _descriptor21, this);
   }
   getOwnPath() {
     return this.dataBinding.getOwnPath();
@@ -96594,6 +96603,11 @@ let TreePicklistNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_
   enumerable: true,
   writable: true,
   initializer: null
+}), _descriptor21 = _babel_runtime_helpers_applyDecoratedDescriptor__WEBPACK_IMPORTED_MODULE_1___default()(_class2.prototype, "tid", [_dec22], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
 })), _class2)) || _class);
 
 /***/ }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.68.0",
+  "version": "5.68.1-init-value-by-formula-if-absent.2",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,