ru.coon 2.7.53 → 2.7.55

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# Version 2.7.55, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ffc9e1be5d88576d1e55c01cfd0af5f6dbbfb2aa)
+* ## Fixes
+* <span style='color:red'> У AceEditor в mode:javascript отключена загрузка web-worker в production режиме.</span> ([b2e0f4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b2e0f4b4c427e79fd4826fdb6b95b775b6bdc6b3))
+
+* update: CHANGELOG.md ([68f517], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/68f517a04d7c7e0c2e58044a615c94945f0e2cbf))
+
+# Version 2.7.54, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a19441b9743262927cddd105cae2ada2813cd1d5)
+* ## Fixes
+* <span style='color:red'> HT-9400 Исправление ошибок фильтрации списка плагинов в кастомной панели</span> ([b2b26e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b2b26e284939d93431e62980f5e5b97dc9a35e0a))
+
+* update: CHANGELOG.md ([51f898], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/51f89806fc1f770ac00a25ab1a7a3a992e851dc0))
+
 # Version 2.7.53, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/694dce77cf290d786cc594c9d55532556a33ca31)
 * ## Fixes
 * <span style='color:red'> HT-9805 excel export checkbox column</span> ([00b75d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/00b75d185f59e6d26aad753e649a94117d2db076))
@@ -35,6 +47,9 @@ This reverts commit b3524303e203486f1c393f2174967c652d2f8c33.</span> ([0bfe61],
 * update: CHANGELOG.md ([2f020b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2f020b8a2b6d2e2150329164ac7cef4d686de162))
 
 # Version 2.7.49, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f1191865e9e52331596a93e7bcf3ba36c85940f6)
+* ## Features
+* <span style='color:green'>feat: TR-69015: css</span> ([ecd879], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ecd87930a535ff13b0ad42eba28df9d1ed91cd2a))
+
 * ## Fixes
 * <span style='color:red'> HT-9084 ReportColumnStatePlugin column width</span> ([b10a75], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b10a75f78f92262543be268863961fda1113d9d5))
 
@@ -46,11 +61,17 @@ This reverts commit b3524303e203486f1c393f2174967c652d2f8c33.</span> ([0bfe61],
 * update: CHANGELOG.md ([e32b02], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e32b025afe52cc55930d04bccba9fd19be5905b9))
 
 # Version 2.7.46, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/236b6e13be06add8fe0eeab8b079e086e1d8b524)
+* ## Features
+* <span style='color:green'>feat: TR-69015: css</span> ([a2f2b9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a2f2b9ba72b21e13e6ef30394e72af12f7e3811f))
+* <span style='color:green'>feat: TR-69015: toolbar overflow panel on change overflow size hide/show buttons</span> ([d3540e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d3540e57ae3db0c52e02a0604c176f46cc411654))
+
 * :feat HT-8890 update extjs_iconpack to 1.3.27 ([108b17], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/108b17bbd73ed4064b884baa8633b0ceb9981048))
 * update: CHANGELOG.md ([c2d8dd], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c2d8dde1d050e900e2cd6fec5ded2c94c38050f0))
 
 # Version 2.7.46, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/19e7bc15c819e0dda639b962060e1993b1f29b6b)
 * ## Features
+* <span style='color:green'>feat: TR-69015: css toolbar overflow panel</span> ([02e557], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/02e557e27dee1856c7d79d112bc36aacffb9a146))
+* <span style='color:green'>feat: TR-69015: css toolbar overflow panel</span> ([af4b4f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/af4b4f895eb300ebaba1226c93af7eabf565916a))
 * <span style='color:green'>feat: extjs_iconpack version 1.3.26. Related to HT-8076.</span> ([4800c2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4800c23beff6959619ff467bbcb6c7fc30afb188))
 
 * upd ([b76ef9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b76ef97561c257ff2c4956cebd21a69813219c2a))
@@ -58,6 +79,12 @@ This reverts commit b3524303e203486f1c393f2174967c652d2f8c33.</span> ([0bfe61],
 * update: CHANGELOG.md ([c9af96], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c9af967e425b3f60570f9bf2198c105c7480f8e6))
 
 # Version 2.7.45, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6d09543c991b7ecfb2ea0f7e4369298dbfd2327f)
