ru.coon 2.8.14 → 2.8.16

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+# Version 2.8.16, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/87872e4d0fe6f6cdf23cc72721ec14721a15e7c8)
+* update: CHANGELOG.md ([80dc33], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/80dc3360b47ddac2924e7d25d40873815511154a))
+
+# Version 2.8.15, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8243a899e863488223002046a50b6692d3af8fb5)
+* ## Features
+* <span style='color:green'>feat: HT-10125: remove tbfill when it has in items</span> ([f57798], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f57798b08404721c6d13512b3be38771dc53ee30))
+* <span style='color:green'>feat: HT-10125: remove tbfill when it has in items</span> ([3e9b04], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3e9b04e719016aedab59ac8b889da93de0540715))
+* <span style='color:green'>feat: HT-10008: refactor overrides styles code part</span> ([ffbcc9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ffbcc9fc179deba7c46fb1e158136cd32a5d4c3c))
+* <span style='color:green'>feat: HT-8951: fix css</span> ([7ddd11], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7ddd117e3ba365e1c2da3472ecd0efe180e1e204))
+* <span style='color:green'>feat: HT-10485: apply tpl for xls and xlsx</span> ([eb4503], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/eb450352f7e5062d394f6b0f29eff84603c1511a))
+
+* ## Fixes
+* <span style='color:red'>fixes</span> ([77fb8d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/77fb8de94f02156769b48092d91ea16a11f9aa94))
+
+* update: CHANGELOG.md ([b6ceb3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b6ceb36854b9ae262d9dcf375f19695392da16ca))
+
 # Version 2.8.14, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dcae10177e3289827d597b883c0e7be99ff45e98)
 * ## Fixes
 * <span style='color:red'>fix ClearFiltersButton visible status, HT-10125</span> ([689462], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6894624e9d2cc0ba572308e2ac4c366a626432c8))

package/package.json

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

package/src/report/component/ReportPanel.js

