ru.coon 3.0.71 → 3.0.72

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# Version 3.0.72, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c2f5896748cca4a1467fa9dedd00ed69b950c033)
+* ## Fixes
+* <span style='color:red'> исправление отображения кнопок репорта</span> ([45f49f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/45f49ff03cfd18a299ba92a73f415fc86f9c6bbf))
+
+* remove span if no title ([33c3f7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/33c3f713cbee011f31de9a68216b5f615477fb0d))
+* HT-14867 fix: Исправление подсветки выделенной строки. Отключение черезполосной раскраски строки при наличии плагина GridRowStylePlugin. ([650840], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6508409dac9bffbdfd672f2befd4f52e0d7dc40c))
+* update: CHANGELOG.md ([7c81a0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7c81a089d558f6788dd14582814325cd1d331e9c))
+
 # Version 3.0.71, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c392614cffea74a4f5b5886307e26be5fffcb14a)
 * update: CHANGELOG.md ([f10394], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f10394bec0b7055bc79a4716495bc9049e994758))
 

package/package.json

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

package/src/app/viewPort/CenterView.js

@@ -129,7 +129,7 @@ Ext.define('Coon.app.viewPort.CenterView', {
         this.add(component);
 
         component.on('titlechange', function(_, title) {
-            title = title || Coon.format.withHint('<span style="color:red">---</span>', 'заголовок не задан');
+            title = title || Coon.format.withHint('', 'заголовок не задан');
             if (typeof title !== 'string') {
                 if (typeof title.getTitle !== 'function') {
                     return;

package/src/common/panel/WindowWrap.js

@@ -162,7 +162,7 @@ Ext.define('Coon.common.panel.WindowWrap', {
         }, this);
 
         this.content.on('titlechange', function(_, title) {
-            title = title || Coon.format.withHint('<span style="color:red">---</span>', 'заголовок не задан');
+            title = title || Coon.format.withHint('', 'заголовок не задан');
             if (typeof title !== 'string') {
                 if (typeof title.getTitle !== 'function') {
                     return;

package/src/report/component/ReportPanel.js

@@ -866,11 +866,6 @@ Ext.define('Coon.report.component.ReportPanel', {
             }
             config[prefix + 'type'] = plugin[ns.$uiElement].xtype || plugin[ns.$xtype];
             config[ns.$sortSequence] = plugin[ns.$sortSequence] || null;
-            config.pluginConfig = {
-                properties: Object.assign({}, config),
-                type,
-                name: prefix + 'type',
-            };
             return config;
         });
     },

package/src/report/component/reportpanel/ReportGrid.scss

@@ -54,8 +54,10 @@
   .x-grid-cell.filtered-cell {
     //background-color: #fff6e8;
   }
+}
+.ReportGrid:not(.gridrowstyleplugin) {
   .x-grid-with-row-lines.enable-striped-rows {
-    .x-grid-item-alt:not(.inheritParentBgColor, .x-grid-item-over) {
+    .x-grid-item-alt:not(.x-grid-item-selected, .x-grid-item-over) {
       background-color: rgba(137, 204, 198, 0.07);
     }
   }

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

@@ -271,7 +271,6 @@ Ext.define('Coon.report.plugin.grid.GridRowStylePlugin', {
             if (uniqCls) {
                 grid.addCls(uniqCls);
             }
-            grid.addCls('gridrowstyleplugin');
         }
         if (this.treeNodesColors !== false && this.treeNodesColors !== '') {
             const proto = Ext.ClassManager.classes[Ext.ClassManager.aliasToName['widget.'+grid.xtype]].prototype;

package/src/uielement/component/UiCustomController.js

@@ -153,7 +153,7 @@ Ext.define('Coon.uielement.component.UiCustomController', {
             if (!typeof title === 'string') {
                 return;
             }
-            title = title || Coon.format.withHint('<span style="color:red">---</span>', 'заголовок не задан');
+            title = title || Coon.format.withHint('', 'заголовок не задан');
             view.titleText = title;
             if (
                 view.tab && typeof view.tab.setTooltip === 'function'

package/src/version.js

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