+* ## Features
+* <span style='color:green'>feat: TR-69015: fix menu rendering problem after change parent panel</span> ([7f17ea], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7f17ea3eebc99c044831a3fbeadab3f1c8a358a4))
+* <span style='color:green'>feat: TR-69015: refactoring</span> ([96f8a4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/96f8a4b10c77c3ab50be18ed82d4def80e6039b8))
+* <span style='color:green'>feat: TR-69015: create new plugin</span> ([bc5a5c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bc5a5c7b3440a0a3965c589b519d63f6dc473c94))
+* <span style='color:green'>feat: TR-69015: create new plugin</span> ([4a5f92], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4a5f92c2f8ee5d8c3cb141572867bb50c8f7423f))
+
 * ## Fixes
 * <span style='color:red'> Added required deps. Related to TR-68743, TR-63848.</span> ([27be06], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/27be06f608741d363f0c7e8521e94aefb2e9ba81))
 
@@ -105,6 +132,8 @@ fix: restore version of custom panel in editor</span> ([53a300], [link](http://g
 
 # Version 2.7.38, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3e9d06de2b191d41e62cc8ecb0fa9bf29863d57f)
 * ## Features
+* <span style='color:green'>feat: TR-69015: create new plugin</span> ([ee863e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ee863e9df28954347719fde3d8141fd021f88bea))
+* <span style='color:green'>feat: TR-69015: create new plugin</span> ([5231c9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5231c90f995574078ccdd61357dc4a92b3fac31d))
 * <span style='color:green'>feat: Added markClean fn, added initial value support. Related to TR-68743.</span> ([832572], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/83257261caf417563e7e698e1679da7266660fc5))
 * <span style='color:green'>feat: Added isDirty fn. Related to TR-68743.</span> ([eb0069], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/eb006993c46e4bab039e74703afc942ea1ca86e8))
 

package/package.json

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

package/src/report/component/ReportPanel.js

@@ -475,9 +475,59 @@ Ext.define('Coon.report.component.ReportPanel', {
         ];
     },
 
+    getGridTopToolbar() {
+        return this.gridTopToolbar;
+    },
+    getGridBottomToolbar() {
+        return this.gridBottomToolbar;
+    },
+    getGridFooterToolbar() {
+        return this.gridFooterToolbar;
+    },
+
+
+    createGridToolbars(grid) {
+        grid.tbar = this.createTopToolbar(grid.tbar);
+        grid.bbar = this.createBottomToolbar(grid.bbar);
+        grid.fbar = this.createFooterToolbar(grid.fbar);
+    },
+
+    createTopToolbar(items) {
+        return this.gridTopToolbar = Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(items || [])});
+    },
+    createBottomToolbar(items) {
+        return this.gridBottomToolbar =Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(items || [])});
+    },
+    createFooterToolbar(items) {
+        return this.gridFooterToolbar =Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(items || [])});
+    },
+
+    getGridButtonsOrder() {
+        return false;
+    },
+
+    addToolbarPlugin(plugin) {
+        const ns = Coon.report.model.ReportPluginBeanFields;
+        const config = {pluginId: plugin[ns.$uiElement] && plugin[ns.$uiElement].id};
+        if (plugin[ns.$uiElement].propertyData) {
+            Ext.apply(config, Coon.Function.convertAdvancedProperties(Ext.decode(plugin[ns.$uiElement].propertyData)));
+        } else {
+            Ext.apply(config, Coon.Function.convertAdvancedProperties(plugin[ns.$uiElement].properties || plugin[ns.$properties]));
+        }
+        config['ptype'] = plugin[ns.$uiElement].xtype || plugin[ns.$xtype];
+        config[ns.$sortSequence] = plugin[ns.$sortSequence] || null;
+        this.addPlugin(config);
+    },
+
     preprocessPlugins(plugins) {
         return plugins.reduce((acc, plugin) => {
-            plugin = this.preprocessPluginConfig(plugin, plugin.uiElement && plugin.uiElement.xtype);
+            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);
+            }
             plugin && acc.push(plugin);
             return acc;
         }, []);
