ru.coon 2.5.66 → 2.5.68

package/CHANGELOG.md

@@ -1,20 +1,31 @@
-# Version 2.5.66, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4e253ae2e8836166212d3886d091d342673deaee)
-* update: CHANGELOG.md ([51a0c7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/51a0c702bb85db10b71ba3002e52ae2b0c7f98f7))
+# Version 2.5.68, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/98ad55fc31f43905c6600483ea3665275bccbcb0)
+* ## Features
+* <span style='color:green'>feat: NEVA-439: set null values before send on server for postgres</span> ([bf7739], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bf7739be43a2bb3e52932059699b493e31f2371f))
+* <span style='color:green'>feat: HT-7969: set xtypes for editors</span> ([8c4edc], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8c4edc5c63f46d647bb4f3286e4517af31cbbe5b))
+* <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))
 
-# Version 2.5.65, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/64478c87b5169b1d5be5b28bae8b82ada2477f32)
-* ## Fixes
-* <span style='color:red'> BFL-9170 GridRowStylePlugin in method renderer metadata equal nul</span> ([ac1868], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ac18684cc90b93256bc64067dc8a050d17fafa1d))
-* <span style='color:red'> HT-7918 WindowWrap missing focus</span> ([0bdf38], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0bdf38c03dbd1cac10c9f2d8ea5d0786909d68e1))
+* Resolve HT-7568 ([eb0297], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/eb0297d1927ae6e2d3a8d492d368d5ea7bef89ef))
+* update: CHANGELOG.md ([fed09b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/fed09bab2391b2ef0adde36107c4c8e9f8e9ad32))
 
-* update: CHANGELOG.md ([4a4d82], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4a4d820afb7cfa7df56e325ba7435a3ecdfff712))
+# Version 2.5.67, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/eda77f29b413590ae650c8fb7ba1615c63cf104a)
+* update: CHANGELOG.md ([c9c3ce], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c9c3ceb588fa3e6bbf7e1cc4b1dec223a9f11a7f))
 
-# Version 2.5.64, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9f48777236abed76cf08cd5cef56e7f9be0dac63)
+# Version 2.5.66, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dcba8ef34445cf8802926b747844bbbf086fd76d)
+* update: CHANGELOG.md ([035aa3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/035aa331319ac8d972f5289467698bff54180bd1))
+
+# Version 2.5.65, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3fe0112c646f6daed5bd7988f8c46b4b83c95d00)
+* update: CHANGELOG.md ([0d40ec], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0d40ecf9ac3d6a716830785e5dc21c451ad9b233))
+
+# Version 2.5.64, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d55fa844a67279117847d229fd7edcb5b5784fe9)
 * ## Features
+* <span style='color:green'>feat: HT-7281 GridEditorPlugin editor dependField</span> ([975be6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/975be69118652f7995b2bfd40e5a174deaa47c68))
 * <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'> BFL-9170 GridRowStylePlugin in method renderer metadata equal nul</span> ([ac1868], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ac18684cc90b93256bc64067dc8a050d17fafa1d))
+* <span style='color:red'> HT-7918 WindowWrap missing focus</span> ([0bdf38], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0bdf38c03dbd1cac10c9f2d8ea5d0786909d68e1))
 * <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))
 

package/package.json

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

package/src/common/component/characteristic/characteristicAlgorithm/CharacteristicAlgorithmList.js

@@ -66,7 +66,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
         {
             header: 'Тип элемента',
             flex: 1,
-            dataIndex: 'AlgorithmChain',
+            dataIndex: 'AlgoritmChain',
             renderer: function(value) {
                 return value ? 'Цепочка' : 'Алгоритм';
             },
@@ -74,9 +74,9 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
         {
             header: 'Идентификатор',
             flex: 1,
-            dataIndex: 'AlgorithmChain',
+            dataIndex: 'algoritmChain',
             renderer: function(value, meta, record) {
-                return value ? value : record.get('AlgorithmID');
+                return value ? value : record.get('AlgoritmID');
             },
         },
         {

package/src/common/component/characteristic/characteristicAlgorithm/CharacteristicAlgorithmListController.js

@@ -19,7 +19,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
     load: function() {
         const command = Ext.create('Iswe.command.IsweGetAlgorithmChainBind');
         command.on('complete', function(data) {
-            this.getViewModel().getStore('mainStore').loadData(data['algorithmChainList'] || []);
+            this.getViewModel().getStore('mainStore').loadData(data['algoritmChainList'] || []);
         }, this);
         command.execute(this.subentity);
     },
@@ -111,7 +111,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
                     this.getView().unmask();
                 }
                 this.getView().fireEvent('save', this);
-                this.getViewModel().getStore('mainStore').loadData(response['algorithmChainList'] || []);
+                this.getViewModel().getStore('mainStore').loadData(response['algoritmChainList'] || []);
             }, this);
             command.execute(this.subentity, Ext.encode(this.getData()));
         }

