ru.coon 2.5.34 → 2.5.35

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

@@ -1,164 +1,164 @@
-/**
- * Добавляет в таблицу возможность фильтрации полей
- */
-Ext.define('Coon.report.plugin.grid.GridFiltersPlugin', {
-    extend: 'Ext.grid.filters.Filters',
-    alias: 'plugin.GridFiltersPlugin',
-    requires: [],
-    uses: [],
-    alternateClassName: [
-        'Sigma.components.plugins.ChangeableGridFiltersPlugin',
-        'Sigma.common.plugin.grid.GridFiltersPlugin'
-    ],
-    menuFilterText: 'Фильтр',
-    editorConfig: undefined,
-    configurePanelWizard: 'GridFiltersPluginConfigPanel',
-    local: true,
-    configFilters: [],
-
-    constructor: function(config) {
-        this.callParent([config]);
-        this.configFilters = this.filters || [];
-        if (!Ext.isArray(this.configFilters)) {
-            this.configFilters = [this.configFilters];
-        }
-    },
-
-    init: function(grid) {
-        this.columns = grid.columnManager.getColumns();
-
-        for (let i = 0; i < this.columns.length; i++) {
-            const column = this.columns[i];
-            for (let j = 0; j < this.configFilters.length; j++) {
-                if (column.dataIndex == this.configFilters[j].dataIndex) {
-                    column.filter = this.getFilterType(this.configFilters[j].type);
-                }
-            }
-        }
-        this.callParent([grid]);
-        this.grid.on('needChangeFilter', this.changeFilterHandler, this);
-    },
-
-    createMenuItem: function(menu, parentTableId) {
-        const filter = this.callParent([menu, parentTableId]);
-        if (this.showMenu) {
-            this.filterTypeMenu = Ext.create('Ext.menu.Menu', {
-                id: this.grid.id + '-filters-type-menu',
-                items: [
-                    {
-                        xtype: 'menucheckitem',
-                        group: 'filterType',
-                        handler: Ext.bind(this.changeFilterTypeHandler, this),
-                        text: 'Текстовый',
-                        type: 'string',
-                    },
-                    {
-                        xtype: 'menucheckitem',
-                        group: 'filterType',
-                        handler: Ext.bind(this.changeFilterTypeHandler, this),
-                        text: 'Числовой',
-                        type: 'numeric',
-                    },
-                    {
-                        xtype: 'menucheckitem',
-                        group: 'filterType',
-                        handler: Ext.bind(this.changeFilterTypeHandler, this),
-                        text: 'Дата',
-                        type: 'date',
-                    },
-                    {
-                        xtype: 'menucheckitem',
-                        group: 'filterType',
-                        handler: Ext.bind(this.changeFilterTypeHandler, this),
-                        text: 'Список',
-                        type: 'list',
-                    }
-                ],
-            });
-            this.typeMenuItem = menu.add({
-                itemId: 'typeFilters',
-                text: 'Тип фильтра',
-                menu: this.filterTypeMenu,
-            });
-        }
-        return filter;
-    },
-
-    onMenuBeforeShow: function(menu) {
-        if (!this.showMenu) {
-            return;
-        }
-        const parentTable = menu.up('tablepanel');
-        const filter = this.getMenuFilter(parentTable.headerCt);
-        if (!Ext.isEmpty(filter)) {
-            if (filter.type == 'list') {
-                this.changeFilter(filter.type, menu.ownerCmp.dataIndex);
-            }
-            if (filter.type === 'string') {
-                filter.itemDefaults.emptyText = 'Введите текст...';
-            }
-            if (filter.type === 'date') {
-                filter.fields.lt.text = 'До';
-                filter.fields.gt.text = 'После';
-                filter.fields.eq.text = 'На';
-            }
-        }
-        this.callParent([menu]);
-
-        if (filter) {
-            let filterType = this.getFilterType(filter.type);
-            filterType = (filterType === 'auto') ? 'string' : filterType;
-
-            this.filterTypeMenu.items.each(function(item) {
-                if (item.type == filterType) {
-                    item.setChecked(true, true);
-                    return false;
-                }
-            });
-            this.typeMenuItem.show();
-        } else {
-            this.typeMenuItem.hide();
-        }
-    },
-
-    getFilterType: function(filterType) {
-        if (filterType == 'int' ||
-            filterType == 'number' ||
-            filterType == 'float') {
-            filterType = 'numeric';
-        } else if (filterType == 'list' ||
-            filterType == 'DynamicList') {
-            filterType = 'list';
-        }
-        return filterType;
-    },
-
-    changeFilterTypeHandler: function(item) {
-        const parentTable = item.up('tablepanel');
-        // Сбрасываем текущую фильтрацию
-        const filter = this.getMenuFilter(parentTable.headerCt);
-        if (filter) {
-            filter.setActive(false);
-        }
-
-        this.changeFilter(item.type, item.ownerCt.ownerCmp.ownerCt.ownerCmp.dataIndex);
-    },
-
-    changeFilter: function(type, dataIndex) {
-        // Подменяем фильтр
-        const newFilter = {
-            type: type,
-            dataIndex: dataIndex,
-        };
-
-        if (newFilter.type == 'list') {
-            newFilter.gridStore = this.grid.getStore();
-        }
-        this.addFilter(newFilter, true);
-        this.grid.fireEvent('filterChanged', newFilter);
-    },
-
-    changeFilterHandler({type, dataIndex}) {
-        this.changeFilter(type, dataIndex);
-    },
-});
+/**
+ * Добавляет в таблицу возможность фильтрации полей
+ */
+Ext.define('Coon.report.plugin.grid.GridFiltersPlugin', {
+    extend: 'Ext.grid.filters.Filters',
+    alias: 'plugin.GridFiltersPlugin',
+    requires: [],
+    uses: [],
+    alternateClassName: [
+        'Sigma.components.plugins.ChangeableGridFiltersPlugin',
+        'Sigma.common.plugin.grid.GridFiltersPlugin'
+    ],
+    menuFilterText: 'Фильтр',
+    editorConfig: undefined,
+    configurePanelWizard: 'GridFiltersPluginConfigPanel',
+    local: true,
+    configFilters: [],
+
+    constructor: function(config) {
+        this.callParent([config]);
+        this.configFilters = this.filters || [];
+        if (!Ext.isArray(this.configFilters)) {
+            this.configFilters = [this.configFilters];
+        }
+    },
+
+    init: function(grid) {
+        this.columns = grid.columnManager.getColumns();
+
+        for (let i = 0; i < this.columns.length; i++) {
+            const column = this.columns[i];
+            for (let j = 0; j < this.configFilters.length; j++) {
+                if (column.dataIndex == this.configFilters[j].dataIndex) {
+                    column.filter = this.getFilterType(this.configFilters[j].type);
+                }
+            }
+        }
+        this.callParent([grid]);
+        this.grid.on('needChangeFilter', this.changeFilterHandler, this);
+    },
+
+    createMenuItem: function(menu, parentTableId) {
+        const filter = this.callParent([menu, parentTableId]);
+        if (this.showMenu) {
+            this.filterTypeMenu = Ext.create('Ext.menu.Menu', {
+                id: this.grid.id + '-filters-type-menu',
+                items: [
+                    {
+                        xtype: 'menucheckitem',
+                        group: 'filterType',
+                        handler: Ext.bind(this.changeFilterTypeHandler, this),
+                        text: 'Текстовый',
+                        type: 'string',
+                    },
+                    {
+                        xtype: 'menucheckitem',
+                        group: 'filterType',
+                        handler: Ext.bind(this.changeFilterTypeHandler, this),
+                        text: 'Числовой',
+                        type: 'numeric',
+                    },
+                    {
+                        xtype: 'menucheckitem',
+                        group: 'filterType',
+                        handler: Ext.bind(this.changeFilterTypeHandler, this),
+                        text: 'Дата',
+                        type: 'date',
+                    },
+                    {
+                        xtype: 'menucheckitem',
+                        group: 'filterType',
+                        handler: Ext.bind(this.changeFilterTypeHandler, this),
+                        text: 'Список',
+                        type: 'list',
+                    }
+                ],
+            });
+            this.typeMenuItem = menu.add({
+                itemId: 'typeFilters',
+                text: 'Тип фильтра',
+                menu: this.filterTypeMenu,
+            });
+        }
+        return filter;
+    },
+
+    onMenuBeforeShow: function(menu) {
+        if (!this.showMenu) {
+            return;
+        }
+        const parentTable = menu.up('tablepanel');
+        const filter = this.getMenuFilter(parentTable.headerCt);
+        if (!Ext.isEmpty(filter)) {
+            if (filter.type == 'list') {
+                this.changeFilter(filter.type, menu.ownerCmp.dataIndex);
+            }
+            if (filter.type === 'string') {
+                filter.itemDefaults.emptyText = 'Введите текст...';
+            }
+            if (filter.type === 'date') {
+                filter.fields.lt.text = 'До';
+                filter.fields.gt.text = 'После';
+                filter.fields.eq.text = 'На';
+            }
+        }
+        this.callParent([menu]);
+
+        if (filter) {
+            let filterType = this.getFilterType(filter.type);
+            filterType = (filterType === 'auto') ? 'string' : filterType;
+
+            this.filterTypeMenu.items.each(function(item) {
+                if (item.type == filterType) {
+                    item.setChecked(true, true);
+                    return false;
+                }
+            });
+            this.typeMenuItem.show();
+        } else {
+            this.typeMenuItem.hide();
+        }
+    },
+
+    getFilterType: function(filterType) {
+        if (filterType == 'int' ||
+            filterType == 'number' ||
+            filterType == 'float') {
+            filterType = 'numeric';
+        } else if (filterType == 'list' ||
+            filterType == 'DynamicList') {
+            filterType = 'list';
+        }
+        return filterType;
+    },
+
+    changeFilterTypeHandler: function(item) {
+        const parentTable = item.up('tablepanel');
+        // Сбрасываем текущую фильтрацию
+        const filter = this.getMenuFilter(parentTable.headerCt);
+        if (filter) {
+            filter.setActive(false);
+        }
+
+        this.changeFilter(item.type, item.ownerCt.ownerCmp.ownerCt.ownerCmp.dataIndex);
+    },
+
+    changeFilter: function(type, dataIndex) {
+        // Подменяем фильтр
+        const newFilter = {
+            type: type,
+            dataIndex: dataIndex,
+        };
+
+        if (newFilter.type == 'list') {
+            newFilter.gridStore = this.grid.getStore();
+        }
+        this.addFilter(newFilter, true);
+        this.grid.fireEvent('filterChanged', newFilter);
+    },
+
+    changeFilterHandler({type, dataIndex}) {
+        this.changeFilter(type, dataIndex);
+    },
+});

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

