ru.coon 2.8.44 → 2.8.45

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# Version 2.8.45, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/25627ac5acaac8b27d8715539f6f5d660d06e4cb)
+* ## Features
+* <span style='color:green'>feat: HT-11254: Доработана возможность прокидывать функции в свойства элементов</span> ([b55ec0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b55ec087990a4350abedbd7cff217c52e482eb1e))
+* <span style='color:green'>feat: TR-70262: Доработана возможность выставление времени ожидания ответа сервера</span> ([498d84], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/498d847755e76adcbb2da40e469626454f5b8da6))
+
+* update: CHANGELOG.md ([0508b8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0508b825a1f89b1651b8f6c83181fa222e2544ee))
+
 # Version 2.8.44, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/50df0b225f3a1efaaa05828e6445e74667856840)
 * ## Features
 * <span style='color:green'>feat: HT-11254: Доработана возможность прокидывать функции в свойства элементов</span> ([94e499], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/94e499f50bc145ebc6fca12a75905ae0fb82b54b))

package/package.json

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

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

@@ -76,7 +76,17 @@ Ext.define('Coon.report.plugin.configPanel.ExportReportDataToFilePluginConfigPan
                             },
                             this.createAddButtonPanel(),
                             this.getAllRowsCheckBox(),
-                            this.createCustomColumnsFieldset()
+                            this.createCustomColumnsFieldset(),
+                            {
+                                xtype: 'numberfield',
+                                name: 'countHours',
+                                minValue: 1,
+                                allowDecimals: true,
+                                step: 0.1,
+                                decimalPrecision: 1,
+                                maxValue: 24,
+                                fieldLabel: 'таймаут(в часах)',
+                            }
                         ],
                         defaults: {
                             labelWidth: 130,
@@ -129,7 +139,7 @@ Ext.define('Coon.report.plugin.configPanel.ExportReportDataToFilePluginConfigPan
                     useLinter: true,
                     scrollable: 'y',
                     name: 'exportConfig',
-                    value: {},
+                    value: '{}',
                 }
             ],
         };
@@ -183,6 +193,7 @@ Ext.define('Coon.report.plugin.configPanel.ExportReportDataToFilePluginConfigPan
         if (config.exportConfig) {
             this.down('UiAceEditor').setValue(config.exportConfig);
         }
+        Coon.Function.getFieldByName(this, 'countHours').setValue(config.countHours ? config.countHours : 1);
         this.setFieldsData(this.context.fields);
     },
 
@@ -191,7 +202,6 @@ Ext.define('Coon.report.plugin.configPanel.ExportReportDataToFilePluginConfigPan
         const ns = Coon.report.model.ReportFieldMaintenanceBeanFields;
         const fieldsNS = Coon.report.model.ReportFieldBeanFields;
         const warningMessage = this.lookup('warning');
-
         const fieldsData = fields.length && fields.map((field) => {
             if (field[fieldsNS.$reportFieldTypeLookup] === 'BOOLEAN') {
                 this.booleanFields.push(field[fieldsNS.$reportFieldCd]);
@@ -215,6 +225,7 @@ Ext.define('Coon.report.plugin.configPanel.ExportReportDataToFilePluginConfigPan
                 config['columnList'] = JSON5.stringify(checkedRecords.length ? checkedRecords : this.grid.getStore().queryRecords());
                 config['allowUserSelectColumnsToUpload'] = allowUserColumns;
             }
+            config['countHours'] = Coon.Function.getFieldByName(this, 'countHours').getValue();
             config['exportConfig'] = this.down('UiAceEditor').getValue();
             return config;
         });

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

@@ -12,10 +12,11 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
         exportAllRows: true,
         allowUserSelectColumnsToUpload: undefined,
         addToSearchButton: false,
+        countHours: 1,
     },
     exportConfig: {},
     defaultDateFormat: 'Y-m-d_h-i',
-    defaultTimeout: 10 * 60 * 1000,
+    defaultTimeout: 3600000,
 
     constructor(config) {
         config.invisibleByDefault = config.addToSearchButton === true;
@@ -186,7 +187,7 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
     getTimeout() {
         return !isNaN(this.config.cmp && this.config.cmp.timeout) && this.config.cmp.timeout ?
             this.config.cmp.timeout :
-            this.defaultTimeout;
+            (this.getCountHours() * this.defaultTimeout);
     },
     printCsvFile: async function(extension) {
         this.grid.mask('подождите пожалуйста...');

package/src/version.js

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