ru.coon 2.5.39 → 2.5.40

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# Version 2.5.40, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5b5d783b6007d6cf16d9f3fb48e203818a0b9c47)
+* ## Fixes
+* <span style='color:red'>fix</span> ([5400c1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5400c17b624f78acfa1dbe8c27742e7a1f4b1cc1))
+* <span style='color:red'> Переделан механизм добавления меню в кнопку "Поиск"</span> ([0437f3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0437f3f77c410d545f65d75516091db6ba41ad80))
+
+* revert to bf9339051130805e551f48ce07bd5bac3d49d140 ([80394d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/80394d8e7b64a12c3e137d74661c529d6162004c))
+* update: CHANGELOG.md ([14b820], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/14b8208316d9994deafbbd54ccab2fdae4900e74))
+
 # Version 2.5.39, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/197e1a48c71c978b75397d971309a8df6c4eae59)
 * hotfix ExportReportDataToFilePlugin ([ccdd78], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ccdd78c5e826fc1c93493e9336bdfb3124b58f44))
 * update: CHANGELOG.md ([35314e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/35314ed753380fa21254cf133f068f812e6b5031))

package/package.json

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

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

@@ -26,6 +26,12 @@ Ext.define('Coon.report.component.report.NorthPanel', {
             text: 'Поиск',
         }, this.findButtonConfig || {}));
 
