ru.coon 2.7.50 → 2.7.52

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

@@ -1,53 +1,53 @@
-.AddFilterConditionPluginConfigPanel {
-        .svg-icon{
-                height: 24px;
-                width: 24px;
-        }
-        .fa{
-                height: 24px;
-                width: 24px;
-                padding-top: 6px;
-                color: black;
-        }
-
-        .x-segmented-button-item{
-                background-color: transparent;
-        }
-        .x-segmented-button-item:hover{
-                background-color: rgba(61, 103, 128, 0.04);
-        }
-        .x-segmented-button-item:active{
-                background-color: rgba(61, 103, 128, 0.12);
-        }
-        .x-btn-pressed .x-btn-icon-el {
-                color: #ffffff !important;
-        }
-        .x-segmented-button .x-segmented-button-item .x-btn-inner{
-                color: #3D6780;
-        }
-        .x-segmented-button .x-segmented-button-item .x-btn-icon-el{
-                color: #3D6780;
-        }
-        .x-btn-icon-el{
-                color: #3D6780;
-        }
-}
-
-@include extjs-button-small-ui(
-        $ui: 'FilterSegmentedButton',
-        $padding: 8px 12px,
-        $color: #3D6780,
-        $icon-size: 16px,
-
-        $background-color-over: rgba(61, 103, 128, 0.04),
-        $background-color-focus-over: rgba(61, 103, 128, 0.04),
-
-        $background-color-pressed: rgba(61, 103, 128, 0.12),
-        $background-color-focus-pressed: rgba(61, 103, 128, 0.12),
-
-
-        $border-color: 'none',
-        $background-color: transparent,
-        $border-color-focus: #3D6780,
-        $background-color-focus: rgba(61, 103, 128, 0.12)
-);
+.AddFilterConditionPluginConfigPanel {
+        .svg-icon{
+                height: 24px;
+                width: 24px;
+        }
+        .fa{
+                height: 24px;
+                width: 24px;
+                padding-top: 6px;
+                color: black;
+        }
+
+        .x-segmented-button-item{
+                background-color: transparent;
+        }
+        .x-segmented-button-item:hover{
+                background-color: rgba(61, 103, 128, 0.04);
+        }
+        .x-segmented-button-item:active{
+                background-color: rgba(61, 103, 128, 0.12);
+        }
+        .x-btn-pressed .x-btn-icon-el {
+                color: #ffffff !important;
+        }
+        .x-segmented-button .x-segmented-button-item .x-btn-inner{
+                color: #3D6780;
+        }
+        .x-segmented-button .x-segmented-button-item .x-btn-icon-el{
+                color: #3D6780;
+        }
+        .x-btn-icon-el{
+                color: #3D6780;
+        }
+}
+
+@include extjs-button-small-ui(
+        $ui: 'FilterSegmentedButton',
+        $padding: 8px 12px,
+        $color: #3D6780,
+        $icon-size: 16px,
+
+        $background-color-over: rgba(61, 103, 128, 0.04),
+        $background-color-focus-over: rgba(61, 103, 128, 0.04),
+
+        $background-color-pressed: rgba(61, 103, 128, 0.12),
+        $background-color-focus-pressed: rgba(61, 103, 128, 0.12),
+
+
+        $border-color: 'none',
+        $background-color: transparent,
+        $border-color-focus: #3D6780,
+        $background-color-focus: rgba(61, 103, 128, 0.12)
+);

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

