ru.coon 3.0.78 → 3.0.80

package/CHANGELOG.md

@@ -1,6 +1,23 @@
+# Version 3.0.80, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3b43f1d4de9199df4725890955ab76c6e4491cdc)
+* refactoring OpenPanelPlugin ([67cd0c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/67cd0c0b004f89f7fb3607497a43f960ae4f0735))
+* update: CHANGELOG.md ([6e78bf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6e78bf0dd1e0394557f2aba6b2fa56c1f022fc86))
+
+# Version 3.0.79, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/05cc0396686f91876a09be0e05bed80d6e3591a8)
+* ## Fixes
+* <span style='color:red'> HT-13828 upd</span> ([54a357], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/54a357933afc6b44569625816ad724d56053c012))
+* <span style='color:red'> HT-13828 upd</span> ([7f75df], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7f75df96aaa27d9563b63117c27e84fc01671624))
+* <span style='color:red'> HT-13828 ReportFormData/getCSVReport</span> ([bb3a16], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bb3a1642daeb9ee52bdfb1726f3245b8669fd1a8))
+
+* refactoring ([5f3f72], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5f3f72e58a8b60e83f60a682162e3a7a15ba4e4e))
+*  ([Update], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/Update file OpenPanelPlugin.jsa547ab1288c887b0c3c9405d86fc8f6afd7de2c3))
+* upd ([85ffb7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/85ffb7997e465b3618f903f321b056fe87304126))
+* upd ([0dca21], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0dca21517a5c8dfc0f607c6050c7e6191e2f5421))
+* update: CHANGELOG.md ([8a9562], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8a9562a11c8d0b93f21c7a3f2954a45dcb381e7d))
+
 # Version 3.0.78, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a6e988a302441a8caed1ca77948890a3d01926d2)
 * ## Fixes
 * <span style='color:red'> Добавление недостающих стилей, при формировании заголовка таблицы. Closes HT-10579.</span> ([2a5f88], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2a5f88a201ed319f030164e13513458a09e0f2bf))
+* <span style='color:red'> HT-13828 ReportFormData/getCSVReport</span> ([b10fd7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b10fd76a565c5393cca7fb91d77420ce253b80c3))
 * <span style='color:red'>fix HT-15169: TriggerFieldEditorCreator set window title</span> ([d55115], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d55115c1684ecc8ad9e9689fc1216c22100ac076))
 * <span style='color:red'>fix HT-15169: TriggerFieldEditorCreator set window title</span> ([3bc707], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3bc707c3aab9349482572c15e4f243a7ad97687d))
 * <span style='color:red'>fix HT-15169: CharacteristicGridEditor delete value</span> ([99e05a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/99e05a21822c48dce600109db56481baff030783))

package/package.json

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

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

@@ -120,6 +120,32 @@ Ext.define('Coon.report.plugin.configPanel.ExportReportDataToFilePluginConfigPan
                     displayField: 'name',
                     valueField: 'id',
                     name: 'exportFileFormat',
+                    listeners: {
+                        change: function(_, value) {
+                            const isCsvOrTxtFormat = value === 'csv' || value === 'txt';
+                            this.down('[name=charsetOption]').setHidden(!isCsvOrTxtFormat);
+                            this.down('[name=exportWithHeaders]').setHidden(!isCsvOrTxtFormat);
+                        },
+                        scope: this,
+                    },
+                },
+                {
+                    xtype: 'radiogroup',
+                    fieldLabel: 'Кодировка',
+                    hidden: true,
+                    simpleValue: true,
+                    vertical: true,
+                    name: 'charsetOption',
+                    items: [
+                        {boxLabel: 'UTF-8', inputValue: 'utf-8', checked: true},
+                        {boxLabel: 'windows-1251', inputValue: 'windows-1251'}
+                    ],
+                },
+                {
+                    xtype: 'checkbox',
+                    hidden: true,
+                    boxLabel: 'exportWithHeaders',
+                    name: 'exportWithHeaders',
                 },
                 {
                     xtype: 'container',

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

@@ -13,6 +13,8 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
         allowUserSelectColumnsToUpload: undefined,
         addToSearchButton: false,
         countHours: 1,
+        charsetOption: 'utf-8',
+        exportWithHeaders: false,
     },
     exportConfig: {},
     defaultDateFormat: 'Y-m-d_h-i',