@@ -487,10 +537,7 @@ Ext.define('Coon.report.component.ReportPanel', {
         this.clear();
         const command = Ext.create('command.LoadReportConfig', {activeComponent: this.activeComponent});
         command.on('complete', function(response) {
-            if (typeof this.preprocessPluginConfig === 'function') {
-                response.plugins = this.preprocessPlugins(response.plugins);
-            }
-            // response.plugins = this.checkPluginsCompatibility(response.plugins);
+            response.plugins = this.preprocessPlugins(response.plugins);
             this.build(response);
             this.fireEvent('configured', response, this);
             this.grid.fireEvent('configured', response, this);
@@ -762,6 +809,7 @@ Ext.define('Coon.report.component.ReportPanel', {
             groupSortFunc: this.groupSortFunc,
             enableAutoSize: this.enableAutoSize,
             fields: [],
+            reportPanel: this,
             url: this.url || '/ReportFormData/get',
             timeout: this.timeout || undefined,
             pageSize: this.pageSize || reportBean[ns.$rowCountPerPageValue],

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

@@ -45,11 +45,9 @@ Ext.define('Coon.report.component.reportpanel.ReportGrid', {
             }, this);
             this.store.on('beforeload', () => this.getView().setEmptyText(''));
         }, this, {single: true});
-
-        this.tbar = Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(this.tbar || [])});
-        this.bbar = Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(this.bbar || [])});
-        this.fbar = Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(this.fbar || [])});
-
+        if (this.reportPanel) {
+            this.reportPanel.createGridToolbars(this);
+        }
         const plugins = this.plugins;
         delete this.plugins;
         const pluginErrors = [];

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

@@ -102,11 +102,9 @@ Ext.define('Coon.report.component.reportpanel.ReportTree', {
                 }
             }
         }
-
-        this.tbar = Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(this.tbar||[])});
-        this.bbar = Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(this.bbar||[])});
-        this.fbar = Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(this.fbar||[])});
-
+        if (this.reportPanel) {
+            this.reportPanel.createGridToolbars(this);
+        }
         this.callParent();
         this.relayEvents(this.getStore(), ['datachanged', 'load']);
     },

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

