ru.coon 2.5.37 → 2.5.39

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 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))
+
+# Version 2.5.38, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cf1397fbbe07d11e5cdf281bdd82611040a1b31e)
+* ## Features
+* <span style='color:green'>feat: TR-67541 Исправление причину сообщений WRN callParent has no target при сборке wb</span> ([a5753d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a5753dff2b7454b5d466e30cb4369f8632059805))
+
+* rollback ExportReportDataToFilePlugin version ([abd98f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/abd98fe930283d34326d00dad7d1f97ec08aabfd))
+* update: CHANGELOG.md ([96c169], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/96c169bfcd80139251086e0b37e13589cd8267a8))
+
 # Version 2.5.37, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6d81ec7e9ac5bfbcbe04d3310a7e26088ac648fb)
 * ## Fixes
 * <span style='color:red'> CRM-7853 ParameterizedReportCombo  исправлен expand при начитке стора  с...</span> ([026277], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0262778f6eabba77c4af806b2819447a7711bb33))

package/package.json

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

package/src/common/component/editor/CharacteristicColumnModel.js

@@ -27,9 +27,4 @@ Ext.define('Coon.common.component.editor.CharacteristicColumnModel', {
     prepareType: function(record) {
         this.activeEditor = this.factory.getEditorForType(record, this.context);
     },
-
-    getCellEditor: function(colIndex, rowIndex) {
-        const editor = this.callParent([colIndex, rowIndex]);
-        return editor || this.activeEditor;
-    },
 });

package/src/common/component/editor/TypedCharacteristicEditor.js

@@ -386,10 +386,5 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
         this.activeEditor.editingPlugin = this.editingPlugin;
         this.activeEditor.grid = this;
         return this.activeEditor;
-    }, /* ,
-
-    getUiElementPanelCellEditor: function (colIndex, rowIndex) {
-        var editor = Coon.common.component.editor.CharacteristicColumnModel.superclass.getCellEditor.call(this, colIndex, rowIndex);
-        return editor || this.activeEditor;
-    }*/
+    },
 });

package/src/common/field/combo/GridComboBox.js

@@ -126,14 +126,6 @@ Ext.define('Coon.common.field.combo.GridComboBox', {
         }
     },
 
-    doResize: function(w) {
-        this.callParent([w]);
-
-        if (!Ext.isDefined(this.listWidth) && !this.gridRendering) {
-            this.grid.getView().refresh();
-        }
-    },
-
     // private
     onBeforeLoad: function() {
         if (!this.hasFocus) {

package/src/log.js

@@ -79,7 +79,7 @@ Ext.define('Coon.log', {
         });
     },
 
-    isDebug: !!Ext.util.Cookies.get('coon_log_debug'),
+    isDebug: !!['1', 'true'].includes(Ext.util.Cookies.get('coon_log_debug')),
 
     setDebug(flag) {
         this.isDebug = !!flag;

package/src/report/ReportEntity.js

@@ -102,6 +102,7 @@ Ext.define('Coon.report.ReportEntity', {
                     description: pluginClass.prototype.description,
                     tags: prototype.tags || pluginClass.prototype.tags,
                     isSingle: prototype.isSingle,
+                    isDeprecated: prototype.isDeprecated || false,
                 };
             }
         }
@@ -130,6 +131,7 @@ Ext.define('Coon.report.ReportEntity', {
                             value: alias,
                             description: prototype.description || '',
                             tags: prototype.tags || [],
+                            isDeprecated: prototype.isDeprecated || false,
                         });
                         this.existed.add(alias);
                     }

package/src/report/command/BaseReportDataCommand.js

