ru.coon 2.7.22 → 2.7.24

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# Version 2.7.24, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8e3cc36a693f048a9feceada5eb46f979eda23db)
+* ## Features
+* <span style='color:green'>feat: HT-8422: set dynamic size on filter panel</span> ([e5816e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e5816e9be17f9ca40fad6ba2d86e79318455b633))
+* <span style='color:green'>feat: HT-8422: set dynamic size on filter panel</span> ([e5bf0f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e5bf0fbe72cbaf763f92c40b0885614b2077bbfe))
+* <span style='color:green'>feat: HT-8422: set dynamic size on filter panel</span> ([6eb768], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6eb768f94991539f70c339b9cc4fe5785d8284b2))
+* <span style='color:green'>feat: HT-8422: set dynamic size on filter panel</span> ([c6f315], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c6f3156c261c7c8bd0da5c90e42ff14287bd7feb))
+
+* update: CHANGELOG.md ([41c58e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/41c58ef69138e4f0067bc75b9d1df92962f67165))
+
+# Version 2.7.23, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e1fd5ef91937dab7196de70f1ec48895dd0e036f)
+* ## Fixes
+* <span style='color:red'>fix ReportLookupCombo</span> ([389b88], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/389b882bb57e27db1acebb9196f4ebf533794200))
+
+* update: CHANGELOG.md ([1da73b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1da73b648a1493be777199ffce8a8fe0dac63998))
+
 # Version 2.7.22, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/44122a0527f68e71a21175a4e497157b5ac18b3b)
 * ## Fixes
 * <span style='color:red'>fix function call</span> ([70df27], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/70df27e80e9798056bb565c1683b09ee2f3d0ce5))

package/package.json

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

package/src/report/component/ReportLookupCombo.js

@@ -97,10 +97,12 @@ Ext.define('Coon.report.component.ReportLookupCombo', {
         this._setValue = this.setValue.bind(this);
         this.setValue = function(value) {
             this._setValue(value);
-            if (!this._inited && value) {
-                this.loadReportData(value);
+            if (!this._inited) {
+                this._inited = true;// don't touch this
+                if (value) {
+                    this.loadReportData(value);
+                };
             }
-            this._inited = true;
         };
         if (Ext.isObject(this.defaultParameters)) {
             this.setFilterDefaults(this.defaultParameters);

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

@@ -3,6 +3,8 @@ Ext.define('Coon.report.component.report.NorthPanel', {
     alias: 'widget.NorthPanel',
     xtype: 'NorthPanel',
     cls: 'NorthPanel',
+    minimalHeight: 55,
+    alignButtons: -15,
     layout: {
         type: 'hbox',
         align: 'stretch',
@@ -169,7 +171,7 @@ Ext.define('Coon.report.component.report.NorthPanel', {
             enableHighlightingRequiredFields: enableHighlightingRequiredFields,
             plugins: this.filterPlugins,
         });
-
+        this.filterPanel = filterPanel;
 
         this.on('searchbuttontoggle', function(isValid, errorMessage) {
             this.searchButton.setDisabled(!isValid);
@@ -177,10 +179,10 @@ Ext.define('Coon.report.component.report.NorthPanel', {
         }, this);
 
         this.filterContainer.removeAll();
+        filterPanel.on('afterrender', (cmp) => {
+            this.setHeight(Math.max(cmp.getHeight(), this.minimalHeight) + (this.tbarsHeight || this.alignButtons));
+        }, this);
         this.filterContainer.add(filterPanel);
-        if (!this.hideFilterPanel) {
-            this.setHeight(Math.max(filterPanel.height, 55));
-        }
         if (this.hideFilterButtons) {
             this.buttonsContainer.hide();
         }
@@ -194,12 +196,6 @@ Ext.define('Coon.report.component.report.NorthPanel', {
             });
         }
         this.changeTbarStates();
-        Ext.defer(function() {
-            if (this.el) {
-                this.setHeight(null);
-                this.setHeight(this.getHeight()-15);
-            }
-        }, 1, this);
     },
 
     changeTbarStates() {
@@ -208,10 +204,14 @@ Ext.define('Coon.report.component.report.NorthPanel', {
         }
         const tbar = this.down('[reference="tbar"]');
         const bbar = this.down('[reference="bbar"]');
+        let tbarsHeight = 0;
+        const tbarH = 20;
+        const bbarH = 30;
         if (!tbar || !bbar || this.hideFilterPanel) {
             return;
         }
         if (this.enableHighlightingRequiredFields || this.getEnableChipToolbar()) {
+            tbarsHeight += tbarH;
             tbar.show();
             if (this.isLegendHidden() && this.enableHighlightingRequiredFields && !this.legend) {
                 this.legend = this.buildLegend();
@@ -234,7 +234,7 @@ Ext.define('Coon.report.component.report.NorthPanel', {
             if (!this.buttonsContainer.hidden) {
                 bbar.add(this.buttonsContainer);
             }
-
+            tbarsHeight += bbarH;
             bbar.show();
             this.filterConditionToolbar.getController().addChangeReaction();
         } else {
@@ -244,13 +244,10 @@ Ext.define('Coon.report.component.report.NorthPanel', {
                 this.add(this.buttonsContainer);
             }
         }
-
-        Ext.defer(function() {
-            if (this.el) {
-                this.setHeight(null);
-                this.setHeight(this.getHeight()-15);
-            }
-        }, 1, this);
+        this.tbarsHeight = tbarsHeight;
+        if (this.filterPanel.getEl()) {
+            this.setHeight(Math.max(this.filterPanel.getHeight(), this.minimalHeight) + (this.tbarsHeight || this.alignButtons));
+        }
     },
 
     setEnableChipToolbar(enableChipToolbar) {

package/src/version.js

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