ru.coon 2.8.24 → 2.8.25

package/CHANGELOG.md

@@ -1,9 +1,5 @@
-# Version 2.8.24, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c4c48ae9746e9698a71cee189e9d4193ee08b0ad)
-* ## Fixes
-* <span style='color:red'> refactoring CopyRowsFromGrid, add Coon.perf</span> ([347b0c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/347b0c16446273fbe50dcd3a460d8454566355d1))
-
-* upd ([148f60], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/148f60ace9a0813d409432b6871721c7f622d369))
-* upd ([8e64dd], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8e64dd9dcd8af8f4333d69c2bfcfdae7b94ec056))
+# Version 2.8.25, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0ead4798f8be665c09627567bb8ac2b473d6d429)
+# Version 2.8.24, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/51b87374eb81c47d86d6fa33c8f25eaa9dce5d18)
 * upd ([4091e1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4091e19d36ca3b790a53d1b5e0d79addd0146536))
 * update: CHANGELOG.md ([6e87dc], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6e87dc9719686cca7da70d876ea24da53b2dbe82))
 
@@ -16,9 +12,6 @@
 
 * upd ([571495], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/571495ffbd6b23c76edd9eac741b87163fc59cdc))
 * add loadFakeData to ReportPanel ([671b7f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/671b7f27f3538291a56ba8c1b45016910b42e17d))
-* upd ([5f960b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5f960b5e19d19540423a3d13bf288b5d4b2149bb))
-* upd ([3f1cb7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3f1cb7e4e680cfc6a30d92ae0731dcd370be9e4b))
-* upd ([cab5b5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cab5b55a9360b8f6cfc5de6f36d31ad961862280))
 * update: CHANGELOG.md ([c73ba4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c73ba4e040a66da70edbeb990b8e7d42a690cc1b))
 
 # Version 2.8.22, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/abdcd052a504db9e3ef0d640c05c861dab6fc771)
@@ -32,7 +25,6 @@
 * ## Fixes
 * <span style='color:red'>fix builder issues</span> ([67abd4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/67abd4785b47f62e1004e58ff8c27282d9e87664))
 
-* upd ([3d3e6b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3d3e6b7ea69c8114658f64859038187b16708f66))
 * update: CHANGELOG.md ([866504], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/86650477e9606983c72620ed063150bb23fc3e4e))
 
 # Version 2.8.21, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dcc7c4b24a73690b18533027979c7ed0e3c88a78)

package/index.js

@@ -1,5 +1,5 @@
 import * as xEchartsJs from 'echarts';
-import xPrintJs from 'sigma-printjs';
+import xPrintJs from 'sigma-printjs/dist/print';
 import xAceDiff from 'ace-diff';
 import hashFromObj from 'object-hash';
 import xAceEditor from 'ace-builds/src-noconflict/ace';

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "2.8.24",
+  "version": "2.8.25",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"
@@ -30,7 +30,7 @@
     "extjs_iconpack": "1.3.27",
     "json5": "2.2.3",
     "object-hash": "^3.0.0",
