ru.coon 3.0.39 → 3.0.41

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 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))
+
+* update: CHANGELOG.md ([5881f9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5881f967085c3b2f6d8ecc4469c3103f2ace1d72))
+
 # Version 3.0.39, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e29f7baa54dc8f31fddecef2ec9c648f70b55ce1)
 * ## Fixes
 * <span style='color:red'> titlechange handler parameters</span> ([f79859], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f79859a64493b3840b268958fc693b405cf0616a))

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "3.0.39",
+  "version": "3.0.41",
   "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/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/configPanel/SimpleFilterPluginConfigPanelFilterGrid.js

@@ -73,7 +73,7 @@ Ext.define('Coon.report.plugin.configPanel.SimpleFilterPluginConfigPanelFilterGr
     },
     encodeConditions: function(conditions) {
         return conditions.map((condition) => {
-            return {value: condition};
+            return condition.value ? condition : {value: condition};
         });
     },
     decodeConditions: function(conditions) {

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

@@ -34,7 +34,7 @@ Ext.define('Coon.report.plugin.grid.SimpleFilterPlugin', {
     doInit: function(grid) {
         if (this.valueConfig.length) {
             this.activeItem = this.valueConfig[0];
-            const tBar = grid.dockedItems.items.find((item) => item.xtype === 'toolbar' && item.dock === 'top');
+            const tBar = grid.dockedItems.items.find((item) => item.isToolbar && item.dock === 'top');
             if (tBar) {
                 this.filterContainer = this.getFilterContainer(this.valueConfig);
                 if (this.position === 2) {

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/version.js

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