ru.coon 2.8.13 → 2.8.15

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+# Version 2.8.15, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8243a899e863488223002046a50b6692d3af8fb5)
+* ## Features
+* <span style='color:green'>feat: HT-10125: remove tbfill when it has in items</span> ([f57798], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f57798b08404721c6d13512b3be38771dc53ee30))
+* <span style='color:green'>feat: HT-10125: remove tbfill when it has in items</span> ([3e9b04], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3e9b04e719016aedab59ac8b889da93de0540715))
+* <span style='color:green'>feat: HT-8951: fix css</span> ([7ddd11], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7ddd117e3ba365e1c2da3472ecd0efe180e1e204))
+
+* ## Fixes
+* <span style='color:red'>fixes</span> ([77fb8d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/77fb8de94f02156769b48092d91ea16a11f9aa94))
+
+* update: CHANGELOG.md ([b6ceb3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b6ceb36854b9ae262d9dcf375f19695392da16ca))
+
+# Version 2.8.14, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dcae10177e3289827d597b883c0e7be99ff45e98)
+* ## Fixes
+* <span style='color:red'>fix ClearFiltersButton visible status, HT-10125</span> ([689462], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6894624e9d2cc0ba572308e2ac4c366a626432c8))
+
+* update: CHANGELOG.md ([8bda50], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8bda502e40800b08f934d9642f7089f5c71e343c))
+
 # Version 2.8.13, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/33ee197b3f9236825df8a0fca08d2b6d8b873d65)
 * TR-69125 feat: плагин ExecuteReportPlugin ([9950bc], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9950bce3518c8edb9512d5125c3c0a7bca284c21))
 * update: CHANGELOG.md ([d117f3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d117f322365a1d8d5399cb1031edc2a1d9579caf))

package/package.json

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

package/src/report/component/ClearFiltersButton.js

@@ -4,10 +4,10 @@ Ext.define('Coon.report.component.ClearFiltersButton', {
     cls: 'ClearFiltersButton',
     itemId: 'actionButton',
     position: 998,
-    disabled: true,
     focusOnToFront: false,
     focusable: false,
     allowDepress: false,
+    hidden: true,
     iconCls: 'svg-icon svg-icon-filter-alt-off',
     tooltip: 'Отключить фильтры в колонках',
     toolbar: null,
@@ -26,7 +26,7 @@ Ext.define('Coon.report.component.ClearFiltersButton', {
             ReportPanel && ReportPanel.grid;
             this.grid = ReportPanel.grid;
             this.grid.getStore().on('filterchange', (store) => {
-                this.setDisabled(!store.getFilters().length);
+                this.setHidden(!store.getFilters().length);
             }, this);
         };
         if (this.toolbar) {

package/src/report/component/ReportPanel.js

@@ -493,13 +493,24 @@ Ext.define('Coon.report.component.ReportPanel', {
     },
 
     createTopToolbar(items) {
-        return this.gridTopToolbar = Ext.create({
-            xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(items || []).concat([{
+        const clearBlock = [];
+        if ((items && Ext.isArray(items) && !items.find((item) => {
+            if (Ext.isObject(item)) {
+                return item.xtype === 'tbfill';
+            } else {
+                return item === '->';
+            }
+        })) || !items) {
+            clearBlock.push({
                 xtype: 'tbfill',
                 position: 997,
-            }, {
-                xtype: 'ClearFiltersButton',
-            }]),
+            });
+        }
+        clearBlock.push({
+            xtype: 'ClearFiltersButton',
+        });
+        return this.gridTopToolbar = Ext.create({
+            xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(items || []).concat(clearBlock),
         });
     },
     createBottomToolbar(items) {

package/src/report/toolbar/ButtonsByType.scss

@@ -39,7 +39,7 @@
   .function-button-type {
 
     border: 1px solid #F5F7F8 !important;
-    background-color: #ECEEEF;
+    background-color: #F5F7F8;
     border-radius: 6px;
   }
 
@@ -62,7 +62,7 @@
 
 
   .function-button-type.x-btn-over {
-    background-color: #E3E7EA;
+    background-color:  #ECF0F3;
   }
 
   .function-button-type.x-btn-over .x-btn-arrow-right::after {

package/src/report/toolbar/ReportGridToolbar.js

@@ -9,6 +9,7 @@ Ext.define('Coon.report.toolbar.ReportGridToolbar', {
     userPreferences: {},
     reportPanel: undefined,
     newButtons: {},
+
     initComponent: function() {
         this.layout = {
             overflowHandler: Ext.create('Coon.report.toolbar.layout.ReportToolbarOverflow', {
@@ -25,6 +26,9 @@ Ext.define('Coon.report.toolbar.ReportGridToolbar', {
             this.foldItemsContainer,
             {
                 xtype: 'displayfield',
+                width: 2,
+                margin: 0,
+                padding: 0,
                 position: -10,
                 itemId: 'hiddenDisplayElement',
             }
@@ -139,6 +143,7 @@ Ext.define('Coon.report.toolbar.ReportGridToolbar', {
             return 0;
         });
     },
+
     readUserPreferences: function() {
         if (this.getEl()) {
             this.getLayout().overflowHandler.menuButton.setTooltip(null);

package/src/report/toolbar/layout/ReportToolbarOverflow.js

@@ -146,7 +146,7 @@ Ext.define('Coon.report.toolbar.layout.ReportToolbarOverflow', {
                 },
             },
             style: {
-                borderLeft: '3px solid #D3D3D3',
+                borderLeft: '2px solid #D3D3D3',
             },
             items: systemItemsList,
         });

package/src/version.js

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