ru.coon 3.0.53 → 3.0.55

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# Version 3.0.55, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3aa9d1a7bd56ffe2e12a7470620065930b6c9002)
+* ## Fixes
+* <span style='color:red'>fix HT-14573: DFVCharacteristicField completeEdit on select</span> ([683c19], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/683c19de5c78219346d6529d1f223afe16b480c5))
+
+* HT-14532 feat: Четыре режима SelectionModelPlugin ([92c4a8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/92c4a8edcf4fd2cf79633732cd2e801a8ee4fd53))
+* HT-13994: исправление ошибок при удалении колонок ([d47f7a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d47f7a00098c312b2ea2a665dfbea5aebfe0e9ac))
+* update: CHANGELOG.md ([af2f08], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/af2f08fd3487b410c8ea7b7824da5a43289c4444))
+
+# Version 3.0.54, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/91b425e436e17c3f26aa3c6eabb1c23ac52686c1)
+* ## Fixes
+* <span style='color:red'> src/util:mapObject acc[rule.to] or defValue</span> ([f2355c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f2355c41590bd574c51fdd6ed4a231ef59c29477))
+
+* add scss ([1a6380], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1a63800f3db4aa3b5e29853fc2c71058f19dba42))
+* update: CHANGELOG.md ([614a25], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/614a25f19071b375b0a09d2e771c8d7df2d63313))
+
 # Version 3.0.53, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/18d790002292ecd0650d868dca06ddcf668fcede)
 * ## Features
 * <span style='color:green'>feat: NEVA-974: bug fix. Передаю нужный контекст</span> ([22bb87], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/22bb870b28bdafac81dca86804b482e6e365c9c8))

package/package.json

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

package/src/common/component/editor/EditorFactory.js

@@ -348,9 +348,17 @@ Ext.define('Coon.common.component.editor.DFVTypeEditor', {
             this.field.on('load', function() {
                 this.field.setValue(value);
             }, this, {single: true});
+            this.field.on('select', this.afterEdit, this);
             this.field.doInit();
         }
     },
+
+    afterEdit: function() {
+        this.completeEdit && this.completeEdit();
+        if (this.boundEl || (this.context && this.context.getCell)) {
+            this.restoreCell();
+        }
+    },
 });
 
 /**

package/src/report/component/ReportPanel.js

@@ -721,6 +721,7 @@ Ext.define('Coon.report.component.ReportPanel', {
 
     configureGrid: function(ReportBean) {
         this.grid = this.createGrid(ReportBean);
+        this.grid.getPluginProperty = (key) => this.getPluginProperty(key, this.grid);
         // this.grid.on('added', this.chipsInit, this);
         this.centerPanel.add(this.grid);
         this.initGridEvents();
@@ -850,6 +851,7 @@ Ext.define('Coon.report.component.ReportPanel', {
     configureNorthPanel: function(reportFormBean) {
         this.northPanel.filterPlugins = this.getPluginConfigByType('FILTER_PLUGIN', 'p');
         this.northPanel.configureFilterPanel(reportFormBean);
+        this.northPanel.getPluginProperty = (key) => this.getPluginProperty(key, this.northPanel.filterPanel);
     },
 
     getPluginConfigByType: function(type, prefix, pluginList) {
@@ -1292,4 +1294,21 @@ Ext.define('Coon.report.component.ReportPanel', {
         }
         return this.grid.getStore().getDataSource().getCount() === 0;
     },
+
+    /**
+     * Способ получения свойства плагина в контексте scope. Если scope не передается, то поиск плагина будет в контексте отчета.
+     * Плагин и свойство задаются в строке key с разделителем "точка".
+     * @param {String} key плагин плюс свойство плагина
+     * @param scope контекст
+     * @returns {*|undefined}
+     */
+    getPluginProperty(key, scope) {
+        scope = scope || this;
+        if (!Ext.isString(key) || !/\./.test(key)) {
+            return;
+        }
+        const [pluginName, propertyName] = key.split('.');
+        const plugin = scope.findPlugin(pluginName);
+        return plugin ? plugin[propertyName] : undefined;
+    },
 });

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

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

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

