ru.coon 3.0.31 → 3.0.32

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Version 3.0.32, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/54a1adc38f21829b195830d3eced818bf79b9ae8)
+* HT-13143 feat: Доработка функционала тулбара ([143359], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/14335922547e88e2da04be44ecd90b62b10ba9bb))
+* upd ([bfda87], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bfda878d1063c5c85d7e606457e925186fe99c02))
+* upd ([567480], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/567480f225764cfdfce2ffc5ab2e132d23d7c80f))
+* update: CHANGELOG.md ([aec290], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/aec29006235ca1d8f82e3dc1eaa594c797f1a14c))
+
 # Version 3.0.31, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9665b81ba1d0a4cded52d8755f915381c0753074)
 * ## Fixes
 * <span style='color:red'>fix OCPB</span> ([d9f750], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d9f7501828ec8437a029d6eb0ef7582e43bac2ba))

package/core-uls.d2

@@ -0,0 +1,12 @@
+login phase: {
+    /info
+    /revision\.json
+    /login
+    /generateCSRFToken
+}
+
+read navigation menu: {|`
+    - /ReportFormData/get -> reportId.MENU_ALLITEMS
+    - /ReportFormData/get -> reportId.MENU_PROFILE
+`|
+}

package/core-urls.json

@@ -0,0 +1,54 @@
+{
+    "loginPhase": [
+        "/info",
+        "/revision.json",
+        "/login",
+        "/generateCSRFToken"
+    ],
+    "readNavMenu": [
+        { "url": "/ReportFormData/get", "params": "reportId:MENU_ALLITEMS" },
+        { "url": "/ReportFormData/get", "params": "reportId.MENU_PROFILE" }
+    ],
+    "uiElement": [
+        "/UIElement/get",
+        "/UIElement/copy",
+        "/UIElement/delete",
+        "/UIElement/version/revision/get",
+        "/UIElement/version/get",
+        "/UIElement/save",
+        "/UIElement/import",
+        "/UIElement/editor/import",
+        "/UIElement/getNameProperties"
+    ],
+    "report": [
+        "/ReportConfiguration/get",
+        "/ReportConfiguration/delete",
+        "/ReportFormData/get",
+        "/ReportFormData/getCSVReport",
+        "/ReportFormData/getExcelFromRowsOrReport",
+        "/ReportFormData/getExcelReport",
+        "/ReportFormData/getPdfReport",
+        "/ReportFormData/getReportSqlText",
+        "/ReportField/get",
+        "/Report/version/get",
+        "/Report/version/revision/get",
+        "/ReportFormMaintenance/save"
+    ],
+    "common": [
+        "/personification/personify",
+        "/configurationProperty/get",
+        "/configurationProperty/getAllPropertiesWithDefault",
+        "/configurationProperty/save"
+    ],
+    "entities": [
+        "/externalSystem/proxy/SWE/LookUpService/getLookUpList.do",
+        "/externalSystem/proxy/SWE/AlgoritmChainBind/get.do",
+        "/externalSystem/proxy/SWE/CharacteristicList/get.do",
+        "/externalSystem/proxy/SWE/CharacteristicList/getAll.do",
+        "externalSystem/proxy/SWE/Entity/getWithAllCharacteristicsByGroups.do",
+        "/externalSystem/proxy/SWE/Entity/save.do",
+        "/externalSystem/proxy/SWE/EntityGroup/saveCharacters.do",
+        "/externalSystem/proxy/SWE/CharacteristicList/save.do",
+        "externalSystem/proxy/SWE/AlgoritmChainBind/save.do"
+    ]
+}

package/package.json

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

package/src/common/ComponentFactory.js

