ru.coon 3.0.77 → 3.0.79

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+# 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))
+
+* update: CHANGELOG.md ([b9fef7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b9fef7414d9705114190b9f24db27727cd4d3d3b))
+
 # Version 3.0.77, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d15ddab76fd455fb8b9b82cbff864158bbf9a462)
 * ## Features
 * <span style='color:green'>feat: move new tab after current</span> ([775c5f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/775c5fd4ffc07e70db7b3524c260410448b21d4a))
@@ -5,10 +27,15 @@
 * update: CHANGELOG.md ([ee60b0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ee60b048f763cbf3d45439a54fbab4c370bb954f))
 
 # Version 3.0.76, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/fcaeb8313f0e64d8f380e69efed2665ba4b4a6d6)
+* ## Fixes
+* <span style='color:red'>fix HT-15169: TriggerFieldEditorCreator remove value</span> ([c492c3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c492c3662b15701fcbe78bda2d62412373e7c91a))
+
 * update: CHANGELOG.md ([640dc5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/640dc51e5601eba349bc14c91ec0641c4a8d1d86))
 
 # Version 3.0.75, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bca8dfcc721f5bf5f9150e54f382e6224565f427)
 * ## Fixes
+* <span style='color:red'>fix HT-15169: CharacteristicGridEditor delete value</span> ([c2a6be], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c2a6be72637a265ca2d368c68f4d16c31c2f6456))
+* <span style='color:red'>fix HT-15169: TriggerFieldEditorCreator remove value</span> ([dd3606], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dd3606934e4acefe54956f835da038afc4b887b7))
 * <span style='color:red'> исправление в PeriodPickerPlugin сообщений minText и maxText</span> ([552b34], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/552b3430b8535edf87c420f54cc16f8d5dc03011))
 
 * HT-14725: исправление работы BindCustomPanelPlugin ([26547e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/26547e340cec89c0019b98ddf5c3ecd6a8b24438))

package/package.json

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

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

@@ -21,7 +21,6 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
     twoWayBindable: ['context'],
 
     initComponent: function() {
-        const ns = Coon.report.model.CharacteristicBeanFields;
         this.tbarItems = this.tbarItems || [];
 
         this.createAdditionButtons();
@@ -61,9 +60,13 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
                         buttons.del.disable();
                     } else {
                         if (select) {
-                            if (this.getSelection()[0].get(ns.$required)) {
+                            const isDeletableChar = this.isDeletableChar(this.getSelection()[0]);
+                            if (!isDeletableChar) {
                                 buttons.del.disable();
                             }
+                            const delButtonText = isDeletableChar === 'allowDeleteValue' ? 'Удалить значение' :
+                                isDeletableChar === 'allowDeleteChar' ? 'Удалить характеристику' : 'Удалить';
+                            buttons.del.setText(delButtonText);
                         } else {
                             buttons.del.disable();
                         }
@@ -96,6 +99,16 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
         this.on('cellclick', this.cellclickHandler, this);
     },
 
+    isDeletableChar: function(char) {
+        if (char.get('required') && char.get('allowEmpty') && char.get('value') && char.get('value').trim()) {
+            return 'allowDeleteValue';
+        } else if (!char.get('required')) {
+            return 'allowDeleteChar';
+        } else {
+            return false;
+        }
+    },
+
     createAdditionButtons: function() {
         const ns = Coon.report.model.CharacteristicBeanFields;
 
@@ -364,6 +377,10 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
                 record.set(ns.$isDeleted, !currentIsDeleted);
             }
         }
+        if (record && (record.get(ns.$editable) || record.isNew) && this.isDeletableChar(record) === 'allowDeleteValue') {
+            record.set(ns.$value, ' ');
+            record.set(ns.$valueDescription, ' ');
+        }
         this.getView().refresh();
     },
 

package/src/common/component/editor/creators/TriggerFieldEditorCreator.js

