ru.coon 3.0.40 → 3.0.42

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# Version 3.0.42, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7859eef6bddbdc1445b1027d10a93f8e71dfe828)
+* ## Fixes
+* <span style='color:red'>fix MethodChainPlugin set sortableColumns false</span> ([5cb285], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5cb2859e29cc2b98172ea823d7198a92580af6d7))
+
+* upd ([ce41e9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ce41e9037128b176347d3294fff67f0ab50ecf99))
+* HT-13143 fix: Исправление размера кнопок в системной части тулбара. ([5e338f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5e338f42303943cd14e79005f23ec9287cfd8383))
+* update: CHANGELOG.md ([f8a7af], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f8a7afbddb4366edb564fb9a8d657bd5d3b20e4d))
+
+# Version 3.0.41, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/84d8a98d66dd68e5c0995733325a00642bfe9831)
+* HT-13877: add resizable option in BindCustomPanelPlugin ([8080fb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8080fbaf9644cc7609e8d926e7f94bbede5b2952))
+* HT-13860: исправлено отображение названия в WindowWrap ([dc12df], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dc12dff200a37c3dc652a44e65a86bff1d864cd9))
+* update: CHANGELOG.md ([45a7eb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/45a7eb298e3494f84b97ce48a96c3e23d08e699e))
+
 # Version 3.0.40, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/eebffdf8f042d83590e66cfe7a43fdfabcd80ccb)
 * ## Fixes
 * <span style='color:red'>HT-13864 fix SimpleFilterPlugin find toolbar</span> ([c0ef9c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c0ef9c1e766b187b2af5196ac7827c5e78235e18))

package/package.json

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

package/src/common/panel/WindowWrap.js

@@ -160,6 +160,17 @@ Ext.define('Coon.common.panel.WindowWrap', {
         this.content.on('close', function() {
             this.doClose();
         }, this);
+
+        this.content.on('titlechange', function(view, title) {
+            if (typeof title !== 'string') {
+                if (typeof title.getTitle !== 'function') {
+                    return;
+                }
+                title = title.getTitle();
+            }
+            this.setTitle(title);
+        }, this);
+
         this.content.hide = Ext.bind(this.hide, this);
         this.content.close = Ext.bind(this.close, this);
         this.content.setTitle = Ext.bind(this.setTitle, this);

package/src/report/model/CharacteristicBean.js

@@ -9,10 +9,8 @@ Ext.define('Coon.report.model.CharacteristicBean', {
     ],
     requires: 'Coon.report.model.CharacteristicBeanFields',
     fields: [
-        {name: Coon.report.model.CharacteristicBeanFields.$effectiveDate, type: 'date'},
-        {
-            name: Coon.report.model.CharacteristicBeanFields.$value, type: 'string',
-        },
+        {name: Coon.report.model.CharacteristicBeanFields.$effectiveDate, type: 'date', dateFormat: 'Y-m-d'},
+        {name: Coon.report.model.CharacteristicBeanFields.$value, type: 'string'},
         {name: Coon.report.model.CharacteristicBeanFields.$valueDescription, type: 'string'},
         {name: Coon.report.model.CharacteristicBeanFields.$type, type: 'string'},
         {name: Coon.report.model.CharacteristicBeanFields.$typeDescription, type: 'string'},

package/src/report/plugin/configPanel/BindCustomPanelPluginConfigPanel.js

@@ -313,9 +313,52 @@ Ext.define('Coon.report.plugin.configPanel.BindCustomPanelPluginConfigPanel', {
                             },
                             {
                                 xtype: 'checkbox',
-                                boxLabel: 'useSimpleEngine',
+                                boxLabel: 'Добавить разделитель для изменения размера панели (resizable)',
+                                boxLabelAlign: 'before',
+                                name: 'addResizable',
+                                bind: '{addResizable}',
+                            },
+                            {
+                                xtype: 'container',
+                                layout: {
+                                    type: 'hbox',
+                                },
+                                items: [
+                                    {
+                                        xtype: 'numberfield',
+                                        fieldLabel: 'Мин. размер панели',
+                                        value: 100,
+                                        name: 'resizableMinValue',
+                                        disabled: true,
+                                        bind: {
+                                            disabled: '{!addResizable}',
+                                        },
+                                    },
+                                    {
+                                        xtype: 'numberfield',
+                                        fieldLabel: 'Макс. размер панели',
+                                        value: 500,
+                                        name: 'resizableMaxValue',
+                                        disabled: true,
+                                        bind: {
+                                            disabled: '{!addResizable}',
+                                        },
+                                    }
+                                ],
+                            },
+                            {
+                                xtype: 'checkbox',
+                                boxLabel: 'Выключить обработку параметров',
                                 boxLabelAlign: 'before',
                                 name: 'useSimpleEngine',
+                                listeners: {
+                                    afterrender: function(component) {
+                                        Ext.create('Ext.tip.ToolTip', {
+                                            target: component.getEl(),
+                                            html: 'Выключение расширенной обработки параметров (useSimpleEngine)',
+                                        });
+                                    },
+                                },
                             }
                         ],
                     },

package/src/report/plugin/report/BindCustomPanelPlugin.js

@@ -39,9 +39,8 @@ Ext.define('Coon.report.plugin.report.BindCustomPanelPlugin', {
             const config = {
                 panelSize: this.panelSize || 100,
             };
-            const properties = this.useSimpleEngine ? this.properties :
-                (Coon.Function[this.advancedPropertyConverter ?
-                    'convertAdvancedProperties' : 'convertProperties'](this.properties));
+
+            const properties = this.getPanelProperties();
 
             if (this.panelXType === 'UiCustomPanel') {
                 this.panel = Ext.widget('UICPWrapper', properties);
@@ -53,6 +52,37 @@ Ext.define('Coon.report.plugin.report.BindCustomPanelPlugin', {
         }, this);
     },
 
+    getPanelProperties() {
+        const properties = this.useSimpleEngine ? this.properties :
+            (Coon.Function[this.advancedPropertyConverter ?
+                'convertAdvancedProperties' : 'convertProperties'](this.properties));
+
+        if (this.addResizable && this.position) {
+            properties.resizable = {
+                pinned: true,
+            };
+            if (this.position === 'south') {
+                Ext.apply(properties.resizable, {
+                    handles: 'n',
+                    minHeight: this.resizableMinValue,
+                    maxHeight: this.resizableMaxValue,
+                    heightIncrement: 8,
+                });
+                properties.padding = '10 0 0 0';
+            } else if (this.position === 'east') {
+                Ext.apply(properties.resizable, {
+                    handles: 'w',
+                    minWidth: this.resizableMinValue,
+                    maxWidth: this.resizableMaxValue,
+                    widthIncrement: 8,
+                });
+                properties.padding = '0 0 0 10';
+            }
+        }
+
+        return properties;
+    },
+
     afterCreatePanel: function(config) {
         this.component.getStore().on('load', this.initHandler, this);
         if (this.dependOnGridRow) {

package/src/report/toolbar/ButtonsByType.scss

@@ -81,7 +81,6 @@
     color: #86909C;
   }
 
-
   .information-button-type {
     border: 1px solid #D8E1E6 !important;
     border-radius: 6px;
@@ -91,7 +90,6 @@
     color: #3D6780;
   }
 
-
   .information-button-type.x-btn-menu-active {
     border: 1px solid #ABBECA !important;
     background-color: #F5F8FC;
@@ -106,9 +104,6 @@
     color: #3D78BF;
   }
 
-  //
-
-
   .information-button-type.x-btn-over {
     background-color: #FFFFFF;
     border: 1px solid #BBCAD2 !important;
@@ -139,6 +134,15 @@
     .x-btn-icon-el-default-small {
       color: #3d6780 !important;
       background-color: #3d6780 !important;
+      min-width: 16px !important;
+      min-height: 16px !important;
+    }
+  }
+
+  .system-button-type {
+    .x-btn-icon-el-default-small {
+      mask-size: 16px;
+      -webkit-mask-size: 16px;
     }
   }
 
@@ -148,6 +152,16 @@
       color: #888888 !important;
       background-color: #888888 !important;
     }
+    .svg-icon-ellipsis {
+      mask-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTcgMTJDNyAxMy4xMDQ2IDYuMTA0NTcgMTQgNSAxNEMzLjg5NTQzIDE0IDMgMTMuMTA0NiAzIDEyQzMgMTAuODk1NCAzLjg5NTQzIDEwIDUgMTBDNi4xMDQ1NyAxMCA3IDEwLjg5NTQgNyAxMloiIGZpbGw9ImJsYWNrIi8+CjxwYXRoIGQ9Ik0xNCAxMkMxNCAxMy4xMDQ2IDEzLjEwNDYgMTQgMTIgMTRDMTAuODk1NCAxNCAxMCAxMy4xMDQ2IDEwIDEyQzEwIDEwLjg5NTQgMTAuODk1NCAxMCAxMiAxMEMxMy4xMDQ2IDEwIDE0IDEwLjg5NTQgMTQgMTJaIiBmaWxsPSJibGFjayIvPgo8cGF0aCBkPSJNMjEgMTJDMjEgMTMuMTA0NiAyMC4xMDQ2IDE0IDE5IDE0QzE3Ljg5NTQgMTQgMTcgMTMuMTA0NiAxNyAxMkMxNyAxMC44OTU0IDE3Ljg5NTQgMTAgMTkgMTBDMjAuMTA0NiAxMCAyMSAxMC44OTU0IDIxIDEyWiIgZmlsbD0iYmxhY2siLz4KPC9zdmc+Cg==") !important;
+      -webkit-mask-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTcgMTJDNyAxMy4xMDQ2IDYuMTA0NTcgMTQgNSAxNEMzLjg5NTQzIDE0IDMgMTMuMTA0NiAzIDEyQzMgMTAuODk1NCAzLjg5NTQzIDEwIDUgMTBDNi4xMDQ1NyAxMCA3IDEwLjg5NTQgNyAxMloiIGZpbGw9ImJsYWNrIi8+CjxwYXRoIGQ9Ik0xNCAxMkMxNCAxMy4xMDQ2IDEzLjEwNDYgMTQgMTIgMTRDMTAuODk1NCAxNCAxMCAxMy4xMDQ2IDEwIDEyQzEwIDEwLjg5NTQgMTAuODk1NCAxMCAxMiAxMEMxMy4xMDQ2IDEwIDE0IDEwLjg5NTQgMTQgMTJaIiBmaWxsPSJibGFjayIvPgo8cGF0aCBkPSJNMjEgMTJDMjEgMTMuMTA0NiAyMC4xMDQ2IDE0IDE5IDE0QzE3Ljg5NTQgMTQgMTcgMTMuMTA0NiAxNyAxMkMxNyAxMC44OTU0IDE3Ljg5NTQgMTAgMTkgMTBDMjAuMTA0NiAxMCAyMSAxMC44OTU0IDIxIDEyWiIgZmlsbD0iYmxhY2siLz4KPC9zdmc+Cg==") !important;
+      mask-size: 18px;
+      -webkit-mask-size: 18px;
+      mask-repeat: no-repeat;
+      -webkit-mask-repeat: no-repeat;
+      mask-position: center;
+      -webkit-mask-position: center;
+    }
   }
 
   .system-button-type.x-btn-focus {
@@ -204,8 +218,8 @@
 
   .system-button-type .x-btn-icon-el,
   .system-secondary-button-type .x-btn-icon-el {
-    width: 18px;
-    height: 18px;
+    width: 16px;
+    height: 16px;
   }
 
   .system-button-type .x-btn-split-right::before,

package/src/report/toolbar/OptionsMenuButton.js

@@ -10,7 +10,7 @@ Ext.define('Coon.report.toolbar.OptionsMenuButton', {
         advancedSearch: false,
     },
 
-    iconCls: 'svg-icon svg-icon-ellipsis',
+    iconCls: 'svg-icon-ellipsis',
     text: '',
     arrowVisible: false,
     menu: {

package/src/report/toolbar/ReportGridToolbar.js

@@ -70,12 +70,9 @@ Ext.define('Coon.report.toolbar.ReportGridToolbar', {
         } else {
             if (this.reportToolbarPluginCfg && this.reportToolbarPluginCfg.length) {
                 const btn = this.reportToolbarPluginCfg.find((btn) => btn.id === item.foldStateId);
-                if (btn) {
-                    const cls = this.getClsByType(btn.buttonType);
-                    item.focusCls = cls;
-                    item.cls = item.cls ? item.cls + ' ' + cls : cls;
-                }
-                if (btn && btn.buttonType === 3) {
+                const buttonType = btn && btn.buttonType;
+                this.prepareItemBeforeAdd(buttonType, item);
+                if (this.isSystemButton(buttonType)) {
                     this.getLayout().overflowHandler.addButton(item);
                 } else {
                     this.callParent(arguments);
@@ -88,6 +85,23 @@ Ext.define('Coon.report.toolbar.ReportGridToolbar', {
         }
     },
 
+    isSystemButton(buttonType) {
+        return buttonType === 3;
+    },
+
+    prepareItemBeforeAdd(buttonType, item) {
+        if (!Ext.isDefined(buttonType)) {
+            return;
+        }
+        const cls = this.getClsByType(buttonType);
+        item.focusCls = cls;
+        item.cls = item.cls ? item.cls + ' ' + cls : cls;
+
+        if (this.isSystemButton(buttonType) && item.ui !== 'default') {
+            item.ui = '';
+        }
+    },
+
     updateNewButtonsState(button) {
         if (Object.keys(this.newButtons).length && this.newButtons[button.foldStateId]) {
             this.newButtons[button.foldStateId].name = button.text;

package/src/report/toolbar/dropdown/ToolbarOverflowButton.scss

@@ -23,8 +23,7 @@
 
 .ToolbarOverflowButton.x-btn-menu-active,
 .ToolbarOverflowButton.x-btn-pressed,
-.ToolbarOverflowButton.x-btn-focus,
-{
+.ToolbarOverflowButton.x-btn-focus {
   background-color: #ffffff !important;
   border-color: #3d6780 !important;
 }
@@ -32,7 +31,7 @@
 .ToolbarOverflowButton {
   border: 1px solid #3d6780;
   border-radius: 6px;
-  padding: 7px;
+  padding: 6px;
 
   .overflow-indicator{
     position: absolute;
@@ -50,8 +49,8 @@
   .ToolbarOverflowButtonIcon{
     mask-image: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0zLjI5Mjg5IDcuMjkyODlDMy42ODM0MiA2LjkwMjM3IDQuMzE2NTggNi45MDIzNyA0LjcwNzExIDcuMjkyODlMMTIgMTQuNTg1OEwxOS4yOTI5IDcuMjkyODlDMTkuNjgzNCA2LjkwMjM3IDIwLjMxNjYgNi45MDIzNyAyMC43MDcxIDcuMjkyODlDMjEuMDk3NiA3LjY4MzQyIDIxLjA5NzYgOC4zMTY1OCAyMC43MDcxIDguNzA3MTFMMTIuNzA3MSAxNi43MDcxQzEyLjMxNjYgMTcuMDk3NiAxMS42ODM0IDE3LjA5NzYgMTEuMjkyOSAxNi43MDcxTDMuMjkyODkgOC43MDcxMUMyLjkwMjM3IDguMzE2NTggMi45MDIzNyA3LjY4MzQyIDMuMjkyODkgNy4yOTI4OVoiIGZpbGw9ImJsYWNrIi8+PC9zdmc+");
     -webkit-mask-image: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0zLjI5Mjg5IDcuMjkyODlDMy42ODM0MiA2LjkwMjM3IDQuMzE2NTggNi45MDIzNyA0LjcwNzExIDcuMjkyODlMMTIgMTQuNTg1OEwxOS4yOTI5IDcuMjkyODlDMTkuNjgzNCA2LjkwMjM3IDIwLjMxNjYgNi45MDIzNyAyMC43MDcxIDcuMjkyODlDMjEuMDk3NiA3LjY4MzQyIDIxLjA5NzYgOC4zMTY1OCAyMC43MDcxIDguNzA3MTFMMTIuNzA3MSAxNi43MDcxQzEyLjMxNjYgMTcuMDk3NiAxMS42ODM0IDE3LjA5NzYgMTEuMjkyOSAxNi43MDcxTDMuMjkyODkgOC43MDcxMUMyLjkwMjM3IDguMzE2NTggMi45MDIzNyA3LjY4MzQyIDMuMjkyODkgNy4yOTI4OVoiIGZpbGw9ImJsYWNrIi8+PC9zdmc+");
-    mask-size: 100%;
-    -webkit-mask-size: 100%;
+    mask-size: 16px;
+    -webkit-mask-size: 16px;
     mask-repeat: no-repeat;
     -webkit-mask-repeat: no-repeat;
     background-color: #3d6780;

package/src/uielement/plugin/configPanel/MethodChainPluginConfigPanelFormEditor.js

@@ -71,6 +71,7 @@ Ext.define('Coon.uielement.plugin.configPanel.MethodChainPluginConfigPanelFormEd
                 {ptype: 'cellediting', clicksToEdit: 2}
             ],
             title: 'Последовательно вызываемые обработчики',
+            sortableColumns: false,
             flex: 1,
             columns: [
                 {

package/src/version.js

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