ru.coon 2.7.63 → 2.7.65

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+# Version 2.7.65, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/575aaa8ea4982726ce21f98300e95aa55ecbb906)
+* update: CHANGELOG.md ([72d780], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/72d7808927b07eb6ce33080c2b2e808b9b9a4a55))
+
+# Version 2.7.64, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8b0b9a392f1f27837b2ef59a39ab5e0cfb4c6167)
+* ## Fixes
+* <span style='color:red'> TR-68748: set aceEditor value on render editor</span> ([91d6a5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/91d6a540b1c59bf30fc9b137d713dab6fd10f23c))
+* <span style='color:red'> TR-68748: set aceEditor value on render editor</span> ([d9104a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d9104adce83918b72fa7d97032a33c3f5faf402e))
+
+* update: CHANGELOG.md ([eadbfc], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/eadbfcd1f66dc7e59c26b198c160054c7140fa5b))
+
 # Version 2.7.63, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3105569cc716302c9533958daa3aef9dbdc0e6a8)
 * ## Fixes
 * <span style='color:red'> BFL-14999: check north panel exists</span> ([cbc17a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cbc17a278fd1468539fe081d29fdd3819df51b08))
@@ -97,7 +107,10 @@ This reverts commit b3524303e203486f1c393f2174967c652d2f8c33.</span> ([0bfe61],
 * <span style='color:green'>feat: TR-69015: css</span> ([ecd879], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ecd87930a535ff13b0ad42eba28df9d1ed91cd2a))
 
 * ## Fixes
+* <span style='color:red'> HT-7916 ExportReportDataToFilePluginConfigPanel fix display checkboxes</span> ([4971af], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4971af01b9196a138c382f04090bb681d11b40aa))
 * <span style='color:red'> HT-9084 ReportColumnStatePlugin column width</span> ([b10a75], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b10a75f78f92262543be268863961fda1113d9d5))
+* <span style='color:red'> HT-7916 ExportReportDataToFilePluginConfigPanel fix display checkboxes</span> ([a32fb4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a32fb45007cdc8a1a32cb958a92ac490ab081fd9))
+* <span style='color:red'> HT-7916 ExportReportDataToFilePluginConfigPanel fix displya checkboxes</span> ([a56d49], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a56d4938522370475d73072188ac72851a2c010f))
 
 * improve custom panel plugin tracing ([ed6206], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ed62065b34ebb04520b62f6fce269e4d4cbb6d21))
 * upd ([57157a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/57157acdd88c0fa6702e5c5cbd321bc89d840d09))

package/package.json

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

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

@@ -179,9 +179,7 @@ Ext.define('Coon.report.plugin.configPanel.ExportReportDataToFilePluginConfigPan
 
     doInit: function(config) {
         this.callParent(arguments);
-        if (config && config.columnList) {
-            this.columnList = config.columnList;
-        }
+        this.columnList = config && config.columnList && Coon.util.parseJSON5(config.columnList) || [];
         if (config.exportConfig) {
             this.down('UiAceEditor').setValue(config.exportConfig);
         }
@@ -201,7 +199,7 @@ Ext.define('Coon.report.plugin.configPanel.ExportReportDataToFilePluginConfigPan
             return {
                 reportField: field[ns.$reportField],
                 description: field[ns.$description],
-                checkbox: (this.columnList && this.columnList.includes(field[ns.$reportField])),
+                checkbox: this.columnList.find((col) => col.reportField === field[ns.$reportField]),
             };
         });
 

package/src/uielement/component/settings/UiAceEditor.js

@@ -12,6 +12,7 @@ Ext.define('Coon.uielement.component.settings.UiAceEditor', {
     cls: 'ace_editor ace_hidpi ace-xcode',
     config: {
         value: '',
+        originalValue: null,
         readOnly: false,
         useLinter: false,
         enableEmptyValue: false,
@@ -95,6 +96,7 @@ Ext.define('Coon.uielement.component.settings.UiAceEditor', {
 
     updateValue: function(value) {
         if (!this.editor) {
+            this.setOriginalValue(value);
             return;
         }
         this.setValue(value);
@@ -102,13 +104,14 @@ Ext.define('Coon.uielement.component.settings.UiAceEditor', {
 
     getValue: function() {
         if (!this.editor) {
-            return;
+            return this.getOriginalValue();
         }
         return this.editor.getValue();
     },
 
     setValue: function(value) {
         if (!this.editor) {
+            this.setOriginalValue(value);
             return;
         }
         const pos = this.editor.getCursorPosition();
@@ -282,6 +285,9 @@ Ext.define('Coon.uielement.component.settings.UiAceEditor', {
             this.markClean();
         }
         this.linterInitialized = true;
+        if (this.getOriginalValue() !== null && this.getOriginalValue() !== undefined) {
+            this.setValue(this.getOriginalValue());
+        }
         this.fireEvent('ready', this);
     },
 

package/src/version.js

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