ru.coon 3.0.46 → 3.0.48

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+# Version 3.0.48, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/227c685c3c849b36bec245c8f91c338cb6ea40f7)
+* ## Fixes
+* <span style='color:red'>fix HT-14284 - remove title setting</span> ([29a26d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/29a26d463a68d1755820e08698100eea7fcfb59f))
+
+* HT-13994: Исправление работы плагина, добавление кнопки в тулбар для сброса состояния ([feaee6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/feaee672face5d48cdb74326966df8e1d1f6ede5))
+* update: CHANGELOG.md ([c2b6ce], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c2b6ced6aafc5f28fec8ae207689d3eb5899c449))
+
+# Version 3.0.47, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3dd226d0cac935732115784118e6a1acdde75bae)
+* HT-12816 fix: Исправление ошибки получения выбранных строк в ReportTagLookup ([4b89a3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4b89a35f198780bb93e4e7ce341d156c379ecb94))
+* update: CHANGELOG.md ([f6f1e6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f6f1e6e36b78a7a728d61640c0b7b7f21810c6fb))
+
 # Version 3.0.46, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6feb5506104ee6d9dcca9e829363f387ff566dcf)
 * ## Fixes
 * <span style='color:red'> ThreeStateCheckColumn, getGrid</span> ([0b4fab], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0b4fabcd5365e978b332f1b2685a39c805b1b267))

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "3.0.46",
+  "version": "3.0.48",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"

package/src/app/Application.js