@@ -24,7 +24,7 @@ Ext.define('Coon.report.command.BaseReportDataCommand', {
 
     execute: function(grid, config) {
         this.grid = grid;
-        const form = this.getForm() || this.injectForm();
+        const form = this.getForm() || this.injectForm() && this.getForm();
 
         const filename = config.reportFileName ||
             this.grid.reportId ||
@@ -93,7 +93,6 @@ Ext.define('Coon.report.command.BaseReportDataCommand', {
             <input name="parameterList" id="toReportFormDataParameterList"/>
             `;
         document.body.append(form);
-        return form;
     },
 
 });

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

@@ -21,7 +21,7 @@ Ext.define('Coon.report.component.report.NorthPanel', {
         enableHighlightingRequiredFields: false,
     },
     initComponent() {
-        this.searchButton = Ext.widget('button', Ext.apply({
+        this.searchButton = Ext.widget('splitbutton', Ext.apply({
             ui: 'orange-button',
             text: 'Поиск',
         }, this.findButtonConfig || {}));
@@ -196,35 +196,39 @@ Ext.define('Coon.report.component.report.NorthPanel', {
         if (!menuItems.length) {
             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 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
+        //         );
+        //     }
+        // }
     },
 });

package/src/report/component/settings/ReportFieldPropertiesGrid.js

@@ -42,25 +42,6 @@ Ext.define('Coon.report.component.settings.ReportFieldPropertiesGrid', {
         );
     },
 
-    load: function(list) {
-        this.callParent(
-            Ext.isArray(list) ? [
-                list.map(function(r) {
-                    const ns = Coon.report.model.ReportFieldPropertyBeanFields;
-                    const type = r[ns.$type];
-                    const forWrap = type.indexOf('wp-') === 0;
-                    if (forWrap) {
-                        const copy = Ext.apply({}, r);
-                        copy[ns.$forWrap] = forWrap;
-                        copy[ns.$type] = type.substring(3);
-                        return copy;
-                    } else {
-                        return r;
-                    }
-                })
-            ] : []);
-    },
-
     getData: function() {
         return this.processRecords(this.callParent());
     },

package/src/report/component/settings/plugin/PluginSelectWindow.js

@@ -173,7 +173,7 @@ Ext.define('Coon.report.component.settings.plugin.PluginSelectWindow', {
 
     getData: function() {
         const plugins = Coon.report.ReportEntity.getNormalPlugins();
-        return plugins.filter((plugin) => !plugin.isSingle || !this.exclude.has(plugin.value)).sort();
+        return plugins.filter((plugin) => (!plugin.isSingle || !this.exclude.has(plugin.value)) && !plugin.isDeprecated).sort();
     },
 
     selectButtonHandler: function(_, record, el, rowIndex, e) {

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

@@ -16,19 +16,6 @@ Ext.define('Coon.report.plugin.grid.ExecuteCommandAndSaveNotePlugin', {
     noteSaveTitle: 'Сообщение системы',
     noteSaveText: 'Создать запись в записной книжке?',
 
-    executeCommand: function() {
-        if (this.noteSave) {
-            Ext.Msg.confirm(this.noteSaveTitle, this.noteSaveText, function(btn) {
-                if (btn == 'yes') {
-                    this.saveNote(this.component.getContextManager().getContext());
-                }
-                this.callParent(arguments);
-            }, this);
-        } else {
-            this.callParent(arguments);
-        }
-    },
-
     saveNote: function(context) {
         let noteId = '';
         if (this.notebookIdSource === 'field') {

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

@@ -14,26 +14,39 @@ 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);
-        this.printPdfCommand = Ext.create('command.GetPdfReportDataCommand', {useRawFilterParams: this.getConfig('addToSearchButton')});
+        // 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;
     },
 
     handler: function() {
@@ -41,10 +54,8 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
             this.showPanel();
         } else {
             this.config.columns = this.config.columnList.map((record) => record.reportField);
-            this.getRecordsToPrint();
-            this.config.exportFileFormat === 'pdf' ?
-                this.printPdfCommand.execute(this.report, this.config) :
-                this.printExcelFile();
+            this.getSelections();
+            this.getDataCommand.execute(this.report, this.config);
         }
     },
 
@@ -110,10 +121,8 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
             title: 'Выводить колонки',
         });
         this.win.on('setColumns', function() {
-            this.getRecordsToPrint();
-            this.config.exportFileFormat === 'pdf' ?
-                this.printPdfCommand.execute(this.report, this.config) :
-                this.printExcelFile();
+            this.getSelections();
+            this.getDataCommand.execute(this.report, this.config);
             this.win.close();
         }, this);
         this.win.show();
@@ -124,60 +133,24 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
     },
 
     setColumns: function() {
-        const checkedRecords = this.columnsGrid.getStore().queryRecords('checkbox', true);
-        if (!checkedRecords.length) {
+        const selectedColumns = this.columnsGrid.getStore().queryRecords('checkbox', true);
+        if (!selectedColumns.length) {
             return;
         }
-        this.config.columns = checkedRecords.map((record) => record.get('reportField'));
+        this.config.columns = selectedColumns.map((record) => record.get('reportField'));
         this.win.fireEvent('setColumns');
     },
 
-    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]});
+    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);
             }
         }
-
-        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/report/plugin/grid/GridFiltersPlugin.js

@@ -6,10 +6,6 @@ Ext.define('Coon.report.plugin.grid.GridFiltersPlugin', {
     alias: 'plugin.GridFiltersPlugin',
     requires: [],
     uses: [],
-    alternateClassName: [
-        'Sigma.components.plugins.ChangeableGridFiltersPlugin',
-        'Sigma.common.plugin.grid.GridFiltersPlugin'
-    ],
     menuFilterText: 'Фильтр',
     editorConfig: undefined,
     configurePanelWizard: 'GridFiltersPluginConfigPanel',

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

@@ -27,17 +27,6 @@ Ext.define('Coon.report.plugin.grid.MenuPanel', {
         this.setText(this.label + ' ' + formattedValue);
     },
 
-    getTemplateArgs: function() {
-        const args = this.callParent();
-        return Ext.apply(args, {
-            labelCls: Ext.isString(this.labelCls) ? this.labelCls : '',
-            valueCls: Ext.isString(this.valueCls) ? this.valueCls : '',
-            label: this.label,
-            value: this.value,
-            labelWidth: this.labelWidth,
-        });
-    },
-
     getCopyData: function() {
         return this.value;
     },

package/src/version.js

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