ru.coon 2.8.63 → 2.8.65

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# Version 2.8.65, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cd4e6a05be766150803dee8bf864f689b45a5071)
+* ## Fixes
+* <span style='color:red'>HT-12063 fix ReportTree and SimpleFilterPlugin</span> ([b1601d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b1601dfca09e99bb0e1dd4c7b8199b597aa1fed0))
+
+* update: CHANGELOG.md ([221867], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/22186752ea29dc2b72be2b336f34c357076f83fa))
+
+# Version 2.8.64, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/897ee46e0d8fae98bd8dcc598440a1f95318ee6f)
+* ## Fixes
+* <span style='color:red'>CRM-9995 fix coonChart display legend</span> ([75852b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/75852b69d974405206ece0630a70ae091f1aa6cb))
+
+* HT-11123 :fix Исправление получения для сохранения логических значений настроек конфигурации плагинов, наследованных от PluginDefaults. Если значения конфигурации были при приведении к логическому типу ложными, то для сохранения использовались значения по ([2b8df3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2b8df3778c9ba826621f09955372c702ae23906d))
+* HT-11134 :feat Поддержка валидного добавления в тулбар 2.0 кнопок из gridProperties ([dc3d95], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dc3d95d989899fbbcc24cc990d61dbceb757c983))
+* update: CHANGELOG.md ([354a4d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/354a4db6d724093525fb64d44eb5985bebde3b3f))
+
 # Version 2.8.63, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b3dfb03ece646a94541bcd8588582aad5c074114)
 * ## Features
 * <span style='color:green'>feat: Allow dynamic setting of "uiElementCd". Related to NEVA-762.</span> ([5543e2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5543e2a294923afac914ca722b2ff1f74b712d66))
@@ -85,6 +99,7 @@
 * <span style='color:red'>fix</span> ([f7ce88], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f7ce88d8859e702af4521253068bda50df90c39b))
 
 * remove template 'beforeComplete' ([e746ea], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e746ea99a3adbb1b0b5e6eadac6068e1250a567a))
+* TR-70340 :fix Исправлена возможность создания ui элемента с посторонними символами ([952773], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/952773095ade2cea2f98b77c94b06cf37ad8ce90))
 * update: CHANGELOG.md ([58846f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/58846fbc62873ca4c56f685e85420bad0e56652b))
 
 # Version 2.8.48, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/201d12dfc121f4045867a23b2d92f9fe252191cf)

package/package.json

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

package/src/chart/CoonChart.js

@@ -19,12 +19,6 @@ Ext.define('Coon.chart.CoonChart', {
     publishes: 'selection',
     autoFilter: false,
     filterDefaults: {},
-    defaultConfig: {
-        tooltip: {
-            trigger: 'item',
-        },
-        categoryLineY: false,
-    },
     defaultLegendType: 'plain',
 
     initChart() {
@@ -314,9 +308,9 @@ Ext.define('Coon.chart.CoonChart', {
         });
         config.rows.map((row) => {
             let serieName;
-            legend.forEach((legendEl) => {
-                legendEl.data = legendEl.data || [];
+            !isSettingAxisData && legend.forEach((legendEl) => {
                 serieName = normalizeValue(row, legendEl, 'axis');
+                legendEl.data = legendEl.data || [];
                 legendEl.data.push(serieName);
             });
             categoryAxis.forEach((categoryEl) => {
@@ -334,7 +328,7 @@ Ext.define('Coon.chart.CoonChart', {
         });
         config.categoryAxis = isSettingAxisData && categoryAxis;
         config.valueAxis = isSettingAxisData && valueAxis;
-        config.legend = legend;
+        config.legend = legend.length ? legend : {};
         if (isSettingAxisData && !config.categoryLineY) {
             config.xAxis = config.categoryAxis;
             config.yAxis = config.valueAxis;

package/src/chart/editor/CoonChartEditorController.js

@@ -149,8 +149,7 @@ Ext.define('Coon.chart.editor.CoonChartEditorController', {
             } else if (key === 'categoryConfig' || key === 'valueConfig') {
                 acc[key] = value;
             } else {
-                acc.defaultConfig = acc.defaultConfig || {};
-                acc.defaultConfig[key] = value;
+                acc[key] = value;
             }
             return acc;
         }, {});
@@ -188,13 +187,34 @@ Ext.define('Coon.chart.editor.CoonChartEditorController', {
                 additionalConfig: config,
             });
         });
+        const coonChartConfig = {...coonChart};
+        const serviceProps = [
+            'id',
+            'description',
+            'xtype',
+            'properties',
+            'propertyData',
+            'accessDecision',
+            'reportSourceId',
+            'sourceType',
+            'chartType',
+            'commandSourceId',
+            'rootNode',
+            'config',
+            'parameters'
+        ];
+        serviceProps.forEach((prop) => {
+            if (prop in coonChartConfig) {
+                delete coonChartConfig[prop];
+            }
+        });
         return Ext.applyIf({
             valueConfig: valueConfig,
             categoryConfig: categoryConfig,
             legendConfig: legendConfig,
             serieConfig: serieConfig,
-            categoryLineY: this.vm.get('coonChart.categoryLineY') || chartCmp.defaultConfig.categoryLineY,
-        }, coonChart.defaultConfig || chartCmp.defaultConfig);
+            categoryLineY: this.vm.get('coonChart.categoryLineY'),
+        }, coonChartConfig);
     },
 
     showPreview() {