+        // arrowVisible is not working, so we need this hack
+        this.searchButton['_splitCls'] = this.searchButton.getSplitCls();
+        this.searchButton.getSplitCls = function() {
+            return this.menu && this.menu.items.length ? this['_splitCls'] : '';
+        };
+
         this.clearButton = Ext.widget('button', Ext.apply({
             ui: 'green-button',
             text: 'Очистить',
@@ -64,7 +70,7 @@ Ext.define('Coon.report.component.report.NorthPanel', {
          */
         this.on('added', function() {
             this.reportPanel = this.findParentByType('ReportPanel');
-            this.searchButton.handler = this.reportPanel ? Ext.bind(this.reportPanel.filterHandler, this.reportPanel): Ext.emptyFn;
+            this.searchButton.handler = this.reportPanel ? Ext.bind(this.reportPanel.filterHandler, this.reportPanel) : Ext.emptyFn;
             this.clearButton.handler = Ext.bind(function() {
                 this.clearFilter();
                 this.clearData();
@@ -93,7 +99,7 @@ Ext.define('Coon.report.component.report.NorthPanel', {
         Ext.merge(this, properties);
         this.filterPlugins.push({
             ptype: 'EnterConfirmFormPlugin',
-            confirmHandler: this.reportPanel ? Ext.bind(this.reportPanel.filterHandler, this.reportPanel): Ext.emptyFn,
+            confirmHandler: this.reportPanel ? Ext.bind(this.reportPanel.filterHandler, this.reportPanel) : Ext.emptyFn,
         });
 
         const [enableHighlightingRequiredFields, hiddenLegend] = this.hasPropertiesFilterPanel(reportFormBean.plugins, properties);
@@ -107,7 +113,7 @@ Ext.define('Coon.report.component.report.NorthPanel', {
         });
         filterPanel.on('searchbuttontoggle', function(isValid, errorMessage) {
             this.searchButton.setDisabled(!isValid);
-            this.searchButton.setTooltip(!isValid ? errorMessage: '');
+            this.searchButton.setTooltip(!isValid ? errorMessage : '');
         }, this);
         this.filterContainer.removeAll();
         this.filterContainer.add(filterPanel);
@@ -196,39 +202,19 @@ Ext.define('Coon.report.component.report.NorthPanel', {
         if (!menuItems.length) {
             return;
         }
-        const btn = this.searchButton;
-        btn.setMenu(menuItems);
-        btn.setArrowVisible(true);
-        return;
-        // if (this.splitSearchButton) {
-        //     menuItems.forEach((c) => {
-        //         this.splitSearchButton.menu.insert(0,
-        //             c.$className && c.isMenuItem ?
-        //                 c :
-        //                 Ext.create(Object.assign(c, {xtype: 'menuitem'}))
-        //         );
-        //     });
-        // } else {
-        //     const btn = this.searchButton;
-        //     if (btn) {
-        //         this.splitSearchButton = Ext.create(
-        //             Object.assign(
-        //                 {
-        //                     xtype: 'splitbutton',
-        //                     handler: btn.handler.bind(btn),
-        //                     menu: menuItems,
-        //                 },
-        //                 btn.initialConfig || {},
-        //                 {margin: btn.margin}
-        //             )
-        //         );
-        //         btn.hide();
-        //         btn.ownerCt.items.items.splice(
-        //             btn.ownerCt.items.items.indexOf(btn),
-        //             0,
-        //             this.splitSearchButton
-        //         );
-        //     }
-        // }
+        const existingMenu = this.searchButton.getMenu();
+        if (existingMenu && existingMenu.items.length) {
+            for (const menuItem of menuItems) {
+                existingMenu.insert(
+                    0,
+                    menuItem.$className && menuItem.isMenuItem ?
+                        menuItem :
+                        Ext.create(Object.assign(menuItem, {xtype: 'menuitem'}))
+                );
+            }
+        } else {
+            this.searchButton.setMenu(menuItems);
+            this.searchButton.btnWrap.addCls(this.searchButton.getSplitCls());
+        }
     },
 });

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

@@ -14,39 +14,26 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
     },
 
     constructor(config) {
-        // config.invisibleByDefault = config.addToSearchButton === true;
+        config.invisibleByDefault = config.addToSearchButton === true;
         this.callParent(arguments);
     },
 
-
     init(grid) {
         this.callParent([grid]);
         const format = this.config.exportFileFormat;
         this.buttonText = this.buttonText || (format && 'Экспорт в ' + format);
-        // grid.on(
-        //     'render',
-        //     function() {
-        //         this.report = grid.findParentByType('ReportPanel');
-        //         if (this.getConfig('addToSearchButton') === true) {
-        //             this.report.northPanel.addToSearchButtonMenu({
-        //                 text: this.buttonText,
-        //                 iconCls: this.buttonIconCls,
-        //                 handler: Ext.bind(this.handler, this),
-        //             });
-        //         }
-        //         this.grid = grid;
-        //     }, this,
-        //     {single: true}
-        // );
-        this.getDataCommand = Ext.create(
-            `command.${
-                format === 'pdf' ?
-                    'GetPdfReportDataCommand' :
-                    'GetExcelFromRowsOrReportData'
-            }`,
-            {useRawFilterParams: this.getConfig('addToSearchButton') || true}
-        );
-        debugger;
+        grid.on('render', function() {
+            this.report = grid.findParentByType('ReportPanel');
+            if (this.getConfig('addToSearchButton') === true) {
+                this.report.northPanel.addToSearchButtonMenu({
+                    text: this.buttonText,
+                    iconCls: this.buttonIconCls,
+                    handler: Ext.bind(this.handler, this),
+                });
+            }
+            this.grid = grid;
+        }, this);
+        this.printPdfCommand = Ext.create('command.GetPdfReportDataCommand', {useRawFilterParams: this.getConfig('addToSearchButton')});
     },
 
     handler: function() {
@@ -54,8 +41,10 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
             this.showPanel();
         } else {
             this.config.columns = this.config.columnList.map((record) => record.reportField);
-            this.getSelections();
-            this.getDataCommand.execute(this.report, this.config);
+            this.getRecordsToPrint();
+            this.config.exportFileFormat === 'pdf' ?
+                this.printPdfCommand.execute(this.report, this.config) :
+                this.printExcelFile();
         }
     },
 
@@ -121,8 +110,10 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
             title: 'Выводить колонки',
         });
         this.win.on('setColumns', function() {
-            this.getSelections();
-            this.getDataCommand.execute(this.report, this.config);
+            this.getRecordsToPrint();
+            this.config.exportFileFormat === 'pdf' ?
+                this.printPdfCommand.execute(this.report, this.config) :
+                this.printExcelFile();
             this.win.close();
         }, this);
         this.win.show();
@@ -133,24 +124,60 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
     },
 
     setColumns: function() {
-        const selectedColumns = this.columnsGrid.getStore().queryRecords('checkbox', true);
-        if (!selectedColumns.length) {
+        const checkedRecords = this.columnsGrid.getStore().queryRecords('checkbox', true);
+        if (!checkedRecords.length) {
             return;
         }
-        this.config.columns = selectedColumns.map((record) => record.get('reportField'));
+        this.config.columns = checkedRecords.map((record) => record.get('reportField'));
         this.win.fireEvent('setColumns');
     },
 
-    getSelections: function() {
-        const rows = this.grid.getSelectionModel().getSelection();
-        if (rows.length > 0) {
-            this.config.toExcel = [];
-            for (const row of rows.length) {
-                const rowData = Object.assign({}, row.getData());
-                delete rowData['id'];
-                this.config.toExcel.push(rowData);
+    getSelectedRecords() {
+        return this.grid.getSelectionModel().getSelection();
+    },
+
+    getRecordsToPrint: function() {
+        this.config.toExcel = [];
+        const selectedRecords = this.getSelectedRecords();
+        const records = selectedRecords.length ? selectedRecords : this.grid.getStore().getRange();
+
+        records.forEach((rec) => {
+            const recData = rec.getData();
+            delete recData['id'];
+            this.config.toExcel.push(recData);
+        });
+    },
+
+    printExcelFile: async function() {
+        const fileName = this.config.reportFileName || this.report.reportId || 'defaultReportName';
+        const currentParamList = this.report.currentParamList;
+        const parameterList = [];
+
+        for (const key in currentParamList) {
+            if (currentParamList.hasOwnProperty(key) && !Ext.isEmpty(currentParamList[key])) {
+                parameterList.push({type: key, value: currentParamList[key]});
             }
         }
+
+        const hasSelected = !!(this.getSelectedRecords() || []).length;
+        const url = hasSelected && !this.getConfig('addToSearchButton') ?
+            '/ReportFormData/getExcelFromRowsOrReport' :
+            '/ReportFormData/getExcelReport';
+
+        Ext.Ajax.request({
+            url,
+            method: 'POST',
+            binary: true,
+            params: {
+                reportId: this.report.reportId,
+                fileName: fileName,
+                appendDateToFileName: 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) => Coon.util.downloadFileFromBlob(new Blob([responce.responseBytes]), `${fileName}.xlsx`),
+        });
     },
 
 });

package/src/version.js

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