@@ -205,27 +205,6 @@ 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 ||
@@ -234,6 +213,28 @@ Ext.define('Coon.report.plugin.configPanel.GridToolbarButtonPluginConfigPanel',
         },
     },
 
+    setContext: function(context) {
+        this.callParent(arguments);
+        const dependOnGridParameter = this.down('[name=dependOnGridParameters]');
+        if (dependOnGridParameter) {
+            const data = context.parameters.map((item) => {
+                item.descriptionFull = `${item.reportParameterCd} (${item.description})`;
+                return item;
+            });
+            dependOnGridParameter.getStore().loadData(data);
+        }
+        const reportFieldsCombo = this.down('[name=singleClickDataIndex]');
+        if (reportFieldsCombo) {
+            const reportFields = context.fields.map(
+                ({viewComboDescription: description, reportFieldCd: value}) => ({
+                    value,
+                    description,
+                })
+            );
+            reportFieldsCombo.getStore().loadData(reportFields);
+        }
+    },
+
     createActionColumnFieldSet: function() {
         return {
             xtype: 'fieldset',
@@ -275,4 +276,24 @@ Ext.define('Coon.report.plugin.configPanel.GridToolbarButtonPluginConfigPanel',
             name: 'handleNewObjectEvent',
         };
     },
+
+    createActOnOnSingleClickControl() {
+        return {
+            xtype: 'BaseComboBox',
+            loadOnRender: false,
+            displayField: 'description',
+            valueField: 'value',
+            store: {
+                fields: ['description', 'value'],
+            },
+            fieldLabel: 'Активировать по одиночному клику на поле',
+            name: 'singleClickDataIndex',
+            bind: {
+                disabled: '{actOnDoubleClick.checked}',
+            },
+            reference: 'singleClickDataIndexRef',
+            flex: 1,
+            resettable: true,
+        };
+    },
 });

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

@@ -0,0 +1,5 @@
+.x-grid-cell.GTBP-clickable-cell {
+  text-decoration: underline;
+  cursor: pointer;
+  color: var(--base-color);
+}

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

