ru.coon 2.6.16 → 2.6.18

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# Version 2.6.18, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1c189ec63993901ccd4a8045777a19f485c5c065)
+* ## Fixes
+* <span style='color:red'> windowWrap default size for restore when maximized:true CRM-8393</span> ([8eb4a5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8eb4a5586089b2cc8581e0d647e20b8955c8b097))
+
+* update: CHANGELOG.md ([4e316a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4e316ac4c2c96cb4de23ff0dfb73ff4db75ea4ec))
+
+# Version 2.6.17, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a85820f03c44ab7b35ae02ae88209c435f264807)
+* ## Fixes
+* <span style='color:red'> PrintPdfPlugin.handler call parseProperty on 'string'</span> ([8dec18], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8dec18c777cd4e6f3daf9fb1540726e613639220))
+
+* update: CHANGELOG.md ([e7aec8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e7aec82f66947539e462f813c3d8249a6f071b6f))
+
 # Version 2.6.16, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0fda3b6a033bacf1d07829445c44a4fab42b440d)
 * ## Fixes
 * <span style='color:red'>fix SummaryPluginConfigPanelSummaryGrid, BFL-11632</span> ([c3c46a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c3c46a8581698ea75ccebe42105d0b36e59b3f25))

package/package.json

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

package/src/common/panel/WindowWrap.js

@@ -37,12 +37,6 @@ Ext.define('Coon.common.panel.WindowWrap', {
 
     addTool: function(tools) {
         const me = this;
-        const isWinMaximized = me.height >= me.maxHeight && me.width >= me.maxWidth;
-
-        me.maximized = me.maximized || isWinMaximized;
-        me.height = Ext.isEmpty(me.height) ? 500 : (me.height > me.maxHeight ? me.maxHeight : me.height);
-        me.width = Ext.isEmpty(me.width) ? 800 : (me.width > me.maxWidth ? me.maxWidth : me.width);
-
         me.callParent([tools]);
 
         if (me.maximized && !!me.tools.maximize) {
@@ -62,6 +56,19 @@ Ext.define('Coon.common.panel.WindowWrap', {
         const viewPortSize = Ext.getBody().getViewSize();
         this.maxWidth = viewPortSize.width;
         this.maxHeight = viewPortSize.height;
+
+        const isWinMaximized = this.height >= this.maxHeight && this.width >= this.maxWidth;
+        this.maximized = this.maximized || isWinMaximized;
+
+        if (this.maximized) {
+            const defaultRestoreSize = {
+                height: 500,
+                width: 800,
+            };
+            this.height = Ext.isEmpty(this.height) ? defaultRestoreSize.height : this.height;
+            this.width = Ext.isEmpty(this.width) ? defaultRestoreSize.width : this.width;
+        }
+
         if (this.alwaysInCenter) {
             this.center();
         }

package/src/uielement/plugin/PrintPdfPlugin.js

@@ -113,7 +113,7 @@ Ext.define('Coon.uielement.plugin.PrintPdfPlugin', {
                     let paramValue = parameters[field.name];
                     if (Ext.isString(paramValue) && paramValue.startsWith('{')) {
                         paramValue = this.view.getController().getViewModel().get(paramValue.substring(1, paramValue.length - 1));
-                    } else if (!!paramValue) {
+                    } else if (Ext.isObject(paramValue)) {
                         Ext.each(Object.keys(paramValue), (f) => this.parseProperty(paramValue, f));
                     }
                     if (typeof parameters[field.name] != 'undefined') {

package/src/version.js

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