-    "sigma-printjs": "^1.0.3",
+    "sigma-printjs": "^1.0.1",
     "sql-formatter": "^13.0.0"
   },
   "devDependencies": {

package/src/report/component/ReportPanel.js

@@ -302,7 +302,7 @@ Ext.define('Coon.report.component.ReportPanel', {
         return undefined;
     },
 
-    loadFakeData(len) {
+    loadFakeData(len = 1000) {
         if (!this.isConfigured) {
             return;
         }
@@ -405,6 +405,12 @@ Ext.define('Coon.report.component.ReportPanel', {
         this.on('invalidateCache', this.filterHandler.bind(this, true));
     },
 
+    onDestroy: function() {
+        if (this.eventDestroier) {
+            //   Ext.destroy(this.eventDestroier)
+        }
+    },
+
     onWindowResize: function(width, height) {
         this.height = this.height || height - 105;
         this.width = this.width || width - 270;

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

@@ -2,15 +2,12 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
     extend: 'Coon.report.plugin.grid.ToolbarButtonPlugin',
     alias: 'plugin.CopyRowsFromGrid',
     uses: [],
-    requires: [
-        'Coon.report.plugin.grid.exporters.xlsxExporter'
-    ],
+    requires: [],
     alternateClassName: [
         'Sigma.common.grid.plugin.CopyRowsFromGrid',
         'Sigma.common.plugin.grid.CopyRowsFromGrid'
     ],
     defaultFloatPrecision: 2,
-    defaultFieldType: 'string',
     configurePanelWizard: 'CopyRowsFromGridConfigPanel',
     position: -1,
     allowAddRowOnPaste: false,
@@ -90,10 +87,9 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         `;
     },
 
-    init(component) {
+    init: function(component) {
         this.injectForm();
         this.callParent([component]);
-        this.reportPanel = this.getCmp().up('ReportPanel');
         component.on('reconfigure', function(grid, store, columns) {
             this.getCmp().store = store;
             this.getCmp().columns = columns;
@@ -101,7 +97,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         Object.assign(this.tableHeaderStyle || {}, this.allBordersStyle);
     },
 
-    createToolbarItem(config) {
+    createToolbarItem: function(config) {
         let tbItem = this.callParent([config]);
         if (this.showConfirmDialog) {
             tbItem = new Ext.button.Split(Ext.apply({
@@ -129,7 +125,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return tbItem;
     },
 
-    handler(button) {
+    handler: function(button) {
         this.recordsToExport = undefined;
         if (button.itemId === 'getAllButton' || (button.itemId !== 'getSelectedButton' && this.exportAllRows)) {
             this.recordsToExport = this.getAll();
@@ -151,7 +147,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         }
     },
 
-    showConfirmFormatDialog(fn) {
+    showConfirmFormatDialog: function(fn) {
         const formatSelectField = Ext.create(Coon.common.field.combo.ConstantList, {
             data: [
                 ['xls', 'xls - старый формат'],
@@ -179,14 +175,14 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                 buttons: [
                     {
                         text: this.buttonText,
-                        handler() {
+                        handler: function() {
                             fn(formatSelectField.getValue());
                             win.close();
                         },
                     },
                     {
                         text: 'Закрыть',
-                        handler() {
+                        handler: function() {
                             win.close();
                         },
                     }
@@ -195,15 +191,14 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         );
         win.show();
     },
-
-    rgbToHex(arr) {
+    rgbToHex: function(arr) {
         return '#' + arr.map((x) => {
             const hex = Number(x).toString(16);
             return hex.length === 1 ? '0' + hex : hex;
         }).join('');
     },
 
-    mergeDeep(target, ...sources) {
+    mergeDeep: function(target, ...sources) {
         if (!sources.length) {
             return target;
         }
@@ -226,7 +221,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
     },
 
     getCurrentFilterParameters() {
-        return this.reportPanel.currentParamList || {};
+        return this.getCmp().up('ReportPanel').currentParamList || {};
     },
 
     applyTemplate(content = '', data = {}) {
@@ -239,7 +234,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return tpl.apply(Object.assign(data, {parameters: this.getCurrentFilterParameters()}));
     },
 
-    parseJsEditorObj(obj, workbook) {
+    parseJsEditorObj: function(obj, workbook) {
         if (typeof obj !== 'object' || !obj.blocks || !obj.blocks.length) {
             return [];
         }
@@ -301,21 +296,161 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         );
         return result;
     },
+    /**
+     * Формируем заголовок
+     * @returns {Object[] || []}
+     */
+    collectHeaderJson: function(columnCount, workbook) {
+        const reportPanel = this.getCmp().up('ReportPanel');
+        const result = [];
+        // Работа с отображением выгрузок
+        if (this.addHeader === true) {
+            result.push({
+                value: reportPanel.title,
+                mergeAcross: columnCount || 1,
+                styleId: workbook.addCellStyle({
+                    font: {
+                        bold: true,
+                        size: 17,
+                    },
+                }),
+            });
+        }
+        return result;
+    },
 
-    execute() {
-        this.reportPanel && this.reportPanel.mask('Экспорт', 'x-mask-loading');
-        this.generateExport()
-            .then(
-                () => this.reportPanel && this.reportPanel.unmask()
+    /**
+     * Собираем фильтры
+     * @returns {string}
+     */
+    collectFiltersJson: function(columnCount, workbook) {
+        const reportPanel = this.getCmp().up('ReportPanel');
+        const result = [];
+        if (this.addFilters === true) {
+            result.push({
+                value: 'Используемые фильтры:',
+                mergeAcross: columnCount || 1,
+                styleId: workbook.addCellStyle({
+                    font: {
+                        bold: true,
+                        size: 13,
+                        color: '#a6a4a4',
+                    },
+                }),
+            });
+
+            const customXtype = ['SimpleReportTag'];
+            const filterComponents = function(comp) {
+                return Ext.getClassName(comp) !== 'Ext.form.field.Display' &&
+                    !Ext.isEmpty(comp.getValue()) &&
+                    comp.xtype !== 'CustomValueCheckBox'; // todo: как-то узнать, почему нельзя этот компонент вывести в файл
+            };
+            const renderFilterConditions = function(filter) {
+                if (customXtype.includes(filter.xtype)) {
+                    let tmp = '';
+                    filter.valueCollection.items.forEach(function(it) {
+                        tmp = tmp + it.getData()[filter.getDisplayField()];
+                    });
+                    result.push({
+                        value: filter.fieldLabel + ': ' + tmp,
+                        mergeAcross: columnCount || 1,
+                        styleId: workbook.addCellStyle({
+                            font: {
+                                color: '#a6a4a4',
+                            },
+                        }),
+                    });
+                } else if (!filter.initialConfig.hidden) {
+                    const label = (Ext.getClassName(filter) === 'Ext.form.field.Checkbox') ?
+                        filter.boxLabel || filter.fieldLabel :
+                        filter.fieldLabel;
+
+                    const rawValue = Ext.isBoolean(filter.getRawValue()) ? filter.getRawValue() ? 'Да' : 'Нет' :
+                        filter.getRawValue();
+                    result.push({
+                        value: label + ': ' + rawValue,
+                        mergeAcross: columnCount || 1,
+                        styleId: workbook.addCellStyle({
+                            font: {
+                                bold: true,
+                            },
+                        }),
+                    });
+                }
+            };
+            reportPanel.filterContainer.query('field')
+                .filter(filterComponents)
+                .forEach(renderFilterConditions);
+        }
+        return result;
+    },
+    collectGridDataAsObject: function(selections, workbook) {
+        const dataRows = [];
+        let headerRows = [];
+        let footerRows = [];
+        const grid = this.getCmp();
+        const columnModel = grid.getColumns();
+        const columnCount = grid.getColumns().length;
+        if (this.addHeader === true) {
+            headerRows = this.collectHeaderJson(columnCount, workbook);
+        }
+        if (this.addFilters === true) {
+            headerRows = headerRows.concat(
+                this.collectFiltersJson(columnCount, workbook)
             );
+        }
+        if (this.headerXlsx) {
+            headerRows = headerRows.concat(this.parseJsEditorObj(this.headerXlsx, workbook));
+        }
+        const dataIndexToColumn = [];
+        const visibleColumns = [];
+        const columnIndexToDataIndex = [];
+
+        for (let c = 0; c < columnCount; c++) {
+            if (!columnModel[c].hidden) {
+                const dataIndex = columnModel[c].dataIndex;
+                if (!Ext.isEmpty(dataIndex)) {
+                    visibleColumns.push(c);
+                    columnIndexToDataIndex[c] = dataIndex;
+                    dataIndexToColumn[dataIndex] = columnModel[c];
+                }
+            }
+        }
+        selections.forEach(function(record, i) {
+            dataRows.push(
+                this.collectColumns(
+                    grid,
+                    record,
+                    visibleColumns,
+                    columnIndexToDataIndex,
+                    columnModel,
+                    dataIndexToColumn,
+                    i,
+                    true,
+                    workbook
+                )
+            );
+        }, this);
+        if (this.footerXlsx) {
+            footerRows = this.parseJsEditorObj(this.footerXlsx, workbook);
+        }
+        return {headerRows, dataRows, footerRows};
+    },
+
+    execute() {
+        const reportPanel = this.getCmp().up('ReportPanel');
+        reportPanel && reportPanel.mask('Экспорт', 'x-mask-loading');
+        Ext.defer(this.generateExport, 1, this);
     },
 
-    getFilename() {
+    generateExport: function() {
+        // const stop = Coon.perf.start('CPFG');
+        const reportPanel = this.getCmp().up('ReportPanel');
         const selected = this.getSelected()[0];
         const name = this.getTemplatedFileName(this.reportFileName) ||
             (selected && selected.data['CM_REPORT_CD']) ||
             this.tryToGetTitle() ||
-            (this.reportPanel && this.reportPanel.reportId) ||
+            (reportPanel && reportPanel.reportId) ||
             'defaultReportName';
         const dateFormat = this.dateFormat || this.defaultDateFormat;
 
@@ -328,59 +463,27 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             filename += '_';
             filename += Ext.Date.format(new Date(), dateFormat);
         }
-        return this.normalizeFileName(filename);
-    },
-
-    generateXlsx(filename) {
-        const xlsxExporter = Ext.create('Coon.report.plugin.grid.exporters.xlsxExporter', {
-            plugin: this,
-        });
-        Coon.util.bindMethods([
-            'mergeDeep',
-            'getRenderedValue',
-            'getCellClass',
-            'getConfig',
-            'getCmp',
-            'getSelected',
-            'prepareData',
-            'getSummaryRows',
-            'getTableHeaderRows',
-            'getRowStyleXlsx',
-            'getRowStyle'
-        ], this, xlsxExporter);
-        this.exporter = xlsxExporter.getExporter(filename);
-        return this.exporter.saveAs().then(function() {
-            this.exporter.destroy();
-        });
-    },
-
-    generateXls(filename) {
-        filename += '.xls';
-        const exporter = this.exporter = Ext.create('Ext.exporter.text.Html', {fileName: filename});
-        this.prepareData(exporter);
-        const blob = new Blob(this.collectGridDataAsArray(
-            this.getSelected(),
-            this.getTableHeaderRows(exporter, 'xls')
-        ), {
-            type: 'text/xls;charset=UTF-8',
-        });
-        Coon.util.downloadFileFromBlob(blob, filename);
-    },
-
-    generateExport() {
-        // const stop = Coon.perf.start('CPFG');
-        const filename = this.getFilename();
+        filename = this.normalizeFileName(filename);
 
         if (this.format === 'xlsx') {
-            return this.generateXlsx(filename);
-            // .then(() => {
-            //     Coon.log.debug(Coon.perf.getLog(stop()));
-            // });
+            const exporter = this.initExporter(filename);
+            exporter.saveAs().then(function() {
+                exporter.destroy();
+            });
         } else {
-            return Promise.resolve(() => {
-                this.generateXls(filename);
+            filename += '.xls';
+            const exporter = this.exporter = Ext.create('Ext.exporter.text.Html', {fileName: filename});
+            this.prepareData(exporter);
+            const blob = new Blob(this.collectGridDataAsArray(
+                this.getSelected(),
+                this.getTableHeaderRows(exporter, 'xls')
+            ), {
+                type: 'text/xls;charset=UTF-8',
             });
+            Coon.util.downloadFileFromBlob(blob, filename);
         }
+        reportPanel && reportPanel.unmask();
+        // console.log(Coon.perf.getLog(stop()));
     },
 
     /**
@@ -388,7 +491,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
      * @param fileName имя файла
      * @returns {*}
      */
-    getTemplatedFileName(fileName) {
+    getTemplatedFileName: function(fileName) {
         if (!Ext.isString(fileName) || fileName.match(/{.*}/g) === null) {
             return fileName;
         }
@@ -402,7 +505,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return fileName;
     },
 
-    normalizeFileName(fileName) {
+    normalizeFileName: function(fileName) {
         const forbiddenSymbolMap = {
             underscore: '_',
             space: ' ',
@@ -431,6 +534,31 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return fileName;
     },
 
+    initExporter: function(filename) {
+        const exporter = this.exporter = Ext.create('Ext.exporter.excel.Xlsx', {
+            fileName: filename + '.xlsx',
+            tableHeaderStyle: this.tableHeaderStyle,
+        });
+        exporter.excel = new Ext.exporter.file.ooxml.Excel({
+            properties: {
+                title: 'Лист 1',
+            },
+        });
+
+        exporter.worksheet = exporter.excel.addWorksheet({
+            name: 'Лист 1',
+        });
+        this.prepareData();
+        const {headerRows, dataRows, footerRows} =
+            this.collectGridDataAsObject(this.getSelected(), exporter.excel);
+        const tableHeaderRows = this.getTableHeaderRows(exporter);
+        const summaryRows = this.getSummaryRows(exporter.excel);
+        // this.assignStyle([...dataRows, ...summaryRows], this.allBordersStyle);
+        exporter.jsonData = [...headerRows, ...tableHeaderRows, ...dataRows, ...summaryRows, ...footerRows];
+        exporter.getContent = this.getContent.bind(exporter, this);
+        return exporter;
+    },
+
     prepareData() {
         let exporterPlugin = this.getCmp().plugins.find(
             (p) => p.ptype === 'gridexporter'
@@ -442,11 +570,27 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         this.exporter.setData(exporterPlugin.prepareData({includeSummary: this.includeSummary}));
     },
 
+    getContent: function() {
+        const me = this;
+        const config = this.getConfig();
+        me.tableHeaderStyleId = me.excel.addCellStyle(config.tableHeaderStyle);
+        me.worksheet.beginRowRendering();
+        if (this.jsonData) {
+            this.jsonData.forEach((row) => {
+                me.worksheet.addRow().addCell(row);
+            });
+        }
+        me.worksheet.endRowRendering();
+        me.columnStylesNormal = me.columnStylesNormalId = me.columnStylesFooter = null;
+        me.columnStylesFooterId = me.headerStyles = me.footerStyles = null;
+
+        return me.excel.render();
+    },
     /**
      * Возвращает агрегирующие строки из плагина GroupRowsPlugin.
      * Чтобы экспортировать текст, например "Всего" в конфиге колонки должны быть указаны:
      *  ```
-     *  summaryRenderer(){return 'Всего'},
+     *  summaryRenderer: function(){return 'Всего'},
      *  exportSummaryRenderer: true
      *  ```
      * @returns {Object[]}
@@ -515,11 +659,11 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             return row.cells;
         });
     },
-    getTitle() {
+    getTitle: function() {
         return this.addHeader === true ? this.getCmp().up('ReportPanel').title : '';
     },
 
-    getFilters() {
+    getFilters: function() {
         const filters = [];
         if (this.addFilters === true) {
             const reportPanel = this.getCmp().up('ReportPanel');
@@ -551,7 +695,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return filters;
     },
 
-    getAdditionalParameters() {
+    getAdditionalParameters: function() {
         const text = (this.header || '') + (this.footer || '');
         if (Ext.isEmpty(text)) {
             return;
@@ -572,7 +716,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return additionalParameters;
     },
 
-    insertAdditional(additionalParameters) {
+    insertAdditional: function(additionalParameters) {
         let header = this.header;
         let footer = this.footer;
         for (const key in additionalParameters) {
@@ -588,7 +732,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         this.execute();
     },
 
-    customInit() {
+    customInit: function() {
         this.buttonText = this.buttonText || 'Экспорт в Excel';
         this.getCmp().CopyPlugin = this;
         if (this.header) {
@@ -599,7 +743,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         }
     },
 
-    addKeyMap() {
+    addKeyMap: function() {
         if (this.disableCopying) {
             return;
         }
@@ -607,7 +751,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             {
                 key: Ext.event.Event.C,
                 ctrl: true,
-                handler() {
+                handler: function() {
                     this.copyToClipBoard(this.getSelected());
                 },
                 scope: this,
@@ -630,11 +774,11 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         }
     },
 
-    getAll() {
+    getAll: function() {
         return this.getCmp().getStore().getRange();
     },
 
-    collectSelectedRecords() {
+    collectSelectedRecords: function() {
         const selectionModel = this.getCmp().getSelectionModel();
         const selectedRecords = [];
         this.getCmp().getStore().each(function(record) {
@@ -650,7 +794,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return selectedRecords;
     },
 
-    getSelected() {
+    getSelected: function() {
         if (this.recordsToExport) {
             return this.recordsToExport;
         }
@@ -659,7 +803,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return records ? this.collectSelectedRecords() : this.getAll();
     },
 
-    copyToClipBoard(rows) {
+    copyToClipBoard: function(rows) {
         let copiedData = null;
 
         if (this.getCmp().getSelectionModel().type === 'cellmodel') {
@@ -684,7 +828,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         }
     },
 
-    getStartPosition() {
+    getStartPosition: function() {
         let startColumn = 0;
         let startRow = 0;
         const selectionModel = this.getCmp().getSelectionModel();
@@ -703,7 +847,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return {row: startRow, column: startColumn};
     },
 
-    pasteFromClipBoard() {
+    pasteFromClipBoard: function() {
         if (!this.allowPaste) {
             return;
         }
@@ -712,7 +856,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         hiddenTextArea.focus();
     },
 
-    updateGridData() {
+    updateGridData: function() {
         if (!this.allowPaste) {
             return;
         }
@@ -790,7 +934,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         this.hiddentextarea.blur();
     },
 
-    clearValue(value, type, convert, record) {
+    clearValue: function(value, type, convert, record) {
         let columnValue = value;
         if (!Ext.isEmpty(type)) {
             switch (type) {
@@ -821,7 +965,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
      * @param tableHeaderRows
      * @returns {*[]}
      */
-    collectGridDataAsArray(selections, tableHeaderRows = []) {
+    collectGridDataAsArray: function(selections, tableHeaderRows = []) {
         const result = [];
         const grid = this.getCmp();
         const columnCount = grid.getColumns().length;
@@ -849,7 +993,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             result.push(this.applyTemplate(html, this.getDataForTemplate(html)));
         }
         // собираем заголовки
-        const dataIndexToColumn = {};
+        const dataIndexToColumn = [];
         const visibleColumns = [];
         const columnIndexToDataIndex = [];
         const columnModel = grid.getColumns();
@@ -894,21 +1038,12 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             });
         }
         let chunk = '';
-        this.localData = {
-            grid,
-            visibleColumns,
-            columnIndexToDataIndex,
-            columnModel,
-            dataIndexToColumn,
-        };
-        selections.forEach(function(record, idx) {
+        selections.forEach(function(record, i) {
             const row = [];
-            row.push(
-                this.collectColumns({record, idx})
-            );
+            row.push(this.collectColumns(grid, record, visibleColumns, columnIndexToDataIndex, columnModel, dataIndexToColumn, i));
             chunk += row.join('');
             // Через this.rowsInChunk строк сгружаем данные в массив
-            if (idx % this.rowsInChunk === 0 || idx === selections.length - 1) {
+            if (i % this.rowsInChunk === 0 || i === selections.length - 1) {
                 result.push(chunk);
                 chunk = '';
             }
@@ -927,7 +1062,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
      * Формируем заголовок
      * @returns {string}
      */
-    collectHeader() {
+    collectHeader: function() {
         const reportPanel = this.getCmp().up('ReportPanel');
         let result = '';
         // Работа с отображением выгрузок
@@ -942,7 +1077,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
      * Собираем фильтры
      * @returns {string}
      */
-    collectFilters() {
+    collectFilters: function() {
         const reportPanel = this.getCmp().up('ReportPanel');
         let name = '';
         const result = [];
@@ -985,9 +1120,20 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
      * Собираем поля
      * @returns {string}
      */
-    collectColumns({record, idx, xlsx}) {
-        const {grid, visibleColumns, columnIndexToDataIndex, columnModel, dataIndexToColumn, workbook} = this.localData;
-        const result = xlsx ? [] : ['<tr>'];
+    collectColumns: function(grid, record, visibleColumns, columnIndexToDataIndex, columnModel, dataIndexToColumn, i, object, workbook) {
+        const result = object ? [] : ['<tr>'];
+        const getValueType = function(idx, defValue) {
+            if (Array.isArray(record.fields)) {
+                const field = record.fields.find(function(element, index, array) {
+                    if (element.name === idx) {
+                        return element;
+                    }
+                });
+                return field ? field.type : defValue;
+            } else {
+                return defValue;
+            }
+        };
         visibleColumns.forEach(function(columnIndex) {
             const columnConfig = columnModel[columnIndex];
             if (columnConfig.ignoreExport) {
@@ -997,7 +1143,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             const dataIndex = columnIndexToDataIndex[columnIndex];
             const renderer = columnConfig.renderer;
             const exportRenderer = columnConfig.exportRenderer;
-            const valueType = this.localData.fieldTypes.get(dataIndex);// getValueType(dataIndex, 'string');
+            const valueType = getValueType(dataIndex, 'string');
 
 
             const value = typeof (exportRenderer || renderer) === 'function' ?
@@ -1006,13 +1152,13 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                     record.get(dataIndex),
                     {column: columnConfig},
                     record,
-                    idx,
+                    i,
                     columnIndex,
                     grid.getStore(),
                     grid.getView()
                 ) :
                 record.data[dataIndex] || '';
-            if (!xlsx) {
+            if (!object) {
                 const styles = this.getRowStyle(grid, record);
                 result.push(`
                         <td
@@ -1041,15 +1187,14 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                 result.push(JSON.parse(JSON.stringify(col)));
             }
         }, this);
-        if (!xlsx) {
+        if (!object) {
             result.push('</tr>');
             return result.join('');
         } else {
             return result;
         }
     },
-
-    getRowStyleXlsx(grid, record) {
+    getRowStyleXlsx: function(grid, record, workbook) {
         let styles = {};
         const rowElement = Ext.fly(grid.getView().getRow(grid.getStore().indexOf(record)));
         if (rowElement) {
@@ -1066,7 +1211,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
 
         return {styles: styles};
     },
-    getRowStyle(grid, record) {
+    getRowStyle: function(grid, record) {
         const rowElement = Ext.fly(grid.getView().getRow(grid.getStore().indexOf(record)));
 
         let resultClasses = '';
@@ -1097,7 +1242,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return resultClasses;
     },
 
-    getHeaderStyle(value, type) {
+    getHeaderStyle: function(value, type) {
         let style = '';
         if (!Ext.isEmpty(type)) {
             switch (type) {
@@ -1109,7 +1254,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return style;
     },
 
-    getCellClass(value, type) {
+    getCellClass: function(value, type) {
         let style = '';
         if (!Ext.isEmpty(type)) {
             switch (type) {
@@ -1125,7 +1270,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         }
         return style;
     },
-    getRenderedValue(v, type) {
+    getRenderedValue: function(v, type) {
         let value = v;
         if (v instanceof Date) {
             value = Ext.util.Format.dateRenderer(this.dateFormat)(v);
@@ -1156,7 +1301,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return value;
     },
 
-    getHiddenTextArea() {
+    getHiddenTextArea: function() {
         if (!this.hiddentextarea) {
             this.hiddentextarea = new Ext.Element(document.createElement('textarea'));
             this.hiddentextarea.setStyle('position', 'absolute');
@@ -1170,7 +1315,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return this.hiddentextarea;
     },
 
-    tryToGetTitle() {
+    tryToGetTitle: function() {
         let title = this.getCmp().title || '';
         if (Ext.isEmpty(title)) {
             this.getCmp().bubble(function(panel) {
@@ -1184,7 +1329,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
     },
 
     // Получение параметров шаблонов
-    getDataForTemplate(text) {
+    getDataForTemplate: function(text) {
         if (Ext.isEmpty(text)) {
             return {};
         }
@@ -1229,7 +1374,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
     },
 
     // Обработка шаблона
-    processingTemplate(template) {
+    processingTemplate: function(template) {
         let result = '' + template;
         this.getParametersForReplace().forEach(function(p) {
             result = result.replace(new RegExp(p.re, 'g'), p.getHandler.call(this));
@@ -1243,12 +1388,12 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
      * re - регулярное выражения для поиска параметра
      * getHandler - функция, возвращающая функцию замены
      */
-    getParametersForReplace() {
+    getParametersForReplace: function() {
         if (Ext.isEmpty(this.parametersForReplace)) {
             this.parametersForReplace = [
                 {
                     re: '\\{\\$\\w[\\w ,\\\\/.:-]*\\$\\}', // Даты в виде {$формат_даты$}
-                    getHandler() {
+                    getHandler: function() {
                         const date = new Date();
                         return function(m) {
                             return Ext.Date.format(date, m.substring(2, m.length - 2));
@@ -1257,7 +1402,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                 },
                 {
                     re: '\\{\\$\\w[\\w-]*(?!\\$)\\}', // Прочие параметры в виде {$имя_параметра}
-                    getHandler() {
+                    getHandler: function() {
                         const params = {
                             REPORT_TITLE: this.tryToGetTitle(),
                         };
@@ -1271,7 +1416,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return this.parametersForReplace;
     },
 
-    parseHTML(htmlString) {
+    parseHTML: function(htmlString) {
         const div = document.createElement('div');
         div.innerHTML = htmlString.split('body>')[1] && htmlString.split('body>')[1].slice(0, -2);
         const result = [];
@@ -1285,12 +1430,13 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return result.join('\n');
     },
 
-    getPluginCustomPropsForFields() {
+    getPluginCustomPropsForFields: function() {
         return [{
             name: 'exportRenderer',
             description: 'Данное свойство позволяет обработать итоговые строки',
             type: 'function',
             fields: 'all',
         }];
-    },
+    }
+    ,
 });

package/src/version.js

@@ -1,4 +1,4 @@
 Ext.define('Coon.version', {
     singleton: true,
-    number: '2.8.24',
+    number: '2.8.25',
 });

package/src/report/plugin/grid/exporters/xlsxExporter.js

@@ -1,278 +0,0 @@
-Ext.define('Coon.report.plugin.grid.exporters.xlsxExporter', {
-
-    defaultFieldType: 'string',
-
-    constructor(cfg) {
-        Ext.apply(this, cfg);
-    },
-
-    getExporter(filename) {
-        // Coon.perf.clearAll();
-        // const stopMeasure = Coon.perf.start('getExporter', true);
-        const exporter = Ext.create('Ext.exporter.excel.Xlsx', {
-            fileName: filename + '.xlsx',
-            tableHeaderStyle: this.tableHeaderStyle,
-        });
-        this.plugin.exporter = exporter;
-        exporter.excel = new Ext.exporter.file.ooxml.Excel({
-            properties: {
-                title: 'Лист 1',
-            },
-        });
-
-        exporter.worksheet = exporter.excel.addWorksheet({
-            name: 'Лист 1',
-        });
-        this.prepareData();
-
-        const {headerRows, dataRows, footerRows} =
-            this.collectGridDataAsObject(this.getSelected(), exporter.excel);
-        const tableHeaderRows = this.getTableHeaderRows(exporter);
-        const summaryRows = this.getSummaryRows(exporter.excel);
-        exporter.jsonData = [...headerRows, ...tableHeaderRows, ...dataRows, ...summaryRows, ...footerRows];
-        exporter.getContent = this.getContent.bind(exporter, this);
-        // Coon.log.debug(
-        //     Coon.perf.getLog(stopMeasure())
-        // );
-        return exporter;
-    },
-
-    getContent: function() {
-        const me = this;
-        const config = this.getConfig();
-        me.tableHeaderStyleId = me.excel.addCellStyle(config.tableHeaderStyle);
-        me.worksheet.beginRowRendering();
-        if (this.jsonData) {
-            this.jsonData.forEach((row) => {
-                me.worksheet.addRow().addCell(row);
-            });
-        }
-        me.worksheet.endRowRendering();
-        me.columnStylesNormal = me.columnStylesNormalId = me.columnStylesFooter = null;
-        me.columnStylesFooterId = me.headerStyles = me.footerStyles = null;
-
-        return me.excel.render();
-    },
-
-    collectGridDataAsObject: function(selections, workbook) {
-        // const stopMeasure = Coon.perf.start('collectGridDataAsObject', true);
-        const dataRows = [];
-        let headerRows = [];
-        let footerRows = [];
-        const grid = this.getCmp();
-        const columnModel = grid.getColumns().reduce((acc, column) => {
-            if (!column.hidden) {
-                acc.push(column);
-            }
-            return acc;
-        }, []);
-        const columnCount = columnModel.length;
-        if (this.addHeader === true) {
-            headerRows = this.collectHeaderJson(columnCount, workbook);
-        }
-        if (this.addFilters === true) {
-            headerRows = headerRows.concat(
-                this.collectFiltersJson(columnCount, workbook)
-            );
-        }
-        if (this.headerXlsx) {
-            headerRows = headerRows.concat(this.parseJsEditorObj(this.headerXlsx, workbook));
-        }
-        const dataIndexToColumn = {};
-        const visibleColumns = [];
-        const columnIndexToDataIndex = [];
-
-        for (let idx = 0; idx < columnCount; idx++) {
-            const el = columnModel[idx];
-            if (el.dataIndex) {
-                visibleColumns.push(idx);
-                columnIndexToDataIndex[idx] = el.dataIndex;
-                dataIndexToColumn[el.dataIndex] = columnModel[idx];
-            }
-        }
-        const fieldTypes = this.getCmp().getStore().getModel().getFields().reduce((acc, field) => {
-            acc.set(field.name, field.type || this.defaultFieldType);
-            return acc;
-        }, new Map());
-
-        this.localData = {
-            fieldTypes,
-            grid,
-            visibleColumns,
-            columnIndexToDataIndex,
-            columnModel,
-            dataIndexToColumn,
-            workbook,
-        };
-
-        selections.forEach(function(record, idx) {
-            dataRows.push(
-                this.collectColumns({
-                    record,
-                    idx,
-                })
-            );
-        }, this);
-        if (this.footerXlsx) {
-            footerRows = this.parseJsEditorObj(this.footerXlsx, workbook);
-        }
-        // Coon.log.debug(
-        //     Coon.perf.getLog(stopMeasure())
-        // );
-        // Coon.log.debug(
-        //     Coon.perf.getLog('mergeDeep', 6)
-        // );
-        // Coon.log.debug(
-        //     Coon.perf.getLog('collectColumns', 5)
-        // );
-
-        return {headerRows, dataRows, footerRows};
-    },
-
-    /**
-     * Формируем заголовок
-     * @returns {Object[] || []}
-     */
-    collectHeaderJson: function(columnCount, workbook) {
-        const reportPanel = this.getCmp().up('ReportPanel');
-        const result = [];
-        // Работа с отображением выгрузок
-        if (this.addHeader === true) {
-            result.push({
-                value: reportPanel.title,
-                mergeAcross: columnCount || 1,
-                styleId: workbook.addCellStyle({
-                    font: {
-                        bold: true,
-                        size: 17,
-                    },
-                }),
-            });
-        }
-        return result;
-    },
-
-    /**
-     * Собираем фильтры
-     * @returns {string}
-     */
-    collectFiltersJson: function(columnCount, workbook) {
-        const reportPanel = this.getCmp().up('ReportPanel');
-        const result = [];
-        if (this.addFilters === true) {
-            result.push({
-                value: 'Используемые фильтры:',
-                mergeAcross: columnCount || 1,
-                styleId: workbook.addCellStyle({
-                    font: {
-                        bold: true,
-                        size: 13,
-                        color: '#a6a4a4',
-                    },
-                }),
-            });
-
-            const customXtype = ['SimpleReportTag'];
-            const filterComponents = function(comp) {
-                return Ext.getClassName(comp) !== 'Ext.form.field.Display' &&
-                    !Ext.isEmpty(comp.getValue()) &&
-                    comp.xtype !== 'CustomValueCheckBox'; // todo: как-то узнать, почему нельзя этот компонент вывести в файл
-            };
-            const renderFilterConditions = function(filter) {
-                if (customXtype.includes(filter.xtype)) {
-                    let tmp = '';
-                    filter.valueCollection.items.forEach(function(it) {
-                        tmp = tmp + it.getData()[filter.getDisplayField()];
-                    });
-                    result.push({
-                        value: filter.fieldLabel + ': ' + tmp,
-                        mergeAcross: columnCount || 1,
-                        styleId: workbook.addCellStyle({
-                            font: {
-                                color: '#a6a4a4',
-                            },
-                        }),
-                    });
-                } else if (!filter.initialConfig.hidden) {
-                    const label = (Ext.getClassName(filter) === 'Ext.form.field.Checkbox') ?
-                        filter.boxLabel || filter.fieldLabel :
-                        filter.fieldLabel;
-
-                    const rawValue = Ext.isBoolean(filter.getRawValue()) ? filter.getRawValue() ? 'Да' : 'Нет' :
-                        filter.getRawValue();
-                    result.push({
-                        value: label + ': ' + rawValue,
-                        mergeAcross: columnCount || 1,
-                        styleId: workbook.addCellStyle({
-                            font: {
-                                bold: true,
-                            },
-                        }),
-                    });
-                }
-            };
-            reportPanel.filterContainer.query('field')
-                .filter(filterComponents)
-                .forEach(renderFilterConditions);
-        }
-        return result;
-    },
-
-    /**
-     * Собираем поля
-     * @returns {string}
-     */
-    collectColumns: function({record, idx}) {
-        // const stopMeasure = Coon.perf.startSerie('collectColumns');
-        const {grid, visibleColumns, columnIndexToDataIndex, columnModel, dataIndexToColumn, workbook} = this.localData;
-        const result = [];
-        visibleColumns.forEach(function(columnIndex) {
-            const columnConfig = columnModel[columnIndex];
-            if (columnConfig.ignoreExport) {
-                return;
-            }
-
-            const dataIndex = columnIndexToDataIndex[columnIndex];
-            const renderer = columnConfig.renderer;
-            const exportRenderer = columnConfig.exportRenderer;
-            const valueType = this.localData.fieldTypes.get(dataIndex);// getValueType(dataIndex, 'string');
-
-
-            const value = typeof (exportRenderer || renderer) === 'function' ?
-                (exportRenderer || renderer).call(
-                    dataIndexToColumn[dataIndex],
-                    record.get(dataIndex),
-                    {column: columnConfig},
-                    record,
-                    idx,
-                    columnIndex,
-                    grid.getStore(),
-                    grid.getView()
-                ) :
-                record.data[dataIndex] || '';
-            // const stopMeasure1 = Coon.perf.startSerie('getRowStyleXlsx');
-            let styles = this.getRowStyleXlsx(grid, record, workbook);
-            // stopMeasure1();
-            const col = {value: this.getRenderedValue(value, valueType) || ''};
-            // const stopMeasure = Coon.perf.startSerie('mergeDeep');
-            styles = this.mergeDeep(styles, this.allBordersStyle);
-            // stopMeasure();
-            if (valueType === 'float') {
-                let precision = Number(columnConfig.precision);
-                if (!Number.isInteger(precision)) {
-                    precision = Number(this.getConfig('floatPrecision') || this.defaultFloatPrecision);
-                }
-                styles = this.mergeDeep(styles, {format: precision !== 0 ? '0.'.padEnd(precision + 2, '0') : '0'});
-                if (col['value'].length) {
-                    col['value'] = parseFloat(col['value'].replace(/\s/g, '').replace(',', '.'));
-                }
-            }
-
-            col['styleId'] = workbook.addCellStyle(styles);
-
-            result.push(JSON.parse(JSON.stringify(col)));
-        }, this);
-        return result;
-    },
-
-});