@@ -23,7 +25,6 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
         this.callParent(arguments);
     },
 
-
     createToolbarItem: function(config) {
         const tbItem = this.callParent([config]);
         tbItem.exportFileFormat = this.exportFileFormat;
@@ -34,6 +35,9 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
         this.callParent([grid]);
         this.grid = grid;
         const format = this.config.exportFileFormat;
+
+        this.setupCharsetConfig();
+
         this.buttonText = this.buttonText || (format && 'Экспорт в ' + format);
         grid.on('render', function() {
             this.report = grid.findParentByType('ReportPanel');
@@ -54,6 +58,15 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
         }, this);
         this.printPdfCommand = Ext.create('command.GetPdfReportDataCommand', {useRawFilterParams: this.getAddToSearchButton()});
     },
+
+    setupCharsetConfig() {
+        this.config.charsetOption = this.config.charsetOption || 'utf-8';
+
+        if (this.config.charsetOption.toLowerCase().startsWith('utf')) {
+            this.config.insertBOM = '\uFEFF';
+        }
+    },
+
     callExportByType() {
         switch (this.config.exportFileFormat) {
         case 'pdf':
@@ -70,6 +83,7 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
             break;
         }
     },
+
     handler: function() {
         if (this.config.allowUserSelectColumnsToUpload) {
             this.showPanel();
@@ -186,6 +200,7 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
             this.config.cmp.timeout :
             (this.getCountHours() * this.defaultTimeout);
     },
+
     printCsvFile: async function(extension) {
         this.grid.mask('подождите пожалуйста...');
         const currentParamList = this.getAddToSearchButton() ? this.report.northPanel.collectParams() : this.report.currentParamList;
@@ -208,17 +223,23 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
             toExcel: JSON.stringify(this.config.toExcel),
             separator: ';',
             border: '',
+            exportWithHeaders: JSON.stringify(this.config.exportWithHeaders),
+            charset: this.config.charsetOption,
         }, this.exportConfig);
         Ext.Ajax.request({
             url,
             method: 'POST',
             binary: true,
+            headers: {
+                'Content-Type': `application/x-www-form-urlencoded;charset=${this.config.charsetOption}`,
+            },
             timeout: this.getTimeout(),
             params: params,
             success(response) {
+                const blobParts = this.config.insertBOM ? [this.config.insertBOM, response.responseBytes] : [response.responseBytes];
                 this.grid.unmask();
                 Coon.util.downloadFileFromBlob(
-                    new Blob(['\uFEFF', response.responseBytes], {type: 'text/csv;charset=utf-8'}),
+                    new Blob(blobParts, {type: `text/csv;charset=${this.config.charsetOption}`}),
                     `${this.fileName}.${extension}`
                 );
             },
@@ -230,6 +251,7 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
             scope: this,
         });
     },
+
     printExcelFile: async function() {
         this.grid.mask('подождите пожалуйста...');
         const currentParamList = this.getAddToSearchButton() ? this.report.northPanel.collectParams() : this.report.currentParamList;
@@ -275,3 +297,4 @@ Ext.define('Coon.report.plugin.grid.ExportReportDataToFilePlugin', {
         });
     },
 });
+

package/src/uielement/plugin/OpenPanelPlugin.js