package/src/common/component/characteristic/characteristicGroup/EntityGroupCharacteristicEditor.js

@@ -128,6 +128,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.EntityGr
             xtype: 'hintColumn',
             editor: {
                 xtype: 'XTypeComboBox',
+                displayField: 'xtype',
                 xtypeBound: function(item) {
                     return item.prototype && item.prototype.isXType && item.prototype.isXType('BaseEditorCreator');
                 },
@@ -163,7 +164,8 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.EntityGr
     ],
     features: [{
         ftype: 'grouping',
-        groupHeaderTpl: '{name}',
+        groupHeaderTpl: '{name} - {[ values.children[0].data.groupDescription ]}',
+
     }],
     plugins: {
         cellediting: {

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

@@ -4,5 +4,6 @@ Ext.define('Coon.common.component.editor.creators.ByReportEditorCreator', {
         'SigmaUtilities.view.common.component.editor.creators.ByReportEditorCreator'
     ],
     alias: 'widget.ByReportEditorCreator',
+    xtype: 'ByReportEditorCreator',
     editable: false,
 });

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

@@ -4,6 +4,7 @@ Ext.define('Coon.common.component.editor.creators.CustomPanelEditorCreator', {
         'SigmaUtilities.view.common.component.editor.creators.CustomPanelEditorCreator'
     ],
     alias: 'widget.CustomPanelEditorCreator',
+    xtype: 'CustomPanelEditorCreator',
     config: {
         uiElementCd: null,
     },

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

@@ -4,7 +4,7 @@ Ext.define('Coon.common.component.editor.creators.ForeignKeyEditorCreator', {
         'SigmaUtilities.view.common.component.editor.creators.ForeignKeyEditorCreator'
     ],
     alias: 'widget.ForeignKeyEditorCreator',
-
+    xtype: 'ForeignKeyEditorCreator',
     disableInternalEditor: true,
 
     createField: function(record, grid, context) {

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

@@ -4,7 +4,7 @@ Ext.define('Coon.common.component.editor.creators.NoteEditorCreator', {
         'SigmaUtilities.view.common.component.editor.creators.NoteEditorCreator'
     ],
     alias: 'widget.NoteEditorCreator',
-
+    xtype: 'NoteEditorCreator',
     createField: function(record, parent) {
         const ns = Coon.report.model.CharacteristicBeanFields;
         this.field = Ext.create('Coon.common.field.OpenDialogField', {

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

@@ -4,6 +4,7 @@ Ext.define('Coon.common.component.editor.creators.NumberEditorCreator', {
         'SigmaUtilities.view.common.component.editor.creators.NumberEditorCreator'
     ],
     alias: 'widget.NumberEditorCreator',
+    xtype: 'NumberEditorCreator',
     decimalSeparator: ',',
 
     normalizeRawValue(raw, separator) {

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

@@ -1,4 +1,5 @@
 Ext.define('Coon.common.component.editor.creators.PercentEditorCreator', {
     extend: 'Coon.common.component.editor.creators.NumberEditorCreator',
     alias: 'widget.PercentEditorCreator',
+    xtype: 'PercentEditorCreator',
 });

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

@@ -11,7 +11,7 @@ Ext.define('Coon.common.component.editor.creators.SimpleReportEditorCreator', {
         'SigmaUtilities.view.common.component.editor.creators.SimpleReportEditorCreator'
     ],
     alias: 'widget.SimpleReportEditorCreator',
-
+    xtype: 'SimpleReportEditorCreator',
     createField: function(record, parent, context) {
         const ns = Coon.report.model.CharacteristicBeanFields;
         const reportId = record.get(ns.$mask);

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

@@ -1,7 +1,7 @@
 Ext.define('Coon.common.component.editor.creators.TimeEditorCreator', {
     extend: 'Coon.common.component.editor.creators.BaseEditorCreator',
     alias: 'widget.TimeEditorCreator',
-
+    xtype: 'TimeEditorCreator',
     createField: function(record, parent) {
         const charNs = Coon.report.model.CharacteristicBeanFields;
 

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

@@ -4,6 +4,7 @@ Ext.define('Coon.common.component.editor.creators.TriggerFieldEditorCreator', {
         'SigmaUtilities.view.common.component.editor.creators.TriggerFieldEditorCreator'
     ],
     alias: 'widget.TriggerFieldEditorCreator',
+    xtype: 'TriggerFieldEditorCreator',
     assignDoubleClick: true,
     updateOnClose: false,
     editable: true,

package/src/nav/editor/menu/form/NavMenuFormView.js

@@ -129,7 +129,6 @@ Ext.define('Coon.nav.editor.menu.form.NavMenuFormView', {
             valueField: 'MENU_ENTRY_CD',
             displayField: 'DESCR',
             reportId: 'MENU_ENTRY_LIST',
-            fieldLabel: 'Родительское меню',
             bind: {
                 value: '{menu.parentMenuId}',
                 disabled: '{!menu.parentMenuId}',

package/src/nav/editor/menu/form/NavMenuFormViewController.js

@@ -66,6 +66,23 @@ Ext.define('Coon.nav.editor.menu.form.NavMenuFormViewController', {
         return result;
     },
 
+    /**
+     * Срабатывает при сохранении формы
+     * Пелучаем данные формы и обрабатывает пустые значения (для postgres)
+     */
+
+    getSavedData() {
+        const vmData = this.getViewModel().get('menu');
+        const data = {};
+        if (Ext.isObject(vmData)) {
+            for (const [key, value] of Object.entries(vmData)) {
+                data[key] = !Ext.isString(value) || value.trim() ? value : null;
+            }
+        }
+        return data;
+    },
+
+
     /**
      * Срабатывает при сохранении формы
      * Вызывает команду по добавлению/сохранению данных о элементе меню
@@ -75,7 +92,7 @@ Ext.define('Coon.nav.editor.menu.form.NavMenuFormViewController', {
         if (this.validate()) {
             const vm = this.getViewModel();
             const commandClass = vm.get('newMenu') ? 'AddMenuCommand' : 'SaveMenuCommand';
-            Coon.util.promisifyCmd('command.' + commandClass, vm.get('menu'))
+            Coon.util.promisifyCmd('command.' + commandClass, this.getSavedData())
                 .then((menuBean) => {
                     vm.set('menu', menuBean);
                     this.getView().close();

package/src/report/component/settings/ReportPropertiesAceEditor.js

@@ -51,9 +51,6 @@ Ext.define('Coon.report.component.settings.ReportPropertiesAceEditor', {
             xtype: 'UiAceEditor',
             height: 400,
             useLinter: true,
-            bind: {
-                value: '{aceEditorData}',
-            },
         }
     ],
 

package/src/report/component/settings/ReportPropertiesGrid.js

@@ -2,6 +2,7 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGrid', {
     extend: 'Ext.grid.Panel',
     alias: 'widget.ReportPropertiesGrid',
     alternateClassName: 'Sigma.component.report.settings.ReportPropertiesGrid',
+    cls: 'ReportPropertiesGrid',
     requires: [],
     controller: 'reportPropertiesGridController',
     config: {
@@ -24,7 +25,6 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGrid', {
     },
     applyEnableAddProps: function(value) {
         this.lookup('addButton').setDisabled(!value);
-        this.lookup('editorButton').setDisabled(!value);
     },
     title: 'Свойства',
     selModel: {
@@ -48,33 +48,56 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGrid', {
                 handler: 'deleteHandler',
                 reference: 'deleteButton',
                 disabled: true,
-            },
-            {
-                text: '{}',
-                tooltip: 'Открыть в редакторе',
-                ui: 'blue-text-button-border',
-                handler: 'openInEditor',
-                reference: 'editorButton',
             }
         ],
     }],
     columns: {
         defaults: {
-            required: true,
             xtype: 'hintColumn',
-            editor: {
-                xtype: 'textfield',
-                allowBlank: false,
-            },
+            required: true,
         },
         items: [
-            {text: 'Номер', dataIndex: 'sequenceNumber', width: 50, hidden: true},
-            {text: 'Ключ', dataIndex: 'key', flex: 1},
+            {
+                text: 'Номер',
+                dataIndex: 'sequenceNumber',
+                width: 50,
+                hidden: true,
+
+                editor: {
+                    xtype: 'textfield',
+                    allowBlank: true,
+                },
+            },
+            {
+                text: 'Ключ',
+                dataIndex: 'key',
+                flex: 1,
+                editor: {
+                    xtype: 'textfield',
+                    allowBlank: false,
+                },
+            },
             {
                 text: 'Значение',
                 dataIndex: 'value',
                 flex: 1,
                 editor: 'textfield',
+            },
+            {
+                xtype: 'actioncolumn',
+                width: 50,
+                items: [{
+                    iconCls: 'svg-fa svg-fa-pencil',
+                    tooltip: 'Редактировать',
+                    handler: 'openValueEditor',
+                }],
+            },
+            {
+                text: 'mode',
+                dataIndex: 'mode',
+                width: 50,
+                required: false,
+                hidden: true,
             }
         ],
     },

package/src/report/component/settings/ReportPropertiesGrid.scss

@@ -0,0 +1,26 @@
+.ReportPropertiesModifier {
+    .x-segmented-button {
+        border: 1px solid #3d6780;
+        border-radius: 6px;
+        overflow: hidden;
+    
+        .x-segmented-button-item {
+          padding: 6px 8px;
+          background-color: #ffffff;
+          .x-btn-inner {
+            color: #3d6780;
+          }
+    
+          &.x-btn-pressed {
+            background-color: #3d6780;
+            .x-btn-inner {
+              color: #ffffff;
+            }
+          }
+        }
+    
+        & > *:not(:last-child) {
+          border-right: 1px solid #3d6780;
+        }
+      }
+}

package/src/report/component/settings/ReportPropertiesGridController.js

@@ -40,12 +40,11 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGridController', {
             Coon.log.error('Unable to save data, some parameter properties have empty key or value');
             isValid = false;
         }
-        const columns = this.getView().getColumns();
-        const columnsReq = columns.map((column) => {
-            if (column.required) {
-                return column.dataIndex;
-            }
-        });
+        const columns = this.getView().getColumns()
+            .filter((c) => c.xtype !== 'actioncolumn');
+        const columnsReq = columns
+            .filter((column) => column.required === true)
+            .map((column) => column.dataIndex);
 
         properties.forEach((prop) => {
             if (!prop['isDeleted']) {
@@ -193,4 +192,130 @@ Ext.define('Coon.report.component.settings.ReportPropertiesGridController', {
     updateProperties: function() {
         this.getView().publishState('data', Coon.Function.serializeRecords(this.getView().getStore().getRange()));
     },
+
+    /**
+     * open editional editor to change value
+     */
+    openValueEditor: function(grid, rowIndex, colIndex) {
+        const rec = grid.getStore().getAt(rowIndex);
+        const value = rec.get('value');
+
+        // set row as selected
+        grid.setSelection(rec);
+
+        const chooseMode = (button) => {
+            const mode = button.getText();
+            const value = win.down('UiAceEditor').getValue();
+
+            // rerender editor
+            win.removeAll();
+            const editor = Ext.widget('UiAceEditor', {
+                useLinter: mode === 'json' ? true : false,
+                mode,
+                enableEmptyValue: true,
+            });
+            editor.on('boxready', function() {
+                if (mode === 'javascript') {
+                    // filter annotations
+                    const doLint = new Ext.util.DelayedTask(function() {
+                        editor.editor.getSession().$annotations.filter((a) => a.text !== 'Missing name in function declaration.');
+                        editor.highlightErrors();
+                    });
+                    editor.editor.on('change', function(action, editor) {
+                        const value = editor.getValue();
+                        // remove annotation if Javascript mode enabled
+                        doLint.delay(1000, undefined, undefined, [value]);
+                    });
+                }
+            });
+            win.add(editor);
+
+            setTimeout(() => {
+                win.down('UiAceEditor').setValue(value);
+            }, 0);
+        };
+
+        const win = Ext.widget('WindowWrap', {
+            layout: 'fit',
+            width: 660,
+            height: 430,
+            title: 'Редактирование свойства ' + rec.get('key') || '',
+            cls: 'ReportPropertiesModifier',
+            tbar: [
+                {
+                    xtype: 'segmentedbutton',
+                    items: [
+                        {
+                            itemId: 'modeText',
+                            text: 'text',
+                            pressed: true,
+                            handler: chooseMode,
+                        },
+                        {
+                            itemId: 'modeJavascript',
+                            text: 'javascript',
+                            handler: chooseMode,
+                        },
+                        {
+                            itemId: 'modeJson',
+                            text: 'json',
+                            handler: chooseMode,
+                        }
+                    ],
+                }
+            ],
+            items: [{
+                xtype: 'UiAceEditor',
+                useLinter: false,
+                mode: 'text',
+            }],
+            buttons: [
+                {
+                    xtype: 'button',
+                    text: 'Сохранить',
+                    ui: 'orange-button',
+                    handler: function() {
+                        const me = this;
+                        const hasErrors = me.up('WindowWrap').down('UiAceEditor').getErrors().length > 0;
+
+                        // eslint-disable-next-line require-jsdoc
+                        function save() {
+                            rec.set({
+                                value: me.up('WindowWrap').down('UiAceEditor').getValue(),
+                            });
+                            me.up('WindowWrap').close();
+                        };
+
+                        if (hasErrors) {
+                            Ext.Msg.show({
+                                title: 'Ошибка при вводе значения',
+                                message: 'Сохранить значение?',
+                                buttons: Ext.Msg.YESNO,
+                                icon: Ext.Msg.WARNING,
+                                fn: function(btn) {
+                                    if (btn === 'yes') {
+                                        save();
+                                    }
+                                },
+                            });
+                            return;
+                        }
+                        save();
+                    },
+                },
+                {
+                    xtype: 'button',
+                    text: 'Закрыть',
+                    ui: 'green-button',
+                    handler: function() {
+                        this.up('WindowWrap').close();
+                    },
+                }
+            ],
+        });
+        win.show();
+
+        win.down('UiAceEditor').setValue(value);
+        win.down('UiAceEditor').editor.focus();
+    },
 });

package/src/report/component/settings/field/ReportFormFieldEditPanelController.js

@@ -33,11 +33,13 @@ Ext.define('Coon.report.component.settings.ReportFormFieldEditPanelController',
         const fieldsPanel = Ext.widget('ReportGrid', Coon.report.component.ReportPanel.getColumnsConfig(fields));
         fieldsPanelContainer.add(fieldsPanel);
         fieldsPanelContainer.updateLayout();
+        this.fieldsDataSetted = true;
     },
 
     sendFieldsDataForSave: function() {
         const fieldsGrid = this.lookup('fieldsGrid');
-        fieldsGrid.publishState('data', fieldsGrid.getData());
+        const fieldsData = this.fieldsDataSetted ? fieldsGrid.getData() : this.getViewModel().get('report.fields');
+        fieldsGrid.publishState('data', fieldsData);
     },
 
     beforeEditFieldPropertiesHandler: function(editor, context) {

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

@@ -70,7 +70,7 @@ Ext.define('Coon.report.plugin.configPanel.GridEditorPluginConfig', {
                     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]) {
+                    if (recordConfig && recordConfig[ns.$mask]) {
                         this.editForm.down('UiAceEditor').setValue(recordConfig[ns.$mask]);
                     }
                     this.editForm.setDisabled(!record);
@@ -112,6 +112,7 @@ Ext.define('Coon.report.plugin.configPanel.GridEditorPluginConfig', {
                     xtype: 'fieldset',
                     checkboxName: 'dependsOnField',
                     checkboxToggle: true,
+                    collapsed: true,
                     layout: {
                         type: 'vbox',
                         align: 'stretch',
@@ -169,7 +170,7 @@ Ext.define('Coon.report.plugin.configPanel.GridEditorPluginConfig', {
 
     doInit: function(properties) {
         if (properties) {
-            this.editorConfig = properties['editorConfig'];
+            this.editorConfig = properties['editorConfig'] || [];
             if (Ext.isString(this.editorConfig)) {
                 this.editorConfig = Ext.decode(this.editorConfig);
             }
@@ -197,7 +198,9 @@ Ext.define('Coon.report.plugin.configPanel.GridEditorPluginConfig', {
         }
         record.set('isDeleted', true);
         const foundIndex = this.editorConfig.findIndex((el) => el.type === record.get('type'));
-        this.editorConfig.splice(foundIndex, 1);
+        if (foundIndex !== -1) {
+            this.editorConfig.splice(foundIndex, 1);
+        }
         Coon.Function.clearAllFieldsOnForm(this.editForm);
         this.editForm.setDisabled(true);
         this.grid.getStore().remove(record);

package/src/report/plugin/grid/ExportReportDataToFilePlugin.md

@@ -0,0 +1,7 @@
+**спецификация:**
+
+входные параметры:
+
+- exportFileFormat [xls/pdf]
+- allowUserSelectColumnsToUpload
+- addToSearchButton добавить в кнопку "поиск", в этом случае в качестве параметра отправляем текущие параметры из FilterPanel(useRawFilterParams: true)

package/src/uielement/component/settings/UiAceEditor.js

@@ -14,9 +14,11 @@ Ext.define('Coon.uielement.component.settings.UiAceEditor', {
         value: '',
         readOnly: false,
         useLinter: false,
+        enableEmptyValue: false,
     },
     errors: [],
     keyMapEnabled: true,
+    linterInitialized: false,
 
     keyMap: {
         'F4': {
@@ -249,20 +251,15 @@ Ext.define('Coon.uielement.component.settings.UiAceEditor', {
         }.bind(this));
         this.editor.setOptions(this.getEditModeConfig());
         if (this.getUseLinter()) {
-            const vm = this.up('UiCustomPanelEditor') ? this.up('UiCustomPanelEditor').getViewModel() : false;
-            this.addPlugin({ptype: 'UiAceLinterPlugin'});
-            if (typeof this.doLint === 'function' && vm) {
+            this.addPlugin({
+                ptype: 'UiAceLinterPlugin',
+                enableEmptyValue: this.enableEmptyValue,
+            });
+            if (typeof this.doLint === 'function') {
                 const doLint = new Ext.util.DelayedTask(this.doLint);
                 this.editor.on('change', (data) => {
-                    if (vm.get('iframeIsFirstLoad')) {
-                        doLint.delay(1000, undefined, undefined, [data]);
-                    }
+                    doLint.delay(1000, undefined, undefined, [data]);
                 }, this);
-                vm.bind('{iframeIsFirstLoad}', (iframeIsFirstLoad) => {
-                    if (iframeIsFirstLoad) {
-                        doLint.delay(1000, undefined, undefined, [this.editor.getSession().getValue()]);
-                    }
-                });
             }
         }
         if (this.type) {
@@ -277,6 +274,7 @@ Ext.define('Coon.uielement.component.settings.UiAceEditor', {
                 console.error(`${this.type} is not supported.`);
             }
         }
+        this.linterInitialized = true;
         this.fireEvent('ready', this);
     },
 

package/src/uielement/component/settings/config/UiCPConfigPanelController.js

@@ -48,6 +48,8 @@ Ext.define('Coon.uielement.component.settings.config.UiCPConfigPanelController',
         uiEditor.setCallback(
             this.getConfigHandlerNames.bind(this)
         );
+        const doLint = new Ext.util.DelayedTask(uiEditor.doLint);
+        doLint.delay(1000, undefined, undefined, [uiEditor.editor.getSession().getValue()]);
     },
     setHandlerList(data) {
         this.lookup('uiEditor').setHandlerList(data);