@@ -1,106 +1,106 @@
-/**
- * Добавляет в таблицу возможность фильтрации полей
- */
-Ext.define('Coon.report.plugin.grid.GridFiltersPopupPlugin', {
-    extend: 'Ext.AbstractPlugin',
-    alias: 'plugin.GridFiltersPopupPlugin',
-    requires: [],
-    uses: [],
-    alternateClassName: [],
-
-    configurePanelWizard: 'GridFiltersPopupPluginConfigPanel',
-
-    startByKeyPressOnColumn: false,
-    hotKey: Ext.event.Event.F,
-    hotKeyUseAlt: false,
-    hotKeyUseCtrl: true,
-    hotKeyUseShift: true,
-
-    filterWindow: undefined,
-    title: 'Панель фильтрации',
-    collapsible: true,
-    closable: false,
-    constrainHeader: true,
-    headerPosition: 'left',
-
-
-    init: function(grid) {
-        this.grid = grid;
-        this.grid.on('afterrender', function() {
-            if (!this.grid.filters) {
-                this.grid.el.on('keydown', this.keyDownHandler, this);
-                this.grid.on('filterchange', this.filterChangeHandler, this);
-                const storeFiltersCollection = this.grid.getStore() && this.grid.getStore().getFilters();
-                if (storeFiltersCollection) {
-                    storeFiltersCollection.on('remove', this.filtersRemoveHandler, this);
-                }
-                this.filterWindow = this.getFilterWindow();
-            } else {
-                Coon.log.error('Плагин панели фильтрации не совместим с плагином GridFiltersPlugin!');
-            }
-        }, this);
-    },
-
-    getFilterWindow: function() {
-        this.filterWindow = this.filterWindow && this.filterWindow.isAlive ? this.filterWindow : this.createPopupWindow();
-        return this.filterWindow;
-    },
-
-    keyDownHandler: function(e) {
-        const passExtKey = (e.ctrlKey === this.hotKeyUseCtrl) &&
-            (e.shiftKey === this.hotKeyUseShift) &&
-            (e.altKey === this.hotKeyUseAlt);
-        if (passExtKey && this.hotKey) {
-            const key = e.getKey();
-            if (this.hotKey === key) {
-                this.openFilterPanel() && e.stopEvent();
-            }
-        }
-    },
-
-    openFilterPanel: function() {
-        let result = false;
-        const win = this.getFilterWindow();
-        win.backstage = false;
-        if (win.items && win.items.length > 0) {
-            const store = this.grid && this.grid.getStore();
-            const storeFiltersArray = store && store.getFilters() && store.getFilters().getRange();
-            win && Ext.isFunction(win.synchronizeWithFilters) && win.synchronizeWithFilters.call(win, storeFiltersArray);
-            win.toWake();
-            result = true;
-        }
-        return result;
-    },
-
-    filtersRemoveHandler: function(storeFiltersCollection) {
-        const win = this.getFilterWindow();
-        win && Ext.isFunction(win.synchronizeWithFilters) &&
-        win.synchronizeWithFilters.call(win, storeFiltersCollection.getRange());
-    },
-
-    filterChangeHandler: function(store, filtersArray) {
-        if (this.startByKeyPressOnColumn) {
-            const win = this.getFilterWindow();
-            if (win && Ext.isFunction(win.synchronizeWithFilters)) {
-                win.synchronizeWithFilters.call(win, filtersArray);
-                if (filtersArray.length > 0) {
-                    if (win && !win.isVisible(false)) {
-                        win.toWake();
-                    }
-                }
-            }
-        }
-    },
-
-    createPopupWindow: function() {
-        return Ext.create('Coon.report.component.GridFilterWindow', {
-            title: this.title,
-            collapsible: this.collapsible,
-            closable: this.closable,
-            constrainHeader: this.constrainHeader,
-            headerPosition: this.headerPosition,
-            grid: this.grid,
-            checkChangeDelay: 400,
-        });
-    },
-});
+/**
+ * Добавляет в таблицу возможность фильтрации полей
+ */
+Ext.define('Coon.report.plugin.grid.GridFiltersPopupPlugin', {
+    extend: 'Ext.AbstractPlugin',
+    alias: 'plugin.GridFiltersPopupPlugin',
+    requires: [],
+    uses: [],
+    alternateClassName: [],
+
+    configurePanelWizard: 'GridFiltersPopupPluginConfigPanel',
+
+    startByKeyPressOnColumn: false,
+    hotKey: Ext.event.Event.F,
+    hotKeyUseAlt: false,
+    hotKeyUseCtrl: true,
+    hotKeyUseShift: true,
+
+    filterWindow: undefined,
+    title: 'Панель фильтрации',
+    collapsible: true,
+    closable: false,
+    constrainHeader: true,
+    headerPosition: 'left',
+
+
+    init: function(grid) {
+        this.grid = grid;
+        this.grid.on('afterrender', function() {
+            if (!this.grid.filters) {
+                this.grid.el.on('keydown', this.keyDownHandler, this);
+                this.grid.on('filterchange', this.filterChangeHandler, this);
+                const storeFiltersCollection = this.grid.getStore() && this.grid.getStore().getFilters();
+                if (storeFiltersCollection) {
+                    storeFiltersCollection.on('remove', this.filtersRemoveHandler, this);
+                }
+                this.filterWindow = this.getFilterWindow();
+            } else {
+                Coon.log.error('Плагин панели фильтрации не совместим с плагином GridFiltersPlugin!');
+            }
+        }, this);
+    },
+
+    getFilterWindow: function() {
+        this.filterWindow = this.filterWindow && this.filterWindow.isAlive ? this.filterWindow : this.createPopupWindow();
+        return this.filterWindow;
+    },
+
+    keyDownHandler: function(e) {
+        const passExtKey = (e.ctrlKey === this.hotKeyUseCtrl) &&
+            (e.shiftKey === this.hotKeyUseShift) &&
+            (e.altKey === this.hotKeyUseAlt);
+        if (passExtKey && this.hotKey) {
+            const key = e.getKey();
+            if (this.hotKey === key) {
+                this.openFilterPanel() && e.stopEvent();
+            }
+        }
+    },
+
+    openFilterPanel: function() {
+        let result = false;
+        const win = this.getFilterWindow();
+        win.backstage = false;
+        if (win.items && win.items.length > 0) {
+            const store = this.grid && this.grid.getStore();
+            const storeFiltersArray = store && store.getFilters() && store.getFilters().getRange();
+            win && Ext.isFunction(win.synchronizeWithFilters) && win.synchronizeWithFilters.call(win, storeFiltersArray);
+            win.toWake();
+            result = true;
+        }
+        return result;
+    },
+
+    filtersRemoveHandler: function(storeFiltersCollection) {
+        const win = this.getFilterWindow();
+        win && Ext.isFunction(win.synchronizeWithFilters) &&
+        win.synchronizeWithFilters.call(win, storeFiltersCollection.getRange());
+    },
+
+    filterChangeHandler: function(store, filtersArray) {
+        if (this.startByKeyPressOnColumn) {
+            const win = this.getFilterWindow();
+            if (win && Ext.isFunction(win.synchronizeWithFilters)) {
+                win.synchronizeWithFilters.call(win, filtersArray);
+                if (filtersArray.length > 0) {
+                    if (win && !win.isVisible(false)) {
+                        win.toWake();
+                    }
+                }
+            }
+        }
+    },
+
+    createPopupWindow: function() {
+        return Ext.create('Coon.report.component.GridFilterWindow', {
+            title: this.title,
+            collapsible: this.collapsible,
+            closable: this.closable,
+            constrainHeader: this.constrainHeader,
+            headerPosition: this.headerPosition,
+            grid: this.grid,
+            checkChangeDelay: 400,
+        });
+    },
+});