ru.coon 2.6.0 → 2.6.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# Version 2.6.1, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2b7d5d8cd09bf94320d149f9cf3aa78ef27594a8)
+* ## Fixes
+* <span style='color:red'> HT-7281 GridEditorPlugin editor dependField</span> ([e9c537], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e9c53704ee957042292ed639343bf217c8cdeca8))
+
+* HT-8006 hotfix ([6569c3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6569c3b6e197471fabb6af4da5c3212fd7079be2))
+* update: CHANGELOG.md ([e7b502], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e7b50227f8ddeaac7322ce3e436c2c0b5fd12163))
+
 # Version 2.6.0, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/78a28499d4ba7dc466ba5ff5a4b815d191c349bf)
 * ## Features
 * <span style='color:green'>feat: HT-7986: chars editor interface upgrade</span> ([9af20a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9af20aa30d2b1fa494994e0cf7d84b26b19604e0))

package/package.json

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

package/src/report/component/reportpanel/ReportGrid.scss

@@ -17,7 +17,7 @@
     }
   }
 
-  &:has(.hover-style:hover, .create-line-left:hover) .create-line-left::before{
+  &:has(.hover-cell:hover, .editable-cell:hover) .editable-cell::before{
     content: " ";
     background: #BDBDBD;
     width: 3px;

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

@@ -53,9 +53,22 @@ Ext.define('Coon.report.plugin.grid.GridEditorsPlugin', {
                 if (Ext.isFunction(column.setEditor)) {
                     column.setEditor(editor);
                 }
-                if (editor.isXType('BaseComboBox') && column.useComboRenderer !== false) {
-                    column.renderer = Coon.format.comboRenderer(editor, column.renderer && column.renderer.customStyle);
-                }
+                let editable = true;
+                column.renderer = (value, metaData, record) => {
+                    if (editorObj['dependsOnField'] && editorObj['dependsOnFieldName']) {
+                        const dependsOnFieldName = editorObj['dependsOnFieldName'];
+                        const invertValue = editorObj['invertValue'];
+                        editable = invertValue === !record.get(dependsOnFieldName);
+                        record.allowEditWithEditorPlugin = editable;
+                        if (editorObj['highlightEditableCells']) {
+                            metaData.tdCls = editable ? 'editable-cell' : 'hover-cell';
+                        }
+                    }
+                    if (editor.isXType('BaseComboBox') && column.useComboRenderer !== false) {
+                        Coon.format.comboRenderer(editor, column.renderer && column.renderer.customStyle);
+                    }
+                    return value;
+                };
             }
         }
         hasEditor.on('beforeedit', function(editor, context) {
@@ -137,20 +150,6 @@ Ext.define('Coon.report.plugin.grid.GridEditorsPlugin', {
         editor.on('beforeedit', function() {
             Ext.emptyFn();
         }, this);
-        let editable = true;
-        if (configuration['dependsOnField'] && configuration['dependsOnFieldName']) {
-            const editableColumn = this.grid.getColumns().find((col) => col.dataIndex === configuration[ns.$type]);
-            editableColumn.renderer = (value, metaData, record) => {
-                const dependsOnFieldName = configuration['dependsOnFieldName'];
-                const invertValue = configuration['invertValue'];
-                editable = invertValue === !record.get(dependsOnFieldName);
-                record.allowEditWithEditorPlugin = editable;
-                if (configuration['highlightEditableCells']) {
-                    metaData.tdCls = editable ? 'create-line-left' : 'hover-style';
-                }
-                return value;
-            };
-        }
         return editor;
     },
 });

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

@@ -120,6 +120,9 @@ Ext.define('Coon.report.plugin.grid.GridQuickSearchPlugin', {
 
     updateColumnHeaderByFilter: function(filter) {
         const columnData = this.columnsData[filter.dataIndex];
+        if (!columnData) {
+            return;
+        }
         const text = filter.value;
         const currentColumn = this.grid.getColumns()[columnData.index];
         if (!filter.active) {

package/src/uielement/plugin/OpenPanelPlugin.js

@@ -71,6 +71,10 @@ Ext.define('Coon.uielement.plugin.OpenPanelPlugin', {
             items: panel,
         }, defaultWindowConfig || {}));
 
+        openWindow.on('close', function() {
+            panel.fireEvent('closeWindow');
+        });
+
         openWindow.on('afterrender', function() {
             const initArguments = {};
             for (const name in this.parameters) {

package/src/version.js

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