@@ -56,8 +56,6 @@ Ext.define('Coon.common.ComponentFactory', {
         }
         const config = route.uiElement;
         const paramsObject = this.paramsToObject(params);
-        const filterDefaults =
-          (paramsObject && Object.assign(paramsObject, {doFilter: true})) || {};
 
         if (!Ext.isObject(config)) {
             throw new Error('неверный формат элемента пункта меню');
@@ -76,6 +74,16 @@ Ext.define('Coon.common.ComponentFactory', {
                 }
             );
         }
+
+        if (Ext.isObject(paramsObject)) {
+            paramsObject.doFilter = 'doFilter' in paramsObject ? paramsObject.doFilter : true;
+        }
+
+        const filterDefaults = Object.assign(
+            paramsObject || {},
+            config.propertyData?.filterDefaults || {}
+        );
+
         Object.assign(
             config,
             {xtype: config.xtype, itemId: uiElementCd},

package/src/report/component/ReportPanel.js

@@ -68,6 +68,13 @@ Ext.define('Coon.report.component.ReportPanel', {
         enableChipToolbar: false,
         filtered: false,
         customButtons: false,
+        locals: {
+            /**
+             * Точка монтирования api плагинов репорта
+             */
+            api: new Map(),
+            plugins: new Map(),
+        },
     },
     defaults: {
         split: true,
@@ -77,9 +84,6 @@ Ext.define('Coon.report.component.ReportPanel', {
 
     lazyConfigLoading: Coon.setup.get('lazyConfigLoading'),
 
-    locals: {
-        plugins: new Map(),
-    },
     /**
      * @property {Coon.report.component.ReportFieldMap}
      */
@@ -353,6 +357,11 @@ Ext.define('Coon.report.component.ReportPanel', {
         return 'complete loadFakeData';
     },
 
+    constructor(config) {
+        this.callParent(arguments);
+        this.getLocals().api = new Map();
+    },
+
     initComponent: function() {
         this.gridProperties = this.gridProperties || {};
         this.centerProperties = this.centerProperties || {};
@@ -603,12 +612,23 @@ Ext.define('Coon.report.component.ReportPanel', {
         this.addPlugin(config);
     },
 
+    preprocessPluginConfig(config, xtype) {
+        return ![
+            'GridQuickSearchPlugin',
+            'GridFiltersPlugin', // Исключается, т.к. есть альтернатива - плагин по умолчанию AddFilterConditionPlugin
+            'ReportToolbarPlugin',
+            'ToolbarSeparatorPlugin' // Не совместим с ReportToolbarPlugin
+        ].includes(xtype) && config;
+    },
+
     preprocessPlugins(plugins) {
+        const isReportToolbarPlugin = plugins.find((item) => item.uiElement.xtype === 'ReportToolbarPlugin');
+        this.isReportToolbarPlugin = isReportToolbarPlugin;
+        const defaultConfig = Coon.report.plugin.form.ReportToolbarPlugin.getDefaultConfig();
+        this.addToolbarPlugin(isReportToolbarPlugin ?
+            Object.assign({}, isReportToolbarPlugin) : defaultConfig
+        );
         return plugins.reduce((acc, plugin) => {
-            if (plugin.uiElement.xtype === 'ReportToolbarPlugin') {
-                this.addToolbarPlugin(Object.assign({}, plugin));
-                plugin = false;
-            }
             if (typeof this.preprocessPluginConfig === 'function') {
                 plugin = this.preprocessPluginConfig(plugin, plugin.uiElement && plugin.uiElement.xtype);
             }
@@ -715,7 +735,10 @@ Ext.define('Coon.report.component.ReportPanel', {
     },
 
     clearData: function() {
-        this.grid && this.grid.clear();
+        if (this.grid) {
+            this.grid.getStore().clearFilter();
+            this.grid.clear();
+        }
         this.fireEvent('clearData');
     },
 
@@ -1138,6 +1161,7 @@ Ext.define('Coon.report.component.ReportPanel', {
     },
 
     loadDataByStore(parameterList, invalidateCache) {
+        const stop = Coon.perf.start(`Report.load: ${this.reportId}`);
         const store = this.grid.getStore();
         store.getProxy().abort();
         return new Promise((resolve) => {
@@ -1148,15 +1172,17 @@ Ext.define('Coon.report.component.ReportPanel', {
                     invalidateCache,
                 },
                 callback: function(records, operation, success) {
+                    Coon.log.debug(Coon.perf.getLog(stop()));
                     resolve(records);
                 },
+                scope: this,
             });
         });
     },
 
     loadDataByCommand(command, parameterList, invalidateCache) {
         const store = this.grid.getStore();
-        return new Promise((resolve) => {
+        return new Promise(function(resolve) {
             command.on('complete', function(response) {
                 if (!store.lastOptions) {
                     store.lastOptions = {};
@@ -1169,6 +1195,9 @@ Ext.define('Coon.report.component.ReportPanel', {
                 store.fireEvent('load', store);
                 resolve(response && response.list);
             }, this);
+            command.on('failure', function(exception) {
+            }, this);
+
 
             this.executeStoreDataCommand(command, {
                 reportID: this.reportID,
@@ -1200,4 +1229,22 @@ Ext.define('Coon.report.component.ReportPanel', {
         const selectedRecords = this.grid.getSelection();
         return selectedRecords && selectedRecords.length > 0 && firstSelectedOnly ? selectedRecords[0] : selectedRecords;
     },
+
+    registerApi(apiKey, api) {
+        if (this.getLocals().api.has(apiKey)) {
+            Coon.log.warn('Дублирование api ' + apiKey);
+        }
+        this.getLocals().api.set(apiKey, api);
+    },
+
+    getApi(apiKey) {
+        return this.getLocals().api.get(apiKey);
+    },
+
+    isStoreEmpty() {
+        if (!this.grid) {
+            return true;
+        }
+        return this.grid.getStore().getDataSource().getCount() === 0;
+    },
 });

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

@@ -17,12 +17,81 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
         this.grid = grid;
         this.columnFilterTypes = this.getColumnFilterTypes();
         grid.on('clearAllFilters', this.clearAllFilters, this);
-        grid.on('added', this.addMenuItems, this);
+        grid.on('added', this.onReportReady, this);
         grid.on('load', this.clearAllFilters, this);
         grid.contextMenu.on('requestMenuItems', this.onShowMenu, this);
+        grid.getStore().on({
+            load: function(_, records, success) {
+                if (success && !records.length) {
+                    this.clearColumnContext();
+                }
+            },
+            clear: function() {
+                this.clearAllFilters();
+                this.clearColumnContext();
+            },
+            scope: this,
+        });
+        const headerContainer = grid.getHeaderContainer();
+        if (headerContainer) {
+            headerContainer.on('boxready', function() {
+                this.addHeaderMenuItems();
+
+                headerContainer.getMenu().on({
+                    beforeshow: this.beforeHeaderMenuShow,
+                    close: function() {
+                        this.inHeaderContext = false;
+                    },
+                    scope: this,
+                });
+            }, this);
+        }
     },
-    addMenuItems(grid) {
-        const contextMenu = grid.contextMenu;
+
+    onReportReady(grid) {
+        this.addMenuItems(grid);
+        this.registerApi();
+    },
+
+    registerApi() {
+        this.grid.up('ReportPanel').registerApi('advancedSearch', {
+            menuItemText: 'Расширенный поиск',
+            showAdvancedSearchHandler: this.advancedSearch,
+            scope: this,
+        });
+    },
+
+    addHeaderMenuItems() {
+        if (!this.grid.getHeaderContainer()) {
+            return;
+        }
+        const headerMenu = this.getHeaderMenu();
+        const filterMenu = Ext.widget('FilterMenu');
+        filterMenu.on('beforeshow', this.createMenuItem, this);
+        headerMenu.add({xtype: 'menuseparator'});
+        const columnHeaderInfoMenuItem = this.getInfoMenuItem();
+        headerMenu.add(columnHeaderInfoMenuItem);
+        headerMenu.add({
+            xtype: 'menuitem',
+            text: 'Фильтр по значению',
+            itemId: 'filterByCellValue',
+            handler: this.filterByCellValue.bind(this),
+        });
+        headerMenu.add({
+            text: 'Поиск',
+            iconCls: 'svg-icon svg-icon-magnifying-glass',
+            itemId: 'searchByValueHeaderMenuItem',
+            menu: filterMenu,
+        });
+        headerMenu.add({
+            xtype: 'menuitem',
+            text: 'Очистить все фильтры',
+            itemId: 'cancelAllFilters',
+            handler: this.clearAllFilters.bind(this),
+        });
+    },
+
+    getInfoMenuItem() {
         const infoMenuItem = Ext.widget('InfoMenuItem', {
             itemId: 'infoMenuItem',
             originalText: '', // 'Фильтр не задан',
@@ -32,8 +101,15 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
         });
         infoMenuItem.on('removefilter', function() {
             this.clearCurrentColumnFilter();
-            contextMenu.hide();
+            const menu = this.getActiveMenu();
+            menu && menu.hide();
         }, this);
+        return infoMenuItem;
+    },
+
+    addMenuItems(grid) {
+        const contextMenu = grid.contextMenu;
+        const infoMenuItem = this.getInfoMenuItem();
         contextMenu.addToAdvancedSearch(infoMenuItem);
         contextMenu.addToAdvancedSearch(new Ext.menu.Item({
             text: 'Фильтр по значению',
@@ -44,7 +120,7 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
         }));
         const filterMenu = Ext.widget('FilterMenu', {
             listeners: {
-                beforeshow: this.createSearchMenuItem.bind(this),
+                beforeshow: this.createMenuItem.bind(this),
                 resize: this.onResizeSearchSubMenu.bind(this),
             },
         });
@@ -57,13 +133,6 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
             isItemHidden: this.isSearchByValueItemHidden.bind(this),
             isItemDisabled: this.isSearchByValueItemDisabled.bind(this),
         });
-        // contextMenu.addToAdvancedSearch(new Ext.menu.Item({
-        //     text: 'Расширенный поиск',
-        //     itemId: 'advancedSearch',
-        //     handler: this.advancedSearch.bind(this),
-        //     isItemHidden: () => false,
-        //     isItemDisabled: () => false,
-        // }));
         contextMenu.addToAdvancedSearch(new Ext.menu.Item({
             text: 'Очистить все фильтры',
             itemId: 'cancelAllFilters',
@@ -105,7 +174,41 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
         const column = columns.length && columns[cellIndex];
         this.column = column;
         this.columnValue = record && record.get(column.dataIndex);
-        this.setMenuText();
+        const contextMenu = this.grid.contextMenu;
+        const infoMenuItem = contextMenu.down('#infoMenuItem');
+        const foundMenuItem = contextMenu.down('#filterByCellValue');
+        this.setMenuText(infoMenuItem, foundMenuItem);
+    },
+
+    beforeHeaderMenuShow(menu) {
+        this.column = menu.ownerCmp;
+        const record = this.getCmp().getContextManager().context.record;
+        this.columnValue = record && record.get(this.column.dataIndex);
+        this.inHeaderContext = true;
+        this.onShowHeaderMenu();
+    },
+
+    onShowHeaderMenu() {
+        const headerMenu = this.getHeaderMenu();
+        const infoMenuItem = headerMenu.down('#infoMenuItem');
+        const foundMenuItem = headerMenu.down('#filterByCellValue');
+        this.setMenuText(infoMenuItem, foundMenuItem);
+        this.setVisibilityMenuItems();
+    },
+
+    setVisibilityMenuItems() {
+        const headerMenu = this.getHeaderMenu();
+        const searchByValueItem = headerMenu.down('#searchByValueHeaderMenuItem');
+        const filterByCellValue = headerMenu.down('#filterByCellValue');
+        const infoMenuItem = headerMenu.down('#infoMenuItem');
+        const cancelAllFiltersItem = headerMenu.down('#cancelAllFilters');
+
+        const menuItemsStatus = !this.getCmp().reportPanel.isStoreEmpty();
+
+        infoMenuItem.setVisible(menuItemsStatus);
+        searchByValueItem.setVisible(menuItemsStatus);
+        filterByCellValue.setVisible(menuItemsStatus);
+        cancelAllFiltersItem.setVisible(menuItemsStatus);
     },
 
     filterByCellValue: function() {
@@ -439,7 +542,9 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
             return value;
         }
         if (typeof value === 'boolean') {
-            const booleanLabels = this.column ? {trueText: this.column.trueText, falseText: this.column.falseText}: {};
+            const booleanLabels = this.column ?
+                {trueText: this.column.trueText, falseText: this.column.falseText} :
+                {};
             return value ? booleanLabels.trueText || 'да' : booleanLabels.falseText || 'нет';
         }
         if (value === null || value === undefined || value === '') {
@@ -447,22 +552,83 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
         }
     },
 
-    setMenuText() {
-        const contextMenu = this.grid.contextMenu;
+    createInfoMenuText(currentColumnFilter) {
+        const operators = {
+            'ne': 'не равно',
+            'gt': 'больше',
+            'ge': 'больше или равно',
+            'lt': 'меньше',
+            'le': 'меньше или равно',
+            'notfilled': 'не заполнено',
+            'like': 'Содержит',
+            'in': 'Список',
+        };
+        let itemText; let itemPrefix;
+        switch (currentColumnFilter.operator) {
+        case 'between':
+            // Фильтр between может быть задан без одной из границ. Тогда информацию о фильтрации не корректно отображать как диапазон.
+            const operator = currentColumnFilter.operator !== 'between' ?
+                currentColumnFilter.operator:
+                Ext.isEmpty(currentColumnFilter.value[0]) ?
+                    'le':
+                    Ext.isEmpty(currentColumnFilter.value[1]) ? 'ge' : 'between';
+            const valueStart = this.formatFilterValue(currentColumnFilter.value[0]);
+            const valueEnd = this.formatFilterValue(currentColumnFilter.value[1]);
+            if (operator === 'between') {
+                itemPrefix = 'по диапазону';
+                itemText = `  «${valueStart} - ${valueEnd}»`;
+            } else {
+                const value = Ext.isEmpty(currentColumnFilter.value[0]) ?
+                    currentColumnFilter.value[1] :
+                    currentColumnFilter.value[0];
+                itemPrefix = operators[operator];
+                itemText = `  «${this.getValueText(value)}»`;
+            }
+
+            break;
+        case 'ge':
+        case 'gt':
+        case 'le':
+        case 'lt':
+        case 'ne':
+            itemPrefix = operators[currentColumnFilter.operator];
+            itemText = `«${this.getValueText(currentColumnFilter.value)}»`;
+            break;
+        case 'eq':
+            itemPrefix = ' равно ';
+            itemText = `«${this.getValueText(currentColumnFilter.value)}»`;
+            break;
+        case 'like':
+            itemPrefix = ' по подстроке ';
+            itemText = `«${currentColumnFilter.value}»`;
+            break;
+        case 'in':
+            itemPrefix = 'по списку';
+            itemText = ' ';
+            break;
+        case 'notfilled':
+            itemPrefix = ' не заполнено ';
+            itemText = ' ';
+            break;
+        }
+        return {itemPrefix, itemText};
+    },
+
+    formatFilterValue(value) {
+        return Ext.isDate(value) ? Ext.Date.format(value, this.column.format || Coon.format.dateTime) : value;
+    },
+
+    setMenuText(infoMenuItem, foundMenuItem) {
         if (!this.column) {
             return;
         }
-        const infoMenuItem = contextMenu.down('#infoMenuItem');
+
         infoMenuItem.removeQTip();
         infoMenuItem.setFilterText(infoMenuItem.originalText);
         infoMenuItem.setFilterPrefix('');
 
         const currentColumnFilter = this.filters.get(this.getColumnKey());
-        const formatFilterValue = (value) => {
-            return Ext.isDate(value) ? Ext.Date.format(value, this.column.format || Coon.format.dateTime): value;
-        };
 
-        const foundMenuItem = contextMenu.down('#filterByCellValue');
         if (!this.isFilterable()) {
             infoMenuItem.buttonSetHidden(true);
             infoMenuItem.setFilterText(infoMenuItem.forbiddenText);
@@ -478,64 +644,10 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
                 </div>`);
             }
         }
+
         if (currentColumnFilter) {
             infoMenuItem.buttonSetHidden(false);
-            const operators = {
-                'ne': 'не равно',
-                'gt': 'больше',
-                'ge': 'больше или равно',
-                'lt': 'меньше',
-                'le': 'меньше или равно',
-                'notfilled': 'не заполнено',
-                'like': 'Содержит',
-                'in': 'Список',
-            };
-            let itemText; let itemPrefix;
-            switch (currentColumnFilter.operator) {
-            case 'between':
-                // Фильтр between может быть задан без одной из границ. Тогда информацию о фильтрации не корректно отображать как диапазон.
-                const operator = currentColumnFilter.operator !== 'between' ?
-                    currentColumnFilter.operator:
-                    Ext.isEmpty(currentColumnFilter.value[0]) ?
-                        'le':
-                        Ext.isEmpty(currentColumnFilter.value[1]) ? 'ge': 'between';
-                const valueStart = formatFilterValue(currentColumnFilter.value[0]);
-                const valueEnd = formatFilterValue(currentColumnFilter.value[1]);
-                if (operator === 'between') {
-                    itemPrefix = 'по диапазону';
-                    itemText = `  &laquo;${valueStart} - ${valueEnd}&raquo;`;
-                } else {
-                    const value = Ext.isEmpty(currentColumnFilter.value[0]) ? currentColumnFilter.value[1] :currentColumnFilter.value[0];
-                    itemPrefix = operators[operator];
-                    itemText = `  &laquo;${this.getValueText(value)}&raquo;`;
-                }
-
-                break;
-            case 'ge':
-            case 'gt':
-            case 'le':
-            case 'lt':
-            case 'ne':
-                itemPrefix = operators[currentColumnFilter.operator];
-                itemText = `&laquo;${this.getValueText(currentColumnFilter.value)}&raquo;`;
-                break;
-            case 'eq':
-                itemPrefix = ' равно ';
-                itemText = `&laquo;${this.getValueText(currentColumnFilter.value)}&raquo;`;
-                break;
-            case 'like':
-                itemPrefix = ' по подстроке ';
-                itemText = `&laquo;${currentColumnFilter.value}&raquo;`;
-                break;
-            case 'in':
-                itemPrefix = 'по списку';
-                itemText = ' ';
-                break;
-            case 'notfilled':
-                itemPrefix = ' не заполнено ';
-                itemText = ' ';
-                break;
-            }
+            const {itemPrefix, itemText} = this.createInfoMenuText(currentColumnFilter);
             infoMenuItem.setColumnName(this.column.config.text);
             infoMenuItem.setFilterText(itemText);
             infoMenuItem.setFilterPrefix(itemPrefix);
@@ -548,15 +660,26 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
 
     getColumnGroup() {
         let columnGroup = this.column && this.column.columnGroup;
-        columnGroup = Ext.isString(columnGroup) ? columnGroup.replaceAll(';', ' / ') + ' / ': '';
+        columnGroup = Ext.isString(columnGroup) ? columnGroup.replaceAll(';', ' / ') + ' / ' : '';
         return columnGroup;
     },
 
+    getDefaultOperator(filterType) {
+        const selectedRecord = this.getCmp().getContextManager().context.record;
+        const headerOperator = !selectedRecord && filterType === 'string' ? 'like' : 'eq';
+        if (filterType === 'list') {
+            return 'in';
+        }
+        return this.inHeaderContext ?
+            headerOperator :
+            !Ext.isEmpty(this.columnValue) ? 'eq' : 'notfilled';
+    },
+
     /**
      * Создать подменю простого фильтра
      * @param menu
      */
-    createSearchMenuItem(menu) {
+    createMenuItem(menu) {
         const currentColumnFilter = this.filters.get(this.getColumnKey());
         const dataIndex = this.column && this.column.dataIndex;
         const filterType = this.columnFilterTypes[dataIndex];
@@ -571,13 +694,12 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
                 filter.value = currentColumnFilter.value;
                 filter.operator = currentColumnFilter.operator;
             } else {
-                filter.value = filterType === 'list' ? [this.columnValue]: this.columnValue;
-                filter.operator = filterType === 'list' ?
-                    'in':
-                    Ext.isEmpty(this.columnValue) ? 'notfilled': 'eq';
+                filter.value = filterType === 'list' ? [this.columnValue] : this.columnValue;
+                filter.operator = this.getDefaultOperator(filterType);
             }
+            filter.inHeaderContext = this.inHeaderContext;
             if (filterType === 'string') {
-                filter.useCombo = /* this.filters.size === 0 &&*/ this.canUseCombo();
+                filter.useCombo = this.canUseCombo();
             }
             const filterWrapPanelCfg = {
                 filterType,
@@ -597,7 +719,10 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
                 this.addFilter(dataIndex, condition, value);
                 this.doFilter();
                 this.changeColumnsStyle();
-                this.grid.contextMenu.hide();
+                menuItem.hide();
+                if (this.getActiveMenu()) {
+                    this.getActiveMenu().hide();
+                }
             }, this);
             menuItem.on('advancedsearch', this.advancedSearch, this);
             menu.removeAll();
@@ -605,6 +730,19 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
         }
     },
 
+    /**
+     * Возвращает открытое меню (контекстное или меню колонки)
+     * @returns {Ext.menu.Menu}
+     */
+    getActiveMenu() {
+        const headerContainer = this.grid.getHeaderContainer();
+        if (this.grid.contextMenu.isVisible()) {
+            return this.grid.contextMenu;
+        } else if (headerContainer && headerContainer.getMenu().isVisible()) {
+            return headerContainer.getMenu();
+        }
+    },
+
     isCancelAllFiltersHidden() {
         return false;
     },
@@ -629,5 +767,12 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
     isFilterByCellValueDisabled() {
         return false;
     },
+    clearColumnContext() {
+        this.column = undefined;
+        this.columnValue = undefined;
+    },
+    getHeaderMenu() {
+        return this.grid.getHeaderContainer().getMenu();
+    },
 });