ru.coon 3.0.42 → 3.0.44

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+# Version 3.0.44, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/756720c821a0d995e730a59515674c414c9c3a14)
+* HT-13021 feat: Рефакторинг SelectionModelPlugin ([431870], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/431870ce07d71eb0d366c1407e7c4a6cf11672e3))
+* update: CHANGELOG.md ([bdfcd8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bdfcd820035ddda767868813dca5d0a1d1f5a87f))
+
+# Version 3.0.43, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ed0d119336e1e590451052944f718cc75fecacee)
+* ## Fixes
+* <span style='color:red'> util.promisifyCmd - move getCommand in Promise</span> ([15cd69], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/15cd69c943724bc75905aa9df16ab02b1d4a564d))
+
+* update: CHANGELOG.md ([22c545], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/22c5454a7bf27678f57cd0a5e2d49170b4d63a6d))
+
 # Version 3.0.42, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7859eef6bddbdc1445b1027d10a93f8e71dfe828)
 * ## Fixes
 * <span style='color:red'>fix MethodChainPlugin set sortableColumns false</span> ([5cb285], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5cb2859e29cc2b98172ea823d7198a92580af6d7))

package/package.json

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

package/src/report/column/ThreeStateCheckColumn.js

@@ -29,39 +29,105 @@ Ext.define('Coon.report.column.ThreeStateCheckColumn', {
     checkedItemCount: 0,
     totalItemCount: 0,
     massCheckChange: false,
-    maskDisplayThreshold: 5000,
+    maskDisplayThreshold: 1000,
+    // Отслеживание количества нажатых чекбоксов на основании событий checkchange и headercheckchange
+    countOnCheck: true,
+
+    groupingCheckboxWidth: 50,
+    checkboxWidth: 40,
 
     constructor: function(cfg) {
+        this.wrapOriginalToggleAll();
+        this.callParent([cfg]);
+        this.subscribe();
+    },
+
+    wrapOriginalToggleAll() {
         this.toggleAllOriginal = this.toggleAll;
         this.toggleAll = this.toggleAllRewrite;
+    },
 
-        this.callParent([cfg]);
-
+    subscribe() {
         // добавления класса на случай перезаписи cls при использовании xtype
         this.addCls('ThreeStateCheckColumn');
 
-        this.on('afterrender', function() {
-            this.getView().getStore().on('load', (store, items, success) => {
-                if (!success) {
-                    return;
-                }
-                this.totalItemCount = items.length;
-                this.checkedItemCount = store.getRange().filter((el) => el.get('checked')).length;
+        this.on('afterrender', this.onAfterRender, this);
+
+        this.on('headercheckchange', (component, checked) => {
+            this.loadMask && this.loadMask.destroy();
+            this.massCheckChange = false;
+        });
+        if (this.countOnCheck) {
+            this.on('headercheckchange', (component, checked) => {
+                this.checkedItemCount = checked ? this.totalItemCount : 0;
                 this.updateHeaderStatus();
             });
-        }, this);
+            this.on('checkchange', (component, rowIndex, checked) => {
+                if (this.checkOnSelect || this.defaultMode) {
+                    const store = this.getView().getStore();
+                    this.checkedItemCount = store.getRange().filter((el) => el.get('checked')).length;
+                } else {
+                    this.checkedItemCount = checked ? this.checkedItemCount + 1 : this.checkedItemCount - 1;
+                }
+                this.updateHeaderStatus();
+            }, this);
+        } else {
+            this.on('added', function(column) {
+                column.getView().on('selectionchange', function(selModel, selected) {
+                    this.checkedItemCount = selected.length;
+                    this.updateHeaderStatus();
+                }, this);
+            }, this);
+        }
+    },
+
+    getGrid() {
+        if (!this.grid) {
+            this.grid = this.up('grid');
+        }
+        return this.grid;
+    },
 
-        this.on('checkchange', (component, rowIndex, checked) => {
-            this.checkedItemCount = checked ? this.checkedItemCount + 1 : this.checkedItemCount - 1;
+    onAfterRender() {
+        const store = this.getGrid().getStore();
+        this.totalItemCount = store.getCount();
+        store.on('load', (store, items, success) => {
+            if (!success) {
+                return;
+            }
+            this.totalItemCount = items.length;
+            this.checkedItemCount = store.getRange().filter((el) => el.get('checked')).length;
             this.updateHeaderStatus();
         });
-
-        this.on('headercheckchange', (component, checked) => {
-            this.checkedItemCount = checked ? this.totalItemCount : 0;
+        store.on('datachanged', (store) => {
+            (this.checkOnSelect || this.defaultMode) && (this.checkedItemCount = store.getRange().filter((el) => el.get('checked')).length);
+            this.totalItemCount = store.getCount();
             this.updateHeaderStatus();
+        });
+        store.on('filterchange', () => {
+            this.totalItemCount = store.getCount();
+            this.updateHeaderStatus();
+        });
 
-            this.loadMask && this.loadMask.destroy();
-            this.massCheckChange = false;
+        if (this.getGrid().features.find((feature) => feature.$className === 'Ext.grid.feature.Grouping')) {
+            this.groupingCheckboxSwitch();
+        }
+    },
+
+    groupingCheckboxSwitch() {
+        const checkcolumn = this.getGrid().getColumns()[0];
+
+        checkcolumn.setWidth(this.groupingCheckboxWidth);
+        this.getGrid().addCls('group-style-checkbox');
+
+        this.getGrid().on('groupchange', (store, grouper) => {
+            if (grouper) {
+                checkcolumn.setWidth(this.groupingCheckboxWidth);
+                this.getGrid().addCls('group-style-checkbox');
+            } else {
+                checkcolumn.setWidth(this.checkboxWidth);
+                this.getGrid().removeCls('group-style-checkbox');
+            }
         });
     },
 
@@ -69,10 +135,17 @@ Ext.define('Coon.report.column.ThreeStateCheckColumn', {
      * Обновление визуального статуса чекбокса заголовка в зависимости от кол-ва отмеченных записей
      */
     updateHeaderStatus() {
+        const component = this.up('grid, treepanel');
+        if (!component) {
+            return;
+        }
+        const selModel = component.getSelectionModel();
         if ((this.checkedItemCount === 0) || (this.checkedItemCount === this.totalItemCount)) {
             this.removeCls('indeterminate_check_box');
         } else {
-            this.addCls('indeterminate_check_box');
+            if (selModel.getSelectionMode() === 'MULTI') {
+                this.addCls('indeterminate_check_box');
+            }
         }
     },
 
@@ -92,6 +165,7 @@ Ext.define('Coon.report.column.ThreeStateCheckColumn', {
         }
         this.massCheckChange = true;
         setTimeout(() => {
+            this.allChecked = (this.defaultMode && (this.checkedItemCount > 0)) ? true : this.allChecked;
             this.toggleAllOriginal(e);
         }, 0);
     },
@@ -138,6 +212,6 @@ Ext.define('Coon.report.column.ThreeStateCheckColumn', {
      * @returns {component}
      */
     getParentComponent() {
-        return this.getView().up('ReportPanel') || this.getView().up('grid');
+        return this.getView().up('ReportPanel, grid, treepanel');
     },
 });

package/src/report/column/ThreeStateCheckColumn.scss

@@ -1,4 +1,11 @@
 .ThreeStateCheckColumn {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  .x-column-header-inner.x-leaf-column-header {
+    padding: 2px 0 8px !important;
+    width: 21px;
+  }
   &.indeterminate_check_box {
     .x-column-header-checkbox {
       &:after {

package/src/report/component/ReportPanel.js

@@ -929,6 +929,17 @@ Ext.define('Coon.report.component.ReportPanel', {
         return plugins;
     },
 
+    checkPluginsFeaturesCompat(plugins, features) {
+        const selectionModelFeature = features.find((feature) => feature.ftype === 'SelectionModelFeature');
+        if (selectionModelFeature) {
+            const index = plugins.findIndex((item) => item.ptype === 'SelectionModelPlugin');
+            if (index !== -1) {
+                Coon.log.warn('Из-за наличия SelectionModelFeature отключен SelectionModelPlugin');
+                plugins.splice(index, 1);
+            }
+        }
+    },
+
     createGrid: function(reportBean) {
         const ns = Coon.report.model.ReportBeanFields;
         const gridPlugins = this.getPluginConfigByType(
@@ -937,14 +948,20 @@ Ext.define('Coon.report.component.ReportPanel', {
             reportBean[ns.$plugins]
         );
 
+        const features = this.getPluginConfigByType('GRID_FEATURE', 'f', reportBean[ns.$plugins]);
+
         const plugins = this.mixPlugins(gridPlugins, [
             {ptype: 'GridContextPlugin'},
             {ptype: 'GridContextMenu'},
             {ptype: 'gridexporter'},
             {ptype: 'AddFilterConditionPlugin'},
             {ptype: 'CalculatorPlugin'},
-            {ptype: 'GridRowCountPlugin'}
+            {ptype: 'GridRowCountPlugin'},
+            {ptype: 'SelectionModelPlugin', defaultMode: true}
         ]);
+
+        this.checkPluginsFeaturesCompat(plugins, features);
+
         plugins.sort(this.raiseUpGroupButton);
 
         const gridConfig = {
@@ -955,7 +972,7 @@ Ext.define('Coon.report.component.ReportPanel', {
                     sortable: true,
                 },
             },
-            features: this.getPluginConfigByType('GRID_FEATURE', 'f', reportBean[ns.$plugins]),
+            features,
             plugins,
             preventDblClick: this.preventDblClick,
             groupField: this.groupField,
@@ -1225,9 +1242,26 @@ 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;
+    // getSelection: function(firstSelectedOnly) {
+    //     const selectedRecords = this.grid.getSelection();
+    //     return selectedRecords && selectedRecords.length > 0 && firstSelectedOnly ? selectedRecords[0] : selectedRecords;
+    // },
+
+    countSelectedRecords() {
+        const grid = this.grid;
+        if (!grid) {
+            return;
+        }
+        // const selectionModelPlugin = grid.findPlugin('SelectionModelPlugin');
+        // const selectionModelFeature = grid.getFeature('SelectionModelFeature');
+        // if (selectionModelPlugin) {
+        //     return grid.getSelectionModel().getSelection().length;
+        // } else if (selectionModelFeature) {
+        //     return grid.getSelectionModel().getSelection().length;
+        // } else {
+        //     return grid.getSelectionModel().getSelection().length;
+        // }
+        return grid.getSelectionModel().getSelection().length;
     },
 
     registerApi(apiKey, api) {

package/src/report/component/reportpanel/ReportGrid.js

@@ -114,4 +114,22 @@ Ext.define('Coon.report.component.reportpanel.ReportGrid', {
             this.getStore().removeAll(!this.rendered);
         }
     },
+
+    getCheckedRecords() {
+        if (this.getFeature('SelectionModelFeature')) {
+            return this.checkedRecords;
+        } else if (this.findPlugin('SelectionModelPlugin')?.defaultMode) {
+            // В этой конфигурации плагина реализована синхронизация выделения с чекбоксами.
+            return this.getSelectionModel().getSelection();
+        } else {
+            return this.checkedRecords;
+        }
+    },
+
+    getFeature(ftype) {
+        if (!ftype) {
+            return;
+        }
+        return this.features.find((feature) => feature.ftype === ftype);
+    },
 });

package/src/report/component/settings/context/PluginParameterTypeComboBox.js

@@ -0,0 +1,38 @@
+Ext.define('Coon.report.component.settings.common.PluginParameterTypeComboBox', {
+    extend: 'Coon.common.field.combo.BaseComboBox',
+    alias: 'widget.PluginParameterTypeComboBox',
+    data: undefined,
+    mode: 'local',
+    valueField: 'VALUE',
+    displayField: 'DESCRIPTION',
+    editable: false,
+    typeAhead: false,
+    triggerAction: 'all',
+    loadOnRender: false,
+
+    initComponent: function() {
+        this.listConfig = {
+            tpl: Ext.create('Ext.XTemplate',
+                '<ul class="x-list-plain">' +
+                '<tpl for=".">',
+                '<li role="option" data-qtip="{TOOLTIP}" class="x-boundlist-item">{' +
+                this.displayField + '}</li>',
+                '</tpl>' +
+                '</ul>'),
+        };
+        this.store = Ext.create('Ext.data.Store', {
+            fields: ['VALUE', 'DESCRIPTION', 'TYPE', 'TOOLTIP'],
+            data: [
+                ['ALLR', 'allRecords', 'MULTI', 'Все записи'],
+                ['CHCK', 'checkedRecords', 'MULTI', 'Записи, отмеченные чекбоксом'],
+                ['DFLT', 'default', 'CONSTANT', 'Константа'],
+                ['FLD', 'field', 'SINGLE', 'Поле из выбранной записи'],
+                ['MDFD', 'modifiedRecords', 'MULTI', 'Измененные записи'],
+                ['PRM', 'parameter', 'PARAMETER', 'Параметр отчета'],
+                ['RCRD', 'record', 'SINGLE', 'Текущая записись'],
+                ['SELR', 'selectedRecords', 'MULTI', 'Выбранные записи']
+            ],
+        });
+        this.callParent(arguments);
+    },
+});

package/src/report/component/settings/context/ReportFormContextParametersGrid.js

@@ -90,9 +90,7 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
         });
 
         this.typeEditor = Ext.create({
-            xtype: 'lookupCombo',
-            loadOnRender: false,
-            lookupId: 'REPORT_NAV_OPT_CTXT_SRC_FLG',
+            xtype: 'PluginParameterTypeComboBox',
             allowBlank: false,
         });
 

package/src/report/component/settings/plugin/ReportFormPluginPanelController.js

@@ -141,6 +141,7 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginPanelControlle
 
                 if (this.context && this.activePanel.setContext) {
                     this.activePanel.setContext(this.context);
+                    this.activePanel.getViewModel() && this.activePanel.getViewModel().set('context', this.context);
                 }
 
                 this.activePanel.on('updateContext', function(kv, oldValue) {

package/src/report/plugin/configPanel/GridToolbarButtonPluginConfigPanel.js

@@ -73,8 +73,16 @@ Ext.define('Coon.report.plugin.configPanel.GridToolbarButtonPluginConfigPanel',
             items: [
                 {
                     fieldLabel: 'Зависит от параметра отчета',
-                    xtype: 'textfield',
+                    xtype: 'combo',
                     name: 'dependOnGridParameters',
+                    submitFormat: true,
+                    queryMode: 'local',
+                    displayField: 'descriptionFull',
+                    valueField: 'reportParameterCd',
+                    store: {
+                        type: 'json',
+                        data: [],
+                    },
                 },
                 {
                     xtype: 'container',
@@ -197,6 +205,27 @@ Ext.define('Coon.report.plugin.configPanel.GridToolbarButtonPluginConfigPanel',
     },
 
     controller: {
+        bindings: {
+            onContextChange: '{context}',
+        },
+
+        onContextChange(context) {
+            const dependOnGridParameters = this.view.down('[name=dependOnGridParameters]');
+            if (dependOnGridParameters) {
+                const data = JSON.parse(JSON.stringify(context.parameters));
+                data.map((item) => {
+                    item.descriptionFull = `${item.reportParameterCd} (${item.description})`;
+                    return item;
+                });
+                const store = dependOnGridParameters.getStore();
+                store.loadData(data);
+
+                // hack: to visually display value in the field
+                const values = dependOnGridParameters.getValue();
+                dependOnGridParameters.setValue(values);
+            }
+        },
+
         setHideMsgValue() {
             this.getViewModel().set('hideAddActionColumnMsg',
                 this.lookup('actionColumnRef').collapsed ||

package/src/report/plugin/configPanel/SelectionModelPluginConfigPanel.js

@@ -39,75 +39,97 @@ Ext.define('Coon.report.plugin.configPanel.SelectionModelPluginConfigPanel', {
                         value: '{description}',
                     },
                 },
-                {
-                    xtype: 'combo',
-                    fieldLabel: 'Режим',
-                    bind: {
-                        value: '{mode}',
-                        store: '{modes}',
-                    },
-                },
                 {
                     xtype: 'checkbox',
-                    boxLabel: 'Возможность снять выделение записи по нажатию',
-                    tooltip: 'allowDeselect',
+                    boxLabel: 'Режим по умолчанию',
                     bind: {
-                        value: '{allowDeselect}',
+                        value: '{defaultMode}',
                     },
                 },
                 {
-                    xtype: 'checkbox',
-                    boxLabel: 'Переключить по нажатию (применимо только в режиме "SINGLE" и при allowDeselect: true)',
-                    tooltip: 'toggleOnClick',
-                    bind: {
-                        value: '{toggleOnClick}',
-                        hidden: '{mode !== "SINGLE" || !allowDeselect}',
-                    },
+                    html: '<a href="https://confluence.sigma-it.ru" target="_blank">Описание режима по умолчанию.</a>',
                 },
                 {
-                    xtype: 'checkbox',
-                    boxLabel: 'Добавить колонку с чекбоксами',
+                    xtype: 'container',
+                    margin: '20 0 0 0',
                     bind: {
-                        value: '{addCheckboxColumn}',
+                        disabled: '{defaultMode}',
                     },
-                },
-                {
-                    xtype: 'fieldcontainer',
-                    layout: 'anchor',
-                    scrollable: 'y',
-                    bind: {
-                        disabled: '{!addCheckboxColumn}',
+                    layout: {
+                        type: 'vbox', align: 'stretch',
                     },
-                    defaults: {anchor: '100%', labelAlign: 'top'},
                     items: [
                         {
-                            xtype: 'checkbox',
-                            boxLabel: 'Выделять строку при выставлении чекбокса',
+                            xtype: 'combo',
+                            fieldLabel: 'Режим',
                             bind: {
-                                value: '{selectOnCheck}',
+                                value: '{mode}',
+                                store: '{modes}',
                             },
                         },
                         {
                             xtype: 'checkbox',
-                            boxLabel: 'Отмечать чекбокс при выделении строки',
+                            boxLabel: 'Возможность снять выделение записи по нажатию',
+                            tooltip: 'allowDeselect',
                             bind: {
-                                value: '{checkOnSelect}',
+                                value: '{allowDeselect}',
                             },
                         },
                         {
                             xtype: 'checkbox',
-                            boxLabel: 'Включить фильтр в меню колонки',
+                            boxLabel: 'Переключить по нажатию (применимо только в режиме "SINGLE" и при allowDeselect: true)',
+                            tooltip: 'toggleOnClick',
                             bind: {
-                                value: '{filterable}',
-                                disabled: '{menuDisabled}',
+                                value: '{toggleOnClick}',
+                                hidden: '{mode !== "SINGLE" || !allowDeselect}',
                             },
                         },
                         {
                             xtype: 'checkbox',
-                            boxLabel: 'Отключить меню колонки',
+                            boxLabel: 'Добавить колонку с чекбоксами',
+                            bind: {
+                                value: '{addCheckboxColumn}',
+                            },
+                        },
+                        {
+                            xtype: 'fieldcontainer',
+                            layout: 'anchor',
+                            scrollable: 'y',
                             bind: {
-                                value: '{menuDisabled}',
+                                disabled: '{!addCheckboxColumn}',
                             },
+                            defaults: {anchor: '100%', labelAlign: 'top'},
+                            items: [
+                                {
+                                    xtype: 'checkbox',
+                                    boxLabel: 'Выделять строку при выставлении чекбокса',
+                                    bind: {
+                                        value: '{selectOnCheck}',
+                                    },
+                                },
+                                {
+                                    xtype: 'checkbox',
+                                    boxLabel: 'Отмечать чекбокс при выделении строки',
+                                    bind: {
+                                        value: '{checkOnSelect}',
+                                    },
+                                },
+                                {
+                                    xtype: 'checkbox',
+                                    boxLabel: 'Включить фильтр в меню колонки',
+                                    bind: {
+                                        value: '{filterable}',
+                                        disabled: '{menuDisabled}',
+                                    },
+                                },
+                                {
+                                    xtype: 'checkbox',
+                                    boxLabel: 'Отключить меню колонки',
+                                    bind: {
+                                        value: '{menuDisabled}',
+                                    },
+                                }
+                            ],
                         }
                     ],
                 }

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

@@ -22,25 +22,21 @@ Ext.define('Coon.report.plugin.grid.FitColumnPlugin', {
     },
 
 
-    handler: function() {
-        if (this.component) {
-            let width = 0;
-            const columns = this.component.getColumnManager().getColumns();
-            for (let i = 0; i < columns.length; i++) {
-                const column = columns[i];
-                if (column.isVisible()) {
-                    width += column.getWidth();
-                }
-            }
-            const gridWidth = this.component.getWidth() - Ext.getScrollbarSize().width;
-            for (let i = 0; i < columns.length; i++) {
-                const column = columns[i];
-                if (column.isVisible()) {
-                    column.setWidth(Math.floor(column.getWidth() * gridWidth / width));
-                }
-            }
-            this.component.fireEvent('autosizecolumnscoplete');
+    handler() {
+        let width = 0;
+        const columns = this.component.getVisibleColumns().filter((column) => column.resizable);
+        const unresizableWidth = this.component.getVisibleColumns().filter((column) => !column.resizable).reduce((acc, column) => {
+            acc += column.getWidth();
+            return acc;
+        }, 0);
+        for (const column of columns) {
+            width += column.getWidth();
+        }
+        const gridWidth = this.component.getWidth() - Ext.getScrollbarSize().width - unresizableWidth;
+        for (const column of columns) {
+            column.setWidth(Math.floor(column.getWidth() * gridWidth / width));
         }
+        this.component.fireEvent('autosizecolumnscoplete');
     },
 
     customValidation: function(component) {
@@ -48,15 +44,15 @@ Ext.define('Coon.report.plugin.grid.FitColumnPlugin', {
     },
 
     customInit: function() {
-        if (this.autoFit) {
-            this.component.getStore().on('load', function() {
-                if (this.component.rendered) {
-                    Ext.defer(this.handler, 1, this);
-                } else {
-                    this.component.on('afterrender', this.handler, this);
-                }
-            }, this);
+        if (!this.autoFit) {
+            return;
         }
+        this.component.getStore().on('load', function() {
+            if (this.component.rendered) {
+                Ext.defer(this.handler, 1, this);
+            } else {
+                this.component.on('afterrender', this.handler, this);
+            }
+        }, this);
     },
 });
-