@@ -493,13 +493,24 @@ Ext.define('Coon.report.component.ReportPanel', {
     },
 
     createTopToolbar(items) {
-        return this.gridTopToolbar = Ext.create({
-            xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(items || []).concat([{
+        const clearBlock = [];
+        if ((items && Ext.isArray(items) && !items.find((item) => {
+            if (Ext.isObject(item)) {
+                return item.xtype === 'tbfill';
+            } else {
+                return item === '->';
+            }
+        })) || !items) {
+            clearBlock.push({
                 xtype: 'tbfill',
                 position: 997,
-            }, {
-                xtype: 'ClearFiltersButton',
-            }]),
+            });
+        }
+        clearBlock.push({
+            xtype: 'ClearFiltersButton',
+        });
+        return this.gridTopToolbar = Ext.create({
+            xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(items || []).concat(clearBlock),
         });
     },
     createBottomToolbar(items) {

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

@@ -205,14 +205,18 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return this.mergeDeep(target, ...sources);
     },
 
-    applyTemplate(content) {
+    getCurrentFilterParameters() {
+        return this.component.up('ReportPanel').currentParamList || {};
+    },
+
+    applyTemplate(content = '', data = {}) {
         const tpl = new Ext.XTemplate(content, {
             disableFormats: true,
             date(format = 'd.m.Y') {
                 return Ext.Date.format(new Date(), format);
             },
         });
-        return tpl.apply({params: this.component.up('ReportPanel').currentParamList || {}});
+        return tpl.apply(Object.assign(data, {parameters: this.getCurrentFilterParameters()}));
     },
 
     parseJsEditorObj: function(obj, workbook) {
@@ -229,7 +233,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                 result.push(tr.reduce((accumulator, td) => {
                     if (td.display === true) {
                         const tmp = {
-                            'value': this.applyTemplate(td.content.replace(/<br>/gi, '')),
+                            'value': td.content.replace(/&nbsp;|<br>/gi, ''),
                         };
                         if (td.colspan && td.colspan > 1) {
                             tmp.mergeAcross = td.colspan - 1;
@@ -368,7 +372,6 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         const dataRows = [];
         let headerRows = [];
         let footerRows = [];
-        const dataForTemplate = this.getDataForTemplate();
         const grid = this.component;
         const columnModel = grid.getColumns();
         const columnCount = grid.getColumns().length;
@@ -382,10 +385,8 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         }
         if (this.headerXlsx) {
             const headerXlsx = this.parseJsEditorObj(this.headerXlsx, workbook);
-            const tmpl = new Ext.XTemplate(
-                this.processingTemplate(JSON.stringify(headerXlsx))
-            ).apply(dataForTemplate);
-            headerRows = headerRows.concat(JSON.parse(tmpl));
+            const html = this.processingTemplate(JSON.stringify(headerXlsx));
+            headerRows = headerRows.concat(JSON.parse(this.applyTemplate(html, this.getDataForTemplate(html))));
         }
         const dataIndexToColumn = [];
         const visibleColumns = [];
@@ -418,10 +419,8 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         }, this);
         if (this.footerXlsx) {
             const footerXlsx = this.parseJsEditorObj(this.footerXlsx, workbook);
-            const tmpl = new Ext.XTemplate(
-                this.processingTemplate(JSON.stringify(footerXlsx))
-            ).apply(dataForTemplate);
-            footerRows = JSON.parse(tmpl);
+            const html = this.processingTemplate(JSON.stringify(footerXlsx));
+            footerRows = JSON.parse(this.applyTemplate(html, this.getDataForTemplate(html)));
         }
         return {headerRows, dataRows, footerRows};
     },
@@ -477,8 +476,8 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             return fileName;
         }
         try {
-            fileName = new Ext.XTemplate(fileName, {strict: true}).apply({
-                parameters: this.component.up('ReportPanel').currentParamList || {},
+            fileName = this.applyTemplate(fileName, {
+                parameters: this.getCurrentFilterParameters(),
             });
         } catch (err) {
             Coon.log.warn(err);
@@ -534,7 +533,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             this.collectGridDataAsObject(this.getSelected(), exporter.excel);
         const tableHeaderRows = this.getTableHeaderRows(exporter);
         const summaryRows = this.getSummaryRows();
-        this.assignStyle([...dataRows, ...summaryRows], this.allBordersStyle);
+        // this.assignStyle([...dataRows, ...summaryRows], this.allBordersStyle);
         exporter.jsonData = [...headerRows, ...tableHeaderRows, ...dataRows, ...summaryRows, ...footerRows];
         exporter.getContent = this.getContent.bind(exporter, this);
         return exporter;
@@ -941,7 +940,6 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         const result = [];
         const grid = this.component;
         const columnCount = grid.getColumns().length;
-        const dataForTemplates = this.getDataForTemplate();
         result.push('<html>' +
             '<head>' +
             '<meta http-equiv=Content-Type content="text/html; charset=utf-8">' +
@@ -963,7 +961,8 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         }
 
         if (!Ext.isEmpty(this.header)) {
-            result.push(new Ext.XTemplate(this.processingTemplate(this.headerTemplate.html)).apply(dataForTemplates));
+            const html = this.processingTemplate(this.headerTemplate.html);
+            result.push(this.applyTemplate(html, this.getDataForTemplate(html)));
         }
         // собираем заголовки
         const dataIndexToColumn = [];
@@ -1024,7 +1023,8 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         result.push('</table>');
         // Нижний колонтитул (если задан).
         if (!Ext.isEmpty(this.footer)) {
-            result.push(new Ext.XTemplate(this.processingTemplate(this.footerTemplate.html)).apply(dataForTemplates));
+            const html = this.processingTemplate(this.footerTemplate.html);
+            result.push(this.applyTemplate(html, this.getDataForTemplate(html)));
         }
         result.push('</body></html>');
         return result;
@@ -1140,23 +1140,23 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                         </td>
                     `);
             } else {
-                const col = Ext.apply(
-                    {value: this.getRenderedValue(value, valueType) || ''},
-                    this.getRowStyleXlsx(grid, record, workbook)
-                );
+                let styles = this.getRowStyleXlsx(grid, record, workbook);
+                const col = {value: this.getRenderedValue(value, valueType) || ''};
+                styles = this.mergeDeep(styles, this.allBordersStyle);
                 if (valueType === 'float') {
                     let precision = Number(columnConfig.precision);
                     if (!Number.isInteger(precision)) {
                         precision = Number(this.getConfig('floatPrecision') || this.defaultFloatPrecision);
                     }
-                    col['styleId'] = workbook.addCellStyle({
-                        format: precision !== 0 ? '0.'.padEnd(precision + 2, '0') : '0',
-                    });
+                    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(',', '.'));
                     }
                 }
-                result.push(col);
+
+                col['styleId'] = workbook.addCellStyle(styles);
+
+                result.push(JSON.parse(JSON.stringify(col)));
             }
         }, this);
         if (!object) {
@@ -1181,7 +1181,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             }
         }
 
-        return Object.keys(styles).length ? {'styleId': workbook.addCellStyle(styles)} : {};
+        return {styles: styles};
     },
     getRowStyle: function(grid, record) {
         const rowElement = Ext.fly(grid.getView().getRow(grid.getStore().indexOf(record)));
@@ -1301,8 +1301,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
     },
 
     // Получение параметров шаблонов
-    getDataForTemplate: function() {
-        const text = (this.header || '') + (this.footer || '');
+    getDataForTemplate: function(text) {
         if (Ext.isEmpty(text)) {
             return {};
         }

package/src/report/toolbar/ButtonsByType.scss

@@ -39,7 +39,7 @@
   .function-button-type {
 
     border: 1px solid #F5F7F8 !important;
-    background-color: #ECEEEF;
+    background-color: #F5F7F8;
     border-radius: 6px;
   }
 
@@ -62,7 +62,7 @@
 
 
   .function-button-type.x-btn-over {
-    background-color: #E3E7EA;
+    background-color:  #ECF0F3;
   }
 
   .function-button-type.x-btn-over .x-btn-arrow-right::after {

package/src/report/toolbar/ReportGridToolbar.js

@@ -9,6 +9,7 @@ Ext.define('Coon.report.toolbar.ReportGridToolbar', {
     userPreferences: {},
     reportPanel: undefined,
     newButtons: {},
+
     initComponent: function() {
         this.layout = {
             overflowHandler: Ext.create('Coon.report.toolbar.layout.ReportToolbarOverflow', {
@@ -25,6 +26,9 @@ Ext.define('Coon.report.toolbar.ReportGridToolbar', {
             this.foldItemsContainer,
             {
                 xtype: 'displayfield',
+                width: 2,
+                margin: 0,
+                padding: 0,
                 position: -10,
                 itemId: 'hiddenDisplayElement',
             }
@@ -139,6 +143,7 @@ Ext.define('Coon.report.toolbar.ReportGridToolbar', {
             return 0;
         });
     },
+
     readUserPreferences: function() {
         if (this.getEl()) {
             this.getLayout().overflowHandler.menuButton.setTooltip(null);

package/src/report/toolbar/layout/ReportToolbarOverflow.js

@@ -146,7 +146,7 @@ Ext.define('Coon.report.toolbar.layout.ReportToolbarOverflow', {
                 },
             },
             style: {
-                borderLeft: '3px solid #D3D3D3',
+                borderLeft: '2px solid #D3D3D3',
             },
             items: systemItemsList,
         });

package/src/version.js

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