ru.coon 2.6.18 → 2.6.19

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+# Version 2.6.19, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f0dadaf8801ac3d1f9e6cc5accc592c563b6a013)
+* ## Features
+* <span style='color:green'>feat: HT-8044 ExportReportDataToFilePlugin add exportConfig field</span> ([2ae4c4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2ae4c4b856766859796ad6f47d4a8d09e7255200))
+* <span style='color:green'>feat: HT-8044 ExportReportDataToFilePlugin add exportConfig field</span> ([0df785], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0df785630853bcaf2291476fd7007f9a29761d63))
+* <span style='color:green'>feat: HT-8145: remove and set table view empty text on load / before load</span> ([e14b0b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e14b0b784256fc854be3d042bb695575eac83269))
+
+* update extjs_iconpack ([648132], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/648132fadfa22e609d17317e40aee2e99ac289ca))
+* update: CHANGELOG.md ([7b85e2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7b85e26648ab43868b4b1db32f11fb04113645dc))
+
 # Version 2.6.18, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1c189ec63993901ccd4a8045777a19f485c5c065)
 * ## Fixes
 * <span style='color:red'> windowWrap default size for restore when maximized:true CRM-8393</span> ([8eb4a5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8eb4a5586089b2cc8581e0d647e20b8955c8b097))

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "2.6.18",
+  "version": "2.6.19",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"
@@ -27,7 +27,7 @@
     "ace-diff": "^3.0.3",
     "decimal.js-light": "^2.5.1",
     "echarts": "^5.3.3",
-    "extjs_iconpack": "1.3.19",
+    "extjs_iconpack": "1.3.20",
     "json5": "2.2.3",
     "object-hash": "^3.0.0",
     "sigma-printjs": "^1.0.1",

package/src/nav/MenuLoader.js

@@ -0,0 +1,23 @@
+Ext.define('Coon.nav.MenuLoader', {
+    singleton: true,
+
+    isLoaded: false,
+
+    load() {
+        return Coon.util.promisifyCmd('command.GetDynamicReportDataCommand', 'MENU_ALLITEMS')
+            .then((data) => {
+                if (Array.isArray(data.list)) {
+                    this.uiElementMap = data.list.reduce();
+                }
+                this.isLoaded = true;
+            });
+    },
+
+    get() {
+
+    },
+
+    isValidMenuItem(uiEmentId) {
+        return this.uiElementMap.has(uiEmentId);
+    },
+});

package/src/report/component/reportpanel/ReportGrid.js

@@ -39,7 +39,11 @@ Ext.define('Coon.report.component.reportpanel.ReportGrid', {
 
         this.on('afterrender', () => {
             this.doAutoSizeAllColumn();
-            this.store.on('load', this.doAutoSizeAllColumn, this);
+            this.store.on('load', () => {
+                this.doAutoSizeAllColumn();
+                this.getView().setEmptyText(this.initialConfig.viewConfig.emptyText);
+            }, this);
+            this.store.on('beforeload', () => this.getView().setEmptyText(''));
         }, this, {single: true});
 
         this.tbar = Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(this.tbar || [])});

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

@@ -96,18 +96,35 @@ Ext.define('Coon.report.plugin.configPanel.ExportReportDataToFilePluginConfigPan
             },
             title: 'Экспорт в',
             flex: 1,
-            items: [{
-                xtype: 'combo',
-                allowBlank: false,
-                store: [
-                    {name: 'Excel', id: 'excel'},
-                    {name: 'PDF', id: 'pdf'},
-                    {name: 'CSV', id: 'csv'}
-                ],
-                displayField: 'name',
-                valueField: 'id',
-                name: 'exportFileFormat',
-            }],
+            items: [
+                {
+                    xtype: 'combo',
+                    allowBlank: false,
+                    store: [
+                        {name: 'Excel', id: 'excel'},
+                        {name: 'PDF', id: 'pdf'},
+                        {name: 'CSV', id: 'csv'}
+                    ],
+                    displayField: 'name',
+                    valueField: 'id',
+                    name: 'exportFileFormat',
+                },
+                {
+                    xtype: 'container',
+                    html: `<div style="font-size:12px;color:gray">
+                        Конфиг. Для выгрузки в csv можно задать значение параметров:
+                        <br>border - символ начала и окончания строки, по умолчанию '"' (двойные кавычки)
+                        <br>separator - разделитель значений ячеек, по умолчанию ',' (запятая)
+                        </div>`,
+                },
+                {
+                    xtype: 'UiAceEditor',
+                    useLinter: true,
+                    scrollable: 'y',
+                    name: 'exportConfig',
+                    value: {},
+                }
+            ],
         };
     },
 
