ru.coon 3.0.81 → 3.0.84

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# Version 3.0.84, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c37ea9fb9f014a9538fc9a30e6a6f95cc4a6d0cb)
+* ## Fixes
+* <span style='color:red'> OpenPanelPlugin, validation config on init</span> ([dcec0c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dcec0c0a8187b11ea4c107d8603e752273e72d4d))
+
+* update: CHANGELOG.md ([f777dc], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f777dc170d5c6302b14bfaf8cc5a1cfd72936b8e))
+
+# Version 3.0.83, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2f24fb9935153a7d88b28312138c323de92e4492)
+* HT-15051: доработка контекстного меню с summary row ([dc7342], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dc7342770b2c36940bdd6f53b631a10c1a1c3f8f))
+* update: CHANGELOG.md ([8ca3ab], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8ca3abf029b3e618fc92ac2dd56d2211520bf465))
+
+# Version 3.0.82, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4e900a01df1de39f5871323bf9520f2869ec9478)
+* ## Fixes
+* <span style='color:red'> HT-15028 TreeNestingToolbarButtonPlugin setDisabled not rendered nestingButton</span> ([7e3c76], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7e3c764edf97d7a3183c1cb6c1b92fe8c27257b2))
+* <span style='color:red'> HT-15332 CopyRowsFromGrid fix addColumnNumbers in xls</span> ([2fd6e1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2fd6e1d02e82a9212a9f62e72ce5aee1f5a0fb57))
+
+* HT-15082: исправление рендеринга значений в редактируемых ячейках ([79db43], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/79db43dd9dc5291ffd104deb35e0204aa4a84690))
+*  ([Update], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/Update file CopyRowsFromGrid.js6f8f4740848eec981e22d09d45305a4b9d910841))
+* update: CHANGELOG.md ([c66da3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c66da3fb7fd0d6d11ee61eb0fe3b8a2b65df9020))
+
 # Version 3.0.81, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bd688d381953e5cc5d8011296b21dcd891bf1d7b)
 * ## Fixes
 * <span style='color:red'>fix</span> ([d82071], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d82071dc2c72b15caf116564cd84ec5b5900bfc6))

package/package.json

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

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

@@ -600,17 +600,20 @@ Ext.define('Coon.report.plugin.grid.CopyRowsFromGrid', {
                 numbersRow.cells.push(
                     {
                         value: ++index,
+                        text: index,
                         index,
                     }
                 );
             });
             header.push(numbersRow);
         }
