ru.coon 2.7.0 → 2.7.1

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 2.7.1, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9028ecb552a8341a78e6a7e0d2f9eee91554c2d0)
+* upd ([901f4c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/901f4c345d1025ef8861b1b649d84590c6a6a7ec))
+* update: CHANGELOG.md ([1a5ea6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1a5ea663b234831a73ec046c23b951b71797481a))
+
 # Version 2.7.0, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c03c093df3594cbec9b0b6a2e3e4ca8d24b07e76)
 * ## Features
 * <span style='color:green'>feat: HT-7850 Включение FilterConditionToolbar в ReportPanel</span> ([02015f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/02015fd6518dec2fbbf4a16e8e29ff958fe4f1b3))

package/package.json

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

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

@@ -16,6 +16,9 @@
       }
     }
     .filtered-column {
+      .x-column-header-text span{
+       text-decoration: underline;
+      }
       font-style: italic;
       font-weight: bold;
     }

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

@@ -20,7 +20,7 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
                 handler: this.addFilter.bind(this),
             }));
             contextMenu.add(new Ext.menu.Item({
-                text: 'Отменить фильтр для столбца',
+                originalText: 'Отменить фильтр',
                 hidden: true,
                 itemId: 'cancelCurrentColumnFilter',
                 handler: this.clearCurrentColumnFilter.bind(this),
@@ -98,11 +98,6 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
         return this.filters.has(this.getColumnKey());
     },
 
-    showCancelMenuItems: function() {
-        const cancelCurrentItem = this.findMenuItem('cancelCurrentColumnFilter');
-        cancelCurrentItem && cancelCurrentItem.setHidden(!this.isColumnFiltered());
-    },
-
     findMenuItem: function(findBy) {
         const contextMenu = this.grid.contextMenu;
         return contextMenu.down(`#${findBy}`);
@@ -144,6 +139,18 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
         return true;
     },
 
+    getValueText() {
+        if (typeof this.columnValue !== true && this.columnValue) {
+            return this.columnValue;
+        }
+        if (typeof this.columnValue === 'boolean') {
+            return this.columnValue ? 'истинно' : 'ложно';
+        }
+        if (this.columnValue === null || this.columnValue === undefined || this.columnValue === '') {
+            return 'пустое значение';
+        }
+    },
+
     setMenuText(record, cellIndex) {
         const contextMenu = this.grid.contextMenu;
         const columns = this.grid.getColumns();
@@ -154,11 +161,15 @@ Ext.define('Coon.report.plugin.grid.AddFilterConditionPlugin', {
         this.column = column;
         this.columnValue = record.get(column.dataIndex);
 
-        this.showCancelMenuItems();
+        const cancelCurrentItem = this.findMenuItem('cancelCurrentColumnFilter');
+        cancelCurrentItem.hide();
+
         const foundMenuItem = contextMenu.down('#filterByCellValue');
         foundMenuItem.show();
         if (this.filters.size && this.filters.get(this.getColumnKey()) === this.columnValue) {
             foundMenuItem.hide();
+            cancelCurrentItem.setText(`${cancelCurrentItem.originalText} по значению: ${this.getValueText()}`);
+            cancelCurrentItem.show();
         }
 
         if (this.isFilterable()) {

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

@@ -52,10 +52,10 @@ Ext.define('Coon.report.plugin.grid.GridContextMenu', {
         this.qtipSpan = cell.querySelector('[data-qtip]');
         this.qtipSpan && this.qtipSpan.removeAttribute('data-qtip');
 
-        contextMenu.alignTo(cell, 'tl-bl');
+        // contextMenu.alignTo(cell, 'tl-bl');
 
-        const y = contextMenu.getY();
-        contextMenu.setY(y - 7);
+        // const y = contextMenu.getY();
+        // contextMenu.setY(y - 7);
     },
 
     restoreCellQtip: function() {

package/src/uielement/component/formchips/FilterConditionToolbarController.js

@@ -37,7 +37,6 @@ Ext.define('Coon.uielement.component.formchips.FilterConditionToolbarController'
                 }
             }, this);
 
-            reportPanel.on('filterchange', this.setReportGridFilters, this);
             reportPanel.on('clearFilter', this.onReportFilterClear, this);
         } else { // Реализация в кастомной панели
             const mainPanel = this.getView().up();
@@ -151,7 +150,6 @@ Ext.define('Coon.uielement.component.formchips.FilterConditionToolbarController'
      */
     fillChipsHandler: function() {
         this.fillRemoteChips();
-        this.fillLocalChips();
         this.fillIfNoChips();
         this.addButtons();
     },
@@ -182,18 +180,6 @@ Ext.define('Coon.uielement.component.formchips.FilterConditionToolbarController'
         }
     },
 
-    fillLocalChips: function() {
-        const cont = this.lookup('chipsContainer');
-        const filters = this.filters || [];
-        this.countLocalChips = 0;
-        filters.forEach(function(chipConfig) {
-            const cmp = new Coon.uielement.component.formchips.Chip(chipConfig);
-            cmp.on('needReloadChips', this.onReloadChipsHandler, this);
-            cont.add(cmp);
-            this.countLocalChips++;
-        }, this);
-    },
-
     fillIfNoChips: function() {
         if (!this.countRemoteChips && !this.countLocalChips) {
             const cmp = new Coon.uielement.component.formchips.Chip({
@@ -244,14 +230,6 @@ Ext.define('Coon.uielement.component.formchips.FilterConditionToolbarController'
         return ret;
     },
 
-    /**
-     * Установить данные для чипов из фильтров
-     * @param {Array<Object>} filters
-     */
-    setReportGridFilters(filters) {
-        this.filters = filters || [];
-    },
-
     onReportFilterClear() {
         this.setLastSearchFields([]);
         this.onReloadChipsHandler();

package/src/version.js

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