@@ -158,6 +175,9 @@ Ext.define('Coon.report.plugin.configPanel.ExportReportDataToFilePluginConfigPan
         if (config && config.columnList) {
             this.columnList = config.columnList;
         }
+        if (config.exportConfig) {
+            this.down('UiAceEditor').setValue(config.exportConfig);
+        }
         this.setFieldsData(this.context.fields);
     },
 
@@ -190,6 +210,7 @@ Ext.define('Coon.report.plugin.configPanel.ExportReportDataToFilePluginConfigPan
                 config['columnList'] = JSON5.stringify(checkedRecords.length ? checkedRecords : this.grid.getStore().queryRecords());
                 config['allowUserSelectColumnsToUpload'] = allowUserColumns;
             }
+            config['exportConfig'] = this.down('UiAceEditor').getValue();
             return config;
         });
     },

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

@@ -12,6 +12,7 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
         allowUserSelectColumnsToUpload: undefined,
         addToSearchButton: false,
     },
+    exportConfig: {},
     defaultDateFormat: 'Y-m-d_h-i',
     defaultTimeout: 10 * 60 * 1000,
 
@@ -193,23 +194,26 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
             '/ReportFormData/getExcelFromRowsOrReport' :
             '/ReportFormData/getCSVReport';*/
         const url = '/ReportFormData/getCSVReport';
+        const params = Ext.apply({
+            reportId: this.report.reportId,
+            fileName: this.fileName,
+            appendTimestamp: Ext.isBoolean(this.config.appendDateToFileName) ? this.config.appendDateToFileName : true,
+            parameterList: JSON.stringify(parameterList),
+            columnList: JSON.stringify(this.config.columns),
+            toExcel: JSON.stringify(this.config.toExcel),
+            separator: ';',
+            border: '',
+        }, this.exportConfig);
         Ext.Ajax.request({
             url,
             method: 'POST',
             binary: true,
             timeout: this.getTimeout(),
-            params: {
-                reportId: this.report.reportId,
-                fileName: this.fileName,
-                appendTimestamp: Ext.isBoolean(this.config.appendDateToFileName) ? this.config.appendDateToFileName : true,
-                parameterList: JSON.stringify(parameterList),
-                columnList: JSON.stringify(this.config.columns),
-                toExcel: JSON.stringify(this.config.toExcel),
-            },
-            success(responce) {
+            params: params,
+            success(response) {
                 this.grid.unmask();
                 Coon.util.downloadFileFromBlob(
-                    new Blob(['\uFEFF', responce.responseBytes], {type: 'text/csv;charset=utf-8'}),
+                    new Blob(['\uFEFF', response.responseBytes], {type: 'text/csv;charset=utf-8'}),
                     `${this.fileName}.csv`
                 );
             },
@@ -238,22 +242,24 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
             '/ReportFormData/getExcelFromRowsOrReport' :
             '/ReportFormData/getExcelReport';
 
+        const params = Ext.apply({
+            reportId: this.report.reportId,
+            fileName: this.fileName,
+            appendTimestamp: Ext.isBoolean(this.config.appendDateToFileName) ? this.config.appendDateToFileName : true,
+            parameterList: JSON.stringify(parameterList),
+            columnList: JSON.stringify(this.config.columns),
+            toExcel: JSON.stringify(this.config.toExcel),
+        }, this.exportConfig);
+
         Ext.Ajax.request({
             url,
             method: 'POST',
             binary: true,
             timeout: this.getTimeout(),
-            params: {
-                reportId: this.report.reportId,
-                fileName: this.fileName,
-                appendTimestamp: Ext.isBoolean(this.config.appendDateToFileName) ? this.config.appendDateToFileName : true,
-                parameterList: JSON.stringify(parameterList),
-                columnList: JSON.stringify(this.config.columns),
-                toExcel: JSON.stringify(this.config.toExcel),
-            },
-            success(responce) {
+            params: params,
+            success(response) {
                 this.grid.unmask();
-                Coon.util.downloadFileFromBlob(new Blob([responce.responseBytes]), `${this.fileName}.xlsx`);
+                Coon.util.downloadFileFromBlob(new Blob([response.responseBytes]), `${this.fileName}.xlsx`);
             },
             failure(error) {
                 this.grid.unmask();

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

@@ -0,0 +1,7 @@
+**спецификация:**
+
+входные параметры:
+
+- exportFileFormat [xls/pdf]
+- allowUserSelectColumnsToUpload
+- addToSearchButton добавить в кнопку "поиск", в этом случае в качестве параметра отправляем текущие параметры из FilterPanel(useRawFilterParams: true)

package/src/version.js

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