ru.coon 2.6.22 → 2.7.0

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+# 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))
+
+* refactoring ([1c317f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1c317fadf1591a82907cdff905e69d4978dae061))
+* upd ([e79155], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e791556cf00505255593cd1bf6ad022d75c19d79))
+* HT-7444 Исправление ([043abe], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/043abea7c90d62b17a3c4819845a1e20dda36790))
+* HT-7444 разные проверки ([8255f3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8255f3fd46e907425aca877334cf3d52c42f9232))
+* HT-7444 пункт контекстного  меню фильтрации по дате. исправил. ([c36f45], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c36f45ebc46c21bddfb08a9421dd4c6158c29bcb))
+* update: CHANGELOG.md ([f6cba4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f6cba486672b6801c57464bbc8521a59177ec60d))
+
+# Version 2.6.23, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e68f6b9665bae4d8969249f451f473ed7298d86f)
+* ## Fixes
+* <span style='color:red'>fix Coon.Function.getDataFromForm - will correct work with fieldcontainers</span> ([87d0f1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/87d0f1faf59496c1f41cc7b2f1c8a153c25ca97c))
+* <span style='color:red'>Fix:HT-7885 Refactoring getDataFromForm function</span> ([158037], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1580375d0b9d430a8a9379bee7806ea1c5bfc85c))
+
+* HT-7444 рефакторинг ([80ecef], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/80ecef5a7d9f190e7427df6b4d9d6f3ec065d6aa))
+* HT-7444 adding a filter for different value types ([7c090d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7c090d51a331b021260b15fba7e9136ba9dc3952))
+*  ([Update], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/Update src/Function.jsb3713a036513a22b8c920b2d4d230fcaf1eb0779))
+*  ([Update], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/Update src/Function.js3fa4edf5ab6e11a419ed4995c949a0cfe459c1db))
+* update: CHANGELOG.md ([cca905], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cca905a14180478df3c9f460ceb07b2950c14fba))
+
 # Version 2.6.22, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a580a8a4150b16d4f73ad7a4c1689d610822ee10)
 * ## Fixes
 * <span style='color:red'> loadData on SimplestReportCombo CRM-8429</span> ([e88546], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e88546f3413c2aa5520453b04abe000f4345bfea))
@@ -46,24 +68,31 @@
 * ## Fixes
 * <span style='color:red'> PrintPdfPlugin.handler call parseProperty on 'string'</span> ([8dec18], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8dec18c777cd4e6f3daf9fb1540726e613639220))
 
+* HT-7444: editing contextMenu display and cell data-qtip visibility ([9590ed], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9590edbc2eb57d22e4de581b1fe6b8f5c82617e7))
 * update: CHANGELOG.md ([e7aec8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e7aec82f66947539e462f813c3d8249a6f071b6f))
 
 # Version 2.6.16, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0fda3b6a033bacf1d07829445c44a4fab42b440d)
 * ## Fixes
 * <span style='color:red'>fix SummaryPluginConfigPanelSummaryGrid, BFL-11632</span> ([c3c46a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c3c46a8581698ea75ccebe42105d0b36e59b3f25))
+* <span style='color:red'>HT-7444 fix rename context menu items</span> ([07fd4d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/07fd4d89f598b5d54807d280c82133ca6cd98a5a))
 
 * update: CHANGELOG.md ([5f6155], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5f615546aaa0efa9b209cb9705cab4af5a958f05))
 
 # Version 2.6.15, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9ad5ed1315f5d90adfe7569f83a8f354025f96dd)
 * ## Fixes
 * <span style='color:red'>fix BFL-11632</span> ([8600ec], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8600ec86a3b2b824530ae8116416d7b29b087f3b))
+* <span style='color:red'>HT-7444 fix применение стиля для колонки</span> ([ababf6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ababf67488b952fb9db3645b8bc51d72477872cb))
 
 * update: CHANGELOG.md ([08f451], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/08f45144a4d946fd328a2b43645f08e5b06903aa))
 
 # Version 2.6.14, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2fa5952910e2d64f357d1c17486ab785686f3cc2)
+* ## Features
+* <span style='color:green'>feat: HT-7444 upd</span> ([14ccc5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/14ccc55d54a00ca81907a98b7ef7f5d4e9c58206))
+
 * ## Fixes
 * <span style='color:red'> HT-8113 synchronization of fileName in ExportReportDataToFilePlagin</span> ([2dee16], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2dee167031e2cf5071092a81b437d4748513de30))
 
+* HT-7444 ([7f7452], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7f74526970bda8e8bfc9caa975d43409f98726fc))
 * update: CHANGELOG.md ([122574], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/12257435ce3081dc5641232b789cfa8b2b188e82))
 
 # Version 2.6.13, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b546bb7b481a9dbc4b408c99b9ce158b676a15fa)
@@ -76,7 +105,9 @@
 * ## Fixes
 * <span style='color:red'>BFL-11558 hot fix</span> ([66e78d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/66e78dfde422a1b5938be7d43b607eadac52bd04))
 
+* upd ([b2f552], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b2f5528db3b6c93036fd778c09be388682c559d3))
 * HT-8094 fix: hide fields on hideFilterPanel only if  isReportFilterField is true ([c88510], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c885109cb5e6bd483089022fe0707e0ad2ad2e23))
+* HT-7444 ([2f4045], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2f4045751c2f6cc0fc173660e3cd48e3119fb5c9))
 * update: CHANGELOG.md ([700118], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/70011848b4cda27669d8de9e54ceca0a895153c7))
 
 # Version 2.6.11, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ad47b54f189ab04b20780d2b553a03a1166ebd1b)
@@ -180,6 +211,7 @@ This reverts commit ec83613d1dd2673b448c9fabee62287e9160f6bf. ([e6e94a], [link](
 * <span style='color:green'>feat: HT-7969: view group description, fix fields name in chain</span> ([e19b98], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e19b98356ac3738d40afdd92401d8433d3b86056))
 
 * Resolve HT-7568 ([eb0297], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/eb0297d1927ae6e2d3a8d492d368d5ea7bef89ef))
+* HT-7444 ([9a2226], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9a2226a1c70795e683cdad35a130cbf99cf40c52))
 * Revert "feat: Добавлено предупреждение при выборе дефолтной конфигурации плагина. Closes TR-67200."
 
 This reverts commit 92855b1225a747f15d977c0f23c8d9794523352d. ([312854], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/312854f7d59d711c9921f394c6849d398e529e10))
@@ -214,15 +246,21 @@ This reverts commit 92855b1225a747f15d977c0f23c8d9794523352d. ([312854], [link](
 # Version 2.5.64, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9f48777236abed76cf08cd5cef56e7f9be0dac63)
 * ## Features
 * <span style='color:green'>feat: HT-7955: focus CP before save action, set cell editing values in grids</span> ([4c6578], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4c6578c6873cd21c509de304494938276e7367a9))
+* <span style='color:green'>Feat:HT-7885 Deprecate Coon.Function.getDataFromForm</span> ([43cd8a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/43cd8a2edbafe76c7d5881789a6236b6e23c21cf))
 * <span style='color:green'>feat: BFL-9365 move TimeEditorCreator and DeliveryTimeField from ISWE</span> ([12c3c7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/12c3c701ac9387f4d2918a9feb1840bf0f7fb3ea))
 * <span style='color:green'>feat: HT-7281 GridEditorPlugin editor dependField</span> ([387052], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/38705228276f86858100b6b43c0e204bcc6f26b7))
 
 * ## Fixes
 * <span style='color:red'>Fix:HT-7887 fix filterItemsOnRow property in ReportFormParameterEditPanel</span> ([c10ca9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c10ca98610970df2f51ca39fe698e278db6fe719))
+* <span style='color:red'>Fix:HT-7885 change excelEditorType to local in CopyRowsFromGridConfigPanel</span> ([1ed44e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1ed44e4bb22f4e15a3b06221e0d8870da1ecf025))
 * <span style='color:red'> HT-7941: check if do not have saved data object then close window</span> ([0baf4e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0baf4ea72862a4a61230ffc3ac0af7f8b065d794))
+* <span style='color:red'>Fix:HT-7885 fix group button and position number properties in CopyRowsFromGridConfigPanel</span> ([e0a4d8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e0a4d888c88dfa70c14e649bb027625c769d64ce))
 
 * remove unnecessary filterItemsOnRow property ([772f61], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/772f6190df8b958bd6ff97e5731a59971c9a11fc))
+* HT-7885 ([601a41], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/601a4199efef15290c161766431908ab8993862b))
+* Update getDataFromForm function ([d79274], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d79274267b970ea0b4a31f1724d3dfc54d82d9d5))
 * HT-7882 поддержать возможность передачи свойств редактора х-ки в поле mask в формате json ([507490], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5074900afb170d9f11aa10de6549e05cef12f7cb))
+* Combine query in one row ([6fbb49], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6fbb496601a46bef0506b56d34d179d3d10148ca))
 * update: CHANGELOG.md ([2ec18c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2ec18ccddcb1d571ef6a1d00b9cde439355c8304))
 
 # Version 2.5.63, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/49035e56acea653959f01f96ea96a10d962b1424)
@@ -258,6 +296,7 @@ This reverts commit 92855b1225a747f15d977c0f23c8d9794523352d. ([312854], [link](
 * ## Fixes
 * <span style='color:red'> BFL-10584: fix bug in plugin, set max width window size when param > then desctop</span> ([1baf31], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1baf31449e4bbd8d8cdbfa5447595594c4434e78))
 
+* HT-7444 рефакторинг ([984a3f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/984a3f4eb024c1f8ff999f411ab29c952baac3e4))
 * update: CHANGELOG.md ([72405e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/72405e2ac16f89228c352fc1e340a349f07e0846))
 
 # Version 2.5.59, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/16dce0c2c65b36beafbff497648e510988b59693)
@@ -265,16 +304,20 @@ This reverts commit 92855b1225a747f15d977c0f23c8d9794523352d. ([312854], [link](
 * <span style='color:green'>feat: HT-7726: reject promise when data not valid in ExecuteCommandPlugin.js</span> ([ad2d2e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ad2d2e4b3609b15c9d16b13965829d13b6ed76be))
 * <span style='color:green'>feat: HT-7726: reject promise when data not valid in ExecuteCommandPlugin.js</span> ([aebed3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/aebed31251643b89d87bec03484ef3bda2590fa0))
 
+* HT-7444 ([da63c7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/da63c77d0df1950efe348b3482fcd443ebe9c4c9))
+* HT-7444 ([bb5c04], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bb5c046d8029e4db32a062b8e2a64dbb4dbc62db))
 * update: CHANGELOG.md ([c37b2e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c37b2e65b934e7fa9a20a6526469dfa1e14eeee3))
 
 # Version 2.5.58, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0bc705cdb14b90982a31dfff10ebf7d4c4819fd2)
 * ## Features
 * <span style='color:green'>feat: BFL-9258: add PercentEditorCreator</span> ([3998d6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3998d6908cf7b9bd59e659c5652808e39b5ea4f4))
+* <span style='color:green'>feat: HT-7444 Добавление плагина фильтрации полей репорта</span> ([0cdfc7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0cdfc7a1c1642f39548f070f9a8e900a1fcf505d))
 * <span style='color:green'>feat: TR-68113: move visual editor to other directory, add CP wrapper element</span> ([b4632e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b4632ee2adeb6f8fe0c6a7c414734909b5165fd5))
 
 * ## Fixes
 * <span style='color:red'> CRM-8161 Исправлен доступ к FilterPanel. Исправлено поведение IsweBindCustomPanelPlugin.</span> ([f54bee], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f54beedaf28f9be18c3f0b588c0af2ec340b50a5))
 
+* HT-7444 стилизация сегментированной кнопки ([c058a2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c058a2b4ded5a5cd586f2eef722c093af17bc73a))
 * update: CHANGELOG.md ([44feda], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/44fedab2d737c9d50e1f3bb802ab16f7af5d581c))
 
 # Version 2.5.57, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/98c71c4543fd95e80906b6fff0c955031a86eca1)

package/package.json

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

package/src/Function.js

@@ -122,38 +122,47 @@ Ext.define('Coon.Function', {
 
     /**
      * Получение всех значений полей панели в качестве структуры.
-     * Если поле иммет флаг local - оно не включается в результат
+     * Если поле имеет флаг local - оно не включается в результат
      */
     getDataFromForm: function(formPanel, valuesAsIs, dateFormat, excludeReadOnly, excludeDisabled) {
-        let fields = formPanel.query('field');
-        fields = (fields || []).concat(formPanel.query('fieldcontainer')).concat(formPanel.query('UiCFSegmentedButton'));
+        const fields = formPanel.query('field,fieldcontainer[getValue]');
         const params = {};
-        for (let i = 0; i < fields.length; i++) {
-            const field = fields[i];
-            if ((!field.disabled || !excludeDisabled) && (!field.readOnly || !excludeReadOnly)) {
-                const name = field.getName();
-                const value = field.submitFormat ? field.getSubmitValue() : field.getValue();
-                const local = field.local;
-
-                if (!Ext.isEmpty(name) && local !== true && name.indexOf('ext-comp') === -1) {
-                    if (field.isXType('radiofield')) {
-                        if (!Ext.isEmpty(value) && Ext.isFunction(value.getGroupValue)) {
-                            params[name] = value.getGroupValue();
-                        }
-                    } else if (Ext.isFunction(field.getCleanValue)) {
-                        params[name] = field.getCleanValue();
-                    } else if (Ext.isString(value) || value === undefined || Ext.isBoolean(value) || Ext.isNumber(value) ||
+
+        /**
+         * Проверяет, включать ли данные из поля в результат
+         */
+        const isValid = function(field, name) {
+            return (
+                !(excludeDisabled && field.disabled) &&
+                !(excludeReadOnly && field.readOnly) &&
+                !field.local &&
+                name
+            );
+        };
+
+        for (const field of fields) {
+            const name = Ext.isObject(field.initialConfig) && field.initialConfig.name;
+            if (!(isValid(field, name))) {
+                continue;
+            }
+            const value = field.submitFormat ? field.getSubmitValue() : field.getValue();
+            if (field.isXType('radiofield') && value && Ext.isFunction(value.getGroupValue)) {
+                params[name] = value.getGroupValue();
+            } else if (Ext.isDate(value)) {
+                // !!!ВНИМАНИЕ - при использовании этой функции в web-billing :
+                // из-за override form.field.Date в web-billing сюда мы не попадем, так как value всегда будет строкой,
+                // Следовательно, valuesAsIs и dateFormat не используются для обработки дат
+                params[name] = valuesAsIs ? value : Ext.Date.format(value, dateFormat || Coon.format.dateTimeInternal);
+            } else if (Ext.isFunction(field.getCleanValue)) {
+                params[name] = field.getCleanValue();
+            } else if (Ext.isString(value) || value === undefined || Ext.isBoolean(value) || Ext.isNumber(value) ||
                         (field.submitFormat && field.isXType('combobox'))
-                    ) {
-                        params[name] = value;
-                    } else if (Ext.isDate(value)) {
-                        params[name] = valuesAsIs ? value : Ext.Date.format(value, dateFormat || Coon.format.dateTimeInternal);
-                    } else if (field.submitFormat) {
-                        params[name] = value;
-                    } else {
-                        Ext.apply(params, value);
-                    }
-                }
+            ) {
+                params[name] = value;
+            } else if (field.submitFormat) {
+                params[name] = value;
+            } else {
+                Ext.apply(params, value);
             }
         }
         return params;

package/src/common/field/ForeignField.js

@@ -39,7 +39,7 @@ Ext.define('Coon.common.field.ForeignField', {
         if (this.searchForm) {
             console.warn('Not lazy initialization for Foreign field. ' +
                 'Use createSearchForm function instead explicit set searchForm property');
-            console.trace();
+            Coon.log.trace();
         }
         this.callParent(arguments);
     },

package/src/common/panel/WindowWrap.js

@@ -48,6 +48,15 @@ Ext.define('Coon.common.panel.WindowWrap', {
         }
     },
 
+    addToolBefore: function(toolsCfg) {
+        const header = this.getHeader();
+        const tool = Ext.ComponentManager.create(toolsCfg, 'tool');
+        if (header.getComponent(1)) {
+            header.insert(tool);
+            header.moveBefore(tool, header.getComponent(1));
+        }
+    },
+
     ghost: function(cls) {
         return this.callParent([cls || 'window-wrap']);
     },

package/src/report/component/ReportPanel.js

@@ -62,6 +62,7 @@ Ext.define('Coon.report.component.ReportPanel', {
         groupSortFunc: null,
         preventDblClick: false,
         enableHighlightingRequiredFields: false,
+        enableChipToolbar: false,
     },
     defaults: {
         split: true,
@@ -343,7 +344,14 @@ Ext.define('Coon.report.component.ReportPanel', {
             cls: 'buttonsCenterFilterPanel',
         }));
         this.dockedItems = [].concat(this.dockedItems || []);
+
+        this.filterConditionToolbar = Ext.widget('FilterConditionToolbar', {
+            closableFilterCondition: false,
+            dock: 'top',
+        });
+
         this.dockedItems.push(this.northPanel);
+        this.dockedItems.push(this.filterConditionToolbar);
 
         this.items = [
             this.centerPanel
@@ -401,7 +409,7 @@ Ext.define('Coon.report.component.ReportPanel', {
             return this.fireEvent('beforeselect', this, record);
         }, this);
 
-        this.relayEvents(this.grid, ['needReload', 'shouldReload', 'close', 'configured', 'datachanged', 'load', 'itemdblclick']);
+        this.relayEvents(this.grid, ['needReload', 'shouldReload', 'close', 'configured', 'datachanged', 'load', 'itemdblclick', 'filterchange']);
     },
 
     /**
@@ -532,6 +540,7 @@ Ext.define('Coon.report.component.ReportPanel', {
 
     configureGrid: function(ReportBean) {
         this.grid = this.createGrid(ReportBean);
+        this.grid.on('added', this.chipsInit, this);
         this.centerPanel.add(this.grid);
         this.initGridEvents();
         // this.grid.getColumnModel().autoSizeAllColumn();
@@ -633,6 +642,10 @@ Ext.define('Coon.report.component.ReportPanel', {
             });
         }
 
+        if (this.getEnableChipToolbar()) {
+            this.filterConditionToolbar && this.filterConditionToolbar.show();
+        }
+
         this.configureGrid(reportFormBean);
 
         this.configureNorthPanel(reportFormBean);
@@ -894,6 +907,7 @@ Ext.define('Coon.report.component.ReportPanel', {
         if (this.northPanel.isValid()) {
             this.grid.clear();
             this.currentParamList = this.northPanel.collectParams();
+            this.fireEvent('filterhandlerevent');
             this.beforeCommandExecuter(this.beforeApplyFilterCommand(this), [this.currentParamList], function() {
                 this.loadData(this.currentParamList, typeof invalidateCache === 'boolean' && invalidateCache);
             });
@@ -974,4 +988,31 @@ Ext.define('Coon.report.component.ReportPanel', {
         const selectedRecords = this.grid.getSelection();
         return selectedRecords && selectedRecords.length > 0 && firstSelectedOnly ? selectedRecords[0] : selectedRecords;
     },
+
+    chipsInit: function() {
+        const grid = this.grid;
+        const panel = grid.findParentByType('ReportPanel');
+
+        if (this.getEnableChipToolbar()) {
+            this.filterConditionToolbar.on('chipdelete', this.onChipDelete.bind(this, panel));
+            this.filterConditionToolbar.on('clear', function() {
+                this.clearFilter();
+                this.clearData();
+            }, this);
+            this.filterConditionToolbar.on('needreload', function() {
+                this.filterHandler();
+            }, this);
+
+            panel && panel.on('filterhandlerevent', function() {
+                this.filterConditionToolbar.fireEvent('rememberconditions');
+            }, this);
+        }
+    },
+
+    onChipDelete: function(reportPanel) {
+        if (!reportPanel) {
+            return;
+        }
+        reportPanel.filterHandler();
+    },
 });

package/src/report/component/reportpanel/NorthPanel.js

@@ -217,4 +217,7 @@ Ext.define('Coon.report.component.report.NorthPanel', {
             this.searchButton.btnWrap.addCls(this.searchButton.getSplitCls());
         }
     },
+    onChipDeleteHandler() {
+        Coon.log.debug('onChipDeleteHandler', 'Удалили чип, делаем поиск');
+    },
 });

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

@@ -15,6 +15,10 @@
         border-top: 1px solid $panel-header-background-color;
       }
     }
+    .filtered-column {
+      font-style: italic;
+      font-weight: bold;
+    }
   }
 
   &:has(.hover-cell:hover, .editable-cell:hover) .editable-cell::before{

package/src/report/component/settings/property/ReportPropertiesPanel.js

@@ -75,7 +75,6 @@ Ext.define('Coon.report.component.settings.property.ReportPropertiesPanel', {
                             },
                             viewConfig: {
                                 getRowClass: function(record) {
-                                    // console.log('record', record);
                                     if (record.get('isDeleted')) {
                                         return 'is-deleted';
                                     }

package/src/report/component/settings/property/ReportPropertyDictionary.js

@@ -77,6 +77,9 @@ Ext.define('Coon.report.component.settings.property.ReportPropertyDictionary', {
                         findButtonConfig: {
                             onVal: true,
                         },
+                        enableChipToolbar: {
+                            onVal: true,
+                        },
                     },
                 },
                 {
@@ -177,6 +180,14 @@ Ext.define('Coon.report.component.settings.property.ReportPropertyDictionary', {
                     singleValue: true,
                     description: 'Свойство даёт возможность скрывать/показывать фильтры панели по кнопке.',
                 },
+                {
+                    id: 'enableChipToolbar',
+                    leaf: true,
+                    singleValue: true,
+                    description: 'Свойство включает видимость тулбара с чипами. В чипах отображаются критерии поиска. ' +
+                        '<a href="https://confluence.sigma-it.ru/pages/viewpage.action?pageId=636874446" target="_blank"> ' +
+                        'Описание <i class="fas fa-external-link-alt"></i></a>',
+                },
                 {
                     id: 'enableHighlightingRequiredFields',
                     leaf: true,

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

@@ -0,0 +1,195 @@
+Ext.define('Coon.report.plugin.configPanel.AddFilterConditionPluginConfigPanel', {
+    extend: 'Coon.report.plugin.configPanel.BasePluginConfig',
+    alias: 'widget.AddFilterConditionPluginConfigPanel',
+    description: 'Плагин, позволяющий фильтровать данные репорта локально по значению выбранной ячейки.' +
+        ' Добавляет в контекстное меню ячейки пункты меню, отвечающие за фильтрацию. Меню открывается правым кликом мыши по ячейке грида.',
+    tags: ['ФИЛЬТРЫ'],
+    config: {
+        pluginTypeSettings: {
+            defaultType: 'GRID_PLUGIN',
+            allowedTypes: [
+                'GRID_PLUGIN'
+            ],
+        },
+    },
+    cls: 'AddFilterConditionPluginConfigPanel',
+    createItems: function() {
+        this.filterField = Ext.create('Ext.panel.Panel', {
+            width: 700,
+            tbar: [
+                {
+                    xtype: 'toolbar',
+                    layout: 'hbox',
+                    items: [
+                        {
+                            xtype: 'segmentedbutton',
+                            allowMultiple: false,
+                            items: [
+                                {
+                                    text: 'All',
+                                    ui: 'FilterSegmentedButton',
+                                    tooltip: 'показать все',
+                                    handler: this.showAll.bind(this),
+                                    pressed: true,
+                                },
+                                {
+                                    tooltip: 'показать видимые',
+                                    ui: 'FilterSegmentedButton',
+                                    iconCls: 'x-fa fa-eye',
+                                    handler: this.showVisibleFields.bind(this),
+                                },
+                                {
+                                    tooltip: 'показать невидимые',
+                                    iconCls: 'x-fa fa-eye-slash',
+                                    handler: this.showInvisibleFields.bind(this),
+                                    ui: 'FilterSegmentedButton',
+                                }
+                            ],
+                        },
+                        {
+                            xtype: 'textfield',
+                            fieldLabel: 'Поиск',
+                            width: 300,
+                            labelWidth: 50,
+                            listeners: {
+                                change: {
+                                    fn: this.filter,
+                                    buffer: 300,
+                                    scope: this,
+                                },
+                            },
+                            triggers: {
+                                clear: {
+                                    cls: 'svg-icon svg-icon-cancel-small',
+                                    tooltip: 'Очистить поле',
+                                    hidden: false,
+                                    handler: function() {
+                                        this.clear();
+                                    },
+                                },
+                            },
+                        }
+                    ],
+                }
+            ],
+        });
+
+        this.grid = Ext.create('Ext.grid.Panel', {
+            title: 'Поля репорта',
+            height: 'auto',
+            store: {
+                fields: [
+                    'byCellValueFilterable', 'visibleSwitch', 'reportFieldCd', 'description', 'reportFieldTypeLookup'
+                ],
+            },
+            columns: [
+                {
+                    xtype: 'actioncolumn',
+                    width: 50,
+                    menuDisabled: true,
+                    sortable: false,
+                    items: [{
+                        getClass(v, meta, record) {
+                            meta.tdAttr = `data-qtip = "${record.get('visibleSwitch') ? 'поле видимо' : 'поле не видимо'}"`;
+                            return record.get('visibleSwitch') ? 'x-fa fa-eye' : 'x-fa fa-eye-slash';
+                        },
+                    }],
+                },
+                {
+                    xtype: 'checkcolumn',
+                    dataIndex: 'byCellValueFilterable',
+                    text: 'Фильтрация</br>по полю',
+                    tooltip: 'Фильтрация по полю',
+                    width: 100,
+                },
+                {
+                    dataIndex: 'reportFieldCd',
+                    text: 'Поле',
+                    width: 200,
+                },
+                {
+                    xtype: 'hintColumn',
+                    dataIndex: 'description',
+                    text: 'Описание',
+                    flex: 1,
+                },
+                {
+                    xtype: 'hintColumn',
+                    dataIndex: 'reportFieldTypeLookup',
+                    text: 'Тип',
+                    width: 150,
+                }
+            ],
+        });
+
+        return [
+            this.addToContextMenu,
+            this.filterField,
+            this.grid
+        ];
+    },
+
+    filter: function(_, value) {
+        const store = this.grid.getStore();
+        store.clearFilter();
+        store.filterBy(function(record) {
+            const result = record.get('reportFieldCd').includes(value) ||
+                record.get('description').includes(value) ||
+                record.get('reportFieldTypeLookup').includes(value);
+            return result;
+        }, this);
+    },
+
+    showAll: function() {
+        const store = this.grid.getStore();
+        store.clearFilter();
+    },
+
+    showVisibleFields: function() {
+        const store = this.grid.getStore();
+        store.clearFilter();
+        store.filterBy((record) => record.get('visibleSwitch'));
+    },
+
+    showInvisibleFields: function() {
+        const store = this.grid.getStore();
+        store.clearFilter();
+        store.filterBy((record) => !record.get('visibleSwitch'));
+    },
+
+    setContext(context) {
+        this.context = Ext.clone(context);
+    },
+
+    doInit: function(config) {
+        this.callParent(arguments);
+        const filterOptions = Ext.decode(config.filterOptions, true);
+        if (this.context.fields.length) {
+            const newData = [];
+            this.context.fields.forEach(function(field) {
+                newData.push({
+                    reportFieldCd: field.reportFieldCd,
+                    description: field.description,
+                    reportFieldTypeLookup: field.reportFieldTypeLookup,
+                    byCellValueFilterable: filterOptions ? filterOptions[field.reportFieldCd] : false,
+                    visibleSwitch: field.visibleSwitch,
+                });
+            }, this);
+            this.grid.getStore().loadData(newData);
+        }
+    },
+
+    getConfiguration() {
+        return {
+            filterOptions: JSON.stringify(this.grid.getStore().getRange().reduce(
+                function(acc, current) {
+                    if (current.get('byCellValueFilterable')) {
+                        acc[current.get('reportFieldCd')] = current.get('byCellValueFilterable');
+                    }
+                    return acc;
+                },
+                {}
+            )),
+        };
+    },
+});

package/src/report/plugin/configPanel/AddFilterConditionPluginConfigPanel.scss

@@ -0,0 +1,53 @@
+.AddFilterConditionPluginConfigPanel {
+        .svg-icon{
+                height: 24px;
+                width: 24px;
+        }
+        .fa{
+                height: 24px;
+                width: 24px;
+                padding-top: 6px;
+                color: black;
+        }
+
+        .x-segmented-button-item{
+                background-color: transparent;
+        }
+        .x-segmented-button-item:hover{
+                background-color: rgba(61, 103, 128, 0.04);
+        }
+        .x-segmented-button-item:active{
+                background-color: rgba(61, 103, 128, 0.12);
+        }
+        .x-btn-pressed .x-btn-icon-el {
+                color: #ffffff !important;
+        }
+        .x-segmented-button .x-segmented-button-item .x-btn-inner{
+                color: #3D6780;
+        }
+        .x-segmented-button .x-segmented-button-item .x-btn-icon-el{
+                color: #3D6780;
+        }
+        .x-btn-icon-el{
+                color: #3D6780;
+        }
+}
+
+@include extjs-button-small-ui(
+        $ui: 'FilterSegmentedButton',
+        $padding: 8px 12px,
+        $color: #3D6780,
+        $icon-size: 16px,
+
+        $background-color-over: rgba(61, 103, 128, 0.04),
+        $background-color-focus-over: rgba(61, 103, 128, 0.04),
+
+        $background-color-pressed: rgba(61, 103, 128, 0.12),
+        $background-color-focus-pressed: rgba(61, 103, 128, 0.12),
+
+
+        $border-color: 'none',
+        $background-color: transparent,
+        $border-color-focus: #3D6780,
+        $background-color-focus: rgba(61, 103, 128, 0.12)
+);