ru.coon 2.8.4 → 2.8.7

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# Version 2.8.7, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/086c841f875dba30c6d46e2737876da1349717d5)
+* ## Features
+* <span style='color:green'>feat: Экспорт строки "Всего". Closes HT-10162.</span> ([afbcee], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/afbceeebb84975dd57bd22d0dccf87ec9b81c799))
+
+* update: CHANGELOG.md ([d63112], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d63112ea1457bd42c43dfc86625b72a287c30b24))
+
+# Version 2.8.6, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/71b44f6acfbe1db484173ac579218ed8c494ad3e)
+* update: CHANGELOG.md ([0b6d30], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0b6d304fb344aaceedb55d591c80e4a815f339f0))
+
+# Version 2.8.5, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/224b99c8b4b9674f6732b71e76aa06961fd4e91d)
+* ## Fixes
+* <span style='color:red'>fix modified state for characteristic record, HT-10117</span> ([2f8762], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2f876261d0065a0a02810ac5866f2832b2a36672))
+
+* update: CHANGELOG.md ([1e5402], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1e5402b30bb754e5f58c5c3ccf70859dd6906f66))
+
 # Version 2.8.4, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/79f9eb3363e07fb47ac3ac23659b94b34c7423b9)
 * TR-69542 fix: восстановление утраченной авторизации по токену. ([402a8a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/402a8a5e63da1342b44b6e95a7eed96d5b9a42aa))
 * update: CHANGELOG.md ([b11b4c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b11b4c53ff53f0dde24c4e017e09046a77609ac4))
@@ -8,6 +23,7 @@
 # Version 2.8.2, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b2e3da084c82fa409dca30ef2388bab2f3ef267b)
 * ## Features
 * <span style='color:green'>feat: Added createFromString function. Related to BFL-15767.</span> ([cea621], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cea6218e44b5768116718379e25cc52706ef8a75))
+* <span style='color:green'>feat: HT-9649 Доработка DatePickerPresetsField (убран trigger clear)</span> ([4559c6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4559c6c4a8479928271e1b3daa34fc63a4eff8cb))
 
 * ## Fixes
 * <span style='color:red'> Разрешены html теги в колонке "Описание". Related to BFL-13996.</span> ([8a1793], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8a1793a93a87dcb10f92d854d491c31aefcd2563))
@@ -17,6 +33,9 @@
 * update: CHANGELOG.md ([ad61a8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ad61a8c449000e7b9ff6e921d39eecd97ddabea2))
 
 # Version 2.8.1, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/88c146ad577ce2a14d194c245e3d5151081af6af)
+* ## Features
+* <span style='color:green'>feat: HT-9649 Доработка DatePickerPresetsField</span> ([0f172e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0f172e42774d9f42ad8e228e5eda37880fd3b206))
+
 * ## Fixes
 * <span style='color:red'> HT-9264 CoonChart lite fix</span> ([d8e2d7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d8e2d7a5994649ea9707fd6e901d1201813bbc36))
 

package/package.json

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

package/src/common/component/editor/CharacteristicGridCopyPlugin.js

@@ -86,8 +86,10 @@ Ext.define('Coon.common.component.editor.CharacteristicGridCopyPlugin', {
         if (!masterRecord) {
             return;
         }
-
-        slaveRecord.set('value', masterRecord.get('value'));
-        slaveRecord.set('valueDescription', masterRecord.get('valueDescription') || '');
+        slaveRecord.set({
+            markToCommit: true,
+            value: masterRecord.get('value'),
+            valueDescription: masterRecord.get('valueDescription') || '',
+        });
     },
 });

package/src/common/field/DatePickerPresetsField.js

@@ -9,9 +9,6 @@ Ext.define('Coon.common.field.DatePickerPresetsField', {
         prevYears: 10,
         nextYears: 0,
     },
-    viewModel: {
-        data: {},
-    },
     inclinedMonthNames: [
         'января',
         'февраля',
@@ -255,5 +252,4 @@ Ext.define('Coon.common.field.DatePickerPresetsField', {
             }
         },
     },
-
 });

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

@@ -29,7 +29,28 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
     },
     defaultDateFormat: 'Y-m-d_h-i',
     forbiddenSymbolReplacer: 'underscore',
-
+    includeSummary: true,
+    allBordersStyle: {
+        borders: [
+            {position: 'Left', lineStyle: 'Continuous', weight: 1, color: '#000000'},
+            {position: 'Right', lineStyle: 'Continuous', weight: 1, color: '#000000'},
+            {position: 'Top', lineStyle: 'Continuous', weight: 1, color: '#000000'},
+            {position: 'Bottom', lineStyle: 'Continuous', weight: 1, color: '#000000'}
+        ],
+    },
+    tableHeaderStyle: {
+        alignment: {
+            wrapText: true,
+            horizontal: 'Center',
+            vertical: 'Automatic',
+        },
+        font: {
+            fontName: 'Arial',
+            family: 'Swiss',
+            bold: true,
+            color: '#000000',
+        },
+    },
     injectForm() {
         // if element already exist
         if (document.querySelector(`form#${this.formId()}`)) {
@@ -58,6 +79,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             this.component.store = store;
             this.component.columns = columns;
         }, this);
