ru.coon 2.5.63 → 2.5.64

package/CHANGELOG.md

@@ -1,8 +1,24 @@
+# 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: 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'> 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))
+
+* remove unnecessary filterItemsOnRow property ([772f61], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/772f6190df8b958bd6ff97e5731a59971c9a11fc))
+* 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)
 * BFL-10644 ([e02d63], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e02d636d78004a9687ab5715ce2787fcf50abe5a))
 * update: CHANGELOG.md ([e3238f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e3238fb0cd5428b0f941440a297868db68ae4f69))
 
 # Version 2.5.62, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/aeeccacd770cc533281e3d05d7d840b35607ebf9)
+* ## Features
+* <span style='color:green'>feat: HT-7281 GridEditorPlugin editor dependField</span> ([cbf672], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cbf67227388b27e73167666922835d1689d88a0d))
+
 * ## Fixes
 * <span style='color:red'> HT-7718: add check - break chain when method return false in MethodChainPlugin. reject error on command complete failure in ExecuteCommandPlugin</span> ([293aae], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/293aae575e1abb231ecc07fc6707880eecba61ad))
 
@@ -10,6 +26,7 @@
 
 # Version 2.5.61, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8b05280ab5f9f1f4f80aa8f7bdff7755ff8d5cb1)
 * ## Features
+* <span style='color:green'>feat: HT-7281 GridEditorPlugin editor dependField</span> ([cbc841], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cbc84116414b7d52c8711e4085f8711707c15a24))
 * <span style='color:green'>Feat:HT-7506 Add search by substring in SimpleReportTag</span> ([44ed94], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/44ed94ddfeea30f605174f005ee314211d21a022))
 
 * ## Fixes
@@ -79,6 +96,7 @@
 * <span style='color:green'>feat: HT-7346: remove callback prepare data function</span> ([968a10], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/968a10cd85fb68fb13f4f3887d1785c73934e4cd))
 * <span style='color:green'>feat: BFL-10334: add export csv button</span> ([5c067e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5c067e688795ac9b4341be80ab0909572d899f90))
 * <span style='color:green'>feat: BFL-10334: add export csv button</span> ([afe199], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/afe199fc47b3587dc076debbc9b8e824c4421ed8))
+* <span style='color:green'>feat: HT-7281 GridEditorPlugin editor dependField</span> ([b4b805], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b4b805ab85470c7af499b6f66d11de7746a847ca))
 * <span style='color:green'>feat: HT-7346: get save function return value for call close window functiion</span> ([f0bea7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f0bea74091a045b2477d8518d5d07c4ee2ae3fa1))
 * <span style='color:green'>feat: HT-7346: get save function return value for call close window functiion</span> ([86806d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/86806d51d6a38fce1a4754d3c8497a6957841e1d))
 
@@ -105,6 +123,7 @@
 # Version 2.5.50, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b79597948d4412d8613b028e5e07e49cfb173eb4)
 * ## Features
 * <span style='color:green'>feat: HT-7346: rename plugin</span> ([e06f2c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e06f2cd09c83890ca955c6a11d3071a8d31a1528))
+* <span style='color:green'>feat: HT-7281 GridEditorPlugin editor dependField</span> ([8496f6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8496f6811c6e744652641758f2af3b49c358c51c))
 
 * update: CHANGELOG.md ([9ca215], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9ca2159b8222b4953516c7720fc9f5dbe03e4337))
 
@@ -145,6 +164,9 @@ fix ExecuteCommandPlugin - remove reject on failure if command hasnt erorHandler
 * update: CHANGELOG.md ([4d5a2a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4d5a2ac3120c4aba6a672256fc7cc977014f3591))
 
 # Version 2.5.46, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a60918e34030d42d694153e8a86fa2c13c97e3a0)