@@ -59,7 +59,18 @@ Ext.define('Coon.report.plugin.configPanel.OpenURLButtonPluginConfigPanel', {
                     this.createDependsOnGridRow(),
                     this.createDependsOnGridParameter(),
                     this.createAddButtonPanel(),
-                    this.createActOnDoubleClickCheckBox(),
+                    {
+                        xtype: 'fieldset',
+                        items: [
+                            Object.assign(this.createActOnDoubleClickCheckBox(), {
+                                reference: 'actOnDoubleClick',
+                                bind: {
+                                    disabled: '{!singleClickDataIndexRef.selection}',
+                                },
+                            }),
+                            this.createActOnOnSingleClickControl()
+                        ],
+                    },
                     this.createHotKeyPanel(),
                     this.createVisibilityKeyPanel(),
                     this.url,

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

@@ -7,6 +7,7 @@ Ext.define('Coon.report.plugin.configPanel.RestoreSelectionPluginConfigPanel', {
 
     description: 'Восстанавливает выделение после перезагрузки',
     tags: ['Поведение', 'Выделение'],
+    isSingle: true,
 
     config: {
         pluginTypeSettings: {

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

@@ -39,19 +39,43 @@ Ext.define('Coon.report.plugin.configPanel.SelectionModelPluginConfigPanel', {
                         value: '{description}',
                     },
                 },
+                // {
+                //     xtype: 'checkbox',
+                //     boxLabel: 'Режим по умолчанию',
+                //     bind: {
+                //         value: '{defaultMode}',
+                //     },
+                //     readOnly: true,
+                // },
                 {
-                    xtype: 'checkbox',
-                    boxLabel: 'Режим по умолчанию',
-                    bind: {
-                        value: '{defaultMode}',
-                    },
+                    html: `Описание режимов плагина SelectionModelPlugin в 
+                           <a href="https://confluence.sigma-it.ru/pages/viewpage.action?pageId=619754033" target="_blank">
+                            confluence.sigma-it.ru.
+                           </a>`,
+                    padding: '0 0 10px',
                 },
                 {
-                    html: '<a href="https://confluence.sigma-it.ru" target="_blank">Описание режима по умолчанию.</a>',
+                    xtype: 'radiogroup',
+                    simpleValue: true,
+                    vertical: true,
+                    columns: 1,
+                    items: [
+                        {boxLabel: 'гибрид(по умолчанию SINGLE)', inputValue: 'hybridSingleDefault', checked: true},
+                        {boxLabel: 'гибрид(по умолчанию MULTI)', inputValue: 'hybridMultiDefault'},
+                        {boxLabel: 'только SINGLE(колонка с чекбоксами скрыта)', inputValue: 'singleOnly'},
+                        {boxLabel: 'только MULTI', inputValue: 'multiOnly'}
+                    ],
+                    reference: 'defaultModeVariants',
+                    // disabled: true,
+                    bind: {
+                        // disabled: '{!defaultMode}',
+                        value: '{defaultModeVariant}',
+                    },
                 },
                 {
                     xtype: 'container',
                     margin: '20 0 0 0',
+                    hidden: true,
                     bind: {
                         disabled: '{defaultMode}',
                     },

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

@@ -50,7 +50,7 @@ Ext.define('Coon.report.plugin.configPanel.SummaryPluginConfigPanelSummaryGrid',
                 ['min', 'min (Минимальное значение в столбце)'],
                 ['max', 'max (Максимальное значение в столбце)'],
                 ['count', 'count (Количество значений в столбце)'],
-                ['average', 'average (Среднее значениче в столбце)'],
+                ['average', 'average (Среднее значение в столбце)'],
                 ['unique', 'unique (Кастомная функция агрегации, указывается с помощью summaryRenderer в свойствах поля)']
             ],
         };

package/src/report/plugin/configPanel/openCustomPanelButtonPlugin/OpenCustomPanelButtonPluginConfigPanel.js

@@ -47,11 +47,28 @@ Ext.define('Coon.report.plugin.configPanel.OpenCustomPanelButtonPluginConfigPane
                 this.createAddButtonPanel(),
                 {
                     xtype: 'fieldset',
+                    title: 'активация по одинарному/двойному клику мышью(взаимоисключающие)',
+                    layout: {type: 'hbox', align: 'middle'},
+                    defaults: {
+                        frame: true,
+                        flex: 1,
+                    },
                     items: [
+                        {
+                            xtype: 'button',
+                            maxWidth: 130,
+                            margin: '0 18 0 0',
+                            text: 'отменить',
+                            handler(btn) {
+                                const view = btn.up('fieldset');
+                                view.query('combo, checkbox:not(#mouseActivationBlock)')
+                                    .forEach((field) => field.reset());
+                            },
+                        },
                         Object.assign(this.createActOnDoubleClickCheckBox(), {
                             reference: 'actOnDoubleClick',
                             bind: {
-                                disabled: '{actOnSingleClick.checked}',
+                                disabled: '{singleClickDataIndexRef.selection}',
                             },
                         }),
                         this.createActOnOnSingleClickControl()
@@ -62,7 +79,6 @@ Ext.define('Coon.report.plugin.configPanel.OpenCustomPanelButtonPluginConfigPane
                 this.createNewObjectCreated(),
                 {
                     boxLabel: 'Открыть экземпляр старой версии биллинга',
-
                     xtype: 'checkbox',
                     name: 'oldFrame',
                 },
@@ -319,14 +335,6 @@ Ext.define('Coon.report.plugin.configPanel.OpenCustomPanelButtonPluginConfigPane
             gridSourceMapping.updateParametersList(context.parameters);
             gridSourceMapping.updateTypeEditor(context.additionalContext);
         }
-        this.reportFieldsCombo.getStore().loadData(
-            context.fields.map(
-                ({viewComboDescription: description, reportFieldCd: value}) => ({
-                    value,
-                    description,
-                })
-            )
-        );
     },
 
     doInit: function(config) {
@@ -513,41 +521,4 @@ Ext.define('Coon.report.plugin.configPanel.OpenCustomPanelButtonPluginConfigPane
             ],
         };
     },
-
-    createActOnOnSingleClickControl() {
-        this.reportFieldsCombo = Ext.create({
-            xtype: 'BaseComboBox',
-            loadOnRender: false,
-            displayField: 'description',
-            valueField: 'value',
-            store: Ext.create('Coon.report.store.RefStore'),
-            fieldLabel: 'Поле',
-            name: 'singleClickDataIndex',
-            bind: {
-                disabled: '{!actOnSingleClick.checked}',
-            },
-            flex: 1,
-        });
-        return {
-            xtype: 'fieldcontainer',
-            layout: {
-                type: 'vbox',
-                align: 'stretch',
-            },
-            items: [
-                {
-                    xtype: 'checkbox',
-                    boxLabel: 'Активировать по одиночному клику на поле',
-                    boxLabelAlign: 'after',
-                    reference: 'actOnSingleClick',
-                    name: 'actOnSingleClick',
-                    bind: {
-                        disabled: '{actOnDoubleClick.checked}',
-                    },
-                    flex: 1,
-                },
-                this.reportFieldsCombo
-            ],
-        };
-    },
 });

package/src/report/plugin/configPanel/openCustomPanelButtonPlugin/OpenCustomPanelButtonPluginConfigPanel.scss

@@ -15,8 +15,3 @@
     }
   }
 }
-.x-grid-cell.OCPBP-clickable-cell {
-  text-decoration: underline;
-  cursor: pointer;
-  color: var(--base-color);
-}

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

@@ -1,9 +1,18 @@
 /**
  * Плагин, который управляет контекстом грида, возвращает из него необходимые параметры
+ * При обновлении контекста формируется события:
+ *   - contextchange.load
+ *   - contextchange.selectionchange
+ *   - contextchange.clear
+ *   - contextchange.filterchange
+ * Подписавшись на эти события можно получать обновленный контекст.
  */
 Ext.define('Coon.report.plugin.grid.GridContextPlugin', {
     extend: 'Ext.AbstractPlugin',
     alias: 'plugin.GridContextPlugin',
+    mixins: [
+        'Ext.mixin.Observable'
+    ],
     alternateClassName: [
         'Sigma.common.plugin.grid.GridContextPlugin'
     ],
@@ -12,24 +21,45 @@ Ext.define('Coon.report.plugin.grid.GridContextPlugin', {
      * Для определения контекстной записи мы сохраняем в переменной lastClickedRecord ссылку на запись грида, на которой произошло событие itemclick
      */
     lastClickedRecord: undefined,
+    constructor: function(config) {
+        this.callParent([config]);
+        this.mixins.observable.constructor.call(this);
+    },
+
     init: function(component) {
         if (component instanceof Ext.grid.Panel || component instanceof Ext.tree.Panel) {
             const me = this;
-            this.component = component;
-            this.component.getContextManager = function() {
+
+            component.getContextManager = function() {
                 return me;
             };
-            this.resetContext('load');
-            this.component.getSelectionModel().on('selectionchange', function() {
-                this.resetContext('selectionchange');
-            }, this);
-            this.component.getStore().on('load', function() {
-                this.resetContext('load');
-            }, this);
-            this.component.on('itemclick', function(grid, record) {
-                this.lastClickedRecord = record;
-                this.resetContext();
-            }, this);
+            this.resetContext();
+            component.on({
+                boxready: function() {
+                    this.isSelectionModelDefaultMode = component.getPluginProperty('SelectionModelPlugin.defaultMode');
+                },
+                rowmousedown: function(grid, record) {
+                    this.lastClickedRecord = record;
+                    this.resetContext('rowmousedown', false);
+                },
+                selectionchange: function() {
+                    this.resetContext('selectionchange');
+                },
+                scope: this,
+            });
+
+            component.getStore().on({
+                filterchange: () => {
+                    this.resetContext('filterchange');
+                },
+                load: () => {
+                    this.resetContext('load');
+                },
+                clear: () => {
+                    this.resetContext('clear');
+                },
+                scope: this,
+            });
             this.functionsStack = [];
             this.parametersStack = [];
         } else {
@@ -61,9 +91,9 @@ Ext.define('Coon.report.plugin.grid.GridContextPlugin', {
     },
 
     getParams() {
-        const store = this.component.getStore();
+        const store = this.getCmp().getStore();
         let params;
-        if (this.component instanceof Ext.tree.Panel) {
+        if (this.getCmp() instanceof Ext.tree.Panel) {
             params = store.proxy && store.proxy.extraParams;
         } else {
             params = store.lastOptions && store.lastOptions.params;
@@ -77,15 +107,14 @@ Ext.define('Coon.report.plugin.grid.GridContextPlugin', {
 
     getSelectedRecord() {
         let record;
-        const selModel = this.component.getSelectionModel();
+        const selModel = this.getCmp().getSelectionModel();
         const mode = Ext.isFunction(selModel.getSelectionMode) && selModel.getSelectionMode();
-
         if (this.isRowBasedModel()) {
-            if (mode === 'MULTI' && this.lastClickedRecord) {
+            if (this.isSelectionModelDefaultMode && mode === 'MULTI' && this.lastClickedRecord) {
                 record = this.lastClickedRecord;
             } else {
-                const selected = this.component.getSelectionModel().getSelected().getRange();
-                record = selected[0] || this.component.getSelectionModel().getLastSelected();
+                const selected = this.getCmp().getSelectionModel().getSelected().getRange();
+                record = selected[0];
             }
         } else {
             record = undefined;
@@ -94,20 +123,41 @@ Ext.define('Coon.report.plugin.grid.GridContextPlugin', {
         return record;
     },
 
-    resetContext: function(event) {
+    /**
+     * Обновление контекста отчета и при необходимости формирование события на плагине/
+     * @param {String} transferEvent код наступившего события, по которому требуется обновление контекста отчета
+     * @param {Boolean} sendContextChangeEvent признак необходимости формирования события contextchange.[transferEvent]
+     */
+    resetContext(transferEvent, sendContextChangeEvent = true) {
         this.context = {
             params: this.getParams(),
             record: this.getSelectedRecord(),
         };
+        if (sendContextChangeEvent && transferEvent) {
+            this.fireEvent(`contextchange.${transferEvent}`, this.context);
+        }
+    },
 
-        // Это не правильно. Дублирование события без аргументов
-        // if (event && Ext.isString(event)) {
-        //     this.component.fireEvent(event);
-        // }
+    /**
+     * The method provides an API for other components to call the passed callback by subscribing to a number of events.
+     * The events occur in this plugin.
+     * @param {String|Array} events - event or array events
+     * @param {Object} paramConfig - settings for receiving parameter values of the component's doInit method
+     * @param {Function} doInitCallback - the method the event invokes
+     */
+    buildParamsOnContextChange(events, paramConfig, doInitCallback) {
+        if (!Array.isArray(events)) {
+            events = [events];
+        }
+        events.forEach((eventName) => {
+            this.on(`contextchange.${eventName}`, () => {
+                this.executeFunction(doInitCallback, paramConfig);
+            });
+        });
     },
 
     isRowBasedModel: function() {
-        const sm = this.component.getSelectionModel();
+        const sm = this.getCmp().getSelectionModel();
         return sm instanceof Ext.selection.RowModel || sm instanceof Ext.selection.CheckboxModel;
     },
 
@@ -117,7 +167,7 @@ Ext.define('Coon.report.plugin.grid.GridContextPlugin', {
         }
         if (this.additionalParametersNames.length > 0) {
             const next = this.additionalParametersNames.pop();
-            this.component.fireEvent('loadContext', next);
+            this.getCmp().fireEvent('loadContext', next);
         } else {
             this.functionsStack.pop()(this.getParameters(this.parametersStack.pop()));
         }
@@ -154,8 +204,9 @@ Ext.define('Coon.report.plugin.grid.GridContextPlugin', {
             const paramName = param.reportParameter;
             let paramValue;
             let selectedRecords;
-            const valueField = param['reportNavigationOptionContextSourceValue'];
-            switch (param.reportNavigationOptionContextSource) {
+            const valueField = param.reportNavigationOptionContextSourceValue;
+            const paramType = param.reportNavigationOptionContextSource;
+            switch (paramType) {
             case 'FLD':
                 paramValue = Ext.isEmpty(this.context.record) ? undefined : this.context.record.get(valueField);
                 break;
@@ -168,18 +219,18 @@ Ext.define('Coon.report.plugin.grid.GridContextPlugin', {
                     this.convertRecord(this.context.record.data, valueField, param.defaultValue);
                 break;
             case 'ALLR':
-                if (this.component.getStore().isFiltered()) {
-                    this.component.getStore().clearFilter(true);
+                if (this.getCmp().getStore().isFiltered()) {
+                    this.getCmp().getStore().clearFilter(true);
                 }
                 paramValue = this.convertRecords(
-                    Coon.Function.getDataFromStore(this.component.getStore(), false),
+                    Coon.Function.getDataFromStore(this.getCmp().getStore(), false),
                     valueField,
                     param.defaultValue
                 );
                 break;
             case 'MDFD':
                 paramValue = this.convertRecords(
-                    Coon.Function.getDataFromModifiedRecords(this.component.getStore(), false),
+                    Coon.Function.getDataFromModifiedRecords(this.getCmp().getStore(), false),
                     valueField,
                     param.defaultValue
                 );
@@ -190,7 +241,7 @@ Ext.define('Coon.report.plugin.grid.GridContextPlugin', {
                 break;
             case 'SELR':
                 paramValue = this.convertRecords(
-                    Coon.Function.getDataFromSelectionModel(this.component.getSelectionModel(), false),
+                    Coon.Function.getDataFromSelectionModel(this.getCmp().getSelectionModel(), false),
                     valueField,
                     param.defaultValue
                 );
@@ -200,14 +251,14 @@ Ext.define('Coon.report.plugin.grid.GridContextPlugin', {
                 paramValue = param.defaultValue;
                 break;
             default:
-                paramValue = this.context[param.reportNavigationOptionContextSource] ?
+                paramValue = this.context[paramType] ?
                     (
-                        this.context[param.reportNavigationOptionContextSource][param.defaultValue] ||
-                        this.context[param.reportNavigationOptionContextSource]
+                        this.context[paramType][param.defaultValue] ||
+                        this.context[paramType]
                     ) :
-                    this.context[param.reportNavigationOptionContextSource];
+                    this.context[paramType];
                 if (Ext.isEmpty(paramValue) && param.editable) {
-                    this.component.fireEvent('failContext', param.reportNavigationOptionContextSource);
+                    this.getCmp().fireEvent('failContext', paramType);
                 }
                 break;
             }
@@ -217,26 +268,18 @@ Ext.define('Coon.report.plugin.grid.GridContextPlugin', {
     },
 
     getCheckedRecords() {
-        if (!this.component.ownerCt) {
-            return [];
-        }
-        const checkColumnName = this.component.checkColumn || this.component.ownerCt.checkColumn ||
-            this.component.ownerCt.ownerCt.checkColumn || (this.component.properties && this.component.properties['checkColumn']);
-        const checkedRecords = this.component.getCheckedRecords();
-        if (checkColumnName) {
-            const store = this.component.getStore();
+        const checkColumnName = this.getCmp().up('[checkColumn]') || (this.getCmp().properties && this.getCmp().properties['checkColumn']);
+        const checkedRecords = this.getCmp().getCheckedRecords();
+        if (this.isSelectionModelDefaultMode) {
+            return checkedRecords;
+        } else if (checkColumnName) {
+            const store = this.getCmp().getStore();
             const records = store.getRange(0, store.getCount());
-            const selectedRecords = [];
-            for (let i = 0; i < records.length; i++) {
-                if (records[i].get(checkColumnName) === true) {
-                    selectedRecords.push(records[i]);
-                }
-            }
-            return selectedRecords;
+            return records.filter((record) => record.get(checkColumnName) === true || record.get('checked'));
         } else if (checkedRecords && checkedRecords.length) {
             return checkedRecords;
         } else {
-            return Coon.Function.getDataFromSelectionModel(this.component.getSelectionModel(), false);
+            return Coon.Function.getDataFromSelectionModel(this.getCmp().getSelectionModel(), false);
         }
     },