ru.coon 2.8.58 → 2.8.60

package/.eslintrc.js

@@ -19,7 +19,7 @@ module.exports = {
         'Iconpack': 'writable',
     },
     'parserOptions': {
-        ecmaVersion: 8,
+        ecmaVersion: 2020,
     },
     'rules': {
         'max-len': [

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# Version 2.8.60, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c3691034b2a4144a1773defc7b6d4aab109ee210)
+* ## Features
+* <span style='color:green'>feat: TR-70149: Доработка выгрузки, фикс формата числовых значений, фикс отображения шапки и футера</span> ([38f11a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/38f11a281de81b654bdd7a0af6da48099fd833ae))
+
+* update: CHANGELOG.md ([38b9ed], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/38b9edc4241421ec41051f9502b910d7201e5a69))
+
+# Version 2.8.59, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d00dc72d4c63777c77785e2e13a5a29d994237e5)
+* ## Fixes
+* <span style='color:red'> AddInitSupport in UiCustomPanel init</span> ([9b3207], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9b3207c7ac0138bb5d03f6aac4218983e408da95))
+
+* HT-11664 CharacteristicGridCopyPlugin disable widget on beforeedit ([8d5005], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8d5005fcf699864d9637caa4589df88e83b3c4f6))
+* HT-11664 CharacteristicGridCopyPlugin disable widget on beforeedit ([0ff68e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0ff68efac5d37bb689fa7c358e9f5bc443cf888c))
+* update: CHANGELOG.md ([9fb639], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9fb6392f8f74efd3c929cc0dc31efc14cb6a760e))
+
 # Version 2.8.58, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/22b074ceba901b09c71842d17588be1f35dc9d38)
 * ## Fixes
 * <span style='color:red'> UiCustomPanel init</span> ([3126b1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3126b1b4cfc544658ca0df91832c0dcf75b7034e))

package/package.json

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

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