@@ -9,7 +9,7 @@ Ext.define('Coon.report.component.settings.plugin.PluginSelectWindow', {
     ],
 
     width: 1050,
-    height: 700,
+    height: '95%',
     closeAction: 'hide',
     title: 'Выбор плагина',
 

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

@@ -1,7 +1,10 @@
 Ext.define('Coon.report.component.settings.plugin.ReportFormPluginPanelController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.reportformpluginpanelcontroller',
-    requires: ['Coon.report.plugin.util'],
+    requires: ['Coon.report.plugin.util', 'Coon.report.component.settings.plugin.ReportToolbarFunctions'],
+    mixins: {
+        reportToolbarFunctions: 'Coon.report.component.settings.plugin.ReportToolbarFunctions',
+    },
     init: function(view) {
         this.getViewModel().bind({bindTo: '{pluginsGrid.selection}'}, this.selectionChange, this);
         this.getViewModel().bind({bindTo: '{report.fields}', deep: true}, this.updateContext, this);

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

@@ -0,0 +1,176 @@
+Ext.define('Coon.report.component.settings.plugin.ReportToolbarFunctions', {
+    extend: 'Ext.Mixin',
+    mixinConfig: {
+        after: {
+            saveState: 'updateUBFState',
+        },
+    },
+    getInstance(obj) {
+        if (!obj || obj.$className === 'Ext.plugin.Abstract') {
+            return false;
+        }
+        return obj.$className === 'Coon.report.plugin.grid.ToolbarItemPlugin' ||
+        obj.$className === 'Coon.report.plugin.grid.GroupButtonsPlugin' ||
+        this.getInstance(obj.superclass) ? true : false;
+    },
+
+    compareItems(items, cfg) {
+        cfg && cfg.cfg && cfg.cfg.forEach((cfgItem) => {
+            items.forEach((item) => {
+                if (item.uiElement === cfgItem.id) {
+                    item.buttonType = cfgItem.buttonType;
+                    item.index = cfgItem.index;
+                } else if (item.xtype === 'GroupButtonsPlugin' && item.jsonProperties && item.jsonProperties.groupButtonsConfig) {
+                    item.jsonProperties.groupButtonsConfig.forEach((group) => {
+                        if (group.groupButtonId === cfgItem.id) {
+                            group.buttonType = cfgItem.buttonType;
+                            group.index = cfgItem.index;
+                        }
+                    });
+                }
+            });
+        });
+        return items;
+    },
+
+    sortList(items, index) {
+        items.sort((a, b) => {
+            if (a[index] < b[index]) {
+                return -1;
+            }
+            if (a[index] > b[index]) {
+                return 1;
+            }
+            return 0;
+        });
+    },
+
+    getMaxIndex(items) {
+        let index = 0;
+        items.forEach((item) => {
+            if (item.index && item.index > index) {
+                index = item.index;
+            }
+        });
+        return index;
+    },
+
+    getTreeData(items) {
+        const data = [];
+        const indexes = [];
+        items.forEach((item, pos) => {
+            if (item.xtype === 'GroupButtonsPlugin' && item.jsonProperties && item.jsonProperties.groupButtonsConfig) {
+                item.jsonProperties.groupButtonsConfig.forEach((groupButton) => {
+                    const group = {
+                        id: groupButton.groupButtonId,
+                        index: groupButton.index >= 0 ? groupButton.index : -1,
+                        position: groupButton.position,
+                        text: groupButton.text,
+                        children: [],
+                        pluginId: item.uiElement,
+                        /* expanded: true,*/
+                        buttonType: groupButton.buttonType || 0,
+                    };
+                    indexes.push(pos);
+                    items.forEach((item, pos) => {
+                        if (item && item.jsonProperties && item.jsonProperties.groupButtonId &&
+                            item.jsonProperties.groupButtonId === groupButton.groupButtonId) {
+                            group.children.push({
+                                id: item.uiElement,
+                                position: item.jsonProperties.position >= 0 ? item.jsonProperties.position : item.sortSequence,
+                                text: item.jsonProperties.buttonText,
+                                children: [],
+                                buttonType: 0,
+                                leaf: true,
+                            });
+                            indexes.push(pos);
+                        }
+                    });
+                    this.sortList(group.children, 'position');
+                    data.push(group);
+                });
+            }
+        });
+        let index = this.getMaxIndex(items) + 1;
+        items.forEach((item, pos) => {
+            if (indexes.indexOf(pos) < 0) {
+                if (item.jsonProperties.addButtonOnToolbar && item.jsonProperties.toolbar === 'Top') {
+                    const btnType = item.buttonType >=0 ? item.buttonType : this.getDefaultButtonType(items, item);
+                    data.push({
+                        id: item.uiElement,
+                        index: item.index >= 0 ? item.index : index++,
+                        text: item.jsonProperties.buttonText,
+                        children: [],
+                        buttonType: btnType,
+                        leaf: true,
+                    });
+                    item.buttonType = btnType;
+                }
+            }
+        });
+        data.forEach((item) => {
+            if (!(item.index >= 0)) {
+                item.index = index++;
+            }
+        });
+        this.sortList(data, 'index');
+        return data;
+    },
+    getDefaultButtonType(records, record) {
+        if (this.getSystemList().indexOf(record.xtype) < 0) {
+            return 0;
+        }
+        let flag = false;
+        records.forEach((rec) => {
+            if (rec.xtype === record.xtype && rec.uiElement !== record.uiElement && rec.buttonType === 3) {
+                flag = true;
+                return true;
+            }
+        });
+        return flag ? 0 : 3;
+    },
+    hasReportToolbarPlugin() {
+        let plugin = false;
+        this.getViewModel().get('report.plugins').forEach((el) => {
+            if (el.xtype === 'ReportToolbarPlugin') {
+                plugin = el;
+            }
+        });
+        return plugin;
+    },
+    getSystemList() {
+        return ['CopyRowsFromGrid', 'ExportReportDataToFilePlugin', 'ExporterPlugin', 'PrintPdfButtonPlugin'];
+    },
+    updateUBFState() {
+        const plugin = this.hasReportToolbarPlugin();
+        const pluginRecord = this.lookup('pluginsGrid').getStore().getById(plugin['id']);
+        if (pluginRecord) {
+            if (plugin !== false && (!this.activeRecord || this.activeRecord.get('xtype') !== 'ReportToolbarPlugin')) {
+                const items = [];
+                this.getViewModel().get('report.plugins').forEach((el) => {
+                    if (this.getInstance(Ext.ClassManager.getByAlias(`plugin.${el.xtype}`))) {
+                        items.push(el);
+                    }
+                });
+                const data = this.getTreeData(this.compareItems(items, plugin.jsonProperties));
+                const savedData = [];
+                data.forEach((item) => {
+                    savedData.push(this.getObject(item));
+                });
+                pluginRecord.set('jsonProperties', {cfg: savedData, useReportToolbar: plugin.jsonProperties.useReportToolbar});
+            }
+        }
+    },
+    getObject(item) {
+        return typeof item.get === 'function' ? {
+            id: item.get('id'),
+            index: item.get('index'),
+            buttonType: item.get('buttonType'),
+        } : {
+            id: item['id'],
+            index: item['index'],
+            buttonType: item['buttonType'],
+        };
+    },
+
+});

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

@@ -0,0 +1,195 @@
+Ext.define('Coon.report.plugin.configPanel.ReportToolbarPluginConfigPanel', {
+    extend: 'Coon.report.plugin.configPanel.BasePluginConfig',
+    alias: 'widget.ReportToolbarPluginConfigPanel',
+    description: 'Добавляет разделитель на панель инструментов отчета.',
+    tags: ['Отображение', 'Тулбар'],
+    flex: 1,
+    config: {
+        pluginTypeSettings: {
+            defaultType: 'PANEL_PLUGIN',
+            allowedTypes: [
+                'PANEL_PLUGIN'
+            ],
+        },
+    },
+    viewModel: {
+        data: {
+            useReportToolbar: true,
+        },
+    },
+    doInit(properties) {
+        const panel = this.up('ReportFormEditPanel');
+        if (panel) {
+            const vm = panel.getViewModel();
+            const controller = this.up('ReportFormPluginPanel').getController();
+            const items = [];
+            vm.get('report.plugins').forEach((el) => {
+                if (controller.mixins.reportToolbarFunctions.getInstance(Ext.ClassManager.getByAlias(`plugin.${el.xtype}`))) {
+                    items.push(el);
+                }
+            });
+            this.down('treepanel').getRootNode().appendChild(
+                controller.mixins.reportToolbarFunctions.getTreeData(
+                    controller.mixins.reportToolbarFunctions.compareItems(items, properties)
+                )
+            );
+            this.getViewModel().set('useReportToolbar', typeof properties.useReportToolbar != 'undefined' ? properties.useReportToolbar : true);
+        }
+    },
+    createItems: function() {
+        const filterTypeEditor = Ext.create('Coon.common.field.combo.ConstantList', {
+            data: [
+                [0, 'Без категории'],
+                [1, 'Функциональные'],
+                [2, 'Информационные'],
+                [3, 'Системные']
+            ],
+        });
+        return [
+            {
+                xtype: 'checkbox',
+                boxLabel: 'Отобразить новый интерфейс',
+                bind: {
+                    value: '{useReportToolbar}',
+                },
+            },
+            {
+                xtype: 'treepanel',
+                plugins: {
+                    cellediting: {
+                        clicksToEdit: 2,
+                        listeners: {
+                            beforeedit: function(editor, context) {
+                                if (!context.record.parentNode.isRoot()) {
+                                    return false;
+                                }
+                                const mainPanel = context.grid.up('ReportFormPluginPanel');
+                                const controller = mainPanel.getController();
+                                const plugins = mainPanel.down('ReportFormPluginGrid');
+                                const pos = plugins.getStore().find('uiElement',
+                                    context.record.get('pluginId') ? context.record.get('pluginId') : context.record.get('id')
+                                );
+                                const pluginRecord = plugins.getStore().getAt(pos);
+                                const xtype = pluginRecord.get('xtype');
+
+                                if (controller.mixins.reportToolbarFunctions.getSystemList().indexOf(xtype) >= 0 || xtype === 'GroupButtonsPlugin') {
+                                    filterTypeEditor.getStore().clearFilter();
+                                } else {
+                                    if (!context.grid.getStore().filters.length) {
+                                        filterTypeEditor.getStore().addFilter({
+                                            property: 'value',
+                                            value: 3,
+                                            operator: '!=',
+                                        });
+                                    }
+                                }
+                            },
+                            edit: function(editor, context) {
+                                if (context.field !== 'buttonType' || context.record.get('buttonType') !== 3) {
+                                    return true;
+                                }
+                                context.grid.up('ReportToolbarPluginConfigPanel').updateTypes(context.record);
+                            },
+                        },
+
+                    },
+                },
+                viewConfig: {
+                    plugins: {
+                        treeviewdragdrop: {
+                            dragText: 'Задайте порядок отображения кнопок',
+                            sortOnDrop: true,
+                            allowParentInserts: false,
+                        },
+                    },
+                    listeners: {
+                        beforedrop: function(node, data, overModel, dropPosition, dropHandlers) {
+                            dropHandlers.wait = true;
+                            if (dropPosition === 'append' || !overModel.parentNode.isRoot() || !data.records[0].parentNode.isRoot()) {
+                                dropHandlers.cancelDrop();
+                            } else {
+                                dropHandlers.processDrop();
+                            }
+                        },
+                    },
+                },
+                store: {
+                    root: {
+                        expanded: true,
+                        children: [],
+                    },
+                    type: 'tree',
+                },
+                rootVisible: false,
+                columns: [{
+                    xtype: 'treecolumn',
+                    text: 'Текст кнопки',
+                    dataIndex: 'text',
+                    flex: 1,
+                }, {
+                    text: 'Тип кнопки',
+                    dataIndex: 'buttonType',
+                    flex: 1,
+                    renderer: Coon.format.comboRenderer(filterTypeEditor),
+                    editor: filterTypeEditor,
+
+                }, {
+                    xtype: 'actioncolumn',
+                    width: 50,
+                    items: [{
+                        iconCls: 'x-fa fa-search',
+                        tooltip: 'Перейти',
+                        handler: function(grid, rowIndex, colIndex) {
+                            const rec = grid.getStore().getAt(rowIndex);
+                            const plugins = this.up('ReportFormPluginPanel').down('ReportFormPluginGrid');
+                            if (plugins) {
+                                plugins.getSelectionModel().select(
+                                    plugins.getStore().find('uiElement', rec.get('pluginId') ? rec.get('pluginId') : rec.get('id'))
+                                );
+                            }
+                        },
+                    }],
+                }],
+            }
+        ];
+    },
+    updateTypes(record) {
+        const mainPanel = this.up('ReportFormPluginPanel');
+        const plugins = mainPanel.down('ReportFormPluginGrid');
+        const pos = plugins.getStore().find('uiElement',
+            record.get('pluginId') ? record.get('pluginId') : record.get('id')
+        );
+        const pluginRecord = plugins.getStore().getAt(pos);
+        const pluginsByXtype = [];
+        plugins.getStore().getRange().filter(
+            (rec) => rec.get('xtype') === pluginRecord.get('xtype')
+        ).forEach((rec) => {
+            if (rec.get('xtype') === 'GroupButtonsPlugin') {
+                if (rec.get('jsonProperties') && rec.get('jsonProperties').groupButtonsConfig) {
+                    rec.get('jsonProperties').groupButtonsConfig.forEach((prop) => {
+                        pluginsByXtype.push(prop.groupButtonId);
+                    });
+                }
+            } else {
+                pluginsByXtype.push(rec.get('uiElement'));
+            }
+        });
+        // console.log(pluginsByXtype);
+        this.down('treepanel').getStore().getData().each((item) => {
+            if (item.id !== record.id && pluginsByXtype.indexOf(item.id) >= 0) {
+                item.set('buttonType', 0);
+            }
+        });
+    },
+    getConfiguration: function() {
+        const tree = this.down('treepanel');
+        const data = [];
+        if (tree) {
+            const controller = this.up('ReportFormPluginPanel').getController();
+            this.down('treepanel').getStore().getData().items.forEach((item) => {
+                data.push(controller.mixins.reportToolbarFunctions.getObject(item));
+            });
+        }
+        return {cfg: data, useReportToolbar: this.getViewModel().get('useReportToolbar')};
+    },
+});

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

@@ -22,6 +22,13 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
         this.callParent(arguments);
     },
 
+
+    createToolbarItem: function(config) {
+        const tbItem = this.callParent([config]);
+        tbItem.exportFileFormat = this.exportFileFormat;
+        return tbItem;
+    },
+
     init(grid) {
         this.callParent([grid]);
         this.grid = grid;

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

@@ -36,14 +36,17 @@ Ext.define('Coon.report.plugin.grid.GroupButtonsPlugin', {
             const buttonsConfig = this.getGroupButtonsConfig();
             buttonsConfig.forEach(function(buttonConfig) {
                 const cfg = Ext.create('Ext.button.Button', {
+                    foldStateId: buttonConfig[ns.$groupButtonId],
                     itemId: 'groupButton' + buttonConfig[ns.$groupButtonId],
                     text: buttonConfig[ns.$text],
                     iconCls: buttonConfig[ns.$iconCls],
                     menu: [],
+                    pType: 'GroupButtonsPlugin',
                 });
                 cfg[ns.$sortSequence] = this[ns.$sortSequence];
                 const position = buttonConfig[ns.$position];
-                if (position && !isNaN(Number(position)) && Number(position) > 0) {
+                if (position && !isNaN(Number(
+                    position)) && Number(position) > 0) {
                     cfg[ns.$position] = buttonConfig[ns.$position];
                 } else {
                     cfg[ns.$position] = this[ns.$sortSequence];

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

@@ -31,15 +31,15 @@ Ext.define('Coon.report.plugin.grid.ToolbarItemPlugin', {
         if (component instanceof Ext.panel.Panel) {
             Ext.apply(component, {
                 getTopToolbar: function() {
-                    return this.getToolbar('toolbar[dock=top]');
+                    return component.reportPanel ? component.reportPanel.getGridTopToolbar() : this.getToolbar('toolbar[dock=top]');
                 },
 
                 getBottomToolbar: function() {
-                    return this.getToolbar('toolbar[dock=bottom]');
+                    return component.reportPanel ? component.reportPanel.getGridBottomToolbar() : this.getToolbar('toolbar[dock=bottom]');
                 },
 
                 getFooterToolbar: function() {
-                    return this.getToolbar('toolbar[dock=bottom][ui=footer]');
+                    return component.reportPanel ? component.reportPanel.getGridFooterToolbar() : this.getToolbar('toolbar[dock=bottom][ui=footer]');
                 },
 
                 getToolbar: function(exp) {
@@ -98,17 +98,18 @@ Ext.define('Coon.report.plugin.grid.ToolbarItemPlugin', {
         const bar = toolbarGetter && toolbarGetter.call(this.component);
         if (bar) {
             const cfg = {
+                foldStateId: this.pluginId,
                 groupButtonId: this.groupButtonId,
                 hidden: this.invisibleByDefault,
                 position: this.position,
                 sortSequence: this.sortSequence,
+                pType: this.pluginConfig ? this.pluginConfig.ptype : '',
             };
             if (!this.position || isNaN(Number(this.position)) || Number(this.position) <= 0) {
                 cfg.position = this.sortSequence;
             }
 
             const item = this.createToolbarItem(cfg);
-
             bar.insert(cfg.position, item);
             this.component.fireEvent('buttonIsAdded', {button: item, bar: bar});