-        return type === 'xls' ? header : header.map((row) => {
-            row.cells.forEach((cell) => {
-                this.assignStyle(cell, this.tableHeaderStyle);
-            });
-            return row.cells;
+        return header.map((row) => {
+            if (type === 'xlsx') {
+                row.cells.forEach((cell) => {
+                    this.assignStyle(cell, this.tableHeaderStyle);
+                });
+            }
+            return row.cells || row;
         });
     },
     getTitle() {

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

@@ -5,11 +5,14 @@ Ext.define('Coon.report.plugin.grid.GridContextMenu', {
     requires: [],
     alternateClassName: 'Sigma.common.grid.plugin.GridContextMenu',
     componentType: 'grid',
+
     constructor: function(config) {
         Ext.apply(this, config);
         this.callParent(arguments);
     },
+
     items: [],
+
     init: function(component) {
         if (!(component instanceof Ext.grid.Panel || component instanceof Ext.tree.Panel)) {
             return;
@@ -34,6 +37,85 @@ Ext.define('Coon.report.plugin.grid.GridContextMenu', {
         this.grid.contextMenu.on('hide', this.restoreCellQtip, this);
         this.grid.getSelectionModel().on('selectionchange', this.updateContext, this);
         this.grid.getStore().on('load', this.updateContext, this);
+
+        this.grid.on('afterrender', () => {
+            this.groupingFeature = this.grid.features.find((feature) => feature.$className === 'Ext.grid.feature.Grouping');
+            this.summaryFeature = this.grid.features.find((feature) => feature.$className === 'Ext.grid.feature.Summary');
+            this.grid.ariaEl?.on('contextmenu', this.onGridPanelContextMenu, this);
+        });
+    },
+
+    onGridPanelContextMenu(event, target) {
+        event.preventDefault();
+        if (this.grid.contextMenu.isVisible() || !this.isInteractiveTarget(target)) {
+            return;
+        }
+
+        if (event.record && this.groupingFeature) {
+            this.showContextMenu(this.getDataFromGroupingFeature(event, target, this.groupingFeature));
+        } else if (this.summaryFeature) {
+            this.showContextMenu(this.getDataFromSummaryFeature(event, target, this.summaryFeature));
+        }
+    },
+
+    isInteractiveTarget(target) {
+        if (
+            !target.classList.contains('x-grid-cell-inner') ||
+            Ext.isEmpty(target.innerHTML) ||
+            target.innerHTML.includes(' ')
+        ) {
+            return false;
+        }
+        return true;
+    },
+
+    getDataFromGroupingFeature(event, target, groupingFeature) {
+        const groupField = groupingFeature.groupRenderInfo.groupField;
+        const groupFieldValue = event.record.get(groupField);
+        const summaryData = groupingFeature.generateSummaryData();
+        const recordData = summaryData[groupFieldValue || ''].getData();
+        for (const [key, value] of Object.entries(recordData)) {
+            if (value instanceof Decimal) {
+                recordData[key] = Number(value);
+            }
+        }
+        const record = Ext.create('Ext.data.Model', recordData);
+        const cellIndex = event.position.colIdx;
+        return {
+            cellIndex: cellIndex,
+            rowIndex: event.position.rowIdx,
+            record: record,
+            view: this.grid.view,
+            td: target,
+            tr: event.rowElement,
+            event: event,
+            hasContext: true,
+        };
+    },
+
+    getDataFromSummaryFeature(event, target, summaryFeature) {
+        const cellContent = target.getHTML().replaceAll(/[ ]/g, '').replaceAll(',', '.');
+        let dataIndex;
+        const recordData = summaryFeature.summaryRecord.getData();
+        for (const [key, value] of Object.entries(recordData)) {
+            if (value instanceof Decimal) {
+                recordData[key] = Number(value);
+            }
+            if (cellContent === ('' + recordData[key])) {
+                dataIndex = key;
+            }
+        }
+        const record = Ext.create('Ext.data.Model', recordData);
+        const column = this.grid.columns.find((col) => col.dataIndex === dataIndex);
+        const cellIndex = column.getIndex();
+        return {
+            cellIndex: cellIndex,
+            record: record,
+            view: this.grid.view,
+            td: target,
+            event: event,
+            hasContext: true,
+        };
     },
 
     /**
@@ -53,11 +135,6 @@ Ext.define('Coon.report.plugin.grid.GridContextMenu', {
             this.qtipSpan = cell.querySelector('[data-qtip]');
             this.qtipSpan && this.qtipSpan.removeAttribute('data-qtip');
         }
-
-        // contextMenu.alignTo(cell, 'tl-bl');
-
-        // const y = contextMenu.getY();
-        // contextMenu.setY(y - 7);
     },
 
     restoreCellQtip: function() {

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

@@ -79,6 +79,7 @@ Ext.define('Coon.report.plugin.grid.GridEditorsPlugin', {
 
                 return !!value;
             };
+            const originRenderer = column.renderer;
             column.renderer = (value, metaData, record) => {
                 let editable = true;
                 if (editorConfig.dependsOnField && editorConfig.dependsOnFieldName) {
@@ -109,7 +110,7 @@ Ext.define('Coon.report.plugin.grid.GridEditorsPlugin', {
                 if (Ext.isDate(value)) {
                     return Ext.Date.format(value, editorConfig.mask.format || columnFormat);
                 } else {
-                    return value;
+                    return originRenderer ? originRenderer.call(editor, value, metaData) : value;
                 }
             };
             hasEditor.on('beforeedit', function(editor, context) {

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

@@ -1,5 +1,5 @@
 Ext.define('Coon.report.plugin.grid.TreeNestingToolbarButtonPlugin', {
-    extend: 'Coon.report.plugin.grid.GridToolbarButtonPlugin',
+    extend: 'Coon.report.plugin.grid.ToolbarItemPlugin',
     alias: 'plugin.TreeNestingToolbarButtonPlugin',
     uses: [],
 
@@ -34,18 +34,22 @@ Ext.define('Coon.report.plugin.grid.TreeNestingToolbarButtonPlugin', {
         }
 
         reportTree.getStore().on('load', function() {
-            const records = reportTree.getStore().getRange();
-            if (!records.length) {
-                this.setDisabledButton(true, this.iconDisabled, null);
-                return;
+            if (reportTree.rendered) {
+                this.setDisabledNestingButton();
+            } else {
+                reportTree.on('buttonIsAdded', this.setDisabledNestingButton, this);
             }
-
-            const menu = this.getMenu(reportTree);
-            this.setDisabledButton(false, this.iconEnabled, menu);
         }, this);
     },
 
-    setDisabledButton: function(isDisabled, icon, menu) {
+    setDisabledNestingButton: function() {
+        if (!this.nestingButton) {
+            return;
+        }
+        const records = this.component.getStore().getRange();
+        const isDisabled = !records.length;
+        const icon = isDisabled ? this.iconDisabled : this.iconEnabled;
+        const menu = !isDisabled && this.getMenu(this.component);
         this.nestingButton.setDisabled(isDisabled);
         this.nestingButton.setIconCls(icon);
         this.nestingButton.setMenu(menu, false);

package/src/uielement/plugin/OpenPanelPlugin.js

@@ -29,8 +29,8 @@ Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
             Coon.log.error('OpenPanelPlugin.init: viewModel is required');
             return;
         }
-        if (!this.config.uiElementCd) {
-            Coon.log.error('OpenPanelPlugin.init: uiElementCd is required');
+        if (!this.config.uiElementCd || !this.config.panelXType) {
+            Coon.log.error('OpenPanelPlugin.init: uiElementCd||panelXType is required');
             return;
         }
         this.initialized = true;

package/src/version.js

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