@@ -27,11 +27,15 @@ Ext.define('Coon.common.component.editor.CharacteristicGridCopyPlugin', {
         }
 
         editor.on('load', this.createWidgetColumn, this, {single: true});
+        editor.on('beforeedit', () => {
+            this.slaveWidgets.forEach((widget) => widget.setDisabled(true));
+        });
     },
 
     createWidgetColumn() {
         const me = this;
         me.masterWidgets = [];
+        me.slaveWidgets = [];
 
         this.component.getView().grid.getEl().down('[class="x-grid-item-container"]').addCls('CharacteristicGridCopyPlugin');
         const widgetColumn = Ext.create('Ext.grid.column.Widget', {
@@ -55,6 +59,7 @@ Ext.define('Coon.common.component.editor.CharacteristicGridCopyPlugin', {
                     widget.on('mouseover', me.showSlaveIcon, me, {args: [type, false, me.masterWidgets]});
                     widget.on('mouseout', me.showSlaveIcon, me, {args: [type, true, me.masterWidgets]});
                     widget.testIdToken = type;
+                    me.slaveWidgets.push(widget);
                 }
             },
         });

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

@@ -422,6 +422,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
         Coon.util.bindMethods([
             'mergeDeep',
             'getRenderedValue',
+            'parseJsEditorObj',
             'getCellClass',
             'getConfig',
             'getCmp',
@@ -1092,6 +1093,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
     collectColumns({record, idx, xlsx}) {
         const {grid, visibleColumns, columnIndexToDataIndex, columnModel, dataIndexToColumn, workbook} = this.localData;
         const result = xlsx ? [] : ['<tr>'];
+        let rowStyles = null;
         visibleColumns.forEach(function(columnIndex) {
             const columnConfig = columnModel[columnIndex];
             if (columnConfig.ignoreExport) {
@@ -1117,16 +1119,21 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                 ) :
                 record.data[dataIndex] || '';
             if (!xlsx) {
-                const styles = this.getRowStyle(grid, record);
+                if (!rowStyles) {
+                    rowStyles = this.getRowStyle(grid, record);
+                }
                 result.push(`
                         <td
                             class="${this.getCellClass(value, valueType) || ''}"
-                            style="${styles || ''}">
+                            style="${rowStyles || ''}">
                             ${this.getRenderedValue(value, valueType) || ''}
                         </td>
                     `);
             } else {
-                let styles = this.getRowStyleXlsx(grid, record, workbook);
+                if (!rowStyles) {
+                    rowStyles = this.getRowStyleXlsx(grid, record, workbook);
+                }
+                let styles = rowStyles;
                 const col = {value: this.getRenderedValue(value, valueType) || ''};
                 styles = this.mergeDeep(styles, this.allBordersStyle);
                 if (valueType === 'float') {
@@ -1156,6 +1163,34 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
     getRowStyleXlsx(grid, record) {
         let styles = {};
         const rowElement = Ext.fly(grid.getView().getRow(grid.getStore().indexOf(record)));
+        const plugin = grid.plugins.find((p) => p.ptype === 'GridRowStylePlugin');
+        const recordStyles = plugin.classCache.get(record.id);
+        if (recordStyles) {
+            recordStyles.forEach((key) => {
+                if (key === 'gridrow-bold') {
+                    styles = this.mergeDeep(styles, {font: {bold: true}});
+                } else if (key === 'gridrow-underline') {
+                    styles = this.mergeDeep(styles, {font: {underline: 'Single'}});
+                } else if (key.indexOf('gridrow-color-rgba-') >= 0) {
+                    const rgb = key.replace('gridrow-color-rgba-', '').split('--').splice(0, 3);
+                    styles = this.mergeDeep(styles, {
+                        font: {
+                            color: this.rgbToHex(rgb),
+                        },
+                    });
+                } /* else if (key.indexOf('gridrow-background-rgba-') >= 0) {
+                    const rgb = key.replace('gridrow-background-rgba-', '').split('--').splice(0, 3);
+                    styles = this.mergeDeep(styles, {
+                        interior: {
+                            color: this.rgbToHex(rgb),
+                            pattern: 'Solid',
+                        },
+                    });
+                }*/
+            });
+        }
+
+
         if (rowElement) {
             if (rowElement.hasCls('boldOnRow')) {
                 styles = this.mergeDeep(styles, {font: {bold: true}});
@@ -1167,8 +1202,7 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                 styles = this.mergeDeep(styles, {font: {underline: 'Single'}});
             }
         }
-
-        return {styles: styles};
+        return styles;
     },
     getRowStyle(grid, record) {
         const rowElement = Ext.fly(grid.getView().getRow(grid.getStore().indexOf(record)));

package/src/report/plugin/grid/exporters/xlsxExporter.js

@@ -75,8 +75,8 @@ Ext.define('Coon.report.plugin.grid.exporters.xlsxExporter', {
                 this.collectFiltersJson(columnCount, workbook)
             );
         }
-        if (this.headerXlsx) {
-            headerRows = headerRows.concat(this.parseJsEditorObj(this.headerXlsx, workbook));
+        if (this.plugin.headerXlsx) {
+            headerRows = headerRows.concat(this.parseJsEditorObj(this.plugin.headerXlsx, workbook));
         }
         const dataIndexToColumn = {};
         const visibleColumns = [];
@@ -113,8 +113,8 @@ Ext.define('Coon.report.plugin.grid.exporters.xlsxExporter', {
                 })
             );
         }, this);
-        if (this.footerXlsx) {
-            footerRows = this.parseJsEditorObj(this.footerXlsx, workbook);
+        if (this.plugin.footerXlsx) {
+            footerRows = this.parseJsEditorObj(this.plugin.footerXlsx, workbook);
         }
         // Coon.log.debug(
         //     Coon.perf.getLog(stopMeasure())
@@ -226,6 +226,7 @@ Ext.define('Coon.report.plugin.grid.exporters.xlsxExporter', {
         // const stopMeasure = Coon.perf.startSerie('collectColumns');
         const {grid, visibleColumns, columnIndexToDataIndex, columnModel, dataIndexToColumn, workbook} = this.localData;
         const result = [];
+        let rowStyles = null;
         visibleColumns.forEach(function(columnIndex) {
             const columnConfig = columnModel[columnIndex];
             if (columnConfig.ignoreExport) {
@@ -251,7 +252,10 @@ Ext.define('Coon.report.plugin.grid.exporters.xlsxExporter', {
                 ) :
                 record.data[dataIndex] || '';
             // const stopMeasure1 = Coon.perf.startSerie('getRowStyleXlsx');
-            let styles = this.getRowStyleXlsx(grid, record, workbook);
+            if (!rowStyles) {
+                rowStyles = this.getRowStyleXlsx(grid, record, workbook);
+            }
+            let styles = rowStyles;
             // stopMeasure1();
             const col = {value: this.getRenderedValue(value, valueType) || ''};
             // const stopMeasure = Coon.perf.startSerie('mergeDeep');
@@ -260,7 +264,7 @@ Ext.define('Coon.report.plugin.grid.exporters.xlsxExporter', {
             if (valueType === 'float') {
                 let precision = Number(columnConfig.precision);
                 if (!Number.isInteger(precision)) {
-                    precision = Number(this.getConfig('floatPrecision') || this.defaultFloatPrecision);
+                    precision = Number(this.getConfig('floatPrecision') || this.plugin.defaultFloatPrecision);
                 }
                 styles = this.mergeDeep(styles, {format: precision !== 0 ? '0.'.padEnd(precision + 2, '0') : '0'});
                 if (col['value'].length) {

package/src/uielement/component/UiCustomPanel.js

@@ -9,7 +9,7 @@ Ext.define('Coon.uielement.component.UiCustomPanel', {
         'Coon.uielement.component.UiCustomPanelTraceWindow'
     ],
     controller: {type: 'UiCustomController'},
-    viewModel: {type: 'UiCustomPanelViewModel'},
+    // viewModel: {type: 'UiCustomPanelViewModel'},
 
     keyMap: {
         'Ctrl+Shift+Alt+F8': {
@@ -58,13 +58,15 @@ Ext.define('Coon.uielement.component.UiCustomPanel', {
     copyLink: false,
 
     initComponent() {
+        let data = Object.assign(this.viewModel && this.viewModel.data || {}, {
+            name: 'UiCustomPanel',
+        });
         if (!this.inheritViewModel) {
-            this.viewModel = this.viewModel || {type: 'UiCustomPanelViewModel'};
-            this.viewModel.data = this.viewModel.data || {};
-            this.viewModel = {
-                data: Ext.applyIf(this.viewModel.data, this.getViewModelData()),
-            };
+            data = Ext.applyIf(data, this.getViewModelData());
         }
+        this.viewModel = Ext.create('Ext.app.ViewModel', {
+            data,
+        });
         this.callParent();
     },
 
@@ -76,7 +78,7 @@ Ext.define('Coon.uielement.component.UiCustomPanel', {
             Array.isArray(addDoInitSupportPlugin.parametersToModel)
         ) {
             addDoInitSupportPlugin.parametersToModel.forEach((param) => {
-                data[param.valuePath] = param.forceInit ? undefined : null;
+                data[param.valuePath] = param.forceInit ? null : undefined;
             });
         }
         return data;

package/src/version.js

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