@@ -4,11 +4,6 @@ Ext.define('Coon.report.plugin.configPanel.CopyRowsFromGridConfigPanel', {
     uses: [],
     requires: [],
     alternateClassName: 'Sigma.common.grid.plugin.CopyRowsFromGridConfigPanel',
-    listeners: {
-        'boxready': function() {
-            this.onChangeFormat(null, 'xls');
-        },
-    },
     description: 'Экспорт в Excel.<br>' +
         'Возможно указать верхний и нижний колонтитулы для отчета в формате HTML.<br>' +
         'Также возможно подставлять данные из отчета и другие параметры.<br>' +
@@ -37,7 +32,23 @@ Ext.define('Coon.report.plugin.configPanel.CopyRowsFromGridConfigPanel', {
             ],
         },
     },
-
+    viewModel: {
+        data: {
+            format: 'xls',
+            activeEditor: 'xls',
+            askFormat: false,
+        },
+    },
+    controller: {
+        bindings: {
+            onChangeFormat: '{format}',
+        },
+        onChangeFormat(format) {
+            if (!this.getViewModel().get('askFormat')) {
+                this.getViewModel().set('activeEditor', format);
+            }
+        },
+    },
     createItems: function() {
         return [
             {
@@ -104,12 +115,6 @@ Ext.define('Coon.report.plugin.configPanel.CopyRowsFromGridConfigPanel', {
             });
         }
     },
-    onChangeFormat: function(cmp, newValue) {
-        const fields = Ext.ComponentQuery.query('[xtype="htmleditor"]', this);
-        const fieldsXlsx = Ext.ComponentQuery.query('[xtype="EditorJsField"]', this);
-        fieldsXlsx.forEach((field) => field.setHidden(newValue === 'xls'));
-        fields.forEach((field) => field.setHidden(newValue === 'xlsx'));
-    },
     createFormatField: function() {
         return {
             xtype: 'fieldset',
@@ -133,12 +138,17 @@ Ext.define('Coon.report.plugin.configPanel.CopyRowsFromGridConfigPanel', {
                     allowBlank: false,
                     width: 430,
                     value: 'xls',
+                    bind: {
+                        value: '{format}',
+                    },
                 },
                 {
                     xtype: 'checkbox',
                     boxLabel: 'Спрашивать формат перед выгрузкой',
                     name: 'showFormatSelectDialog',
-                    value: false,
+                    bind: {
+                        value: '{askFormat}',
+                    },
                 }
             ],
         };
@@ -272,21 +282,25 @@ Ext.define('Coon.report.plugin.configPanel.CopyRowsFromGridConfigPanel', {
             width: 1100,
             height: 200,
             plugins: [Ext.create('Coon.report.plugin.htmlEditor.ToolbarCombo', {element: element})],
+            bind: {
+                hidden: '{activeEditor !=="xls"}',
+            },
         };
     },
     createEditorFlag: function() {
         return {
             xtype: 'ConstantList',
-            value: 'xls',
-            data: [
-                ['xls', 'xls'],
-                ['xlsx', 'xlsx']
-            ],
             fieldLabel: 'Отобразить редактор',
             local: true,
-            allowBlank: true,
-            listeners: {
-                change: this.onChangeFormat.bind(this),
+            data: [
+                ['xls', 'xls - старый формат'],
+                ['xlsx', 'xlsx - новый формат']
+            ],
+            name: 'activeEditor',
+            width: 430,
+            bind: {
+                value: '{activeEditor}',
+                disabled: '{!askFormat}',
             },
         };
     },
@@ -298,6 +312,9 @@ Ext.define('Coon.report.plugin.configPanel.CopyRowsFromGridConfigPanel', {
             name: name,
             width: '100%',
             height: 300,
+            bind: {
+                hidden: '{activeEditor !=="xlsx"}',
+            },
         };
     },
 

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

@@ -1,5 +1,5 @@
-.addActionColumnMsg {
-	font-size: 15px;
-	margin: 0 0 0 12px;
-	color: red;
-}
+.addActionColumnMsg {
+	font-size: 15px;
+	margin: 0 0 0 12px;
+	color: red;
+}

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

@@ -1,3 +1,3 @@
-.tpl-key {
-    font-weight: bold;
-}
+.tpl-key {
+    font-weight: bold;
+}

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

@@ -1,20 +1,20 @@
-.UiAceEditorField {
-  .ace-editor-editor{
-    width: 100%;
-    height: 100px;
-    display: block;
-    background-color: red !important;
-    min-height: 30px !important;
-  }
-  .ace-editor-content .x-grid-cell-editor{
-      width: 100%;
-      height: 100%;
-      display: block;
-      position: relative !important;
-      min-height: 100px;
-  }
-  .ace-editor-content .ace_editor{
-    height: 100%;
-    min-height: 100px;
-  }
-}
+.UiAceEditorField {
+  .ace-editor-editor{
+    width: 100%;
+    height: 100px;
+    display: block;
+    background-color: red !important;
+    min-height: 30px !important;
+  }
+  .ace-editor-content .x-grid-cell-editor{
+      width: 100%;
+      height: 100%;
+      display: block;
+      position: relative !important;
+      min-height: 100px;
+  }
+  .ace-editor-content .ace_editor{
+    height: 100%;
+    min-height: 100px;
+  }
+}

package/src/report/plugin/configPanel/common/pluginDescriptionLabel.scss

@@ -1,9 +1,9 @@
-.pluginDescriptionLabel {
-    height: 2.5em;
-    margin: 5px 10px;
-    text-overflow: clip;
-    overflow: hidden;
-    .x-form-display-field {
-        color: #555!important;
-    }
+.pluginDescriptionLabel {
+    height: 2.5em;
+    margin: 5px 10px;
+    text-overflow: clip;
+    overflow: hidden;
+    .x-form-display-field {
+        color: #555!important;
+    }
 }

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

@@ -245,16 +245,15 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
     },
     /**
      * Формируем заголовок
-     * @returns {string}
+     * @returns {Object[] || []}
      */
     collectHeaderJson: function(columnCount, workbook) {
         const reportPanel = this.component.up('ReportPanel');
-        let result = [];
+        const result = [];
         // Работа с отображением выгрузок
         if (this.addHeader === true) {
-            const nameReport = reportPanel.title;
-            result = {
-                value: nameReport,
+            result.push({
+                value: reportPanel.title,
                 mergeAcross: columnCount || 1,
                 styleId: workbook.addCellStyle({
                     font: {
@@ -262,7 +261,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                         size: 17,
                     },
                 }),
-            };
+            });
         }
         return result;
     },
@@ -333,23 +332,28 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return result;
     },
     collectGridDataAsObject: function(selections, workbook) {
-        let resultObj = [];
+        const dataRows = [];
+        let headerRows = [];
+        let footerRows = [];
         const dataForTemplate = this.getDataForTemplate();
         const grid = this.component;
         const columnModel = grid.getColumns();
         const columnCount = grid.getColumns().length;
         if (this.addHeader === true) {
-            resultObj = resultObj.concat(this.collectHeaderJson(columnCount, workbook));
+            headerRows = this.collectHeaderJson(columnCount, workbook);
         }
         if (this.addFilters === true) {
-            resultObj = resultObj.concat(this.collectFiltersJson(columnCount, workbook));
+            headerRows = headerRows.concat(
+                this.collectFiltersJson(columnCount, workbook)
+            );
         }
         if (this.headerXlsx) {
             const headerXlsx = this.parseJsEditorObj(this.headerXlsx, workbook);
-            const tmpl = new Ext.XTemplate(this.processingTemplate(JSON.stringify(headerXlsx))).apply(dataForTemplate);
-            resultObj = resultObj.concat(JSON.parse(tmpl));
+            const tmpl = new Ext.XTemplate(
+                this.processingTemplate(JSON.stringify(headerXlsx))
+            ).apply(dataForTemplate);
+            headerRows = headerRows.concat(JSON.parse(tmpl));
         }
-        const headers = [];
         const dataIndexToColumn = [];
         const visibleColumns = [];
         const columnIndexToDataIndex = [];
@@ -361,30 +365,32 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                     visibleColumns.push(c);
                     columnIndexToDataIndex[c] = dataIndex;
                     dataIndexToColumn[dataIndex] = columnModel[c];
-                    const value = columnModel[c].text || columnModel[c].header;
-                    headers.push({
-                        value: this.getRenderedValue(value, 'string'),
-                        styleId: workbook.addCellStyle({
-                            alignment: {
-                                wrapText: true,
-                            },
-                        }),
-                    });
                 }
             }
         }
-        resultObj.push(headers);
         selections.forEach(function(record, i) {
-            resultObj.push(
-                this.collectColumns(grid, record, visibleColumns, columnIndexToDataIndex, columnModel, dataIndexToColumn, i, true, workbook)
+            dataRows.push(
+                this.collectColumns(
+                    grid,
+                    record,
+                    visibleColumns,
+                    columnIndexToDataIndex,
+                    columnModel,
+                    dataIndexToColumn,
+                    i,
+                    true,
+                    workbook
+                )
             );
         }, this);
         if (this.footerXlsx) {
             const footerXlsx = this.parseJsEditorObj(this.footerXlsx, workbook);
-            const tmpl = new Ext.XTemplate(this.processingTemplate(JSON.stringify(footerXlsx))).apply(dataForTemplate);
-            resultObj = resultObj.concat(JSON.parse(tmpl));
+            const tmpl = new Ext.XTemplate(
+                this.processingTemplate(JSON.stringify(footerXlsx))
+            ).apply(dataForTemplate);
+            footerRows = JSON.parse(tmpl);
         }
-        return resultObj;
+        return {headerRows, dataRows, footerRows};
     },
     execute: function() {
         const reportPanel = this.component.up('ReportPanel');
@@ -415,7 +421,11 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             });
         } else {
             filename += '.xls';
-            const blob = new Blob(this.collectGridDataAsArray(this.getSelected()), {
+            const exporter = Ext.create('Ext.exporter.text.Html', {fileName: filename});
+            const blob = new Blob(this.collectGridDataAsArray(
+                this.getSelected(),
+                this.getTableHeaderRows(exporter, 'xls')
+            ), {
                 type: 'text/xls;charset=UTF-8',
             });
             Coon.util.downloadFileFromBlob(blob, filename);
@@ -484,7 +494,10 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         exporter.worksheet = exporter.excel.addWorksheet({
             name: 'Лист 1',
         });
-        exporter.jsonData = this.collectGridDataAsObject(this.getSelected(), exporter.excel);
+        const {headerRows, dataRows, footerRows} =
+            this.collectGridDataAsObject(this.getSelected(), exporter.excel);
+        const tableHeaderRows = this.getTableHeaderRows(exporter);
+        exporter.jsonData = [...headerRows, ...tableHeaderRows, ...dataRows, ...footerRows];
         exporter.getContent = this.getContent.bind(exporter);
         return exporter;
     },
@@ -504,7 +517,48 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
 
         return me.excel.render();
     },
-
+    getTableHeaderRows(exporter, type = 'xlsx') {
+        let exporterPlugin = this.component.plugins.find(
+            (p) => p.ptype === 'gridexporter'
+        );
+        if (!exporterPlugin) {
+            exporterPlugin = Ext.create('Ext.grid.plugin.Exporter');
+            exporterPlugin.init(this.component);
+        }
+        exporter.setData(exporterPlugin.prepareData({}));
+        if (type === 'xls') {
+            const config = exporter.getConfig();
+            exporter.doc = new Ext.exporter.file.html.Doc({
+                title: config.title,
+                author: config.author,
+                tpl: config.tpl,
+                styles: [config.defaultStyle, config.titleStyle, config.groupHeaderStyle,
+                    config.groupFooterStyle, config.tableHeaderStyle, config.tableFooterStyle],
+            });
+        }
+        const header = exporter.buildHeader();
+        return type === 'xls' ? header : header.map((row) => {
+            row.cells.forEach((cell) => {
+                Object.assign(cell, {
+                    styleId: exporter.excel.addCellStyle(
+                        {
+                            alignment: {
+                                wrapText: true,
+                                horizontal: 'Center',
+                                vertical: 'Automatic',
+                            },
+                            font: {
+                                fontName: 'Arial',
+                                family: 'Swiss',
+                                bold: true,
+                            },
+                        }
+                    ),
+                });
+            });
+            return row.cells;
+        });
+    },
     getTitle: function() {
         return this.addHeader === true ? this.component.up('ReportPanel').title : '';
     },
@@ -808,9 +862,10 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
     /**
      * Формируем данные для экспорта в файл в виде массива строк, чтобы преодолеть максимальный размер строки, допустимый в браузере.
      * @param selections
+     * @param tableHeaderRows
      * @returns {*[]}
      */
-    collectGridDataAsArray: function(selections) {
+    collectGridDataAsArray: function(selections, tableHeaderRows = []) {
         const result = [];
         const grid = this.component;
         const columnCount = grid.getColumns().length;
@@ -838,10 +893,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         if (!Ext.isEmpty(this.header)) {
             result.push(new Ext.XTemplate(this.processingTemplate(this.headerTemplate.html)).apply(dataForTemplates));
         }
-        result.push('<table border="1">');
-        result.push('<tr>');
         // собираем заголовки
-        const headers = [];
         const dataIndexToColumn = [];
         const visibleColumns = [];
         const columnIndexToDataIndex = [];
@@ -854,13 +906,22 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                     visibleColumns.push(c);
                     columnIndexToDataIndex[c] = dataIndex;
                     dataIndexToColumn[dataIndex] = columnModel[c];
-                    const value = columnModel[c].text || columnModel[c].header;
-                    headers.push('<td style="' + this.getHeaderStyle(value, 'string') + '">' + this.getRenderedValue(value, 'string') + '</td>');
                 }
             }
         }
