@kontur.candy/generator 5.121.0-fixes-for-patch.2 → 5.121.0-fixes-for-flang-generator.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.
- package/dist/index.js +8 -7
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -75920,11 +75920,12 @@ class FormulaExpressionToFlangExpressionConverter {
|
|
|
75920
75920
|
compiledArgumentExpression(prefix, target, selectPath, selectType, addPrecalculationRule, aggregationFunction = "Sum") {
|
|
75921
75921
|
const builtInType = this.convertExpressionTypePropertyToFLangType(selectType !== null && selectType !== void 0 ? selectType : "string");
|
|
75922
75922
|
const adjustedSelectPath = this.preparePathAndAdjustMultiplicity(prefix, selectPath);
|
|
75923
|
+
const isSelectEqualsTarget = target.path.isEquals(adjustedSelectPath);
|
|
75923
75924
|
const splitInfo = (0,_Common_ModelPath_PathSplitHelper__WEBPACK_IMPORTED_MODULE_5__.getMatchedAndDifferentModelPaths)(target.path, adjustedSelectPath);
|
|
75924
75925
|
const baseSelectPath = splitInfo.matchedPath;
|
|
75925
75926
|
if (!splitInfo.differentPath.isContainIteration()) {
|
|
75926
75927
|
const valueRefExpression = new _FLang_FLangCodeDom__WEBPACK_IMPORTED_MODULE_9__.ValueReferenceExpression(adjustedSelectPath.toCurrentIteration().normalize(), "value");
|
|
75927
|
-
const finalValue =
|
|
75928
|
+
const finalValue = isSelectEqualsTarget && target.field === "value" ? (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.makeNoDeps)(valueRefExpression) : valueRefExpression;
|
|
75928
75929
|
return (0,_FLang_FlangUtils__WEBPACK_IMPORTED_MODULE_8__.castOperandIfNeed)(finalValue, builtInType);
|
|
75929
75930
|
} else {
|
|
75930
75931
|
var _countValueExpression;
|
|
@@ -103941,14 +103942,14 @@ class FIOConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_3__.Suga
|
|
|
103941
103942
|
}
|
|
103942
103943
|
doBuildNormalizeRules(builder) {
|
|
103943
103944
|
const node = this.getCurrentNodeAs(_FIONode__WEBPACK_IMPORTED_MODULE_7__.FIONode);
|
|
103944
|
-
return [builder.valueInitializer(node, node.dataBinding,
|
|
103945
|
-
disabled:
|
|
103945
|
+
return [builder.valueInitializer(node, node.dataBinding, true, "Фамилия", "surname"), ...builder.specialFieldsInitializer(node, {
|
|
103946
|
+
disabled: true,
|
|
103946
103947
|
pathSuffix: "Фамилия"
|
|
103947
|
-
}), builder.valueInitializer(node, node.dataBinding,
|
|
103948
|
-
disabled:
|
|
103948
|
+
}), builder.valueInitializer(node, node.dataBinding, true, "Имя", "name"), ...builder.specialFieldsInitializer(node, {
|
|
103949
|
+
disabled: true,
|
|
103949
103950
|
pathSuffix: "Имя"
|
|
103950
|
-
}), builder.valueInitializer(node, node.dataBinding,
|
|
103951
|
-
disabled:
|
|
103951
|
+
}), builder.valueInitializer(node, node.dataBinding, true, "Отчество", "patronymic"), ...builder.specialFieldsInitializer(node, {
|
|
103952
|
+
disabled: true,
|
|
103952
103953
|
pathSuffix: "Отчество"
|
|
103953
103954
|
})];
|
|
103954
103955
|
}
|