ru.coon 2.8.7 → 2.8.8

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# Version 2.8.8, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/45ff9950c8d445813e49923d75671f55042ab526)
+* ## Features
+* <span style='color:green'>feat: HT-10322: add plugin</span> ([8e06ce], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8e06cef994d5a85d9752bb73717a5fa3a69e1a44))
+
+* ## Fixes
+* <span style='color:red'> BFL-15645: catch error on open group if grid has not</span> ([357155], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/35715511d8bbb34f399ca92d7e1f08f700249013))
+
+* Update 2 files
+
+- /src/uielement/plugin/configPanel/OpenApiPluginConfigPanelFormEditor.js ([- /src], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/- /src/uielement/plugin/OpenApiPlugin.js56ef155c7fe8d2ab8ad992f03e2704fb4f2be74f))
+*  ([Update], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/Update CharacteristicGridEditor.js7b70ed5f02a7df03bd9c196ad35871014b309eca))
+* update: CHANGELOG.md ([b3bdee], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b3bdeec93dd687347efbe8ecaabbe0079d1dbf89))
+
 # Version 2.8.7, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/086c841f875dba30c6d46e2737876da1349717d5)
 * ## Features
 * <span style='color:green'>feat: Экспорт строки "Всего". Closes HT-10162.</span> ([afbcee], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/afbceeebb84975dd57bd22d0dccf87ec9b81c799))
@@ -8,8 +21,12 @@
 * update: CHANGELOG.md ([0b6d30], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0b6d304fb344aaceedb55d591c80e4a815f339f0))
 
 # Version 2.8.5, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/224b99c8b4b9674f6732b71e76aa06961fd4e91d)
+* ## Features
+* <span style='color:green'>feat: TR-69546: add plugin</span> ([bacca3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bacca324c266b2256baff4919a68932ed9b67890))
+
 * ## Fixes
 * <span style='color:red'>fix modified state for characteristic record, HT-10117</span> ([2f8762], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2f876261d0065a0a02810ac5866f2832b2a36672))
+* <span style='color:red'> Bind ReportFormPluginGrid data to formula (предотвращает вызов setData на каждое обновление "report" проперти у вью модели, будет срабатывать только на обновление report.plugins). Closes NEVA-663.</span> ([607bc1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/607bc1ddbca2c5eaf82302b2226bd7596eae8b50))
 
 * update: CHANGELOG.md ([1e5402], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1e5402b30bb754e5f58c5c3ccf70859dd6906f66))
 
@@ -28,6 +45,7 @@
 * ## Fixes
 * <span style='color:red'> Разрешены html теги в колонке "Описание". Related to BFL-13996.</span> ([8a1793], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8a1793a93a87dcb10f92d854d491c31aefcd2563))
 * <span style='color:red'> TR-69409 исправление проверки значения свойства successMessage в ExecuteCommandPlugin</span> ([b77390], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b77390cabfdbdf3ad837c896b805a4bc7e5e92f3))
+* <span style='color:red'> BFL-15645: catch error on open group if grid has not groups</span> ([e08cf3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e08cf38c6719d0c2dd2788c66375dd4784e671d5))
 
 *  ([Update], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/Update Function.js35da450c2734c57db4cc7bd13380f6da400a9a96))
 * update: CHANGELOG.md ([ad61a8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ad61a8c449000e7b9ff6e921d39eecd97ddabea2))

package/package.json

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

package/src/common/component/editor/CharacteristicGridEditor.js

@@ -414,10 +414,10 @@ Ext.define('Coon.common.component.editor.CharacteristicGridEditor', {
         } else {
             this.getGrouping().collapseAll();
         }
-
+        const grouping = this.getGrouping();
         Ext.each(groupsList, function(type) {
-            if (type[ns.$groupExpanded]) {
-                this.getGrouping().expand(type[ns.$groupDescription], false);
+            if (type[ns.$groupExpanded] && grouping.getGroup(type[ns.$groupDescription])) {
+                grouping.expand(type[ns.$groupDescription], false);
             }
         }, this);
     },

package/src/report/component/ClearFiltersButton.js

@@ -0,0 +1,41 @@
+Ext.define('Coon.report.component.ClearFiltersButton', {
+    extend: 'Ext.button.Button',
+    alias: 'widget.ClearFiltersButton',
+    cls: 'ClearFiltersButton',
+    itemId: 'actionButton',
+    position: 998,
+    disabled: true,
+    focusOnToFront: false,
+    focusable: false,
+    allowDepress: false,
+    iconCls: 'svg-icon svg-icon-filter-alt-off',
+    title: 'Сбросить все фильтры',
+    toolbar: null,
+    grid: null,
+    handler() {
+        this.grid && this.grid.clearFilters();
+    },
+    initComponent() {
+        this.callParent();
+        const fn = (toolbar) => {
+            toolbar.show();
+            const ReportPanel = toolbar.up('ReportPanel');
+            ReportPanel && ReportPanel.grid;
+            this.grid = ReportPanel.grid;
+            this.grid.getStore().on('filterchange', (store) => {
+                this.setDisabled(!store.getFilters().length);
+            }, this);
+        };
+        if (this.toolbar) {
+            if (this.toolbar.rendered) {
+                fn(this.toolbar);
+            } else {
+                this.toolbar.on('render', fn, this);
+            }
+        } else {
+            this.on('render', (cmp) => {
+                cmp.up('toolbar') && fn(cmp.up('toolbar'));
+            }, this);
+        }
+    },
+});

package/src/report/component/ClearFiltersButton.scss

@@ -0,0 +1,40 @@
+.ClearFiltersButton {
+  border: 1px solid #3D6780 !important;
+  border-radius: 6px;
+  padding: 6px;
+  background-color: #FFFFFF;
+
+
+  &.x-btn-over {
+    border: 1px solid #3D6780 !important;
+    border-radius: 6px;
+    padding: 6px;
+    background-color: #F5F7FA;
+  }
+
+  &.x-btn-disabled {
+    border: 1px solid #A3AAB2 !important;
+    border-radius: 6px;
+    padding: 6px;
+    background-color: #FFFFFF;
+  }
+
+  &.x-btn-disabled .x-btn-icon-el {
+    background-color: #A3AAB2;
+  }
+
+  &.x-btn-menu-active {
+    border: 1px solid #3D78BF !important;
+    background-color: #D8E4F2;
+    border-radius: 6px;
+  }
+  .x-btn-icon-el {
+    background-color: rgb(61, 103, 128);
+  }
+
+
+  .x-btn-icon-el {
+    width: 18px;
+    height: 18px;
+  }
+}

package/src/report/component/ReportPanel.js

@@ -493,7 +493,12 @@ Ext.define('Coon.report.component.ReportPanel', {
     },
 
     createTopToolbar(items) {
-        return this.gridTopToolbar = Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(items || [])});
+        return this.gridTopToolbar = Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [{
+            xtype: 'tbfill',
+            position: 997,
+        }, {
+            xtype: 'ClearFiltersButton',
+        }].concat(items || [])});
     },
     createBottomToolbar(items) {
         return this.gridBottomToolbar =Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(items || [])});

