ru.coon 2.8.11 → 2.8.12

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+# Version 2.8.12, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/89d48dd480147733a75d36a62408ec92070c497a)
+* ## Features
+* <span style='color:green'>feat: HT-10449: Add extra fields to plugin
+feat: HT-10458: Check then summery row has values</span> ([b87004], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b870046f1bc55a2046426c4180879d39d489687d))
+* <span style='color:green'>feat: HT-10434: apply x template in header and footer export forms for xlsx</span> ([67519e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/67519e81a914522b09d6ff1b91bd435c584ef1d2))
+
+* ## Fixes
+* <span style='color:red'> HT-10441 CopyRowsFromGrid fix date regex</span> ([dc2144], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dc2144e19b637b11fafcd8ede20ccd98a5b8548d))
+
+* update: CHANGELOG.md ([5d8910], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5d8910be334e3ad00b20ade871bf30dbf605822c))
+
 # Version 2.8.11, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/42b79fd484035a21adaf0e8870b70519fde032a4)
 * ## Fixes
 * <span style='color:red'> HT-10439: set method for readonly formula to use publishState</span> ([fdb85d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/fdb85df08f3581c2bb5f16005a1d16cccf836352))

package/package.json

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

package/src/common/field/PeriodByReportField.js

@@ -107,6 +107,10 @@ Ext.define('Coon.common.field.PeriodByReportField', {
     },
 
     initComponent: function() {
+        const opt = this.getDefaultValueOpt();
+        if (opt && opt.key && opt.value) {
+            this.extraFields = this.extraFields && Ext.isArray(this.extraFields) ? this.extraFields.push(opt.key) : [opt.key];
+        }
         this.callParent();
         this.on('goForward', this.goForward, this);
         this.on('goBack', this.goBack, this);

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

@@ -205,6 +205,16 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         return this.mergeDeep(target, ...sources);
     },
 
+    applyTemplate(content) {
+        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 || {}});
+    },
+
     parseJsEditorObj: function(obj, workbook) {
         if (typeof obj !== 'object' || !obj.blocks || !obj.blocks.length) {
             return [];
@@ -219,7 +229,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                 result.push(tr.reduce((accumulator, td) => {
                     if (td.display === true) {
                         const tmp = {
-                            'value': td.content.replace(/<br>/gi, ''),
+                            'value': this.applyTemplate(td.content.replace(/<br>/gi, '')),
                         };
                         if (td.colspan && td.colspan > 1) {
                             tmp.mergeAcross = td.colspan - 1;
@@ -567,7 +577,16 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         const summaries = this.exporter.getConfig().data.getSummaries();
         if (summaries && summaries.length) {
             summaries.each((row) => {
-                summaryRows.push(row.getCells().getValues('_value').map((value) => ({value})));
+                let flag = false;
+                const values = row.getCells().getValues('_value').map((value) => {
+                    if (value) {
+                        flag = true;
+                    }
+                    return ({value});
+                });
+                if (flag) {
+                    summaryRows.push(values);
+                }
             });
         }
         return summaryRows;
@@ -1002,7 +1021,6 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                 chunk = '';
             }
         }, this);
-
         result.push('</table>');
         // Нижний колонтитул (если задан).
         if (!Ext.isEmpty(this.footer)) {
@@ -1347,7 +1365,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         if (Ext.isEmpty(this.parametersForReplace)) {
             this.parametersForReplace = [
                 {
-                    re: '\\{\\$\\w[\\w ,\\\\/:-]*\\$\\}', // Даты в виде {$формат_даты$}
+                    re: '\\{\\$\\w[\\w ,\\\\/.:-]*\\$\\}', // Даты в виде {$формат_даты$}
                     getHandler: function() {
                         const date = new Date();
                         return function(m) {

package/src/version.js

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