@myrtex-org/form 1.1.38 → 1.1.39

package/fesm2022/myrtex-org-form.mjs

@@ -22,7 +22,6 @@ import * as i2$2 from '@angular/forms';
 import { FormsModule } from '@angular/forms';
 import { provideNgxMask } from 'ngx-mask';
 import { v4 } from 'uuid';
-import CustomStore from 'devextreme/data/custom_store';
 import * as i2$3 from 'devextreme-angular';
 import { DxDataGridModule } from 'devextreme-angular';
 import * as i3 from 'devextreme-angular/ui/nested';
@@ -1452,7 +1451,6 @@ class BaseFieldComponent {
     _initModel() {
         if (this.valueMode === 'manual') {
             this.model = cloneDeep(getValueModel(this.settings, this.manualValues)) || defaultValueModel(this.settings);
-            this._customInit();
         }
         else {
             this.model = defaultValueModel(this.settings);
@@ -1688,7 +1686,7 @@ class InputDateComponent extends BaseFieldComponent {
         this._isInit = false;
         this._isUpdatingInternal = false;
         this._format = '';
-        this.dateModel = null;
+        this.dateModel = '';
         this.modelCounter = 0;
     }
     get getInvalid() {
@@ -1817,10 +1815,6 @@ class InputDateComponent extends BaseFieldComponent {
     }
     _customInit() {
         if (this.settings.options.range) {
-            console.log('Модели в _customInit:', {
-                start: this.modelStart?.value,
-                end: this.modelEnd?.value
-            });
             if (!this.modelStart) {
                 this.modelStart = defaultValueModel(this.settings);
             }
@@ -1833,13 +1827,7 @@ class InputDateComponent extends BaseFieldComponent {
         }
         if (this.settings.options.range) {
             if (this.modelStart?.value && this.modelEnd?.value) {
-                // ПРЕОБРАЗУЕМ В DATE:
-                const d1 = new Date(this.modelStart.value);
-                const d2 = new Date(this.modelEnd.value);
-                this.dateModel = [
-                    isNaN(d1.getTime()) ? null : d1,
-                    isNaN(d2.getTime()) ? null : d2
-                ];
+                this.dateModel = [this.modelStart.value, this.modelEnd.value];
                 this.modelCounter = this._getDaysDifference(this.modelStart.value, this.modelEnd.value);
             }
             else if (!this.modelStart?.value && !this.modelEnd?.value) {
@@ -1851,41 +1839,9 @@ class InputDateComponent extends BaseFieldComponent {
         else {
             this.dateModel = this.model.value;
         }
-        console.log('Финальный DateModel для календаря:', this.dateModel);
         this._isInit = true;
         this._detector.markForCheck();
     }
-    _initModel() {
-        console.log('Доступные системные имена в строке:', this.manualValues.map(x => x.sysName));
-        console.log('Системное имя текущего компонента:', this.settings.sysName);
-        // 1. Стандартная инициализация запишет значение в this.model
-        super._initModel();
-        if (this.valueMode === 'manual' && this.settings.options.range) {
-            // Берем значение из основной модели, которую нашел super._initModel()
-            const rawValue = this.model?.value;
-            let startVal = null;
-            let endVal = null;
-            // Проверяем, в каком виде лежат данные (массив или строка через запятую)
-            if (Array.isArray(rawValue)) {
-                [startVal, endVal] = rawValue;
-            }
-            else if (typeof rawValue === 'string' && rawValue.includes(',')) {
-                [startVal, endVal] = rawValue.split(',');
-            }
-            else if (typeof rawValue === 'string' && rawValue.length > 0) {
-                // На случай если там одна дата, а мы ждем две
-                startVal = rawValue;
-            }
-            // Инициализируем модели для Start и End на базе основной модели
-            this.modelStart = { ...structuredClone(this.model), value: startVal };
-            this.modelEnd = { ...structuredClone(this.model), value: endVal };
-            // Принудительно устанавливаем суффиксы, если ваша логика сохранения их все же ждет
-            // Если нет - можно оставить как есть (this.settings.sysName)
-            this.modelStart.sysName = `${this.settings.sysName}_start`;
-            this.modelEnd.sysName = `${this.settings.sysName}_end`;
-            this._customInit();
-        }
-    }
     _getDaysDifference(startDate, endDate) {
         const start = new Date(startDate);
         const end = new Date(endDate);
@@ -2382,8 +2338,6 @@ const getRowModel = (model) => {
 class InputTableComponent {
     constructor() {
         this.type = ComponentType.InputTable;
-        this._referenceService = inject(ReferenceService);
-        this._lookupsCache = new Map();
         this._store = inject(Store);
         this._detector = inject(ChangeDetectorRef);
         this._modalService = inject(ModalService);
@@ -2473,7 +2427,6 @@ class InputTableComponent {
     }
     editRow(event) {
         const findRow = this.model.data.find(item => item.id === event.row.data.id);
-        console.log(this.settings, 'this.settings');
         if (findRow) {
             this._modalService.open(InputTableModalComponent, {
                 title: 'Редактирование строки',
@@ -2592,29 +2545,6 @@ class InputTableComponent {
                 displayExpr: 'displayValue'
             };
         }
-        if (component.type === ComponentType.InputSelect) {
-            const selectModel = component;
-            if (selectModel.options.manual) {
-                column.lookup = {
-                    dataSource: selectModel.options.items,
-                    valueExpr: 'value',
-                    displayExpr: 'text'
-                };
-            }
-            else if (selectModel.options.directory?.[0]) {
-                const directoryName = selectModel.options.directory[0];
-                column.lookup = {
-                    // Оборачиваем в CustomStore для соответствия типам DevExtreme
-                    dataSource: new CustomStore({
-                        key: 'value',
-                        load: () => this.getLookupData(directoryName),
-                        byKey: (key) => this.getLookupData(directoryName).then(items => items.find(i => i.value === key))
-                    }),
-                    valueExpr: 'value',
-                    displayExpr: 'text'
-                };
-            }
-        }
         if (this.settings.options.groups.length) {
             const findIdx = this.settings.options.groups.findIndex(x => x === component.sysName);
             if (findIdx !== -1) {
@@ -2623,27 +2553,6 @@ class InputTableComponent {
         }
         return column;
     }
-    getLookupData(directoryName) {
-        // Проверяем кэш
-        if (this._lookupsCache.has(directoryName)) {
-            return Promise.resolve(this._lookupsCache.get(directoryName));
-        }
-        // Запрашиваем данные (используем тот же objectId, что и в модалке)
-        // Убедитесь, что objectId доступен в этом компоненте
-        return new Promise((resolve) => {
-            this._referenceService.getReferences(directoryName, this.objectId).subscribe({
-                next: (result) => {
-                    const items = (result?.rows || []).map((row) => ({
-                        value: row.a,
-                        text: row.b
-                    }));
-                    this._lookupsCache.set(directoryName, items);
-                    resolve(items);
-                },
-                error: () => resolve([])
-            });
-        });
-    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: InputTableComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "17.3.12", type: InputTableComponent, selector: "app-input-table", inputs: { values: "values", data: "data" }, outputs: { changed: "changed" }, viewQueries: [{ propertyName: "dataGrid", first: true, predicate: ["dataGrid"], descendants: true }, { propertyName: "editTemplate", first: true, predicate: ["editTemplate"], descendants: true }], ngImport: i0, template: "@if (settings) {\r\n  <div class=\"input-table-content w-100\">\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    <dx-data-grid\r\n      #dataGrid\r\n      [dataSource]=\"dataSource\"\r\n      [columns]=\"columns\"\r\n      [disabled]=\"disabled\"\r\n      noDataText=\"\u041D\u0435\u0442 \u0434\u0430\u043D\u043D\u044B\u0445\"\r\n      style=\"width: 100%\"\r\n      [wordWrapEnabled]=\"true\"\r\n      [columnAutoWidth]=\"true\"\r\n      [class.noData]=\"isRedNoData\"\r\n    >\r\n      <dxo-toolbar>\r\n        <dxi-item location=\"after\">\r\n          <div *dxTemplate class=\"add-row\">\r\n            <mrx-button\r\n              [size]=\"'medium'\"\r\n              [type]=\"'secondary'\"\r\n              [customClasses]=\"'mb-3'\"\r\n              (mrxClick)=\"createRow()\"\r\n            >{{settings.options.addBtnTitle}}\r\n            </mrx-button>\r\n          </div>\r\n        </dxi-item>\r\n      </dxo-toolbar>\r\n\r\n      <div *dxTemplate=\"let buttonData of 'editButtonTemplate'\">\r\n        <span class=\"mrx-icon icon-edit icon-font-16 cursor-pointer\" (click)=\"editRow(buttonData)\"></span>\r\n      </div>\r\n\r\n      <div *dxTemplate=\"let buttonData of 'deleteButtonTemplate'\">\r\n        <span class=\"mrx-icon icon-delete icon-font-16 cursor-pointer\" (click)=\"deleteRow(buttonData)\"></span>\r\n      </div>\r\n\r\n      @if (dataSource.length) {\r\n        <dxo-summary>\r\n          @for (component of settings.components; track component.id; let first = $first) {\r\n            @if (!first) {\r\n              @if (showTotal(component)) {\r\n                <dxi-group-item\r\n                  [column]=\"component.sysName\"\r\n                  summaryType=\"sum\"\r\n                  displayFormat=\"\u0418\u0442\u043E\u0433\u043E: {0}\"\r\n                  [showInGroupFooter]=\"true\"\r\n                  [alignByColumn]=\"true\">\r\n                </dxi-group-item>\r\n\r\n                <dxi-total-item \r\n                  [column]=\"component.sysName\" \r\n                  displayFormat=\"{0}\"\r\n                  summaryType=\"sum\"\r\n                ></dxi-total-item>\r\n              }\r\n\r\n              @for (component of component.components; track component.id) {\r\n                @if (showTotal(component)) {\r\n                  <dxi-group-item\r\n                    [column]=\"component.sysName\"\r\n                    summaryType=\"sum\"\r\n                    displayFormat=\"\u0418\u0442\u043E\u0433\u043E: {0}\"\r\n                    [showInGroupFooter]=\"true\"\r\n                    [alignByColumn]=\"true\">\r\n                  </dxi-group-item>\r\n                }\r\n\r\n                @for (component of component.components; track component.id) {\r\n                  @if (showTotal(component)) {\r\n                    <dxi-group-item\r\n                      [column]=\"component.sysName\"\r\n                      summaryType=\"sum\"\r\n                      displayFormat=\"\u0418\u0442\u043E\u0433\u043E: {0}\"\r\n                      [showInGroupFooter]=\"true\"\r\n                      [alignByColumn]=\"true\">\r\n                    </dxi-group-item>\r\n                  }\r\n                }\r\n              }\r\n            } @else {\r\n              @if (hasAnyTotal) { \r\n                <dxi-total-item\r\n                    [column]=\"component.sysName\"\r\n                    [cssClass]=\"'text-bold'\"\r\n                    [displayFormat]=\"showTotal(component) ? '{0}' : '\u0418\u0422\u041E\u0413\u041E'\"\r\n                    [summaryType]=\"showTotal(component) ? 'sum' : undefined\"\r\n                ></dxi-total-item>\r\n              }\r\n            }\r\n          }\r\n        </dxo-summary>\r\n      }\r\n    </dx-data-grid>\r\n\r\n    @if(!!settings.options.maxRows) {\r\n      <mrx-hint-error-message\r\n        message=\"\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0441\u0442\u0440\u043E\u043A: {{ settings.options.maxRows }}\"\r\n        [maxValue]=\"settings.options.maxRows\"\r\n        [value]=\"rowsCount\"\r\n      ></mrx-hint-error-message>\r\n    }\r\n\r\n    <ng-template #editTemplate let-cellInfo=\"cellInfo\">\r\n      <div class=\"d-flex align-items-center justify-content-center\" style=\"gap: 4px\">\r\n        <span class=\"mrx-icon icon-edit icon-font-16 cursor-pointer\" (click)=\"editRow(cellInfo)\"></span>\r\n        <span class=\"mrx-icon icon-delete icon-font-16 cursor-pointer\" (click)=\"deleteRow(cellInfo)\"></span>\r\n      </div>\r\n    </ng-template>\r\n  </div>\r\n}\r\n\r\n\r\n", styles: [":host::ng-deep .input-table-content .noData .dx-datagrid-nodata{color:var(--system-text-negative, #8E2100)}:host::ng-deep .input-table-content .dx-datagrid{padding:0}:host::ng-deep .input-table-content .dx-datagrid-header-panel{display:flex;align-items:center;min-height:40px;padding:0}:host::ng-deep .input-table-content .dx-datagrid-rowsview{border-bottom:none}:host::ng-deep .input-table-content .dx-datagrid-rowsview.dx-empty{border-bottom:1px solid #ddd;height:48px}:host::ng-deep .input-table-content .dx-datagrid .dx-datagrid-total-footer{border-top:none;border-left:none;border-right:none}:host::ng-deep .input-table-content .dx-datagrid .dx-datagrid-total-footer .dx-datagrid-content{padding:0}:host::ng-deep .input-table-content .dx-datagrid .dx-datagrid-total-footer .dx-datagrid-content table,:host::ng-deep .input-table-content .dx-datagrid .dx-datagrid-total-footer .dx-datagrid-content th,:host::ng-deep .input-table-content .dx-datagrid .dx-datagrid-total-footer .dx-datagrid-content td{border:1px solid #ddd;border-top:none;border-collapse:collapse}:host::ng-deep .input-table-content .dx-datagrid .dx-datagrid-total-footer .dx-datagrid-content table{border-top:none}:host::ng-deep .input-table-content .dx-datagrid .dx-datagrid-total-footer .dx-datagrid-content .dx-datagrid-summary-item{font-weight:400}:host::ng-deep .input-table-content .dx-datagrid .dx-datagrid-headers{position:relative;top:0;border-top:1px solid var(--neutral-bg-divider)}:host::ng-deep .input-table-content .dx-datagrid .dx-datagrid-headers td.dx-command-expand.dx-datagrid-group-space{border-right:none!important;border-right-color:transparent}:host::ng-deep .input-table-content .dx-datagrid .dx-datagrid-total-footer td.dx-command-expand.dx-datagrid-group-space{border-right-color:transparent}:host::ng-deep .input-table-content .dx-datagrid .dx-row>td,:host::ng-deep .input-table-content .dx-datagrid .page-wrapper .dx-treelist-container .dx-row>td{color:var(--neutral-text-secondary, #4D5157);font-family:var(--body-md-bold-font-family, \"PT Sans\");font-size:var(--body-md-bold-font-size, 14px);font-weight:var(--body-md-bold-font-weight, 700);line-height:var(--body-md-bold-line-height, 16px)}:host::ng-deep .input-table-content .dx-datagrid .dx-row.dx-data-row.dx-column-lines>td{color:var(--neutral-text-tertiary, #71767E);font-family:var(--body-md-font-family, \"PT Sans\");font-size:var(--body-md-font-size, 14px);font-weight:var(--body-md-font-weight, 400);line-height:var(--body-md-line-height, 20px)}:host::ng-deep .custom-cell-controls .dx-template-wrapper{display:inline-flex}\n"], 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: "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: i2$3.DxDataGridComponent, selector: "dx-data-grid", inputs: ["accessKey", "activeStateEnabled", "allowColumnReordering", "allowColumnResizing", "autoNavigateToFocusedRow", "cacheEnabled", "cellHintEnabled", "columnAutoWidth", "columnChooser", "columnFixing", "columnHidingEnabled", "columnMinWidth", "columnResizingMode", "columns", "columnWidth", "customizeColumns", "dataRowTemplate", "dataSource", "dateSerializationFormat", "disabled", "editing", "elementAttr", "errorRowEnabled", "export", "filterBuilder", "filterBuilderPopup", "filterPanel", "filterRow", "filterSyncEnabled", "filterValue", "focusedColumnIndex", "focusedRowEnabled", "focusedRowIndex", "focusedRowKey", "grouping", "groupPanel", "headerFilter", "height", "highlightChanges", "hint", "hoverStateEnabled", "keyboardNavigation", "keyExpr", "loadPanel", "masterDetail", "noDataText", "pager", "paging", "remoteOperations", "renderAsync", "repaintChangesOnly", "rowAlternationEnabled", "rowDragging", "rowTemplate", "rtlEnabled", "scrolling", "searchPanel", "selectedRowKeys", "selection", "selectionFilter", "showBorders", "showColumnHeaders", "showColumnLines", "showRowLines", "sortByGroupSummaryInfo", "sorting", "stateStoring", "summary", "syncLookupFilterValues", "tabIndex", "toolbar", "twoWayBindingEnabled", "visible", "width", "wordWrapEnabled"], outputs: ["onAdaptiveDetailRowPreparing", "onCellClick", "onCellDblClick", "onCellHoverChanged", "onCellPrepared", "onContentReady", "onContextMenuPreparing", "onDataErrorOccurred", "onDisposing", "onEditCanceled", "onEditCanceling", "onEditingStart", "onEditorPrepared", "onEditorPreparing", "onExporting", "onFocusedCellChanged", "onFocusedCellChanging", "onFocusedRowChanged", "onFocusedRowChanging", "onInitialized", "onInitNewRow", "onKeyDown", "onOptionChanged", "onRowClick", "onRowCollapsed", "onRowCollapsing", "onRowDblClick", "onRowExpanded", "onRowExpanding", "onRowInserted", "onRowInserting", "onRowPrepared", "onRowRemoved", "onRowRemoving", "onRowUpdated", "onRowUpdating", "onRowValidating", "onSaved", "onSaving", "onSelectionChanged", "onToolbarPreparing", "accessKeyChange", "activeStateEnabledChange", "allowColumnReorderingChange", "allowColumnResizingChange", "autoNavigateToFocusedRowChange", "cacheEnabledChange", "cellHintEnabledChange", "columnAutoWidthChange", "columnChooserChange", "columnFixingChange", "columnHidingEnabledChange", "columnMinWidthChange", "columnResizingModeChange", "columnsChange", "columnWidthChange", "customizeColumnsChange", "dataRowTemplateChange", "dataSourceChange", "dateSerializationFormatChange", "disabledChange", "editingChange", "elementAttrChange", "errorRowEnabledChange", "exportChange", "filterBuilderChange", "filterBuilderPopupChange", "filterPanelChange", "filterRowChange", "filterSyncEnabledChange", "filterValueChange", "focusedColumnIndexChange", "focusedRowEnabledChange", "focusedRowIndexChange", "focusedRowKeyChange", "groupingChange", "groupPanelChange", "headerFilterChange", "heightChange", "highlightChangesChange", "hintChange", "hoverStateEnabledChange", "keyboardNavigationChange", "keyExprChange", "loadPanelChange", "masterDetailChange", "noDataTextChange", "pagerChange", "pagingChange", "remoteOperationsChange", "renderAsyncChange", "repaintChangesOnlyChange", "rowAlternationEnabledChange", "rowDraggingChange", "rowTemplateChange", "rtlEnabledChange", "scrollingChange", "searchPanelChange", "selectedRowKeysChange", "selectionChange", "selectionFilterChange", "showBordersChange", "showColumnHeadersChange", "showColumnLinesChange", "showRowLinesChange", "sortByGroupSummaryInfoChange", "sortingChange", "stateStoringChange", "summaryChange", "syncLookupFilterValuesChange", "tabIndexChange", "toolbarChange", "twoWayBindingEnabledChange", "visibleChange", "widthChange", "wordWrapEnabledChange"] }, { kind: "component", type: i3.DxiItemComponent, selector: "dxi-item", inputs: ["disabled", "html", "icon", "template", "text", "title", "titleTemplate", "visible", "onClick", "stylingMode", "type", "baseSize", "box", "ratio", "shrink", "elementAttr", "hint", "beginGroup", "closeMenuOnClick", "items", "selectable", "selected", "colSpan", "cssClass", "dataField", "editorOptions", "editorType", "helpText", "isRequired", "itemType", "label", "name", "validationRules", "visibleIndex", "alignItemLabels", "caption", "colCount", "colCountByScreen", "tabPanelOptions", "tabs", "badge", "tabTemplate", "buttonOptions", "horizontalAlignment", "verticalAlignment", "locateInMenu", "location", "menuItemTemplate", "options", "showText", "widget", "height", "width", "imageAlt", "imageSrc", "acceptedValues", "formatName", "formatValues", "key", "showChevron", "linkAttr", "url", "heightRatio", "widthRatio", "expanded", "hasItems", "id", "parentId"] }, { kind: "component", type: i3.DxoSummaryComponent, selector: "dxo-summary", inputs: ["calculateCustomSummary", "groupItems", "recalculateWhileEditing", "skipEmptyValues", "texts", "totalItems"] }, { kind: "component", type: i3.DxiGroupItemComponent, selector: "dxi-group-item", inputs: ["alignByColumn", "column", "customizeText", "displayFormat", "name", "showInColumn", "showInGroupFooter", "skipEmptyValues", "summaryType", "valueFormat"] }, { kind: "component", type: i3.DxiTotalItemComponent, selector: "dxi-total-item", inputs: ["alignment", "column", "cssClass", "customizeText", "displayFormat", "name", "showInColumn", "skipEmptyValues", "summaryType", "valueFormat"] }, { kind: "component", type: i3.DxoToolbarComponent, selector: "dxo-toolbar", inputs: ["disabled", "items", "visible", "fileSelectionItems", "container", "multiline"] }, { kind: "directive", type: i4.DxTemplateDirective, selector: "[dxTemplate]", inputs: ["dxTemplateOf"] }, { kind: "component", type: i1$2.HintErrorMessageComponent, selector: "mrx-hint-error-message", inputs: ["message", "value", "maxValue", "minValue", "minLength", "maxLength", "checkInvalid"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }