ru.coon 2.6.13 → 2.6.15

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# Version 2.6.15, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9ad5ed1315f5d90adfe7569f83a8f354025f96dd)
+* ## Fixes
+* <span style='color:red'>fix BFL-11632</span> ([8600ec], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8600ec86a3b2b824530ae8116416d7b29b087f3b))
+
+* update: CHANGELOG.md ([08f451], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/08f45144a4d946fd328a2b43645f08e5b06903aa))
+
+# Version 2.6.14, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2fa5952910e2d64f357d1c17486ab785686f3cc2)
+* ## Fixes
+* <span style='color:red'> HT-8113 synchronization of fileName in ExportReportDataToFilePlagin</span> ([2dee16], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2dee167031e2cf5071092a81b437d4748513de30))
+
+* update: CHANGELOG.md ([122574], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/12257435ce3081dc5641232b789cfa8b2b188e82))
+
 # Version 2.6.13, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b546bb7b481a9dbc4b408c99b9ce158b676a15fa)
 * ## Fixes
 * <span style='color:red'> BFL-11558 ExportReportDataToFilePlugin date format</span> ([109998], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/109998bd10e4fd67d98b88784c008f56c5e965c8))

package/package.json

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

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

@@ -168,19 +168,19 @@ Ext.define('Coon.report.plugin.configPanel.GroupRowsPluginConfigPanel', {
 
     doInit: function(properties) {
         this.selectColumnForGroupingCombo.setValue(
-            properties['groupField'] ||
+            properties.groupField ||
             this.selectColumnForGroupingCombo.getStore().getData().getRange()[0]
         );
-        if (properties['valueConfig']) {
-            this.summaryGrid.doInit(properties['valueConfig']);
+        if (properties.valueConfig) {
+            this.summaryGrid.doInit(properties.valueConfig);
         }
         if (
-            properties['groupHeaderTpl'] &&
-            Ext.isObject(properties['groupHeaderTpl'])
+            properties.groupHeaderTpl &&
+            Ext.isObject(properties.groupHeaderTpl)
         ) {
             this.groupHeaderTplEditor &&
             this.groupHeaderTplEditor.setValue(
-                properties['groupHeaderTpl'].tpl || ''
+                properties.groupHeaderTpl.tpl || '{name}'
             );
         }
         this.callParent([properties]);
@@ -282,7 +282,7 @@ Ext.define('Coon.report.plugin.configPanel.GroupRowsPluginConfigPanel', {
                 {
                     text: 'Очистить',
                     handler(btn) {
-                        btn.up('UiAceEditorPanel').links.editor.setValue('');
+                        btn.up('UiAceEditorPanel').links.editor.setValue('{name}');
                     },
                 },
                 {

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

@@ -34,15 +34,15 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
                     handler: Ext.bind(this.handler, this),
                 });
             }
+            this.fileName = this.config.reportFileName || this.report.reportId || 'defaultReportName';
+            const dateFormat = this.dateFormat || this.defaultDateFormat;
+            const appendDateToFileName = Ext.isBoolean(this.config.appendDateToFileName) ? this.config.appendDateToFileName : true;
+            if (appendDateToFileName) {
+                this.fileName += '_';
+                this.fileName += Ext.Date.format(new Date(), dateFormat);
+            }
         }, this);
         this.printPdfCommand = Ext.create('command.GetPdfReportDataCommand', {useRawFilterParams: this.getConfig('addToSearchButton')});
-        this.fileName = this.config.reportFileName || this.report.reportId || 'defaultReportName';
-        const dateFormat = this.dateFormat || this.defaultDateFormat;
-        const appendDateToFileName = Ext.isBoolean(this.config.appendDateToFileName) ? this.config.appendDateToFileName : true;
-        if (appendDateToFileName) {
-            this.fileName += '_';
-            this.fileName += Ext.Date.format(new Date(), dateFormat);
-        }
     },
     callExportByType() {
         switch (this.config.exportFileFormat) {

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

@@ -47,7 +47,7 @@ Ext.define('Coon.report.plugin.grid.GroupRowsPlugin', {
             undefined;
         if (groupFeature) {
             const groupHeaderTpl = Ext.isObject(this.groupHeaderTpl) && this.groupHeaderTpl.tpl;
-            groupFeature.groupHeaderTpl = groupHeaderTpl || groupFeature.groupHeaderTpl || '{name}';
+            groupFeature.groupHeaderTpl = groupHeaderTpl || '{name}';
         }
     },
 

package/src/version.js

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