@myrtex-org/form 1.1.27 → 1.1.28

package/fesm2022/myrtex-org-form.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { Injectable, inject, Component, ChangeDetectionStrategy, EventEmitter, Directive, Input, Output, ChangeDetectorRef, Inject, ViewChild, NgModule } from '@angular/core';
+import { Injectable, inject, ChangeDetectionStrategy, Component, EventEmitter, Output, Input, Directive, ChangeDetectorRef, Inject, ViewChild, NgModule } from '@angular/core';
 import * as i1$3 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import * as i1$1 from '@angular/router';
@@ -863,6 +863,184 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
             type: Injectable
         }] });
 
+class FormulaCalculateService {
+    constructor() {
+        this._operatorPrecedence = {
+            '+': 1,
+            '-': 1,
+            '*': 2,
+            '/': 2,
+        };
+        this._operators = ['+', '-', '*', '/'];
+    }
+    calculateMathExpression(expression, values) {
+        try {
+            return this._calculateMathExpression(expression, values);
+        }
+        catch {
+            return 0;
+        }
+    }
+    calculateStringConcatenation(expression, values) {
+        return expression.replace(/{(?<systemName>\w+)(?::(?<format>[^}]+))?}/g, (_match, systemName) => {
+            const value = values.find(x => x.sysName === systemName);
+            return value?.value?.toString?.() ?? '';
+        });
+    }
+    _calculateMathExpression(expression, values) {
+        const operatorStack = [];
+        const operandStack = [];
+        for (let i = 0; i < expression.length; i++) {
+            const charValue = expression[i];
+            if (/\s/.test(charValue)) {
+                continue;
+            }
+            if (charValue === '{') {
+                let sysNameOperand = '';
+                while (i < expression.length && expression[i] !== '}') {
+                    sysNameOperand += expression[i];
+                    i++;
+                }
+                sysNameOperand += expression[i] ?? '';
+                const value = this._getNumberValue(values, sysNameOperand);
+                if (value === null) {
+                    return 0;
+                }
+                operandStack.push(value);
+                continue;
+            }
+            if (charValue === '(') {
+                const nestedExpression = this._getExpressionBetweenParentheses(expression, i);
+                operandStack.push(this._calculateMathExpression(nestedExpression, values));
+                i += nestedExpression.length + 1;
+                continue;
+            }
+            if (this._isOperator(charValue)) {
+                this._addOperator(operatorStack, operandStack, charValue);
+                continue;
+            }
+            if (/\d/.test(charValue)) {
+                let number = '';
+                while (i < expression.length && (/[\d.]/.test(expression[i]))) {
+                    number += expression[i];
+                    i++;
+                }
+                i--;
+                const value = this._getNumberValue(values, number);
+                if (value === null) {
+                    return 0;
+                }
+                operandStack.push(value);
+                continue;
+            }
+            if (/[a-zA-Z]/.test(charValue)) {
+                i += this._addFunctionResult(operandStack, values, expression, i);
+            }
+        }
+        this._calculateAll(operandStack, operatorStack);
+        return operandStack.pop() ?? 0;
+    }
+    _addFunctionResult(operandStack, values, expression, startIndex) {
+        const idxEof = expression.indexOf(')', startIndex);
+        const operand = expression.substring(startIndex, idxEof - startIndex + 1);
+        const lowerOperand = operand.toLowerCase();
+        if (lowerOperand.startsWith('pow(') && lowerOperand.endsWith(')')) {
+            const innerExpression = operand.substring(4, operand.length - 1);
+            const innerOperands = innerExpression.split(',').map(x => x.trim());
+            const baseValue = this._getNumberValue(values, innerOperands[0]);
+            const exponent = this._getNumberValue(values, innerOperands[1]);
+            if (baseValue === null || exponent === null) {
+                operandStack.push(0);
+            }
+            else {
+                operandStack.push(Math.pow(baseValue, exponent));
+            }
+            return operand.length - 1;
+        }
+        if (lowerOperand.startsWith('sqrt(') && lowerOperand.endsWith(')')) {
+            const innerExpression = operand.substring(5, operand.length - 1);
+            const value = this._getNumberValue(values, innerExpression);
+            operandStack.push(value === null ? 0 : Math.sqrt(value));
+            return operand.length - 1;
+        }
+        throw new Error('Invalid function operand');
+    }
+    _addOperator(operatorStack, operandStack, operatorToken) {
+        while (operatorStack.length > 0 &&
+            this._getOperatorPrecedence(operatorToken) <= this._getOperatorPrecedence(operatorStack[operatorStack.length - 1])) {
+            const operand2 = operandStack.pop() ?? 0;
+            const operand1 = operandStack.pop() ?? 0;
+            const operatorTokenToApply = operatorStack.pop();
+            operandStack.push(this._calculate(operand1, operand2, operatorTokenToApply));
+        }
+        operatorStack.push(operatorToken);
+    }
+    _calculateAll(operandStack, operatorStack) {
+        while (operatorStack.length > 0) {
+            const operatorToken = operatorStack.pop();
+            const operand2 = operandStack.pop() ?? 0;
+            const operand1 = operandStack.pop() ?? 0;
+            operandStack.push(this._calculate(operand1, operand2, operatorToken));
+        }
+    }
+    _getOperatorPrecedence(operatorToken) {
+        return this._operatorPrecedence[operatorToken];
+    }
+    _getExpressionBetweenParentheses(expression, startIndex) {
+        let level = 0;
+        for (let i = startIndex; i < expression.length; i++) {
+            if (expression[i] === '(') {
+                level++;
+            }
+            else if (expression[i] === ')') {
+                level--;
+                if (level === 0) {
+                    return expression.substring(startIndex + 1, i);
+                }
+            }
+        }
+        throw new Error('Unbalanced parentheses');
+    }
+    _getNumberValue(values, operand) {
+        const cleanOperand = operand.trim().replace(',', '.').replace(/^\{|\}$/g, '');
+        const val = values.find(x => x.sysName === cleanOperand);
+        if (val) {
+            if (val.value === null || val.value === undefined || val.value === '') {
+                return null;
+            }
+            const parsed = Number(String(val.value).replace(',', '.'));
+            return Number.isFinite(parsed) ? parsed : null;
+        }
+        const asNumber = Number(cleanOperand);
+        if (Number.isFinite(asNumber)) {
+            return asNumber;
+        }
+        throw new Error(`Invalid operand ${operand}`);
+    }
+    _calculate(operand1, operand2, operatorToken) {
+        switch (operatorToken) {
+            case '+':
+                return operand1 + operand2;
+            case '-':
+                return operand1 - operand2;
+            case '*':
+                return operand1 * operand2;
+            case '/':
+                return operand1 / operand2;
+            default:
+                throw new Error(`Invalid operator ${operatorToken}`);
+        }
+    }
+    _isOperator(token) {
+        return this._operators.includes(token);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: FormulaCalculateService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: FormulaCalculateService }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: FormulaCalculateService, decorators: [{
+            type: Injectable
+        }] });
+
 class ObjectFormEffects {
     constructor(_actions$, _store, _router, _applicationService, _toasterService) {
         this._actions$ = _actions$;
@@ -1041,48 +1219,39 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
         }], ctorParameters: () => [{ type: i1$1.Router }] });
 
 class ComponentFactoryDirective {
-    constructor(viewContainer, cdr) {
+    constructor(viewContainer) {
         this.viewContainer = viewContainer;
-        this.cdr = cdr;
         this.values = [];
         this.changed = new EventEmitter();
     }
     ngOnChanges(changes) {
-        // 1. Сначала инициализируем виджет, если сменился тип
-        if ('type' in changes && this.type) {
+        if ('type' in changes && this.type && changes['type'].previousValue !== changes['type'].currentValue) {
             this.initWidget(this.type);
         }
-        // 2. Если компонент уже есть (или только что создался), обновляем все свойства
-        if (this.dynamicComponent) {
-            if ('data' in changes && this.data) {
-                this.dynamicComponent.instance.data = this.data;
-            }
-            if ('valueMode' in changes && this.valueMode) {
-                this.dynamicComponent.instance.valueMode = this.valueMode;
-            }
-            // Используем currentValue из changes, чтобы быть уверенными в свежести данных
-            if ('values' in changes) {
-                this.dynamicComponent.instance.values = changes['values'].currentValue;
-            }
-            // КРИТИЧНО: уведомляем Angular, что в динамическом компоненте обновились данные
-            this.dynamicComponent.changeDetectorRef.detectChanges();
+        if ('data' in changes && this.data) {
+            this.applyData(this.data);
+        }
+        if ('valueMode' in changes && this.data && this.valueMode) {
+            this.applyValueMode(this.valueMode);
+        }
+        if ('values' in changes && this.data) {
+            this.applyValues(this.values);
         }
     }
     initWidget(type) {
         const componentType = this.map[type];
-        if (!componentType)
+        if (!componentType) {
             return;
-        this.viewContainer.clear();
+        }
+        if (this.dynamicComponent) {
+            this.viewContainer.clear();
+            this.dynamicComponent = undefined;
+        }
         this.dynamicComponent = this.viewContainer.createComponent(componentType);
-        // Сразу передаем всё, что есть на момент создания
-        const instance = this.dynamicComponent.instance;
-        if (this.data)
-            instance.data = this.data;
-        if (this.values)
-            instance.values = this.values;
-        if (this.valueMode)
-            instance.valueMode = this.valueMode;
-        if (this.dynamicComponent && this.dynamicComponent.instance.changed) {
+        if (this.data) {
+            this.dynamicComponent.instance.data = this.data;
+        }
+        if (this.dynamicComponent.instance.changed) {
             this.dynamicComponent.instance.changed.subscribe((res) => {
                 this.changed.emit(res);
             });
@@ -1103,7 +1272,7 @@ class ComponentFactoryDirective {
             this.dynamicComponent.instance.valueMode = valueMode;
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: ComponentFactoryDirective, deps: [{ token: i0.ViewContainerRef }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Directive }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: ComponentFactoryDirective, deps: [{ token: i0.ViewContainerRef }], target: i0.ɵɵFactoryTarget.Directive }); }
     static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.3.12", type: ComponentFactoryDirective, isStandalone: true, selector: "[appComponentFactory]", inputs: { type: "type", data: "data", values: "values", valueMode: "valueMode", map: "map" }, outputs: { changed: "changed" }, usesOnChanges: true, ngImport: i0 }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: ComponentFactoryDirective, decorators: [{
@@ -1112,7 +1281,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
                     selector: '[appComponentFactory]',
                     standalone: true
                 }]
-        }], ctorParameters: () => [{ type: i0.ViewContainerRef }, { type: i0.ChangeDetectorRef }], propDecorators: { type: [{
+        }], ctorParameters: () => [{ type: i0.ViewContainerRef }], propDecorators: { type: [{
                 type: Input
             }], data: [{
                 type: Input
@@ -1172,6 +1341,12 @@ class BaseFieldComponent {
     set values(value) {
         if (this.valueMode === 'manual') {
             this.manualValues = value;
+            const isFormulaInputNumber = this.settings?.type === ComponentType.InputNumber &&
+                this.settings?.options?.inputState === InputState.Formula;
+            if (isFormulaInputNumber && this.model) {
+                this.model.value = getValueModel(this.settings, this.manualValues)?.value;
+                this._detector.detectChanges();
+            }
         }
     }
     set data(settings) {
@@ -1403,6 +1578,12 @@ class InputNumberComponent extends BaseFieldComponent {
         this.validateValue = 0;
     }
     get isReadonly() {
+        return this.hasFormula;
+    }
+    get isInputDisabled() {
+        return this.disabled || this.hasFormula;
+    }
+    get hasFormula() {
         return this.settings.options.inputState === InputState.Formula;
     }
     onChangeInput() {
@@ -1415,11 +1596,11 @@ class InputNumberComponent extends BaseFieldComponent {
             this.settings.options.maxValue && model.value && this.settings.options.maxValue < model.value);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: InputNumberComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "17.3.12", type: InputNumberComponent, selector: "app-input-number", usesInheritance: true, ngImport: i0, template: "@if (settings) {\r\n  <div class=\"input-number-content\">\r\n    @if (settings.options.label) {\r\n      <mrx-label\r\n        [required]=\"settings.options.required\"\r\n        [tooltip]=\"settings.options.tooltip || ''\"\r\n      >\r\n        {{ settings.options.label }}\r\n      </mrx-label>\r\n    }\r\n\r\n    <mrx-input-number\r\n      [(ngModel)]=\"model.value\"\r\n      [fields]=\"autosaveFields\"\r\n      [readonly]=\"isReadonly\"\r\n      [allowNegative]=\"true\"\r\n      [numberType]=\"isReadonly || settings.options.decimals ? 'float' : 'int'\"\r\n      [decimalSeparator]=\"settings.options.decimalSeparator\"\r\n      [decimals]=\"isReadonly ? (settings.options.decimals || 2) : settings.options.decimals\"\r\n      [placeholder]=\"settings.options.placeholder\"\r\n      [disabled]=\"disabled\"\r\n      [invalid]=\"getInvalid\"\r\n      [invalidMessage]=\"getInvalidMessage\"\r\n      (modelChange)=\"dispatchModify($event)\"\r\n      (change)=\"onChangeInput()\"\r\n    ></mrx-input-number>\r\n\r\n    @if (settings.options.minValue) {\r\n      <mrx-hint-error-message\r\n        message=\"\u041C\u0438\u043D\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u2014 {{ settings.options.minValue }}\"\r\n        [value]=\"validateValue\"\r\n        [minValue]=\"settings.options.minValue\"\r\n      ></mrx-hint-error-message>\r\n    }\r\n    @if (settings.options.maxValue) {\r\n      <mrx-hint-error-message\r\n        message=\"\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u2014 {{ settings.options.maxValue }}\"\r\n        [value]=\"validateValue\"\r\n        [maxValue]=\"settings.options.maxValue\"\r\n      ></mrx-hint-error-message>\r\n    }\r\n  </div>\r\n}\r\n", styles: [""], dependencies: [{ kind: "component", type: i1$2.LabelComponent, selector: "mrx-label", inputs: ["requiredHidden", "required", "boldLabel", "disabled", "placeholder", "label", "customClasses", "triggerTextPosition", "isPublicInfo", "publicInfoTooltip", "isSwitch", "switchLabel", "switchValue", "switchSize", "isCheckbox", "checkboxLabel", "checkboxValue", "counter", "linkText", "linkPrevent", "linkType", "linkMonochrome", "href", "triggerType", "tooltip", "tooltipInitialVisible", "isSaveToStorage"], outputs: ["changeSwitchValue", "changeCheckboxValue", "clickedLink"] }, { kind: "directive", type: i2$2.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2$2.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "component", type: i1$2.InputNumberComponent, selector: "mrx-input-number", inputs: ["fields", "placeholder", "innerClass", "customClasses", "required", "allowNegative", "size", "separator", "decimalSeparator", "decimals", "isNullableValue", "isAutoCorrectingValue", "invalid", "checkInvalid", "numberType", "invalidMessage", "disabled", "readonly", "minValue", "maxValue"], outputs: ["modelChange", "modelChangeBlur"] }, { kind: "component", type: i1$2.HintErrorMessageComponent, selector: "mrx-hint-error-message", inputs: ["message", "value", "maxValue", "minValue", "minLength", "maxLength", "checkInvalid"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "17.3.12", type: InputNumberComponent, selector: "app-input-number", usesInheritance: true, ngImport: i0, template: "@if (settings) {\r\n  <div class=\"input-number-content\">\r\n    @if (settings.options.label) {\r\n      <mrx-label\r\n        [required]=\"settings.options.required\"\r\n        [tooltip]=\"settings.options.tooltip || ''\"\r\n      >\r\n        {{ settings.options.label }}\r\n      </mrx-label>\r\n    }\r\n\r\n    <mrx-input-number\r\n      [(ngModel)]=\"model.value\"\r\n      [fields]=\"autosaveFields\"\r\n      [readonly]=\"isReadonly\"\r\n      [allowNegative]=\"true\"\r\n      [numberType]=\"isReadonly || settings.options.decimals ? 'float' : 'int'\"\r\n      [decimalSeparator]=\"settings.options.decimalSeparator\"\r\n      [decimals]=\"isReadonly ? (settings.options.decimals || 2) : settings.options.decimals\"\r\n      [placeholder]=\"settings.options.placeholder\"\r\n      [disabled]=\"isInputDisabled\"\r\n      [invalid]=\"getInvalid\"\r\n      [invalidMessage]=\"getInvalidMessage\"\r\n      (modelChange)=\"dispatchModify($event)\"\r\n      (change)=\"onChangeInput()\"\r\n    ></mrx-input-number>\r\n\r\n    @if (settings.options.minValue) {\r\n      <mrx-hint-error-message\r\n        message=\"\u041C\u0438\u043D\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u2014 {{ settings.options.minValue }}\"\r\n        [value]=\"validateValue\"\r\n        [minValue]=\"settings.options.minValue\"\r\n      ></mrx-hint-error-message>\r\n    }\r\n    @if (settings.options.maxValue) {\r\n      <mrx-hint-error-message\r\n        message=\"\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u2014 {{ settings.options.maxValue }}\"\r\n        [value]=\"validateValue\"\r\n        [maxValue]=\"settings.options.maxValue\"\r\n      ></mrx-hint-error-message>\r\n    }\r\n  </div>\r\n}\r\n", styles: [""], dependencies: [{ kind: "component", type: i1$2.LabelComponent, selector: "mrx-label", inputs: ["requiredHidden", "required", "boldLabel", "disabled", "placeholder", "label", "customClasses", "triggerTextPosition", "isPublicInfo", "publicInfoTooltip", "isSwitch", "switchLabel", "switchValue", "switchSize", "isCheckbox", "checkboxLabel", "checkboxValue", "counter", "linkText", "linkPrevent", "linkType", "linkMonochrome", "href", "triggerType", "tooltip", "tooltipInitialVisible", "isSaveToStorage"], outputs: ["changeSwitchValue", "changeCheckboxValue", "clickedLink"] }, { kind: "directive", type: i2$2.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2$2.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "component", type: i1$2.InputNumberComponent, selector: "mrx-input-number", inputs: ["fields", "placeholder", "innerClass", "customClasses", "required", "allowNegative", "size", "separator", "decimalSeparator", "decimals", "isNullableValue", "isAutoCorrectingValue", "invalid", "checkInvalid", "numberType", "invalidMessage", "disabled", "readonly", "minValue", "maxValue"], outputs: ["modelChange", "modelChangeBlur"] }, { kind: "component", type: i1$2.HintErrorMessageComponent, selector: "mrx-hint-error-message", inputs: ["message", "value", "maxValue", "minValue", "minLength", "maxLength", "checkInvalid"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: InputNumberComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'app-input-number', changeDetection: ChangeDetectionStrategy.OnPush, template: "@if (settings) {\r\n  <div class=\"input-number-content\">\r\n    @if (settings.options.label) {\r\n      <mrx-label\r\n        [required]=\"settings.options.required\"\r\n        [tooltip]=\"settings.options.tooltip || ''\"\r\n      >\r\n        {{ settings.options.label }}\r\n      </mrx-label>\r\n    }\r\n\r\n    <mrx-input-number\r\n      [(ngModel)]=\"model.value\"\r\n      [fields]=\"autosaveFields\"\r\n      [readonly]=\"isReadonly\"\r\n      [allowNegative]=\"true\"\r\n      [numberType]=\"isReadonly || settings.options.decimals ? 'float' : 'int'\"\r\n      [decimalSeparator]=\"settings.options.decimalSeparator\"\r\n      [decimals]=\"isReadonly ? (settings.options.decimals || 2) : settings.options.decimals\"\r\n      [placeholder]=\"settings.options.placeholder\"\r\n      [disabled]=\"disabled\"\r\n      [invalid]=\"getInvalid\"\r\n      [invalidMessage]=\"getInvalidMessage\"\r\n      (modelChange)=\"dispatchModify($event)\"\r\n      (change)=\"onChangeInput()\"\r\n    ></mrx-input-number>\r\n\r\n    @if (settings.options.minValue) {\r\n      <mrx-hint-error-message\r\n        message=\"\u041C\u0438\u043D\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u2014 {{ settings.options.minValue }}\"\r\n        [value]=\"validateValue\"\r\n        [minValue]=\"settings.options.minValue\"\r\n      ></mrx-hint-error-message>\r\n    }\r\n    @if (settings.options.maxValue) {\r\n      <mrx-hint-error-message\r\n        message=\"\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u2014 {{ settings.options.maxValue }}\"\r\n        [value]=\"validateValue\"\r\n        [maxValue]=\"settings.options.maxValue\"\r\n      ></mrx-hint-error-message>\r\n    }\r\n  </div>\r\n}\r\n" }]
+            args: [{ selector: 'app-input-number', changeDetection: ChangeDetectionStrategy.OnPush, template: "@if (settings) {\r\n  <div class=\"input-number-content\">\r\n    @if (settings.options.label) {\r\n      <mrx-label\r\n        [required]=\"settings.options.required\"\r\n        [tooltip]=\"settings.options.tooltip || ''\"\r\n      >\r\n        {{ settings.options.label }}\r\n      </mrx-label>\r\n    }\r\n\r\n    <mrx-input-number\r\n      [(ngModel)]=\"model.value\"\r\n      [fields]=\"autosaveFields\"\r\n      [readonly]=\"isReadonly\"\r\n      [allowNegative]=\"true\"\r\n      [numberType]=\"isReadonly || settings.options.decimals ? 'float' : 'int'\"\r\n      [decimalSeparator]=\"settings.options.decimalSeparator\"\r\n      [decimals]=\"isReadonly ? (settings.options.decimals || 2) : settings.options.decimals\"\r\n      [placeholder]=\"settings.options.placeholder\"\r\n      [disabled]=\"isInputDisabled\"\r\n      [invalid]=\"getInvalid\"\r\n      [invalidMessage]=\"getInvalidMessage\"\r\n      (modelChange)=\"dispatchModify($event)\"\r\n      (change)=\"onChangeInput()\"\r\n    ></mrx-input-number>\r\n\r\n    @if (settings.options.minValue) {\r\n      <mrx-hint-error-message\r\n        message=\"\u041C\u0438\u043D\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u2014 {{ settings.options.minValue }}\"\r\n        [value]=\"validateValue\"\r\n        [minValue]=\"settings.options.minValue\"\r\n      ></mrx-hint-error-message>\r\n    }\r\n    @if (settings.options.maxValue) {\r\n      <mrx-hint-error-message\r\n        message=\"\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u2014 {{ settings.options.maxValue }}\"\r\n        [value]=\"validateValue\"\r\n        [maxValue]=\"settings.options.maxValue\"\r\n      ></mrx-hint-error-message>\r\n    }\r\n  </div>\r\n}\r\n" }]
         }] });
 
 class InputSelectComponent extends BaseFieldComponent {
@@ -1994,11 +2175,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
             }] } });
 
 class InputTableModalComponent extends ModalServiceComponent {
-    constructor(dialogRef, store, cdr, data) {
+    constructor(dialogRef, store, formulaCalculateService, data) {
         super();
         this.dialogRef = dialogRef;
         this.store = store;
-        this.cdr = cdr;
+        this.formulaCalculateService = formulaCalculateService;
         this.emptyRow = true;
         this.title = data.title;
         this.okText = data.okText;
@@ -2016,6 +2197,7 @@ class InputTableModalComponent extends ModalServiceComponent {
         else {
             this._transformValues(valueModel);
         }
+        this._recalculateFormulaFields();
         this.emptyRow = this.rowModel.data.every(x => this.isEmpty(x.value, x.valueType));
     }
     ok() {
@@ -2036,14 +2218,52 @@ class InputTableModalComponent extends ModalServiceComponent {
         this.dialogRef.close(this.result);
     }
     _transformValues(value) {
-        console.log('Update field:', value.sysName, 'with value:', value.value);
         const cloneRowModel = structuredClone(this.rowModel);
-        const findValue = cloneRowModel.data.find(c => c.sysName === value.sysName);
+        const findValue = cloneRowModel.data.find((c) => c.sysName === value.sysName);
         if (findValue) {
             findValue.value = value.value;
         }
         this.rowModel = cloneRowModel;
-        this.cdr.detectChanges(); // Явно уведомляем об изменениях
+    }
+    _recalculateFormulaFields() {
+        const formulaComponents = this._getFormulaNumberComponents(this.settings.components);
+        if (!formulaComponents.length) {
+            return;
+        }
+        const cloneRowModel = structuredClone(this.rowModel);
+        for (let i = 0; i < formulaComponents.length; i++) {
+            let hasUpdates = false;
+            for (const component of formulaComponents) {
+                const formula = component.options?.formula?.trim();
+                if (!formula) {
+                    continue;
+                }
+                const result = this.formulaCalculateService.calculateMathExpression(formula, cloneRowModel.data);
+                const targetValue = cloneRowModel.data.find(x => x.sysName === component.sysName);
+                if (!targetValue || targetValue.value === result) {
+                    continue;
+                }
+                targetValue.value = result;
+                hasUpdates = true;
+            }
+            if (!hasUpdates) {
+                break;
+            }
+        }
+        this.rowModel = cloneRowModel;
+    }
+    _getFormulaNumberComponents(components) {
+        const result = [];
+        for (const component of components) {
+            if (component.type === ComponentType.InputNumber &&
+                component.options?.inputState === InputState.Formula) {
+                result.push(component);
+            }
+            if (component.components?.length) {
+                result.push(...this._getFormulaNumberComponents(component.components));
+            }
+        }
+        return result;
     }
     _isValid() {
         var hasError = false;
@@ -2076,9 +2296,10 @@ class InputTableModalComponent extends ModalServiceComponent {
             return value.length === 0;
         return false;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: InputTableModalComponent, deps: [{ token: i1$2.ModalRef }, { token: i2.Store }, { token: i0.ChangeDetectorRef }, { token: MODAL_DATA }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: InputTableModalComponent, deps: [{ token: i1$2.ModalRef }, { token: i2.Store }, { token: FormulaCalculateService }, { token: MODAL_DATA }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.3.12", type: InputTableModalComponent, isStandalone: true, selector: "app-input-table-modal", providers: [
             provideNgxMask(),
+            FormulaCalculateService,
             ReferenceService // для компонента список
         ], usesInheritance: true, ngImport: i0, template: "<mrx-modal\r\n  [title]=\"title\"\r\n  size=\"large\"\r\n  (close)=\"close()\"\r\n  (ok)=\"ok()\"\r\n>\r\n  <app-form-dispenser-modal\r\n    [sectionSettings]=\"settings\"\r\n    [values]=\"rowModel.data\"\r\n    [valueMode]=\"'manual'\"\r\n    (changed)=\"componentValueChanged($event)\"\r\n  ></app-form-dispenser-modal>\r\n\r\n  <ng-template #footerContent>\r\n    <mrx-button\r\n      [customClasses]=\"'mr-3'\"\r\n      [type]=\"'secondary'\"\r\n      [size]=\"'medium'\"\r\n      (click)=\"close()\"\r\n    >\u041E\u0442\u043C\u0435\u043D\u0430\r\n    </mrx-button>\r\n    <mrx-button\r\n      [type]=\"'primary'\"\r\n      [size]=\"'medium'\"\r\n      [disabled]=\"emptyRow\"\r\n      (click)=\"ok()\"\r\n    >{{ okText }}\r\n    </mrx-button>\r\n  </ng-template>\r\n</mrx-modal>\r\n", styles: [""], dependencies: [{ kind: "ngmodule", type: ModalModule }, { kind: "component", type: i1$2.ModalComponent, selector: "mrx-modal", inputs: ["title", "message", "alert", "okText", "closeText", "size", "color", "customClasses", "expandable", "isEmbed", "isClose", "isBack", "backText", "enableFooter", "alignButtons", "isLoading", "iconPosition"], outputs: ["ok", "close", "back", "expand"] }, { kind: "ngmodule", type: ButtonModule }, { kind: "component", type: i1$2.ButtonComponent, selector: "mrx-button", inputs: ["size", "type", "color", "iconPosition", "active", "disabled", "isLoading", "iconOnly", "customClasses", "label", "icon", "iconClass", "buttonType", "href", "target", "routerLink", "queryParams"], outputs: ["mrxClick"] }, { kind: "component", type: FormDispenserModal, selector: "app-form-dispenser-modal", inputs: ["sectionSettings", "values", "valueMode"], outputs: ["changed"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
@@ -2090,9 +2311,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
                         FormDispenserModal,
                     ], providers: [
                         provideNgxMask(),
+                        FormulaCalculateService,
                         ReferenceService // для компонента список
                     ], template: "<mrx-modal\r\n  [title]=\"title\"\r\n  size=\"large\"\r\n  (close)=\"close()\"\r\n  (ok)=\"ok()\"\r\n>\r\n  <app-form-dispenser-modal\r\n    [sectionSettings]=\"settings\"\r\n    [values]=\"rowModel.data\"\r\n    [valueMode]=\"'manual'\"\r\n    (changed)=\"componentValueChanged($event)\"\r\n  ></app-form-dispenser-modal>\r\n\r\n  <ng-template #footerContent>\r\n    <mrx-button\r\n      [customClasses]=\"'mr-3'\"\r\n      [type]=\"'secondary'\"\r\n      [size]=\"'medium'\"\r\n      (click)=\"close()\"\r\n    >\u041E\u0442\u043C\u0435\u043D\u0430\r\n    </mrx-button>\r\n    <mrx-button\r\n      [type]=\"'primary'\"\r\n      [size]=\"'medium'\"\r\n      [disabled]=\"emptyRow\"\r\n      (click)=\"ok()\"\r\n    >{{ okText }}\r\n    </mrx-button>\r\n  </ng-template>\r\n</mrx-modal>\r\n" }]
-        }], ctorParameters: () => [{ type: i1$2.ModalRef }, { type: i2.Store }, { type: i0.ChangeDetectorRef }, { type: undefined, decorators: [{
+        }], ctorParameters: () => [{ type: i1$2.ModalRef }, { type: i2.Store }, { type: FormulaCalculateService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [MODAL_DATA]
                 }] }] });
@@ -2193,7 +2415,7 @@ class InputTableComponent {
         });
     }
     deleteRow(event) {
-        const findRow = structuredClone(this.model.data.find(item => item.id === event.row.data.id));
+        const findRow = this.model.data.find(item => item.id === event.row.data.id);
         if (findRow) {
             this.model.data = this.model.data.filter(item => item.id !== event.row.data.id);
             this._initDataSource(this.model.data);
@@ -2241,8 +2463,6 @@ class InputTableComponent {
         switch (component.type) {
             case ComponentType.InputDate:
                 return 'date';
-            case ComponentType.InputSwitch:
-                return 'boolean';
             default:
                 return 'string';
         }
@@ -2299,7 +2519,6 @@ class InputTableComponent {
         this._detector.detectChanges();
     }
     _transformColumn(component) {
-        const dataType = this.getDataType(component);
         const column = {
             caption: component.options.label || '',
             columns: component.components.map(c => this._transformColumn(structuredClone(c))),
@@ -2308,21 +2527,6 @@ class InputTableComponent {
             format: this.getFormat(component),
             minWidth: 160
         };
-        if (dataType === 'boolean') {
-            column.calculateCellValue = (rowData) => {
-                const value = rowData[component.sysName];
-                // Если true — Да, если false, "" или null — Нет
-                return !!value;
-            };
-            column.lookup = {
-                dataSource: [
-                    { value: true, displayValue: 'Да' },
-                    { value: false, displayValue: 'Нет' }
-                ],
-                valueExpr: 'value',
-                displayExpr: 'displayValue'
-            };
-        }
         if (this.settings.options.groups.length) {
             const findIdx = this.settings.options.groups.findIndex(x => x === component.sysName);
             if (findIdx !== -1) {