+        Object.assign(this.tableHeaderStyle || {}, this.allBordersStyle);
     },
 
     createToolbarItem: function(config) {
@@ -422,7 +444,8 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             });
         } else {
             filename += '.xls';
-            const exporter = Ext.create('Ext.exporter.text.Html', {fileName: filename});
+            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')
@@ -483,8 +506,9 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
     },
 
     initExporter: function(filename) {
-        const exporter = Ext.create('Ext.exporter.excel.Xlsx', {
+        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: {
@@ -495,13 +519,24 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         exporter.worksheet = exporter.excel.addWorksheet({
             name: 'Лист 1',
         });
+        this.prepareData();
         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);
+        const summaryRows = this.getSummaryRows();
+        this.assignStyle([...dataRows, ...summaryRows], this.allBordersStyle);
+        exporter.jsonData = [...headerRows, ...tableHeaderRows, ...dataRows, ...summaryRows, ...footerRows];
+        exporter.getContent = this.getContent.bind(exporter, this);
         return exporter;
     },
+
+    prepareData() {
+        const exporterPlugin = this.component.plugins.find(
+            (p) => p.ptype === 'gridexporter'
+        ) || Ext.create('Ext.grid.plugin.Exporter').init(this.component);
+        this.exporter.setData(exporterPlugin.prepareData({includeSummary: this.includeSummary}));
+    },
+
     getContent: function() {
         const me = this;
         const config = this.getConfig();
@@ -518,17 +553,47 @@ 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);
+    /**
+     * Возвращает агрегирующие строки из плагина GroupRowsPlugin.
+     * Чтобы экспортировать текст, например "Всего" в конфиге колонки должны быть указаны:
+     *  ```
+     *  summaryRenderer: function(){return 'Всего'},
+     *  exportSummaryRenderer: true
+     *  ```
+     * @returns {Object[]}
+     */
+    getSummaryRows() {
+        const summaryRows = [];
+        const summaries = this.exporter.getConfig().data.getSummaries();
+        if (summaries && summaries.length) {
+            summaries.each((row) => {
+                summaryRows.push(row.getCells().getValues('_value').map((value) => ({value})));
+            });
+        }
+        return summaryRows;
+    },
+
+    assignStyle(target, style = {}) {
+        if (Array.isArray(target)) {
+            for (const row of target) {
+                if (Array.isArray(row)) {
+                    this.assignStyle(row, style);
+                } else if (typeof row === 'object') {
+                    Object.assign(
+                        row,
+                        {styleId: this.exporter.excel.addCellStyle(style)}
+                    );
+                }
+            }
+        } else if (typeof target === 'object') {
+            this.assignStyle([target], style);
         }
-        exporter.setData(exporterPlugin.prepareData({}));
+        return target;
+    },
+
+    getTableHeaderRows(exporter, type = 'xlsx') {
+        const config = exporter.getConfig();
         if (type === 'xls') {
-            const config = exporter.getConfig();
             exporter.doc = new Ext.exporter.file.html.Doc({
                 title: config.title,
                 author: config.author,
@@ -541,20 +606,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         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,
-                            },
-                        }
-                    ),
+                    styleId: exporter.excel.addCellStyle(config.tableHeaderStyle),
                 });
             });
             return row.cells;
@@ -911,18 +963,34 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
             }
         }
         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',
+            '<tr>',
+            '   <tpl for=".">',
+            '       <th',
+            '           <tpl if="width"> width="{width}"</tpl>',
+            '           <tpl if="mergeAcross"> colSpan="{mergeAcross}"</tpl>',
+            '           <tpl if="mergeDown"> rowSpan="{mergeDown}"</tpl>>',
+            '       {text}',
+            '       </th>',
+            '   </tpl>',
+            '</tr>',
             '</tpl>'
         );
-        /* eslint-enable max-len */
         result.push(headerTpl.apply({columns: tableHeaderRows}));
+        if (this.includeSummary) {
+            const summaryRows = this.getSummaryRows();
+            const {fields} = this.component.getStore().config;
+            summaryRows.forEach((row) => {
+                const rec = Ext.create('Ext.data.Model');
+                fields.map(({name}) => name).filter(
+                    (name, index) => visibleColumns.includes(index)
+                ).forEach((name, index) => {
+                    rec.set(name, row[index].value);
+                });
+                selections.push(rec);
+            });
+        }
         let chunk = '';
         selections.forEach(function(record, i) {
             const row = [];

package/src/version.js

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