-        result.push(headers.join(''));
-        result.push('</tr>');
+        result.push('<table border="1">');
+        /* eslint-disable max-len */
+        const headerTpl = new Ext.XTemplate(
+            '<tpl for="columns">',
+            '               <tr>\n',
+            '<tpl for=".">',
+            '                   <th<tpl if="width"> width="{width}"</tpl><tpl if="mergeAcross"> colSpan="{mergeAcross}"</tpl><tpl if="mergeDown"> rowSpan="{mergeDown}"</tpl>>{text}</th>\n',
+            '</tpl>',
+            '               </tr>\n',
+            '</tpl>'
+        );
+        /* eslint-enable max-len */
+        result.push(headerTpl.apply({columns: tableHeaderRows}));
         let chunk = '';
         selections.forEach(function(record, i) {
             const row = [];

package/src/report/plugin/grid/GridRowStylePlugin.scss

@@ -1,56 +1,56 @@
-
-.boldOnRow.x-grid-row {
-  font-weight: bold;
-}
-
-.italicOnRow.x-grid-row {
-  font-style: italic;
-}
-
-.underlineOnRow.x-grid-row {
-  text-decoration: underline;
-}
-
-.linkColor.x-grid-row {
-  a {
-    color: inherit;
-  }
-}
-
-.boldOnRow .x-grid-row {
-  font-weight: bold;
-}
-
-.italicOnRow .x-grid-row {
-  font-style: italic;
-}
-
-.underlineOnRow .x-grid-row {
-  text-decoration: underline;
-}
-
-.linkColor .x-grid-row {
-  a {
-    color: inherit;
-  }
-}
-
-.x-grid-checkcolumn::after {
-  color: inherit !important;
-  font-weight: inherit;
-  font-style: inherit;
-}
-
-.x-grid-cell-inner .link-button {
-  color: inherit !important;
-  font-weight: inherit;
-  font-style: inherit;
-}
-
-.x-grid-cell-inner {
-  a {
-    font-weight: inherit;
-    font-style: inherit;
-    color: inherit;
-  }
-}
+
+.boldOnRow.x-grid-row {
+  font-weight: bold;
+}
+
+.italicOnRow.x-grid-row {
+  font-style: italic;
+}
+
+.underlineOnRow.x-grid-row {
+  text-decoration: underline;
+}
+
+.linkColor.x-grid-row {
+  a {
+    color: inherit;
+  }
+}
+
+.boldOnRow .x-grid-row {
+  font-weight: bold;
+}
+
+.italicOnRow .x-grid-row {
+  font-style: italic;
+}
+
+.underlineOnRow .x-grid-row {
+  text-decoration: underline;
+}
+
+.linkColor .x-grid-row {
+  a {
+    color: inherit;
+  }
+}
+
+.x-grid-checkcolumn::after {
+  color: inherit !important;
+  font-weight: inherit;
+  font-style: inherit;
+}
+
+.x-grid-cell-inner .link-button {
+  color: inherit !important;
+  font-weight: inherit;
+  font-style: inherit;
+}
+
+.x-grid-cell-inner {
+  a {
+    font-weight: inherit;
+    font-style: inherit;
+    color: inherit;
+  }
+}

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

@@ -28,7 +28,7 @@ Ext.define('Coon.report.plugin.grid.OpenURLButtonPlugin', {
                 if (!Ext.isEmpty(this.dynamicContextField) && !Ext.isEmpty(context.record)) {
                     url += context.record.get(this.dynamicContextField);
                 }
-                let paramsURL = this.url.indexOf('?') == -1 ? '?' : '';
+                let paramsURL = this.url && this.url.indexOf('?') == -1 ? '?' : '';
                 for (const paramName in params) {
                     if (params.hasOwnProperty(paramName)) {
                         if (!Ext.isEmpty(params)) {

package/src/report/plugin/grid/ReportTabContainerPlugin.scss

@@ -1,3 +1,3 @@
-.x-tab-bar-default-top .x-tab-bar-body-default {
-  padding-top: 0;
-}
+.x-tab-bar-default-top .x-tab-bar-body-default {
+  padding-top: 0;
+}

package/src/report/plugin/grid/ToggleColumnsPlugin.scss

@@ -1,7 +1,7 @@
-.ToggleColumnsPlugin {
-  .toggle-pressed {
-    .x-btn-icon-el-blue-text-button-small.svg-icon {
-      background-color: #1E3B4B;
-    }
-  }
-}
+.ToggleColumnsPlugin {
+  .toggle-pressed {
+    .x-btn-icon-el-blue-text-button-small.svg-icon {
+      background-color: #1E3B4B;
+    }
+  }
+}