@@ -11,15 +11,6 @@ Ext.define('Coon.app.Application', {
         this.appRouter = Coon.app.Router;
     },
 
-    setDefaultWindowTitle() {
-        Coon.SystemProperties.fetch('browserDefaultTitle').then((title) => {
-            if (!title) {
-                return;
-            }
-            window.document.title = title;
-        }).catch((error) => console.error('setDefaultWindowTitle', error));
-    },
-
     onLogout: function() {
         Ext.Msg.show({
             title: 'Сообщение системы',
@@ -104,9 +95,6 @@ Ext.define('Coon.app.Application', {
             this.setUserData();
         }
         const isAuthValid = authenticated === true && !requireTwoFactorAuthentication;
-        if (isAuthValid) {
-            this.setDefaultWindowTitle();
-        }
         let view = isAuthValid ? 'mainview' : 'loginview';
 
         if (window.location.href.indexOf('customForm') > -1) {

package/src/report/component/ReportPanel.js

@@ -181,6 +181,9 @@ Ext.define('Coon.report.component.ReportPanel', {
                         currentGroupLevel = currentGroupLevel[currentGroupLevel.length - 1].columns;
                     });
                     columnConfig.cls = 'x-column-header-group-item';
+
+                    columnConfig.draggable = false;
+
                     currentGroupLevel.push(columnConfig);
                     pushed = true;
                 }
@@ -442,6 +445,9 @@ Ext.define('Coon.report.component.ReportPanel', {
                 return;
             }
             setTimeout(function() {
+                if (!this.grid || this.grid.destroyed) {
+                    return;
+                }
                 if (this.grid.viewConfig) {
                     this.grid.scrollTo(0, 0);
                 }
@@ -983,6 +989,7 @@ Ext.define('Coon.report.component.ReportPanel', {
             url: this.url || '/ReportFormData/get',
             timeout: this.timeout || undefined,
             pageSize: this.pageSize || reportBean[ns.$rowCountPerPageValue],
+            sealedColumns: true,
             viewConfig: {
                 emptyText: 'Не найдено записей, удовлетворяющих условию.',
                 enableTextSelection: this.enableTextSelection,
@@ -1248,10 +1255,11 @@ Ext.define('Coon.report.component.ReportPanel', {
         return data;
     },
 
-    // getSelection: function(firstSelectedOnly) {
-    //     const selectedRecords = this.grid.getSelection();
-    //     return selectedRecords && selectedRecords.length > 0 && firstSelectedOnly ? selectedRecords[0] : selectedRecords;
-    // },
+    // todo: Требуется рефакторинг.
+    getSelection: function(firstSelectedOnly) {
+        const selectedRecords = this.grid.getSelection();
+        return selectedRecords && selectedRecords.length > 0 && firstSelectedOnly ? selectedRecords[0] : selectedRecords;
+    },
 
     countSelectedRecords() {
         const grid = this.grid;

package/src/report/component/ReportTagLookup.js

@@ -194,7 +194,7 @@ Ext.define('Coon.report.component.ReportTagLookup', {
                         iconCls: 'x-ccb-btn-custom-pencil',
                         handler: function(btn) {
                             const panel = btn.up('ReportPanel');
-                            panel.fireEvent('itemdblclick', panel, panel.getSelection());
+                            panel.fireEvent('itemdblclick', panel, panel.grid.getSelection());
                         },
                     }] : undefined,
                 }

package/src/report/plugin/grid/ReportColumnStatePlugin.js

@@ -7,11 +7,14 @@ Ext.define('Coon.report.plugin.grid.ReportColumnStatePlugin', {
 
     configurePanelWizard: 'ReportColumnStatePluginConfigPanel',
 
+    suspendStateSave: false,
+    stateEnableConfigs: undefined,
+    defaultReportState: undefined,
 
     init(component) {
         if (component instanceof Coon.report.component.ReportPanel) {
             this.report = component;
-            this.grid = component.grid;
+            this.report.grid = component.grid;
         } else {
             Coon.log.log('Incorrect definition of the parent component for the plugin');
             return;
@@ -19,104 +22,188 @@ Ext.define('Coon.report.plugin.grid.ReportColumnStatePlugin', {
 
         if (this.report.getEnableAutoSize) {
             Coon.log.log('To disable automatic column size, you need to set the enableAutoSize property of the report to "false"');
-        };
+        }
+
+        this.setStateEnableConfigs();
+
         this.checkEnableAutoSize();
+        this.defaultReportState = this.getCurrentReportState()[this.report.reportId];
         this.applySavedState();
 
         const events = ['columnmove', 'columnhide', 'columnshow', 'columnresize'];
         events.forEach(function(e) {
-            this.grid.on(e, this.columnInteractionHandler, this);
+            this.report.grid.on(e, this.columnInteractionHandler, this);
         }.bind(this));
+
+        this.registerApi();
     },
+
+    setStateEnableConfigs() {
+        this.stateEnableConfigs = {};
+        const columns = this.getAllColumns();
+
+        columns.forEach((column) => {
+            this.stateEnableConfigs[this.getColumnIndex(column)] = {
+                columnId: true,
+                position: Ext.isEmpty(column.columnGroup),
+                width: !!column.dataIndex,
+                hidden: true,
+            };
+        });
+    },
+
     checkEnableAutoSize() {
-        if (typeof this.grid.getEnableAutoSize === 'function' && this.grid.getEnableAutoSize() === true) {
+        if (typeof this.report.grid.getEnableAutoSize === 'function' && this.report.grid.getEnableAutoSize() === true) {
             const savedState = localStorage.getItem('reportsState');
-            let deserializedState; let currentReportState;
+            let deserializedState; let savedReportState;
             try {
                 deserializedState = JSON.parse(savedState);
-                currentReportState = deserializedState[this.report.reportId];
+                savedReportState = deserializedState[this.report.reportId];
             } catch (e) {
                 Coon.log.log('Incorrect JSON state');
                 return;
             }
-            if (currentReportState) {
-                this.grid.setEnableAutoSize(false);
+            if (savedReportState) {
+                this.report.grid.setEnableAutoSize(false);
             }
         }
     },
+
     columnInteractionHandler() {
+        if (!this.suspendStateSave) {
+            const stateObj = this.getCurrentReportState();
+            this.saveNewState(stateObj);
+        }
+    },
+
+    getCurrentReportState() {
         const currentState = [];
-        const columns = this.grid.getColumns();
-        columns.forEach((e) => {
-            const currentColumnState = {
-                columnId: e.dataIndex,
-                position: e.fullColumnIndex,
-                width: e.width,
-                hidden: e.getHidden(),
-            };
-            currentState.push(currentColumnState);
+        const gridColumnSet = new Set(this.report.grid.getColumns());
+
+        const columns = this.getColumns();
+        columns.forEach((col, index) => {
+            currentState.push(this.getCurrentColumnState(col, index));
+            gridColumnSet.delete(col);
         });
 
+        // Колонки, входящие в группу
+        if (gridColumnSet.size > 0) {
+            gridColumnSet.forEach((col) => {
+                currentState.push(this.getCurrentColumnState(col, undefined));
+            });
+        }
 
         const stateObj = {};
         stateObj[this.report.reportId] = currentState;
-        this.saveNewState(stateObj);
+        return stateObj;
+    },
+
+    getColumns() {
+        const columnHeader = this.report.grid.headerCt;
+        return columnHeader.getLayout().getLayoutItems();
+    },
+
+    /**
+     * Получение всех колонок.
+     * Решает проблему с группировкой колонок, т.к. ни один стандартный метод не возвращает все колонки сразу.
+     * @returns {*[]}
+     */
+    getAllColumns() {
+        const gridColumns = this.report.grid.getColumns();
+        const columnHeader = this.report.grid.headerCt;
+        const headerColumns = columnHeader.getLayout().getLayoutItems();
+
+        const allColumns = [...gridColumns, ...headerColumns];
+        return [...new Set(allColumns)];
+    },
+
+    getCurrentColumnState(col, position) {
+        const columnId = this.getColumnIndex(col);
+        return {
+            columnId,
+            position,
+            width: col.getWidth(),
+            hidden: col.getHidden(),
+        };
+    },
+
+    /**
+     * Получение индекса колонки. У группировочных колонок нет dataIndex, по этому возвращается text.
+     * @param column
+     * @returns {*}
+     */
+    getColumnIndex(column) {
+        return (column.dataIndex || column.text);
     },
 
     applySavedState() {
         if (this.getCmp().destroyed || !this.getCmp().rendered) {
             return;
         }
-        const savedState = localStorage.getItem('reportsState');
-        const columns = this.grid.getColumns();
-        const columnHeader = this.grid.headerCt;
+
+        const columns = this.getColumns();
 
         if (!Array.isArray(columns)) {
             return;
         }
 
+        const {savedReportState} = this.getSavedState();
+
+        if (savedReportState && Ext.isArray(savedReportState)) {
+            this.applyState(savedReportState);
+        }
+    },
+
+    applyState(state) {
+        const columnHeader = this.report.grid.headerCt;
+        const columns = this.getAllColumns();
+
+        state.forEach((colState) => {
+            const column = this.getColumnById(colState.columnId, columns);
+            if (column.isHidden()) {
+                return;
+            }
+            if (colState.hidden && column.isHideable() && !column.isHidden()) {
+                column.setVisible(false);
+            }
+
+            if (this.stateEnableConfigs[colState.columnId].width) {
+                column.setWidth(colState.width ? colState.width : 100);
+            }
+
+            if (this.stateEnableConfigs[colState.columnId].position) {
+                columnHeader.remove(column, {destroy: false});
+                columnHeader.insert(colState.position, column);
+            }
+        });
+    },
+
+    /**
+     * Получение колонки по ее dataIndex если обычная колонка, или по text если это группа.
+     * @param columnId
+     * @param columns
+     * @returns {*}
+     */
+    getColumnById(columnId, columns) {
+        let column = columns.find((col) => col.dataIndex === columnId);
+        if (!column) {
+            column = columns.find((col) => col.text === columnId);
+        }
+        return column;
+    },
+
+    getSavedState() {
+        const savedState = localStorage.getItem('reportsState');
+        let deserializedState; let savedReportState;
         if (savedState) {
-            let deserializedState; let currentReportState;
             try {
                 deserializedState = JSON.parse(savedState);
-                currentReportState = deserializedState[this.report.reportId];
+                savedReportState = deserializedState[this.report.reportId];
             } catch (e) {
                 Coon.log.log('Incorrect JSON state');
-                return;
-            }
-
-            if (Ext.isArray(currentReportState)) {
-                const stateMap = new Map();
-                currentReportState.forEach((e) => stateMap.set(e.columnId, e));
-                const fixedColumns = [];
-
-                columns.forEach((column) => {
-                    if (column.isHidden()) {
-                        return;
-                    }
-                    const state = stateMap.get(column.dataIndex);
-                    if (state) {
-                        if (!column.up().getMenu().child('#columnItem')) {
-                            return;
-                        }
-                        if (state.hidden && column.isHideable() && !column.isHidden()) {
-                            column.setVisible(false);
-                        }
-                        column.setWidth(state.width ? state.width : 100);
-                        columnHeader.moveBefore(column, columnHeader.getComponent(state.position));
-                    }
-                    if (column.fixedPosition >= 0) {
-                        fixedColumns.push(column);
-                    }
-                });
-
-                if (!Ext.isEmpty(fixedColumns)) {
-                    fixedColumns.forEach((column) => {
-                        columnHeader.moveBefore(column, columnHeader.getComponent(column.fixedPosition));
-                    });
-                }
             }
         }
+        return {savedReportState, deserializedState};
     },
 
     saveNewState(state) {
@@ -130,4 +217,28 @@ Ext.define('Coon.report.plugin.grid.ReportColumnStatePlugin', {
         localStorage.setItem('reportsState', newState);
         this.checkEnableAutoSize();
     },
+
+    registerApi() {
+        this.report.registerApi('resetReportColumnState', {
+            menuItemText: 'Сбросить настройки внешнего вида',
+            removeSavedStateHandler: this.removeSavedState,
+            resetStateEnable: this.resetStateEnable.bind(this),
+            scope: this,
+        });
+    },
+
+    removeSavedState() {
+        const {deserializedState} = this.getSavedState();
+        delete deserializedState[this.report.reportId];
+        localStorage.setItem('reportsState', JSON.stringify(deserializedState));
+
+        this.suspendStateSave = true;
+        this.applyState(this.defaultReportState);
+        this.suspendStateSave = false;
+    },
+
+    resetStateEnable() {
+        const {savedReportState} = this.getSavedState();
+        return savedReportState;
+    },
 });

package/src/report/toolbar/OptionsMenuButton.js

@@ -8,6 +8,7 @@ Ext.define('Coon.report.toolbar.OptionsMenuButton', {
         clearFilters: true,
         resetReport: true,
         advancedSearch: false,
+        resetReportColumnState: true,
     },
 
     iconCls: 'svg-icon-ellipsis',
@@ -34,6 +35,10 @@ Ext.define('Coon.report.toolbar.OptionsMenuButton', {
             {
                 itemId: 'advancedSearch',
                 handler: 'onAdvancedSearch',
+            },
+            {
+                itemId: 'resetReportColumnState',
+                hidden: true,
             }
         ],
     },
@@ -47,6 +52,7 @@ Ext.define('Coon.report.toolbar.OptionsMenuButton', {
         this.clearFiltersInit(menu);
         this.resetReportInit(menu);
         this.advancedSearchInit(menu);
+        this.resetColumnStateInit(menu);
     },
 
     clearFiltersInit(menu) {
@@ -78,6 +84,20 @@ Ext.define('Coon.report.toolbar.OptionsMenuButton', {
         }
     },
 
+    resetColumnStateInit(menu) {
+        const resetColumnStateMenuItem = menu.down('#resetReportColumnState');
+        const reportPanel = this.getReportPanel();
+        const stateApi = reportPanel.getApi('resetReportColumnState');
+        resetColumnStateMenuItem.setVisible(this.getResetReportColumnState() && stateApi);
+        if (stateApi) {
+            resetColumnStateMenuItem.handler = stateApi.removeSavedStateHandler.bind(stateApi.scope);
+            resetColumnStateMenuItem.setText(stateApi.menuItemText);
+        }
+        if (resetColumnStateMenuItem.isVisible()) {
+            resetColumnStateMenuItem.setDisabled(!stateApi.resetStateEnable());
+        }
+    },
+
     // Отключить фильтры в колонках
     onClearFilters() {
         if (Ext.isFunction(this.grid.clearFilters)) {

package/src/uielement/component/UiCustomController.js

@@ -13,8 +13,8 @@ Ext.define('Coon.uielement.component.UiCustomController', {
             Coon.log.debug(` [Error]UiCustomController.init - view not found or view.on is not a function`);
             return;
         }
-        this.setCustomPanelTitle();
         view.on('afterrender', function() {
+            this.setCustomPanelTitle();
             this.processSecurePoints(view);
         }, this);
     },
@@ -161,6 +161,7 @@ Ext.define('Coon.uielement.component.UiCustomController', {
         if (!typeof title === 'string') {
             return;
         }
+        this.getView().titleText = title;
         this.getView().fireEvent('titlechange', this.getView(), title);
         if (
             this.getView().tab &&

package/src/uielement/component/UiCustomPanel.js

@@ -57,17 +57,41 @@ Ext.define('Coon.uielement.component.UiCustomPanel', {
     copyLink: false,
 
     initComponent() {
-        let data = Object.assign(this.viewModel && this.viewModel.data || {}, {
+        let rowData = Object.assign(this.viewModel && this.viewModel.data || {}, {
             name: 'UiCustomPanel',
         });
         if (!this.inheritViewModel) {
-            data = Ext.applyIf(data, this.getViewModelData());
             this.viewModel = Ext.create('Ext.app.ViewModel');
+
+            rowData = Ext.applyIf(rowData, this.getViewModelData());
+            const data = this.convertRowData(rowData);
+
             this.viewModel.setData(data);
         }
         this.callParent();
     },
 
+    convertRowData(rowData) {
+        const data = {};
+
+        let objectCursor;
+        Object.entries(rowData).forEach(([key, value]) => {
+            if (key.includes('.')) {
+                const parts = key.split('.');
+                objectCursor = data;
+                for (const part of parts) {
+                    objectCursor[part] = objectCursor[part] || {};
+                    objectCursor = objectCursor[part];
+                }
+                objectCursor[parts[parts.length - 1]] = value;
+            } else {
+                data[key] = value;
+            }
+        });
+
+        return data;
+    },
+
     getViewModelData() {
         const data = {};
         const addDoInitSupportPlugin = this.plugins && this.plugins.find((plugin) => plugin.ptype === 'AddDoInitSupportPlugin');

package/src/version.js

@@ -1,4 +1,4 @@
 Ext.define('Coon.version', {
     singleton: true,
-    number: '3.0.46',
+    number: '3.0.48',
 });