+* ## Fixes
+* <span style='color:red'>fix ReportSqlPreviewPanel buttons</span> ([850095], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/850095956abc939ab8e45f18e19f4d50d3963e96))
+
 * Update src/util.js ([da9c30], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/da9c307688b60cfa198137929578f257e3d0645f))
 * HT-7570 Падает SelectionModelFeature ([df48e2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/df48e24511eec0e5572d30984fbf6d24ec2e09cd))
 * HT-7570 Падает SelectionModelFeature ([09366e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/09366ee08c7700ba03ea46ebb5bc9461963ea9d3))
@@ -161,6 +183,9 @@ fix ExecuteCommandPlugin - remove reject on failure if command hasnt erorHandler
 * update: CHANGELOG.md ([8b0186], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8b0186d787ec77ad2a4dfc211e85c8ffadee6559))
 
 # Version 2.5.44, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0c4d4a663ae3451dec321c0d68bf1d5c8d70ff58)
+* ## Features
+* <span style='color:green'>feat: Добавлен просмотр шаблона запроса в сравнении с оригинальным текстом запроса. Closes HT-7489.</span> ([10ea27], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/10ea27c06ddbb48922272c25643da3a2a98c23f7))
+
 * ## Fixes
 * <span style='color:red'> HT-7469: commit store state on doInit action. This method remove all modified records from store state</span> ([34c025], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/34c02583013b66314a74c2fbc9512f04f218d85e))
 

package/package.json

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

package/src/common/component/editor/creators/TimeEditorCreator.js

@@ -0,0 +1,14 @@
+Ext.define('Coon.common.component.editor.creators.TimeEditorCreator', {
+    extend: 'Coon.common.component.editor.creators.BaseEditorCreator',
+    alias: 'widget.TimeEditorCreator',
+
+    createField: function(record, parent) {
+        const charNs = Coon.report.model.CharacteristicBeanFields;
+
+        return Ext.create({
+            xtype: 'DeliveryTimeField',
+            format: record.get(charNs.$mask).trim() || 'H:i',
+            increment: 60,
+        });
+    },
+});

package/src/common/field/DeliveryTimeField.js

@@ -0,0 +1,30 @@
+Ext.define('Coon.common.field.DeliveryTimeField', {
+    extend: 'Ext.form.field.Time',
+    alias: 'widget.DeliveryTimeField',
+    displayField: 'date',
+
+    initComponent: function() {
+        this.callParent();
+        this.bindStore(this.createStore(), false);
+    },
+
+    createStore: function() {
+        const initDate = [2008, 0, 1];
+        const times = [];
+        let min = new Date(initDate[0], initDate[1], initDate[2], 8);
+        const max = new Date(initDate[0], initDate[1], initDate[2] + 1, 7);
+
+        while (min <= max) {
+            times.push({
+                date: Ext.Date.format(min, this.format),
+            });
+            min = Ext.Date.add(min, 'mi', this.increment);
+        }
+
+        return times;
+    },
+
+    getValue: function() {
+        return this.rawValue;
+    },
+});

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

@@ -16,4 +16,15 @@
       }
     }
   }
+
+  &:has(.hover-style:hover, .create-line-left:hover) .create-line-left::before{
+    content: " ";
+    background: #BDBDBD;
+    width: 3px;
+    height: 26px;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    margin: auto 0;
+  }
 }

package/src/report/component/settings/common/ReportFormCommonPanel.js