package/src/report/component/settings/ReportFormEditPanelModel.js

@@ -151,5 +151,6 @@ Ext.define('Coon.report.component.settings.ReportFormEditPanelModel', {
                 this.set('report.fields', fields);
             },
         },
+        plugins: (get) => get('report.plugins'),
     },
 });

package/src/report/component/settings/plugin/ReportFormPluginPanel.js

@@ -32,7 +32,7 @@ Ext.define('Coon.report.component.settings.plugin.ReportFormPluginPanel', {
             split: true,
             reference: 'pluginsGrid',
             bind: {
-                data: '{report.plugins}',
+                data: '{plugins}',
             },
         },
         {

package/src/report/toolbar/ReportGridToolbar.js

@@ -3,15 +3,18 @@ Ext.define('Coon.report.toolbar.ReportGridToolbar', {
     xtype: 'ReportGridToolbar',
     cls: 'ReportGridToolbar',
     alias: 'widget.ReportGridToolbar',
-    layout: {
-        overflowHandler: 'ReportToolbarOverflow',
-    },
+
     hidden: true,
     reportToolbarPluginCfg: undefined,
     userPreferences: {},
     reportPanel: undefined,
     newButtons: {},
     initComponent: function() {
+        this.layout = {
+            overflowHandler: Ext.create('Coon.report.toolbar.layout.ReportToolbarOverflow', {
+                ReportGridToolbar: this,
+            }),
+        },
         this.foldItemsContainer = Ext.create({
             xtype: 'toolbar',
             hidden: true,

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

@@ -25,7 +25,9 @@ Ext.define('Coon.report.toolbar.layout.ReportToolbarOverflow', {
          * @property {Array} buttons
          * Массив системных кнопок
          */
-        me.systemItems = [];
+        me.systemItems = [Ext.create('Coon.report.component.ClearFiltersButton', {
+            toolbar: this.ReportGridToolbar,
+        })];
     },
 
     beginLayout: function(ownerContext) {
@@ -137,7 +139,7 @@ Ext.define('Coon.report.toolbar.layout.ReportToolbarOverflow', {
             xtype: 'container',
             itemId: 'systemContainer',
             layout: 'hbox',
-            width: 2,
+            minWidth: 3,
             defaults: {
                 style: {
                     marginLeft: '10px',
@@ -216,7 +218,7 @@ Ext.define('Coon.report.toolbar.layout.ReportToolbarOverflow', {
             return false;
         }
         buttons.forEach((button) => {
-            if (button.xtype !== 'ToolbarOverflowButton') {
+            if (button.xtype !== 'ToolbarOverflowButton' && button.itemId !== 'actionButton') {
                 button.position = this.pTypePriority[button.pType] || 0;
             }
         });
@@ -245,16 +247,11 @@ Ext.define('Coon.report.toolbar.layout.ReportToolbarOverflow', {
         const names = me.layout.names;
         const DEFAULT_BUTTON_WIDTH = 0;
         const systemButtonsWidth = me.systemItems.reduce((acc, button) => {
-            // console.log('button width', button.rendered && Ext.isFunction(button.getWidth) ?
-            //     button.getWidth() + 10:
-            //     DEFAULT_BUTTON_WIDTH);
             acc += button.rendered && Ext.isFunction(button.getWidth) ?
                 button.getWidth() + 10:
                 DEFAULT_BUTTON_WIDTH;
             return acc;
         }, 0);
-        // console.log('buttons width', systemButtonsWidth);
-        // console.log('menuButton', me.menuButton.getWidth());
         // console.log('getMargin', systemContainer.el.getMargin(names.parallelMargins));
         const width = systemButtonsWidth +
             (me.menuButton.getWidth() || 30) + 20 +

package/src/version.js

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