@@ -46,6 +46,9 @@ Ext.define('Coon.common.component.editor.creators.TriggerFieldEditorCreator', {
         const props = this.parseMask(record.get(ns.$mask).trim());
         this.value = record.get(ns.$value);
 
+        const effectiveValue = !record.get('isDeleted') && (!!(record.get('valueDescription') && record.get('valueDescription').trim()) ?
+            record.get('valueDescription') : record.get('value'));
+
         const panel = Ext.create({
             xtype: 'ReportPanel',
             autoFilter: true,
@@ -53,12 +56,46 @@ Ext.define('Coon.common.component.editor.creators.TriggerFieldEditorCreator', {
         });
 
         const win = Ext.widget('WindowWrap', {
-            items: panel,
+            title: 'Редактирование характеристики '+ record.get('typeDescription'),
+            layout: {
+                type: 'vbox',
+            },
+            margin: 5,
+            items: [
+                {
+                    xtype: 'container',
+                    flex: 1,
+                    layout: {
+                        type: 'hbox',
+                        align: 'stretch',
+                    },
+                    hidden: !effectiveValue,
+                    margin: 5,
+                    items: [
+                        {
+                            xtype: 'displayfield',
+                            value: 'Значение характеристики:',
+                            fieldStyle: {
+                                fontSize: '14px',
+                                color: '#a9a9a9',
+                            },
+                        },
+                        {
+                            xtype: 'displayfield',
+                            flex: 1,
+                            value: effectiveValue,
+                            fieldStyle: {
+                                fontSize: '14px',
+                            },
+                        }
+                    ],
+                },
+                panel],
         });
         if (props) {
             const parameter = {};
             parameter[props.parameterName] = this.field.ID;
-            win.doInit(props.reportId, Object.assign(parameter, this.context), true);
+            panel.doInit(props.reportId, Object.assign(parameter, this.context), true);
         } else {
             Coon.log.error('Не задана маска характеристики');
         }
@@ -125,6 +162,7 @@ Ext.define('Coon.common.component.editor.creators.TriggerFieldEditorCreator', {
 
             result.valueColumn = arr.length > ind ? arr[ind++] : result.parameterName;
             result.descriptionColumn = arr.length > ind ? arr[ind++] : result.valueColumn;
+            result.allowDeleteValue = arr.length > ind ? arr[ind++] : result.descriptionColumn;
         } else {
             Coon.log.error('Неверно задана маска характеристики');
         }

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/report/plugin/grid/exporters/xlsxExporter.js

@@ -7,8 +7,6 @@ Ext.define('Coon.report.plugin.grid.exporters.xlsxExporter', {
     },
 
     getExporter(filename) {
-        // Coon.perf.clearAll();
-        // const stopMeasure = Coon.perf.start('getExporter', true);
         const exporter = Ext.create('Ext.exporter.excel.Xlsx', {
             fileName: filename + '.xlsx',
             tableHeaderStyle: this.tableHeaderStyle,
@@ -28,15 +26,38 @@ Ext.define('Coon.report.plugin.grid.exporters.xlsxExporter', {
         const {headerRows, dataRows, footerRows} =
             this.collectGridDataAsObject(this.getSelected(), exporter.excel);
         const tableHeaderRows = this.getTableHeaderRows(exporter);
+        this.mergeDown(tableHeaderRows);
+        this.mergeAcross(tableHeaderRows);
         const summaryRows = this.getSummaryRows(exporter.excel);
         exporter.jsonData = [...headerRows, ...tableHeaderRows, ...dataRows, ...summaryRows, ...footerRows];
         exporter.getContent = this.getContent.bind(exporter, this);
-        // Coon.log.debug(
-        //     Coon.perf.getLog(stopMeasure())
-        // );
         return exporter;
     },
 
+    mergeDown(rows = []) {
+        rows.forEach((row, rowIndex) => {
+            row.forEach(({index, mergeDown, styleId}) => {
+                if (typeof mergeDown === 'number') {
+                    for (let i = rowIndex + mergeDown; i > rowIndex; i--) {
+                        rows[i].splice(index - 1, 0, {styleId, index});
+                    }
+                }
+            });
+        });
+    },
+
+    mergeAcross(rows = []) {
+        rows.forEach((row) => {
+            row.forEach(({index, mergeAcross, styleId}, cellIndex) => {
+                if (typeof mergeAcross === 'number') {
+                    for (let i = mergeAcross; i > 0; i--) {
+                        row.splice(cellIndex + 1, 0, {styleId, index: index + i});
+                    }
+                }
+            });
+        });
+    },
+
     getContent: function() {
         const me = this;
         const config = this.getConfig();
@@ -116,16 +137,6 @@ Ext.define('Coon.report.plugin.grid.exporters.xlsxExporter', {
         if (this.plugin.footerXlsx) {
             footerRows = this.parseJsEditorObj(this.plugin.footerXlsx, workbook);
         }
-        // Coon.log.debug(
-        //     Coon.perf.getLog(stopMeasure())
-        // );
-        // Coon.log.debug(
-        //     Coon.perf.getLog('mergeDeep', 6)
-        // );
-        // Coon.log.debug(
-        //     Coon.perf.getLog('collectColumns', 5)
-        // );
-
         return {headerRows, dataRows, footerRows};
     },
 

package/src/uielement/plugin/OpenPanelPlugin.js

@@ -90,8 +90,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 +129,23 @@ 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) {
+        Object.entries(
+            this.panelEventListeners || {}
+        )
+            .forEach(([eventName, handlerName]) => {
+                const handler = this.view.getController()[handlerName];
+                if (typeof handler === 'function') {
+                    panel.on(eventName, handler, this.view);
+                }
+            });
+    },
+
     setInitArguments() {
         this.initArguments = {};
         for (const name in this.parameters) {

package/src/version.js

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