@@ -22,6 +22,7 @@ Ext.define('Coon.report.component.settings.common.ReportFormCommonPanel', {
             collapseToolText: 'Свернуть',
             expandToolText: 'Развернуть',
             titlePosition: 1,
+            bodyPadding: 10,
             layout: {
                 type: 'vbox',
                 align: 'stretch',
@@ -89,7 +90,7 @@ Ext.define('Coon.report.component.settings.common.ReportFormCommonPanel', {
             items: [
                 {
                     xtype: 'button',
-                    text: 'Скопировать для "PL/SQL"',
+                    text: 'Скопировать запрос',
                     ui: 'blue-text-button-border',
                     maxWidth: 200,
                     copyData: undefined,
@@ -106,34 +107,16 @@ Ext.define('Coon.report.component.settings.common.ReportFormCommonPanel', {
                 },
                 {
                     xtype: 'button',
-                    text: 'Предпросмотр SQL',
+                    text: 'Посмотреть шаблон запроса...',
                     ui: 'blue-text-button-border',
                     handler: 'sqlPreviewHandler',
                     margin: '0 0 0 20px',
                 },
-                {
-                    xtype: 'segmentedbutton',
-                    stateId: 'ReportFormCommonPanel.sqlmode',
-                    margin: '0 0 0 20px',
-                    items: [
-                        {
-                            itemId: 'sql',
-                            text: 'SQL',
-                            pressed: true,
-                            handler: 'chooseSqlMode',
-                        },
-                        {
-                            itemId: 'pgsql',
-                            text: 'PgSQL',
-                            handler: 'chooseSqlMode',
-                        }
-                    ],
-                },
                 {
                     xtype: 'splitbutton',
                     margin: '0 0 0 20px',
                     ui: 'blue-text-button-border',
-                    text: 'Украсить SQL',
+                    text: 'Форматировать запрос',
                     handler: 'beautifySQL',
                     menu: [
                         {
@@ -147,7 +130,7 @@ Ext.define('Coon.report.component.settings.common.ReportFormCommonPanel', {
         },
         {
             xtype: 'UiAceEditor',
-            mode: 'sql',
+            mode: 'pgsql',
             cls: 'textareastyle',
             reference: 'reportSQLField',
             flex: 1,

package/src/report/component/settings/common/ReportFormCommonPanelController.js

@@ -1,6 +1,7 @@
 Ext.define('Coon.report.component.settings.common.ReportFormCommonPanelController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.ReportFormCommonPanelController',
+    requires: ['Coon.report.component.settings.common.ReportSqlBeautifierPanel'],
     defaultBeautifierConfig: {
         language: 'plsql',
         keywordCase: 'upper',
@@ -16,15 +17,6 @@ Ext.define('Coon.report.component.settings.common.ReportFormCommonPanelControlle
         this.beautifierConfig = Ext.apply({}, this.defaultBeautifierConfig);
     },
 
-    chooseSqlMode: function(button) {
-        const vm = this.getViewModel();
-        const editor = this.lookup('reportSQLField').editor;
-        const language = button.itemId === 'sql' ? 'plsql' : 'postgresql';
-        editor.session.setMode(`ace/mode/${button.itemId}`);
-        this.defaultBeautifierConfig.language = language;
-        vm.set('language', language);
-    },
-
     reportTypeChangeHandler: function(field) {
         const pageSizeField = this.lookup('pageSizeField');
         const type = field.getValue();
@@ -50,11 +42,25 @@ Ext.define('Coon.report.component.settings.common.ReportFormCommonPanelControlle
     },
 
     sqlPreviewHandler: function() {
-        const panel = Ext.create('widget.ReportSqlPreviewPanel');
+        const reportProps = this.getViewModel().get('report.properties');
+        let isEnabled = false;
+        if (Array.isArray(reportProps)) {
+            isEnabled = reportProps.find((prop) => prop.key === 'TEMPLATE' && prop.value === 'FREEMARKER');
+        }
+        const sourceEditor = this.lookup('reportSQLField').editor;
+        if (sourceEditor.getValue() === '') {
+            Ext.MessageBox.alert('Ошибка', 'Пустой текст запроса.');
+            return;
+        }
+        if (!isEnabled) {
+            Ext.MessageBox.alert('Информация', 'Необходимо добавить свойство отчета "TEMPLATE" со значением "FREEMARKER".');
+            return;
+        }
+        const panel = Ext.create('widget.ReportSqlPreviewPanel', {sourceEditor});
         const win = Ext.widget('WindowWrap', {
             maximized: true,
             maximizable: false,
-            title: 'Предпросмотр SQL запроса',
+            title: 'Шаблон запроса',
             items: panel,
         });
         win.show();
@@ -62,25 +68,29 @@ Ext.define('Coon.report.component.settings.common.ReportFormCommonPanelControlle
     },
 
     openBeautifierSettings: function() {
-        const win = Ext.create('widget.WindowWrap', {items: [{xtype: 'ReportSqlBeautifierPanel'}],
-            dockedItems: [{
-                xtype: 'toolbar',
-                dock: 'bottom',
-                items: ['->',
-                    {
-                        xtype: 'button',
-                        ui: 'orange-button',
-                        text: 'Сохранить',
-                        handler: () => this.saveBeautifierConfig(win),
-                    },
-                    {
-                        xtype: 'button',
-                        ui: 'orange-button',
-                        text: 'Отмена',
-                        handler: () => win.close(),
-                    }
-                ],
-            }]});
+        const win = Ext.create('widget.WindowWrap', {
+            items: [{xtype: 'ReportSqlBeautifierPanel', viewModel: true}],
+            dockedItems: [
+                {
+                    xtype: 'toolbar',
+                    dock: 'bottom',
+                    items: [
+                        '->',
+                        {
+                            xtype: 'button',
+                            ui: 'orange-button',
+                            text: 'Сохранить',
+                            handler: () => this.saveBeautifierConfig(win),
+                        },
+                        {
+                            xtype: 'button',
+                            ui: 'orange-button',
+                            text: 'Отмена',
+                            handler: () => win.close(),
+                        }
+                    ],
+                }],
+        });
         this.setBeautifierConfigFieldsData(win);
         win.show();
     },
@@ -115,7 +125,7 @@ Ext.define('Coon.report.component.settings.common.ReportFormCommonPanelControlle
         try {
             const editor = this.lookup('reportSQLField').editor;
             this.beautifierConfig.language = this.defaultBeautifierConfig.language;
-            editor.getSession().setValue(Ext.formatSQL(editor.getSession().getValue(), this.beautifierConfig));
+            editor.setValue(Ext.formatSQL(editor.getSession().getValue(), this.beautifierConfig), -1);
         } catch (e) {
             Coon.log.error(e);
         }

package/src/report/component/settings/common/ReportSqlPreviewPanel.js

@@ -9,38 +9,137 @@ Ext.define('Coon.report.component.settings.common.ReportSqlPreviewPanel', {
         type: 'vbox',
         align: 'stretch',
     },
-
     items: [
         {
             xtype: 'panel',
-            id: 'filterPanelContainerId',
-            scrollable: true,
-            flex: 1,
-            items: [],
-            bbar: [{
-                text: 'Обновить',
-                ui: 'blue-text-button-border',
-                itemId: 'showPreview',
-            }],
+            layout: {
+                type: 'hbox',
+                align: 'stretch',
+            },
+            items: [
+                {
+                    xtype: 'panel',
+                    itemId: 'filterPanelContainer',
+                    scrollable: true,
+                    flex: 1,
+                    bodyPadding: 20,
+                    items: [],
+                },
+                {
+                    xtype: 'container',
+                    maxWidth: 200,
+                    margin: '10 0',
+                    autoHeight: true,
+                    layout: {
+                        type: 'hbox',
+                        align: 'end',
+                    },
+                    defaults: {
+                        margin: '0 16 0 0',
+                        xtype: 'button',
+                    },
+                    items: [
+                        {
+                            text: 'Обновить шаблон',
+                            ui: 'blue-text-button-border',
+                            itemId: 'showPreview',
+                        }
+                    ],
+                }
+            ],
         },
         {
-            xtype: 'textareafield',
-            xtype: 'UiAceEditor',
-            mode: 'sql',
-            id: 'textareafieldId',
-            cls: 'textareastyle',
-            reference: 'reportSQLPreviewField',
-            emptyText: 'Select * from...',
-            scrollable: true,
+            xtype: 'container',
+            itemId: 'diffContainer',
             flex: 2,
             margin: 5,
-            readOnly: true,
+            layout: {
+                type: 'vbox',
+                align: 'stretch',
+            },
+            items: [
+                {
+                    xtype: 'container',
+                    height: 30,
+                    layout: {
+                        type: 'hbox',
+                        align: 'stretch',
+                    },
+                    items: [
+                        {
+                            xtype: 'displayfield',
+                            value: 'Шаблон запроса',
+                            style: 'text-align:center;',
+                            flex: 1,
+                        },
+                        {
+                            xtype: 'displayfield',
+                            value: 'Текст запроса',
+                            style: 'text-align:center;',
+                            flex: 1,
+                        }
+                    ],
+                },
+                {
+                    xtype: 'box',
+                    flex: 1,
+                    id: 'diffTarget',
+                }
+            ],
         }
     ],
 
     initComponent() {
         this.callParent();
         this.down('#showPreview').on('click', this.showPreview, this);
+        this.getComponent('diffContainer').on('render', this.renderDiff.bind(this));
+        this.on('beforedestroy', this.disposeDiff.bind(this));
+    },
+
+    disposeDiff() {
+        this.diff && this.diff.destroy();
+    },
+    renderDiff(container) {
+        if (!this.sourceEditor) {
+            Coon.log.error('Не передан параметр "sourceEditor"');
+            return;
+        }
+        this.leftEditor = {
+            id: 'ace-diff-left',
+            content: '',
+            editable: false,
+            copyLinkEnabled: false,
+        };
+        this.diff = new Ext.xAceDiff({
+            element: container.el.dom.querySelector('#diffTarget'),
+            left: this.leftEditor,
+            mode: this.sourceEditor.getSession().getMode()['$id'],
+            theme: this.sourceEditor.getTheme(),
+            right: {
+                id: 'ace-diff-right',
+                content: this.sourceEditor.getValue(),
+                editable: false,
+                copyLinkEnabled: false,
+            },
+        });
+        const left = this.diff.editors.left.ace;
+        const right = this.diff.editors.right.ace;
+        let rightScrolling = false;
+        let leftScrolling = false;
+        right.getSession().on('changeScrollTop', function(scroll) {
+            if (!rightScrolling) {
+                rightScrolling = true;
+                left.getSession().setScrollTop(scroll || 0);
+            }
+            rightScrolling = false;
+        });
+        left.getSession().on('changeScrollTop', function(scroll) {
+            if (!leftScrolling) {
+                leftScrolling = true;
+                right.getSession().setScrollTop(scroll || 0);
+            }
+            leftScrolling = false;
+        });
     },
 
     doInit(report) {
@@ -71,24 +170,28 @@ Ext.define('Coon.report.component.settings.common.ReportSqlPreviewPanel', {
             configurationList: configList,
             plugins: reportPlugins,
         });
-        filterPanel.height += 10; // т.к. filterPanel.frame == true
-
-        this.down('#filterPanelContainerId').add(filterPanel);
-        this.down('#filterPanelContainerId').updateLayout();
+        const container = this.down('#filterPanelContainer');
+        container.add(filterPanel);
+        container.updateLayout();
+        this.showPreview();
     },
 
     showPreview() {
-        const previewField = this.down('#textareafieldId');
-        previewField.setValue('');
+        this.mask();
         fetch(this.getOptions())
-            .then((response) => response.text())
-            .then((text) => previewField.setValue(text))
-            .catch(Coon.log.error);
+            .then((response) => response.text()).then((text) => {
+                this.unmask();
+                this.diff.editors.left.ace.setValue(text, -1);
+                Ext.toast('Шаблон загружен.');
+            }).catch((error) => {
+                this.unmask();
+                Coon.log.error(error);
+            });
     },
 
     getOptions() {
         const parameterList = [];
-        const currentParamList = Coon.Function.getDataFromForm(this.down('#filterPanelContainerId'), false);
+        const currentParamList = Coon.Function.getDataFromForm(this.down('#filterPanelContainer'), false);
         for (const key in currentParamList) {
             if (currentParamList.hasOwnProperty(key)) {
                 if (!Ext.isEmpty(currentParamList[key])) {

package/src/report/component/settings/parameter/ReportFormParameterEditPanelController.js

@@ -49,14 +49,16 @@ Ext.define('Coon.report.component.settings.parameter.ReportFormParameterEditPane
         filterPanelContainer.removeAll();
         this.highlightedFilterField = null;
         const northPanel = Ext.widget('NorthPanel', {
-            filterItemsOnRow: reportProperties['filterItemsOnRow'] || 4,
             enableHighlightingRequiredFields: isValidationPlugin || reportProperties['enableHighlightingRequiredFields'],
             buttonsContainerConfig: {hidden: true},
             filterPlugins: reportPlugins,
             docked: 'top',
             header: false,
         });
-        northPanel.configureFilterPanel({parameters: this.getConfigurationList()});
+        northPanel.configureFilterPanel({
+            parameters: this.getConfigurationList(),
+            properties: {filterItemsOnRow: reportProperties['filterItemsOnRow']},
+        });
         this.filterContainer = northPanel.filterContainer;
         filterPanelContainer.add(northPanel);
         filterPanelContainer.updateLayout();

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

@@ -202,11 +202,11 @@ Ext.define('Coon.report.component.settings.property.ReportPropertiesPanelControl
         }
         if (record.get('isNew')) {
             record.remove();
-            this.lookup('descriptionField').reset();
-            this.lookup('propertyValueContainer').removeAll();
         } else {
             record.set('isDeleted', !record.get('isDeleted'));
         }
+        this.lookup('descriptionField').reset();
+        this.lookup('propertyValueContainer').removeAll();
     },
 
     onAddHandler() {

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

@@ -21,33 +21,206 @@ Ext.define('Coon.report.plugin.configPanel.GridEditorPluginConfig', {
     },
 
     createItems: function() {
-        this.grid = Ext.create('Coon.report.plugin.configPanel.GridEditorPluginConfigGrid', {
+        this.layout = 'fit';
+        this.fieldEditor = this.createFieldColumns({
+            hideLabel: true,
+            allowBlank: false,
+        });
+        const ns = Coon.report.model.CharacteristicBeanFields;
+        this.grid = Ext.create('Ext.grid.Panel', {
             flex: 1,
-            fieldEditor: this.createFieldColumns({
-                hideLabel: true,
-                allowBlank: false,
-            }),
+            region: 'center',
+            store: {
+                type: 'json',
+                data: [],
+            },
+            tbar: {
+                defaults: {
+                    margin: 5,
+                },
+                items: [
+                    {
+                        xtype: 'button',
+                        text: 'Добавить',
+                        ui: 'blue-text-button-border',
+                        handler: Ext.bind(this.addHandler, this),
+                    },
+                    {
+                        xtype: 'button',
+                        text: 'Удалить',
+                        ui: 'blue-text-button-border',
+                        handler: Ext.bind(this.deleteHandler, this),
+                    }
+                ],
+            },
+            columns: [
+                {
+                    header: 'Поле',
+                    dataIndex: ns.$type,
+                    xtype: 'hintColumn',
+                    editor: this.fieldEditor,
+                    flex: 1,
+                }
+            ],
+            plugins: [
+                {ptype: 'cellediting', clicksToEdit: 2}
+            ],
+            listeners: {
+                select: function(grid, record) {
+                    Coon.Function.clearAllFieldsOnForm(this.editForm);
+                    const recordConfig = this.editorConfig.find((el) => el.type === record.get(ns.$type));
+                    Coon.Function.fillFormFields(this.editForm, recordConfig);
+                    if (recordConfig[ns.$mask]) {
+                        this.editForm.down('UiAceEditor').setValue(recordConfig[ns.$mask]);
+                    }
+                    this.editForm.setDisabled(!record);
+                }.bind(this),
+                deselect: this.setEditorConfig.bind(this),
+            },
         });
 
-        return [
-            this.grid
-        ];
+        this.editForm = Ext.create({
+            xtype: 'form',
+            region: 'east',
+            header: {
+                title: 'Редактор',
+                height: 55,
+            },
+            disabled: true,
+            flex: 2,
+            defaults: {
+                margin: 10,
+                anchor: '100%',
+            },
+            items: [
+                {
+                    fieldLabel: 'Тип редактора',
+                    name: ns.$typeOfValue,
+                    xtype: 'lookupCombo',
+                    lookupId: 'ADHOC_CHAR_TYPE_FLG',
+                    submitFormat: false,
+                    allowBlank: false,
+                    loadOnRender: false,
+                },
+                {
+                    boxLabel: 'Значение обязательно',
+                    name: ns.$required,
+                    xtype: 'checkbox',
+                },
+                {
+                    title: 'Редактировать в зависимости от поля',
+                    xtype: 'fieldset',
+                    checkboxName: 'dependsOnField',
+                    checkboxToggle: true,
+                    layout: {
+                        type: 'vbox',
+                        align: 'stretch',
+                    },
+                    defaults: {
+                        flex: 1,
+                    },
+                    items: [
+                        {
+                            xtype: 'checkbox',
+                            boxLabel: 'Редактировать если значение поля false/пусто',
+                            name: 'invertValue',
+                        },
+                        this.createFieldColumns({
+                            name: 'dependsOnFieldName',
+                        }),
+                        {
+                            boxLabel: 'Выделить редактируемые ячейки',
+                            name: 'highlightEditableCells',
+                            xtype: 'checkbox',
+                        }
+                    ],
+                },
+                {
+                    xtype: 'fieldset',
+                    title: 'Конфиг',
+                    height: 200,
+                    items: [
+                        {
+                            xtype: 'UiAceEditor',
+                            useLinter: true,
+                            scrollable: 'y',
+                            name: ns.$mask,
+                            value: {},
+                        }
+                    ],
+                }
+            ],
+        });
+
+        return [{
+            frame: true,
+            align: 'stretch',
+            layout: 'border',
+            defaults: {
+                split: true,
+                border: false,
+            },
+            items: [
+                this.grid,
+                this.editForm
+            ],
+        }];
     },
 
     doInit: function(properties) {
         if (properties) {
-            let editorConfig = properties['editorConfig'];
-            if (Ext.isString(editorConfig)) {
-                editorConfig = Ext.decode(editorConfig);
+            this.editorConfig = properties['editorConfig'];
+            if (Ext.isString(this.editorConfig)) {
+                this.editorConfig = Ext.decode(this.editorConfig);
             }
-            this.grid.doInit(editorConfig);
+            if (!Ext.isEmpty(this.editorConfig) && !Ext.isArray(this.editorConfig)) {
+                this.editorConfig = [this.editorConfig];
+            }
+            this.grid.getStore().loadData(this.editorConfig || []);
         }
     },
 
-    getConfiguration: function() {
-        const config = Coon.Function.getDataFromForm(this);
-        config['editorConfig'] = this.grid.getData();
+    addHandler: function() {
+        const ns = Coon.report.model.CharacteristicBeanFields;
+        const data = {};
+        data[ns.$entity] = 'ADV';
+        const newRecord = Ext.create('Coon.report.model.CharacteristicBean', data);
+        this.grid.getStore().add(newRecord);
+        const editor = this.grid.findPlugin('cellediting');
+        editor.startEditByPosition({row: this.grid.getStore().getCount() - 1, column: 0});
+    },
+
+    deleteHandler: function() {
+        const record = this.grid.getSelectionModel().getSelection()[0];
+        if (!record) {
+            return;
+        }
+        record.set('isDeleted', true);
+        const foundIndex = this.editorConfig.findIndex((el) => el.type === record.get('type'));
+        this.editorConfig.splice(foundIndex, 1);
+        Coon.Function.clearAllFieldsOnForm(this.editForm);
+        this.editForm.setDisabled(true);
+        this.grid.getStore().remove(record);
+    },
 
+    setEditorConfig: function() {
+        const ns = Coon.report.model.CharacteristicBeanFields;
+        const record = this.grid.getSelection()[0];
+        if (!record || record.get('isDeleted')) {
+            return;
+        }
+        record.set(ns.$mask, this.editForm.down('UiAceEditor').getValue());
+        const foundIndex = this.editorConfig.findIndex((el) => el.type === record.get(ns.$type));
+        const deleteCount = foundIndex === -1 ? 0 : 1;
+        const position = foundIndex === -1 ? this.editorConfig.length : foundIndex;
+        this.editorConfig.splice(position, deleteCount, Object.assign(
+            record.getData(),
+            Coon.Function.getDataFromForm(this.editForm)));
+    },
+
+    getConfiguration: function() {
+        this.setEditorConfig();
+        const config = {editorConfig: this.editorConfig};
         return config;
     },
 });

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

@@ -0,0 +1,22 @@
+Ext.define('Coon.report.plugin.configPanel.GridEditorPluginConfigPanel', {
+    extend: 'Coon.report.plugin.configPanel.BasePluginConfig',
+    alias: 'widget.GridEditorPluginConfigPanel',
+    uses: [],
+    requires: [
+        'Coon.Function'
+    ],
+    alternateClassName: 'Sigma.common.grid.plugin.configPanel.GridEditorPluginConfig',
+
+    description: 'Плагин позволяет задать редактор для столбцов',
+    tags: ['Редактирование'],
+
+    config: {
+        pluginTypeSettings: {
+            defaultType: 'GRID_PLUGIN',
+            allowedTypes: [
+                'GRID_PLUGIN'
+            ],
+        },
+    },
+
+});

package/src/report/plugin/configPanel/selectionModelFeature/SelectionModelFeatureConfigPanel.js

@@ -1,7 +1,7 @@
 Ext.define('Coon.report.plugin.configPanel.selectionModelFeature.SelectionModelFeatureConfigPanel', {
     extend: 'Coon.report.plugin.configPanel.PluginDefaults',
     alias: 'widget.SelectionModelFeatureConfigPanel',
-
+    requires: ['Ext.selection.MixedRowSelectionModel'],
     pluginType: 'SelectionModelPlugin',
     description: 'Настройки SelectionModel',
     tags: ['Поведение', 'Выделение'],

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

@@ -58,6 +58,9 @@ Ext.define('Coon.report.plugin.grid.GridEditorsPlugin', {
                 }
             }
         }
+        hasEditor.on('beforeedit', function(editor, context) {
+            return context.record.allowEditWithEditorPlugin;
+        }, this);
     },
 
     createEditorItem: function(configuration) {
@@ -134,6 +137,20 @@ Ext.define('Coon.report.plugin.grid.GridEditorsPlugin', {
         editor.on('beforeedit', function() {
             Ext.emptyFn();
         }, this);
+        let editable = true;
+        if (configuration['dependsOnField'] && configuration['dependsOnFieldName']) {
+            const editableColumn = this.grid.getColumns().find((col) => col.dataIndex === configuration[ns.$type]);
+            editableColumn.renderer = (value, metaData, record) => {
+                const dependsOnFieldName = configuration['dependsOnFieldName'];
+                const invertValue = configuration['invertValue'];
+                editable = invertValue === !record.get(dependsOnFieldName);
+                record.allowEditWithEditorPlugin = editable;
+                if (configuration['highlightEditableCells']) {
+                    metaData.tdCls = editable ? 'create-line-left' : 'hover-style';
+                }
+                return value;
+            };
+        }
         return editor;
     },
 });

package/src/uielement/plugin/UnifiedButtonToolbarPlugin.js

@@ -33,7 +33,11 @@ Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPlugin', {
         });
         view.addDocked(this.controller.unifiedButtonToolbar, this.dock === 'bottom' ? null : 0);
     },
-    onBeforeCloseWindow() {
+    onBeforeCloseWindow(win) {
+        const cp = win.down('UiCustomPanel');
+        if (cp) {
+            cp.focus();
+        }
         if (this.suspendBeforeCloseEvent) {
             this.suspendBeforeCloseEvent = false;
             return true;
@@ -83,6 +87,9 @@ Ext.define('Coon.uielement.plugin.UnifiedButtonToolbarPlugin', {
             } else {
                 this.controller.savedDataHash = Coon.util.generateHashFromObj(params);
             }
+        } else if (this.windowClose) {
+            this.suspendBeforeCloseEvent = true;
+            this.closeWindow();
         }
     },
     callPrepareBeanHandler(compareCash = true) {

package/src/version.js

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