ru.coon 2.6.9 → 2.6.10

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+# Version 2.6.10, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2d87458a32ccab859bbb873010e51d0f860c1cac)
+* ## Fixes
+* <span style='color:red'>Fix isEnabled ayth method</span> ([d7a9d7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d7a9d72fa6d5831b68dec7d4d78ccf2ecb654d33))
+* <span style='color:red'> HT-8060: check property anytime before load store</span> ([333114], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/333114be77d61ebc2e52ccdaf26582398bd42963))
+* <span style='color:red'> HT-8060: check property anytime before load store</span> ([ee8c6b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ee8c6b009d059bef6f274286f7902a64de2425e3))
+* <span style='color:red'> HT-8045 GridEditorsPlugin date format</span> ([af1f26], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/af1f262623d6de218aa183ae685a777c131a8965))
+
+* update: CHANGELOG.md ([c6f733], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c6f733b3e6ccfda235a9e2d2352aa6104b281ed8))
+
 # Version 2.6.9, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/09a3ff5aed07b24a015644b873b7ee84a959d67e)
 * ## Fixes
 * <span style='color:red'> HT-8060: check property, in tree report we dont have it</span> ([156dbc], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/156dbceeb316315d85970bbe9000d4f79dbdcc6c))
@@ -6,6 +15,7 @@
 * Revert "fix: HT-8060: check property, in tree report we dont have it"
 
 This reverts commit ec83613d1dd2673b448c9fabee62287e9160f6bf. ([e6e94a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e6e94a278bb9b4d385f4687fe82b60d743985ff6))
+* CRM-8328 fix: set hidden to fields on filter panel when northPanel is hidden ([e87566], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e8756637f8ca281263c688e59f578bc04f61587f))
 * update: CHANGELOG.md ([569285], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/569285008ba24521643516619a3082ece72d9f8f))
 
 # Version 2.6.8, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/93e8208b4895493b8ad13ac0910a75fc2a2b4531)

package/package.json

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

package/src/common/component/Auth.js

@@ -87,7 +87,6 @@ Ext.define('Coon.common.component.Auth', {
 
     // Проверяет включена ли авторизация
     isEnabled() {
-        return Promise.resolve(true);
         return Coon.SystemProperties.fetch(
             this.systemPropertyName,
             'boolean'

package/src/report/component/ReportPanel.js

@@ -318,6 +318,22 @@ Ext.define('Coon.report.component.ReportPanel', {
             hidden: true,
             header: false,
         });
+
+        this._visibleFieldsMap = new Map();
+        this.northPanel.on('hide', () => {
+            this.query('[validate][hidden=false]').forEach((field) => {
+                this._visibleFieldsMap.set(field, field.hidden);
+                field.setHidden(true);
+            });
+        });
+        this.northPanel.on('show', () => {
+            this.query('[validate][hidden=true]').forEach((field) => {
+                if (this._visibleFieldsMap.has(field)) {
+                    field.setHidden(false);
+                }
+            });
+        });
+
         // для совместимости со старым кодом.
         this.filterContainer = this.northPanel.filterContainer;
         this.centerPanel = Ext.widget('panel', Ext.apply(this.centerProperties, {
@@ -804,6 +820,11 @@ Ext.define('Coon.report.component.ReportPanel', {
         if (this.hideFilterPanel === false) {
             this.northPanel.show();
         } else if (this.hideFilterPanel === true || this.hideFilterPanel === 'hide') {
+            const visibleFields = this.query('[validate][hidden=false]');
+            visibleFields.forEach((field) => {
+                this._visibleFieldsMap.set(field, field.hidden);
+                field.setHidden(true);
+            });
             this.northPanel.hide();
         } else if (this.hideFilterPanel === 'collapse') {
             this.northPanel.collapse(false);

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

@@ -37,12 +37,10 @@ Ext.define('Coon.report.component.reportpanel.ReportGrid', {
             pageSize: this.pageSize,
         });
 
-        if (this.getEnableAutoSize()) {
-            this.store.on('load', this.getColumnModel().autoSizeAllColumn, this);
-            this.on('afterrender', function() {
-                this.getColumnModel().autoSizeAllColumn();
-            }, this, {single: true});
-        }
+        this.on('afterrender', () => {
+            this.doAutoSizeAllColumn();
+            this.store.on('load', this.doAutoSizeAllColumn, this);
+        }, this, {single: true});
 
         this.tbar = Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(this.tbar || [])});
         this.bbar = Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(this.bbar || [])});
@@ -53,6 +51,12 @@ Ext.define('Coon.report.component.reportpanel.ReportGrid', {
         this.relayEvents(this.getStore(), ['datachanged', 'load']);
     },
 
+    doAutoSizeAllColumn() {
+        if (this.getEnableAutoSize()) {
+            this.getColumnModel().autoSizeAllColumn();
+        }
+    },
+
     clear: function() {
         if (this.rendered) {
             this.getSelectionModel().clearSelections();

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

@@ -53,8 +53,10 @@ Ext.define('Coon.report.plugin.grid.GridEditorsPlugin', {
                 if (Ext.isFunction(column.setEditor)) {
                     column.setEditor(editor);
                 }
-                let editable = true;
-                column.renderer = (value, metaData, record) => {
+                const dependsOnFieldName = editorObj['dependsOnField'] && editorObj['dependsOnFieldName'];
+                const needComboRenderer = editor.isXType('BaseComboBox') && column.useComboRenderer !== false;
+                const renderFunction = (value, metaData, record) => {
+                    let editable = true;
                     if (editorObj['dependsOnField'] && editorObj['dependsOnFieldName']) {
                         const dependsOnFieldName = editorObj['dependsOnFieldName'];
                         const invertValue = editorObj['invertValue'];
@@ -67,13 +69,16 @@ Ext.define('Coon.report.plugin.grid.GridEditorsPlugin', {
                     if (editor.isXType('BaseComboBox') && column.useComboRenderer !== false) {
                         Coon.format.comboRenderer(editor, column.renderer && column.renderer.customStyle);
                     }
+                    hasEditor.on('beforeedit', function(editor, context) {
+                        return context.record.allowEditWithEditorPlugin;
+                    }, this);
                     return value;
                 };
+                if (dependsOnFieldName || needComboRenderer) {
+                    column.renderer = renderFunction;
+                }
             }
         }
-        hasEditor.on('beforeedit', function(editor, context) {
-            return context.record.allowEditWithEditorPlugin;
-        }, this);
     },
 
     createEditorItem: function(configuration) {

package/src/version.js

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