@@ -21,17 +21,37 @@ Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
     },
 
     init: function(view) {
-        this.view = view;
-        if (view.getController()) {
-            this.getViewModel = () => view.getController().getViewModel();
-            view.getController()[this.handlerName] = Ext.bind(this.handler, this);
+        if (!this.handlerName) {
+            Coon.log.error('OpenPanelPlugin.init: handlerName is required');
+            return;
+        }
+        if (!this.getCmp().getViewModel()) {
+            Coon.log.error('OpenPanelPlugin.init: viewModel is required');
+            return;
+        }
+        if (!this.config.uiElementCd) {
+            Coon.log.error('OpenPanelPlugin.init: uiElementCd is required');
+            return;
+        }
+        this.cmpController = view.getController();
+        if (this.cmpController) {
+            this.getViewModel = () => this.cmpController.getViewModel();
+            this.cmpController[this.handlerName] = Ext.bind(this.handler, this);
+            this.getCmp().onDestroy(function() {
+                this.cmpController[this.handlerName] = undefined;
+            }, this);
         }
         this.initBindable();
     },
 
     getFromModel: function(value) {
-        if (Ext.isString(value) && value.startsWith('{')) {
-            value = this.view.getViewModel().get(value.substring(1, value.length - 1));
+        if (
+            Ext.isString(value) &&
+            value.length > 2 &&
+            value.startsWith('{') &&
+            value.endsWith('}')
+        ) {
+            value = this.getCmp().getViewModel().get(value.substring(1, value.length - 1));
         }
         return value;
     },
@@ -44,16 +64,25 @@ Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
         if (this.uiElementCd) {
             this.uiElementCd = this.getFromModel(this.uiElementCd);
             const command = Ext.create('command.GetUIElementCommand');
+            command.on('failure', function(error) {
+                Coon.log.error(`OpenPanelPlugin.handler: failed to get UIElement [${this.uiElementCd}]`, error);
+            });
             command.on('complete', function(UIElementBean) {
                 const elementNS = Coon.uielement.UIElementBeanFields;
                 const exists = Ext.ClassManager.getByAlias('widget.' + UIElementBean[elementNS.$xtype]);
-                if (exists === undefined) {
-                    Coon.log.log(UIElementBean[elementNS.$xtype] + ' does not exist');
+                if (!exists) {
+                    Coon.log.log(UIElementBean.xtype + ' does not exist');
                     return;
                 }
                 this.panelXType = UIElementBean[elementNS.$xtype];
-                this.defaultProperties = JSON5.parse(UIElementBean['propertyData']);
-                this.openPanel();
+                try {
+                    this.openPanel(
+                        JSON5.parse(UIElementBean['propertyData'])
+                    );
+                } catch (ex) {
+                    Coon.log.error('OpenPanelPlugin.handler: invalid propertyData JSON5', ex);
+                    return;
+                }
             }, this);
             command.execute(this.uiElementCd);
         } else {
@@ -90,8 +119,8 @@ Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
             this.centerView.setActiveComponent({componentContextId});
             return;
         }
-        console.log('OPP.panel', panel);
         this.centerView.setActiveComponent(panel);
+        this.addPanelEventListeners(panel);
         Coon.Function.executeComponentDoInit(panel, this.initArguments);
         panel.setClosable(true);
         panel.on('afterlayout', function(panel) {
@@ -129,17 +158,25 @@ Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
             Coon.Function.executeComponentDoInit(panel, this.initArguments);
         }, this);
 
-        if (!Ext.isEmpty(this.panelEventListeners)) {
-            for (const eventName in this.panelEventListeners) {
-                if (this.panelEventListeners.hasOwnProperty(eventName)) {
-                    panel.on(eventName, this.view.getController()[this.panelEventListeners[eventName]], this.view);
-                }
-            }
-        }
+        this.addPanelEventListeners(panel);
 
         openWindow.show();
     },
 
+    addPanelEventListeners(panel) {
+        if (!this.cmpController) {
+            return;
+        }
+        Object.entries(
+            this.panelEventListeners || {}
+        ).forEach(([eventName, handlerName]) => {
+            const handler = this.cmpController[handlerName];
+            if (typeof handler === 'function') {
+                panel.on(eventName, handler, this.getCmp());
+            }
+        });
+    },
+
     setInitArguments() {
         this.initArguments = {};
         for (const name in this.parameters) {
@@ -147,10 +184,13 @@ Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
         }
     },
 
-    openPanel: function() {
-        const defaultProperties = this.defaultProperties || {};
-        const properties = Ext.apply(defaultProperties, this.properties);
+    openPanel: function(cmpProperties = {}) {
+        const properties = Ext.apply({}, cmpProperties, this.properties);
         this.panelXType = this.getFromModel(this.panelXType);
+        if (!Ext.ClassManager.getByAlias(`widget.${this.panelXType}`)) {
+            Coon.log.error(`OpenPanelPlugin.openPanel: panelXType [${this.panelXType}] does not exist`);
+            return;
+        }
         const panel = Ext.widget(this.panelXType, properties);
 
         this.setInitArguments();

package/src/version.js

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