ru.coon 2.6.6 → 2.6.7

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

@@ -20,7 +20,7 @@ Ext.define('Coon.report.plugin.grid.ReportColumnStatePlugin', {
         if (this.report.getEnableAutoSize) {
             Coon.log.log('To disable automatic column size, you need to set the enableAutoSize property of the report to "false"');
         };
-
+        this.checkEnableAutoSize();
         this.applySavedState();
 
         const events = ['columnmove', 'columnhide', 'columnshow', 'columnresize'];
@@ -28,7 +28,22 @@ Ext.define('Coon.report.plugin.grid.ReportColumnStatePlugin', {
             this.grid.on(e, this.columnInteractionHandler, this);
         }.bind(this));
     },
-
+    checkEnableAutoSize() {
+        if (this.grid.getEnableAutoSize() === true) {
+            const savedState = localStorage.getItem('reportsState');
+            let deserializedState; let currentReportState;
+            try {
+                deserializedState = JSON.parse(savedState);
+                currentReportState = deserializedState[this.report.reportId];
+            } catch (e) {
+                Coon.log.log('Incorrect JSON state');
+                return;
+            }
+            if (currentReportState) {
+                this.grid.setEnableAutoSize(false);
+            }
+        }
+    },
     columnInteractionHandler(_, col) {
         const currentState = [];
         const columns = this.grid.getColumns();
@@ -88,5 +103,6 @@ Ext.define('Coon.report.plugin.grid.ReportColumnStatePlugin', {
         localStorage.removeItem('reportsState');
         const newState = JSON.stringify(Object.assign({}, oldState, state));
         localStorage.setItem('reportsState', newState);
+        this.checkEnableAutoSize();
     },
 });

package/src/version.js

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