ru.coon 2.5.68 → 2.6.0

package/CHANGELOG.md

@@ -1,10 +1,19 @@
+# Version 2.6.0, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/78a28499d4ba7dc466ba5ff5a4b815d191c349bf)
+* ## Features
+* <span style='color:green'>feat: HT-7986: chars editor interface upgrade</span> ([9af20a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9af20aa30d2b1fa494994e0cf7d84b26b19604e0))
+* <span style='color:green'>feat: HT-7986: chars editor interface upgrade</span> ([ccf1d4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ccf1d42831f67ca298e2598422430da06b01ab49))
+
+* update: CHANGELOG.md ([e47fec], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e47fec57e3e5450390ece76176541c6e3a668bd1))
+
 # Version 2.5.68, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/98ad55fc31f43905c6600483ea3665275bccbcb0)
 * ## Features
+* <span style='color:green'>feat: HT-7986: chars editor interface upgrade</span> ([a27806], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a278066acdef2f6abd723de5a360f612179d50e9))
 * <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))
 
 * Resolve HT-7568 ([eb0297], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/eb0297d1927ae6e2d3a8d492d368d5ea7bef89ef))
+* HT-7882 поддержать возможность передачи свойств редактора х-ки в поле mask в формате json ([ff9d88], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ff9d88c6e8f12d59ea7fd4f8be344696670d13af))
 * update: CHANGELOG.md ([fed09b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/fed09bab2391b2ef0adde36107c4c8e9f8e9ad32))
 
 # Version 2.5.67, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/eda77f29b413590ae650c8fb7ba1615c63cf104a)
@@ -30,6 +39,7 @@
 * <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))
+* HT-7882 поддержать возможность передачи свойств редактора х-ки в поле mask в формате json ([507490], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5074900afb170d9f11aa10de6549e05cef12f7cb))
 * 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)

package/package.json

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

package/src/Function.scss

@@ -0,0 +1,4 @@
+.delete-row {
+  text-decoration: line-through;
+  color: darkred;
+}

package/src/common/component/characteristic/CharacteristicPanel.js

@@ -7,6 +7,7 @@ Ext.define('Coon.uielement.component.characteristic.CharacteristicPanel', {
             entity: null,
             isNew: false,
             groups: null,
+            title: 'Редактирование сущности',
         },
         stores: {
             characteristicEntityStore: {
@@ -15,6 +16,9 @@ Ext.define('Coon.uielement.component.characteristic.CharacteristicPanel', {
             },
         },
     },
+    bind: {
+        title: '{title}',
+    },
     layout: {
         type: 'vbox',
         align: 'stretch',
@@ -36,91 +40,107 @@ Ext.define('Coon.uielement.component.characteristic.CharacteristicPanel', {
             reference: 'entityForm',
             bodyPadding: 5,
             layout: 'anchor',
-            defaults: {
-                anchor: '100%',
-                xtype: 'container',
-                layout: 'column',
-                defaults: {
-                    columnWidth: 0.33,
-                    xtype: 'textfield',
-                    margin: '0 0 0 15px',
-                },
-            },
             items: [
                 {
-                    items: [
-                        {
-                            fieldLabel: 'Код',
-                            name: 'entity',
-                            reference: 'entityField',
-                            margin: 0,
-                            allowBlank: false,
-                            bind: {
-                                disabled: '{!isNew}',
-                            },
+                    anchor: '100%',
+                    bind: {
+                        collapsed: '{!!entity}',
+                        title: 'Данные сущности {entity}',
+                    },
+                    defaults: {
+                        xtype: 'container',
+                        flex: 1,
+                        layout: 'column',
+                        defaults: {
+                            columnWidth: 0.33,
+                            xtype: 'textfield',
+                            margin: '0 0 0 15px',
                         },
-                        {
-                            xtype: 'combo',
-                            reference: 'characteristicEntityCombo',
-                            fieldLabel: 'Класс сущности',
-                            name: 'characteristicEntity',
-                            allowBlank: false,
-                            queryMode: 'local',
-                            displayField: 'description',
-                            valueField: 'value',
-                            bind: {
-                                store: '{characteristicEntityStore}',
-                            },
-                        },
-                        {
-                            fieldLabel: 'Тип сущности',
-                            name: 'entityType',
-                        }
-                    ],
-                },
-                {
+                    },
+                    xtype: 'fieldset',
+                    collapsible: true,
+                    layout: {
+                        type: 'vbox',
+                        align: 'stretch',
+                    },
                     items: [
                         {
-                            fieldLabel: 'Тип сущности 2-го порядка',
-                            margin: 0,
-                            name: 'entityType2',
+                            items: [
+                                {
+                                    fieldLabel: 'Код',
+                                    name: 'entity',
+                                    reference: 'entityField',
+                                    margin: 0,
+                                    allowBlank: false,
+                                    bind: {
+                                        disabled: '{!isNew}',
+                                    },
+                                },
+                                {
+                                    xtype: 'combo',
+                                    reference: 'characteristicEntityCombo',
+                                    fieldLabel: 'Класс сущности',
+                                    name: 'characteristicEntity',
+                                    allowBlank: false,
+                                    queryMode: 'local',
+                                    displayField: 'description',
+                                    valueField: 'value',
+                                    bind: {
+                                        store: '{characteristicEntityStore}',
+                                    },
+                                },
+                                {
+                                    fieldLabel: 'Тип сущности',
+                                    name: 'entityType',
+                                }
+                            ],
                         },
                         {
-                            fieldLabel: 'Тип сущности 3-го порядка',
-                            name: 'entityType3',
+                            items: [
+                                {
+                                    fieldLabel: 'Тип сущности 2-го порядка',
+                                    margin: 0,
+                                    name: 'entityType2',
+                                },
+                                {
+                                    fieldLabel: 'Тип сущности 3-го порядка',
+                                    name: 'entityType3',
+                                },
+                                {
+                                    fieldLabel: 'Тип сущности 4-го порядка',
+                                    name: 'entityType4',
+                                }
+                            ],
                         },
                         {
-                            fieldLabel: 'Тип сущности 4-го порядка',
-                            name: 'entityType4',
-                        }
-                    ],
-                },
-                {
-                    items: [
-                        {
-                            fieldLabel: 'Тип сущности 5-го порядка',
-                            name: 'entityType5',
-                            margin: 0,
-                        },
-                        {
-                            fieldLabel: 'entryPoint',
-                            name: 'cmEntryPoint',
+                            items: [
+                                {
+                                    fieldLabel: 'Тип сущности 5-го порядка',
+                                    name: 'entityType5',
+                                    margin: 0,
+                                },
+                                {
+                                    fieldLabel: 'entryPoint',
+                                    name: 'cmEntryPoint',
+                                },
+                                {
+                                    fieldLabel: 'Описание',
+                                    name: 'description',
+                                    allowBlank: false,
+                                }
+                            ],
                         },
                         {
-                            fieldLabel: 'Описание',
-                            name: 'description',
-                            allowBlank: false,
+                            boxLabel: 'Отображать только эффективные значения для предопределенных характеристик',
+                            xtype: 'checkbox',
+                            name: 'isEffective',
+                            labelWidth: 500,
+                            labelTextAlign: 'right',
+                            boxLabelAlign: 'after',
                         }
                     ],
-                },
-                {
-                    boxLabel: 'Отображать только эффективные значения для предопределенных характеристик',
-                    xtype: 'checkbox',
-                    name: 'isEffective',
-                    labelWidth: 500,
-                    labelTextAlign: 'right',
-                    boxLabelAlign: 'after',
                 }
+
             ],
         },
         {

package/src/common/component/characteristic/CharacteristicPanelController.js

@@ -13,14 +13,19 @@ Ext.define('Coon.uielement.component.characteristic.CharacteristicPanelControlle
 
     doInitForm: function(entity) {
         const vm = this.getViewModel();
-        vm.set('entity', entity || null);
+        entity = entity || vm.get('entity') || null;
+        vm.set('entity', entity);
         vm.set('isNew', !vm.get('entity'));
         if (entity) {
+            vm.set('title', 'Редактирование сущности ' + entity);
             this.lookup('characteristicAlgorithmList').doInit(entity);
             this.lookup('characteristicEditor').doInit(entity, 'SUBENTITY');
             this.load();
+        } else {
+            vm.set('title', 'Добавление новой сущности ');
         }
         this.initCharacteristicEntityStore();
+        this.lookup('entityForm').isValid();
     },
 
     doInitFormGroupReload: function(entity) {
@@ -65,9 +70,12 @@ Ext.define('Coon.uielement.component.characteristic.CharacteristicPanelControlle
             const isNew = this.getViewModel().get('isNew');
             data.isNew = isNew;
             this.getView().mask('Сохранение');
-            const command = Ext.create('Iswe.command.IsweSaveEntity');
-            command.on('complete', function() {
-                this.getView().unmask();
+            const me = this;
+            Coon.util.promisifyCmd(
+                'Iswe.command.IsweSaveEntity',
+                data
+            ).then(() => {
+                me.getView().unmask();
                 if (isNew) {
                     this.getViewModel().set('isNew', false);
                     this.doInitForm(data['entity']);
@@ -76,8 +84,15 @@ Ext.define('Coon.uielement.component.characteristic.CharacteristicPanelControlle
                     this.lookup('characteristicEditor').save();
                     this.lookup('characteristicAlgorithmList').save();
                 }
-            }, this);
-            command.execute(data);
+            }).catch((error) => {
+                me.getView().unmask();
+                Ext.Msg.show({
+                    title: 'Ошибка',
+                    message: error.responceText,
+                    icon: Ext.Msg.ERROR,
+                    buttons: Ext.Msg.OK,
+                });
+            });
         }
     },
     validate: function() {

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

@@ -42,48 +42,41 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Algo
         {
             xtype: 'form',
             reference: 'formPanel',
-            bodyPadding: 5,
-            layout: 'anchor',
+            bodyPadding: 10,
+            layout: 'column',
             defaults: {
-                anchor: '100%',
-                xtype: 'fieldset',
-                layout: 'column',
-                title: 'Данные цепочки алгоритмов',
-                defaults: {
-                    columnWidth: 0.5,
-                    allowBlank: false,
-                    xtype: 'textfield',
-                    margin: '0 0 0 15px',
-                },
+                columnWidth: 0.5,
+                allowBlank: false,
+                xtype: 'textfield',
+                margin: '0 0 0 15px',
             },
-            items: [{
-                items: [
-                    {
-                        fieldLabel: 'Код',
-                        name: 'AlgorithmChain',
-                        margin: 0,
-                        bind: {
-                            disabled: '{!isNew}',
-                        },
+            items: [
+                {
+                    fieldLabel: 'Код',
+                    name: 'AlgorithmChain',
+                    margin: 0,
+                    bind: {
+                        disabled: '{!isNew}',
                     },
-                    {
-                        fieldLabel: 'Наименование',
-                        name: 'description',
-                    }
-                ],
-            }],
+                },
+                {
+                    fieldLabel: 'Наименование',
+                    name: 'description',
+                }
+            ],
         },
         {
             xtype: 'panel',
+            margin: '10px 0 0 0',
             flex: 1,
             layout: {
-                type: 'hbox',
-                align: 'stretch',
+                type: 'border',
             },
             items: [
                 {
                     reference: 'algorithmChainBindList',
                     flex: 2,
+                    region: 'center',
                     xtype: 'AlgorithmChainBindList',
                     listeners: {
                         beforeselect: 'onBeforeSelectAlgorithmChainBindList',
@@ -93,6 +86,8 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Algo
                     xtype: 'AlgorithmChainBindDependencyList',
                     reference: 'algorithmChainBindDependencyList',
                     flex: 1,
+                    split: true,
+                    region: 'east',
                     bind: {
                         disabled: '{!record}',
                     },

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

@@ -1,7 +1,7 @@
 Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.AlgorithmChainSearchWindow', {
     extend: 'Ext.window.Window',
     xtype: 'AlgorithmChainSearchWindow',
-    width: '80%',
+    width: 800,
     closeAction: 'hide',
     modal: true,
     title: 'Поиск цепочки алгоритмов',
@@ -124,6 +124,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Algo
                             columnWidth: 0.12,
                             margin: '15px 0 0 10px',
                             text: 'Поиск',
+                            ui: 'orange-button',
                             handler: 'searchHandler',
                         }
                     ],
@@ -176,6 +177,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Algo
                     },
                     {
                         header: 'Название',
+                        flex: 1,
                         dataIndex: 'description',
                         xtype: 'hintColumn',
                     }

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

@@ -14,6 +14,14 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
                 }
                 return false;
             },
+            selectionChange: function(get) {
+                const rec = get('record');
+                if (rec) {
+                    this.set('buttonText', rec.get('isDeleted') ? 'Восстановить': 'Удалить');
+                } else {
+                    this.set('buttonText', 'Удалить');
+                }
+            },
         },
         stores: {
             mainStore: {
@@ -26,6 +34,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
             },
         },
         data: {
+            buttonText: 'Удалить',
             record: null,
         },
     },
@@ -54,10 +63,10 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
                 },
             },
             {
-                text: 'Удалить',
                 handler: 'deleteHandler',
                 bind: {
                     disabled: '{!record}',
+                    text: '{buttonText}',
                 },
             }
         ],

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

@@ -78,13 +78,18 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
     },
 
     deleteHandler: function() {
-        const record = this.getViewModel().get('record');
+        const vm = this.getViewModel();
+        const record = vm.get('record');
         if (record) {
             if (record.isNew) {
                 this.getViewModel().getStore('mainStore').remove(record);
+                vm.set('buttonText', 'Удалить');
             } else {
                 record.set('isDeleted', !record.get('isDeleted'));
+                vm.set('buttonText', record.get('isDeleted') ? 'Восстановить': 'Удалить');
             }
+        } else {
+            vm.set('buttonText', 'Удалить');
         }
     },
 

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

@@ -1,11 +1,12 @@
 Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.CharacteristicAlgorithmSearchWindow', {
     extend: 'Ext.window.Window',
     xtype: 'CharacteristicAlgorithmSearchWindow',
-    width: '80%',
+    width: 600,
     closeAction: 'hide',
     title: 'Поиск алгоритма',
     modal: true,
     height: '80%',
+    layout: 'fit',
     controller: {
         choose: function() {
             this.getView().fireEvent('choose', this.getViewModel().get('record'));
@@ -47,12 +48,11 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
         {
             xtype: 'ReportPanel',
             reference: 'algReport',
-            flex: 1,
             reportId: 'ISWE_ALG_SEARCH',
             scrollable: true,
-            hideFilterPanel: false,
+            hideFilterPanel: true,
             header: false,
-            autoFilter: false,
+            autoFilter: true,
             listeners: {
                 configured: 'onConfigured',
             },

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

@@ -9,8 +9,19 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.Characte
                 data: [],
             },
         },
+        formulas: {
+            selectionChange: function(get) {
+                const rec = get('localRecord');
+                if (rec) {
+                    this.set('buttonText', rec.get('isDeleted') ? 'Восстановить': 'Удалить');
+                } else {
+                    this.set('buttonText', 'Удалить');
+                }
+            },
+        },
         data: {
             localRecord: null,
+            buttonText: 'Удалить',
         },
     },
     bind: {
@@ -30,10 +41,10 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.Characte
                 handler: 'addHandler',
             },
             {
-                text: 'Удалить',
                 handler: 'deleteHandler',
                 bind: {
                     disabled: '{!localRecord}',
+                    text: '{buttonText}',
                 },
             }
         ],
@@ -43,7 +54,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.Characte
             'header': 'Группа пользователя',
             'dataIndex': 'userGroupDescription',
             'xtype': 'hintColumn',
-            'flex': 1,
+            'width': 180,
             'editable': false,
         },
         {

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

@@ -26,13 +26,18 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.Characte
     },
 
     deleteHandler: function() {
-        const record = this.getViewModel().get('localRecord');
+        const vm = this.getViewModel();
+        const record = vm.get('localRecord');
         if (record) {
             if (record.get('isNew')) {
-                this.getViewModel().getStore('mainStore').remove(record);
+                vm.getStore('mainStore').remove(record);
+                vm.set('buttonText', 'Удалить');
             } else {
                 record.set('isDeleted', !record.get('isDeleted'));
+                vm.set('buttonText', record.get('isDeleted') ? 'Восстановить': 'Удалить');
             }
+        } else {
+            vm.set('buttonText', 'Удалить');
         }
     },
     getFullList: function(encode) {

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

@@ -23,6 +23,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.Characte
     items: [
         {
             region: 'center',
+            layout: 'fit',
             reference: 'entityGroupCharacteristicEditor',
             flex: 1,
             xtype: 'EntityGroupCharacteristicEditor',
@@ -32,6 +33,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.Characte
         },
         {
             region: 'south',
+            layout: 'fit',
             reference: 'characteristicAccessList',
             xtype: 'CharacteristicAccessList',
             flex: 1,

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

@@ -7,8 +7,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.Characte
     modal: true,
     height: '80%',
     layout: {
-        type: 'vbox',
-        align: 'stretch',
+        type: 'border',
     },
     listeners: {
         show: 'onShow',
@@ -39,7 +38,11 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.Characte
             const record = Ext.create('Coon.uielement.component.characteristic.model.characteristicGroup.GroupBeanModel');
             record.set('isNew', true);
             this.getViewModel().getStore('mainStore').insert(0, record);
-            this.lookup('entryGrid').getSelectionModel().select(0);
+            const grid = this.lookup('entryGrid');
+            grid.getSelectionModel().select(0);
+            grid.getView().scrollTo(0, 0);
+            const context = grid.getView().getPosition(record, grid.getColumns()[0]);
+            grid.setActionableMode(true, context);
         },
         deleteHandler: function() {
             const record = this.getViewModel().get('record');
@@ -78,6 +81,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.Characte
                     url: command.getUrl(),
                     method: 'POST',
                     params: rec.data,
+                    processError: true,
                 }));
             });
             const me = this;
@@ -85,7 +89,15 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.Characte
                 me.onShow();
             }).catch(function(err) {
                 me.onShow();
-                Coon.log.error(err); // some coding error in handling happened
+                const data = Coon.util.parseJSON(err.responseText);
+                if (data && Ext.isObject(data) && data.responceText) {
+                    Ext.Msg.show({
+                        title: 'Ошибка',
+                        message: data.responceText,
+                        icon: Ext.Msg.ERROR,
+                        buttons: Ext.Msg.OK,
+                    });
+                }
             });
         },
     },
@@ -135,6 +147,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.Characte
     items: [
         {
             xtype: 'grid',
+            region: 'center',
             tbar: {
                 items: [
                     {
@@ -155,13 +168,14 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.Characte
                 ],
             },
             reference: 'entryGrid',
-            flex: 1,
+            flex: 2,
             bind: {
                 store: '{mainStore}',
                 selection: '{record}',
             },
             plugins: {
                 cellediting: true,
+                gridfilterbar: true,
             },
             columns: {
                 defaults: {
@@ -173,22 +187,31 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.Characte
                 },
                 items: [
                     {
-                        header: 'GROUP',
+                        header: 'Код группы',
                         dataIndex: 'group',
+                        editor: {
+                            xtype: 'textfield',
+                            maxLength: 12,
+                        },
+                        filterType: 'string',
                     },
                     {
                         header: 'Название',
                         dataIndex: 'description',
+                        filterType: 'string',
                     },
                     {
                         header: 'Описание',
                         dataIndex: 'longDescription',
+                        filterType: 'string',
                     }
                 ],
             },
         },
         {
             xtype: 'ReportPanel',
+            region: 'south',
+            split: true,
             bind: {
                 disabled: '{disabledElems}',
             },

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

@@ -92,6 +92,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.Characte
                             margin: '15px 0 0 10px',
                             text: 'Поиск',
                             handler: 'searchHandler',
+                            ui: 'orange-button',
                         }
                     ],
                 }

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

@@ -4,11 +4,10 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.EditChar
     xtype: 'EditCharacteristicGroupWindow',
     width: '80%',
     closeAction: 'hide',
-    title: 'Редактирование групп',
+    title: 'Работа с группами',
     height: '80%',
     layout: {
-        type: 'vbox',
-        align: 'stretch',
+        type: 'border',
     },
     data: null,
 
@@ -66,13 +65,18 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.EditChar
         },
 
         deleteHandler: function() {
-            const record = this.getViewModel().get('record');
+            const vm = this.getViewModel();
+            const record = vm.get('record');
             if (record) {
                 if (record.isNew) {
-                    this.getViewModel().getStore('groupStore').remove(record);
+                    vm.getStore('groupStore').remove(record);
+                    vm.set('buttonText', 'Удалить');
                 } else {
                     record.set('isDeleted', !record.get('isDeleted'));
+                    vm.set('buttonText', record.get('isDeleted') ? 'Восстановить': 'Удалить');
                 }
+            } else {
+                vm.set('buttonText', 'Удалить');
             }
         },
 
@@ -100,20 +104,24 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.EditChar
         formulas: {
             selectionChange: function(get) {
                 const report = this.getView().down('[reference="usedGrid"]');
-                if (get('record')) {
+                const rec = get('record');
+                if (rec) {
                     report.applyFilter(
-                        {GROUP: get('record').get('group')}
+                        {GROUP: rec.get('group')}
                     );
                     report.filterHandler();
+                    this.set('buttonText', rec.get('isDeleted') ? 'Восстановить': 'Удалить');
                 } else {
                     if (report.grid) {
                         report.grid.clear();
                     }
+                    this.set('buttonText', 'Удалить');
                 }
             },
         },
         data: {
             record: null,
+            buttonText: 'Удалить',
         },
         stores: {
             groupStore: {
@@ -135,20 +143,25 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.EditChar
                         handler: 'addHandler',
                     },
                     {
-                        text: 'Удалить',
+                        tooltip: 'Удалить связь группы характеристик и сущности',
                         handler: 'deleteHandler',
                         bind: {
                             disabled: '{!record}',
+                            text: '{buttonText}',
                         },
                     }
                 ],
             },
             reference: 'groupGrid',
-            flex: 1,
+            flex: 2,
+            region: 'center',
             bind: {
                 store: '{groupStore}',
                 selection: '{record}',
             },
+            plugins: {
+                cellediting: true,
+            },
             columns: {
                 defaults: {
                     flex: 1,
@@ -186,6 +199,8 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.EditChar
             bind: {
                 disabled: '{!record}',
             },
+            region: 'south',
+            split: true,
             xtype: 'ReportPanel',
             reference: 'usedGrid',
             flex: 1,

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

@@ -5,6 +5,20 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.EntityGr
     viewModel: {
         data: {
             mainRecord: null,
+            buttonText: 'Удалить',
+        },
+        formulas: {
+            getGroupLength: function(get) {
+                return get('mainRecord.groups').length > 0;
+            },
+            selectionChange: function(get) {
+                const rec = get('record');
+                if (rec) {
+                    this.set('buttonText', rec.get('isDeleted') ? 'Восстановить': 'Удалить');
+                } else {
+                    this.set('buttonText', 'Удалить');
+                }
+            },
         },
         stores: {
             groupStore: {
@@ -36,16 +50,19 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.EntityGr
             {
                 text: 'Добавить',
                 handler: 'addHandler',
+                bind: {
+                    disabled: '{!getGroupLength}',
+                },
             },
             {
-                text: 'Удалить',
                 handler: 'deleteHandler',
                 bind: {
                     disabled: '{!record}',
+                    text: '{buttonText}',
                 },
             },
             {
-                text: 'Редактировать группы',
+                text: 'Работа с группами',
                 handler: 'editGroupHandler',
                 disabled: false,
             }
@@ -53,7 +70,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.EntityGr
     },
     columns: [
         {
-            header: 'Sequence',
+            header: '№',
             dataIndex: 'sequence',
             xtype: 'hintColumn',
             editor: {
@@ -61,7 +78,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.EntityGr
                 allowBlank: false,
                 allowDecimals: false,
             },
-            flex: 1,
+            width: 50,
         },
         {
             header: 'Тип',
@@ -74,7 +91,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.EntityGr
             header: 'Название',
             dataIndex: 'typeDescription',
             xtype: 'hintColumn',
-            flex: 1,
+            flex: 2,
         },
         {
             header: 'Тип значения',
@@ -112,7 +129,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.EntityGr
             dataIndex: 'single',
             xtype: 'checkcolumn',
             editable: true,
-            flex: 1,
+            width: 100,
         },
         {
             header: 'Refercence Code',

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

@@ -35,7 +35,10 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.EntityGr
     },
     onEditItem: function(editor, context) {
         if (context.column.dataIndex === 'group') {
-            this.getViewModel().getStore('EntityGroupStore').fireEvent('refresh');
+            const vm = this.getViewModel();
+            const index = vm.getStore('groupStore').find('group', context.value);
+            context.record.set('groupDescription', index >= 0 ? vm.getStore('groupStore').getAt(index).get('description'): '');
+            vm.getStore('EntityGroupStore').fireEvent('refresh');
         }
     },
     createRow: function(record) {
@@ -51,13 +54,18 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.EntityGr
         this.getViewModel().getStore('EntityGroupStore').insert(0, newRecord);
     },
     deleteHandler: function() {
-        const record = this.getViewModel().get('record');
+        const vm = this.getViewModel();
+        const record = vm.get('record');
         if (record) {
             if (record.isNew) {
-                this.getViewModel().getStore('EntityGroupStore').remove(record);
+                vm.getStore('EntityGroupStore').remove(record);
+                vm.set('buttonText', 'Удалить');
             } else {
                 record.set('isDeleted', !record.get('isDeleted'));
+                vm.set('buttonText', record.get('isDeleted') ? 'Восстановить': 'Удалить');
             }
+        } else {
+            vm.set('buttonText', 'Удалить');
         }
     },
 

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

@@ -19,7 +19,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicGroup.UserGrou
             this.lookup('form').reset();
             const command = Ext.create('Iswe.command.IsweExecuteReportCommand');
             command.on('complete', function(response) {
-                this.getViewModel().getStore('userStore').loadData(response.list && response.list.length ? response.list :[]);
+                this.getViewModel().getStore('userStore').loadData(Ext.isArray(response) ? response :[]);
             }, this);
             command.execute('USER_GROUP_LIST', []);
         },

package/src/common/component/editor/EditorFactory.js

@@ -54,6 +54,9 @@ Ext.define('Coon.common.component.editor.EditorFactory', {
             throw new Ext.Error('Тип редактора не задан');
         }
         Coon.log.debug('createEditor', type);
+        const mask = record.get('mask');
+        record.set('editorConfig', (mask && typeof mask === 'string' && Ext.decode(mask, true) && Ext.isObject(Ext.decode(mask))) ?
+            Ext.decode(mask, true) : {});
         if (type === Coon.common.component.editor.CharacteristicEditorTypes.FOREIGN ||
             type === Coon.common.component.editor.CharacteristicEditorTypes.FILE ||
             !Ext.isEmpty(record.get(Coon.report.model.CharacteristicBeanFields.$editor))) {
@@ -70,10 +73,14 @@ Ext.define('Coon.common.component.editor.EditorFactory', {
                     editor = new Coon.common.component.editor.TextTypeEditor();
                     break;
                 case Coon.common.component.editor.CharacteristicEditorTypes.FLOAT:
-                    editor = new Coon.common.component.editor.NumberTypeEditor();
+                    editor = new Coon.common.component.editor.NumberTypeEditor({
+                        record: record,
+                    });
                     break;
                 case Coon.common.component.editor.CharacteristicEditorTypes.INT:
-                    editor = new Coon.common.component.editor.IntTypeEditor();
+                    editor = new Coon.common.component.editor.IntTypeEditor({
+                        record: record,
+                    });
                     break;
                 case Coon.common.component.editor.CharacteristicEditorTypes.DATE:
                     editor = new Coon.common.component.editor.DateTypeEditor({
@@ -81,7 +88,9 @@ Ext.define('Coon.common.component.editor.EditorFactory', {
                     });
                     break;
                 case Coon.common.component.editor.CharacteristicEditorTypes.LIST:
-                    editor = new Coon.common.component.editor.DFVTypeEditor();
+                    editor = new Coon.common.component.editor.DFVTypeEditor({
+                        record: record,
+                    });
                     break;
                 default:
                     throw new Ext.Error('Не определен тип редактора');
@@ -144,26 +153,32 @@ Ext.define('Coon.common.component.editor.TextTypeEditor', {
         const ns = Coon.report.model.CharacteristicBeanFields;
         const re = new RegExp('^\\d{10}$');
         if (record.recTyp && record.recTyp === 'passport' && re.test(value.replace(/\s/g, ''))) {
-            value = value.slice(0, 2) + ' ' + value.slice(2, 4) + ' ' + value.slice(4);
+            const passportNumber = value.replace(/\s/g, '');
+            value = passportNumber.slice(0, 2) + ' ' + passportNumber.slice(2, 4) + ' ' + passportNumber.slice(4);
         }
         record.set(ns.$valueDescription, value);
     },
 
     prepare: function() {
-        const ns = Coon.report.model.CharacteristicBeanFields;
         const record = this.context.record;
-        const type = this.grid.typeMap.get(record.get(ns.$type));
+        const type = this.grid.typeMap.get(record.get('type'));
         const field = this.field;
-        if (type && type[ns.$mask] !== ' ') {
-            field.regexText = 'Некорректное заполнение поля';
-            field.regex = new RegExp(type[ns.$mask]);
-            field.maskRe = field.regex;
-            record.recTyp = type[ns.$mask] === '^\\d{2}\\s*\\d{2}\\s*\\d{6}$' ? 'passport' : undefined;
-        }
-        if (type && type[ns.$mask] === ' ') {
-            field.regexText = undefined;
-            field.regex = undefined;
-            field.maskRe = undefined;
+        if (!Ext.Object.isEmpty(record.get('editorConfig'))) {
+            Ext.apply(field, record.get('editorConfig'));
+            field.regex = record.get('editorConfig').regex ? new RegExp(record.get('editorConfig').regex) : undefined;
+            record.recTyp = field.recTyp;
+        } else {
+            if (type && type.mask !== ' ') {
+                field.regexText = 'Некорректное заполнение поля';
+                field.regex = new RegExp(type.mask);
+                field.maskRe = field.regex;
+                record.recTyp = type.mask === '^\\d{2}\\s*\\d{2}\\s*\\d{6}$' ? 'passport' : undefined;
+            }
+            if (type && type.mask === ' ') {
+                field.regexText = undefined;
+                field.regex = undefined;
+                field.maskRe = undefined;
+            }
         }
     },
 });
@@ -192,16 +207,13 @@ Ext.define('Coon.common.component.editor.NumberTypeEditor', {
         const record = this.context.record;
         const type = this.grid.typeMap.get(record.get(ns.$type));
         const field = this.field;
-        if (type && type.mask && type.mask.startsWith('minValue')) {
+        field.minValue = Number.NEGATIVE_INFINITY;
+        if (!Ext.Object.isEmpty(record.get('editorConfig'))) {
+            Ext.apply(field, record.get('editorConfig'));
+        } else if (type && type.mask && type.mask.startsWith('minValue')) {
             const range = type[ns.$mask].split(';');
             field.minValue = range[0].slice(9);
-            if (range.length === 2) {
-                field.maxValue = range[1].slice(10);
-            } else {
-                field.maxValue = Number.POSITIVE_INFINITY;
-            }
-        } else {
-            field.minValue = Number.NEGATIVE_INFINITY;
+            field.maxValue = range.length === 2 ? range[1].slice(10) : Number.POSITIVE_INFINITY;
         }
     },
 
@@ -247,25 +259,23 @@ Ext.define('Coon.common.component.editor.DateTypeEditor', {
     ],
 
     createField: function() {
-        const ns = Coon.report.model.CharacteristicBeanFields;
-        this.mask = this.parseMask(this.record.get(ns.$mask));
-        const plugins = this.mask['periodPicker'] ? 'PeriodPickerPlugin' : [];
-        return new Ext.form.field.Date({
+        const mask = Ext.Object.isEmpty(this.record.get('editorConfig')) ? this.parseMask(this.record.get('mask')) : {};
+        return Ext.create(Ext.apply({
+            xtype: 'datefield',
             allowBlank: true,
-            plugins: plugins,
-            format: this.mask['valueFormat'] || 'd.m.Y',
-        });
+            plugins: mask['periodPicker'] ? 'PeriodPickerPlugin' : [],
+            format: mask['valueFormat'] || 'd.m.Y',
+        }, this.record.get('editorConfig')));
     },
 
     setData: function(value, record) {
-        const ns = Coon.report.model.CharacteristicBeanFields;
-        this.mask = this.parseMask(record.get(ns.$mask));
-        if (this.mask['valueFormat']) {
-            record.set(ns.$value,
-                Ext.util.Format.dateRenderer(this.mask['valueFormat'])(value));
+        const mask = Ext.Object.isEmpty(this.record.get('editorConfig')) ? this.parseMask(this.record.get('mask')) : {};
+        const valueFormat = mask['valueFormat'] || (record.get('editorConfig') && record.get('editorConfig').format);
+        if (valueFormat) {
+            record.set('value', Ext.util.Format.dateRenderer(valueFormat)(value));
         }
-        record.set(ns.$valueDescription,
-            Ext.util.Format.dateRenderer(this.mask['displayFormat'] || 'd.m.Y')(value));
+        const displayFormat = mask['displayFormat'] || (record.get('editorConfig') && record.get('editorConfig').displayFormat) || 'd.m.Y';
+        record.set('valueDescription', Ext.util.Format.dateRenderer(displayFormat)(value));
     },
 
     /**
@@ -303,19 +313,19 @@ Ext.define('Coon.common.component.editor.DFVTypeEditor', {
     ],
     alias: 'widget.DFVTypeEditor',
 
-    config: {
-        field: {
+    setData: function(value, record) {
+        const ns = Coon.report.model.CharacteristicBeanFields;
+        record.set(ns.$valueDescription, this.field.getVisibleValue());
+    },
+
+    createField: function() {
+        return Ext.create(Ext.apply({
             xtype: 'DFVCharacteristicField',
             characteristicType: '',
             listWidth: 350,
             allowBlank: true,
             loadOnRender: false,
-        },
-    },
-
-    setData: function(value, record) {
-        const ns = Coon.report.model.CharacteristicBeanFields;
-        record.set(ns.$valueDescription, this.field.getVisibleValue());
+        }, this.record.get('editorConfig')));
     },
 
     prepare: function() {

package/src/common/component/editor/TypedCharacteristicEditor.js

@@ -30,7 +30,7 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
             text: 'Добавить',
             disabled: !this.showEditButtons(),
             hidden: this.hideButtons,
-            iconCls: 'svg-icon svg-icon-add',
+            // iconCls: 'svg-icon svg-icon-add',
             createSelectWindow: function() {
                 return Ext.create('Coon.common.component.editor.CharacteristicForeignWindow');
             },
@@ -44,7 +44,11 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
                 },
             },
         });
-
+        this.viewConfig = {
+            getRowClass: Coon.Function.markDelete(
+                'isDeleted'
+            ),
+        };
         this.plugins = Ext.clone(this.plugins) || [];
 
         if (this.enableToolBar) {
@@ -72,7 +76,7 @@ Ext.define('Coon.common.component.editor.TypedCharacteristicEditor', {
                     add: this.addTypeButton,
                     del: {
                         text: 'Удалить',
-                        iconCls: 'svg-icon svg-icon-status-refusing',
+                        // iconCls: 'svg-icon svg-icon-status-refusing',
                         disabled: true,
                         hidden: this.hideButtons,
                         handler: this.delHandler.bind(this),

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

@@ -10,7 +10,7 @@ Ext.define('Coon.common.component.editor.creators.CustomPanelEditorCreator', {
     },
     createField: function(record, grid, context) {
         this.context = context;
-        this.field = Ext.create({
+        this.field = Ext.create(Ext.apply({
             xtype: 'textfield',
             setVisibleValue: function(visibleValue) {
                 this.visibleValue = visibleValue;
@@ -19,7 +19,7 @@ Ext.define('Coon.common.component.editor.creators.CustomPanelEditorCreator', {
                 return this.visibleValue;
             },
             editable: false,
-        });
+        }, record.get('editorConfig')));
         return this.field;
     },
     valueIsValidJson: function(str) {

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

@@ -7,7 +7,8 @@ Ext.define('Coon.common.component.editor.creators.NoteEditorCreator', {
     xtype: 'NoteEditorCreator',
     createField: function(record, parent) {
         const ns = Coon.report.model.CharacteristicBeanFields;
-        this.field = Ext.create('Coon.common.field.OpenDialogField', {
+        this.field = Ext.create(Ext.apply({
+            xtype: 'OpenDialogField',
             dialogForm: this.showPanel(record, parent),
             getValue: this.getValue,
             noteID: record.get(ns.$value),
@@ -18,7 +19,7 @@ Ext.define('Coon.common.component.editor.creators.NoteEditorCreator', {
             getVisibleValue: function() {
                 return this.visibleValue;
             },
-        }, this);
+        }, record.get('editorConfig')));
         return this.field;
     },
 

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

@@ -16,15 +16,15 @@ Ext.define('Coon.common.component.editor.creators.NumberEditorCreator', {
         return `${first},${rest.join('')}`;
     },
 
-    createField: function(record, parent) {
-        const charNs = Coon.report.model.CharacteristicBeanFields;
-
-        return Ext.create({
+    createField: function(record) {
+        return Ext.create(Ext.apply({
             xtype: 'numberfield',
             allowDecimals: true,
             isFieldHighlightOnChange: false,
-            decimalPrecision: record.get(charNs.$mask) ? record.get(charNs.$mask) : 3,
+            decimalPrecision: Ext.Object.isEmpty(record.get('editorConfig')) ? (record.get('mask') || 3) : 3,
             enableKeyEvents: true,
+            truncate: false,
+            decimalSeparator: this.decimalSeparator,
             listeners: {
                 keyup: {
                     fn: function(f, e) {
@@ -40,6 +40,22 @@ Ext.define('Coon.common.component.editor.creators.NumberEditorCreator', {
                     scope: this,
                 },
             },
-        });
+            fixPrecision: function(value) {
+                const me = this;
+                const nan = isNaN(value);
+                let precision = me.decimalPrecision;
+
+                if (nan || !value) {
+                    return nan ? '' : value;
+                } else if (!me.allowDecimals || precision <= 0) {
+                    precision = 0;
+                }
+
+                return parseFloat(this.truncate ?
+                    Ext.Number.truncateToPrecision(parseFloat(value), precision) :
+                    Ext.Number.toFixed(parseFloat(value), precision)
+                );
+            },
+        }, record.get('editorConfig')));
     },
 });

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

@@ -13,8 +13,6 @@ Ext.define('Coon.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);
         const entityID = parent && parent.model && parent.model.ID;
         const entityTypeID = parent && parent.model && parent.model.subentityId;
         const params = {};
@@ -24,14 +22,14 @@ Ext.define('Coon.common.component.editor.creators.SimpleReportEditorCreator', {
         if (entityTypeID) {
             params['ENTITY'] = entityTypeID;
         }
-        return Ext.create({
+        return Ext.create(Ext.apply({
             xtype: 'SimplestReportCombo',
-            reportId: reportId,
+            reportId: record.get('mask'),
             defaultParameters: Object.assign(params, context),
             valueField: 'VALUE',
             displayField: 'DESCRIPTION',
             searchBySubstring: true,
-        });
+        }, record.get('editorConfig')));
     },
 
 });

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

@@ -3,12 +3,10 @@ Ext.define('Coon.common.component.editor.creators.TimeEditorCreator', {
     alias: 'widget.TimeEditorCreator',
     xtype: 'TimeEditorCreator',
     createField: function(record, parent) {
-        const charNs = Coon.report.model.CharacteristicBeanFields;
-
-        return Ext.create({
+        return Ext.create(Ext.apply({
             xtype: 'DeliveryTimeField',
-            format: record.get(charNs.$mask).trim() || 'H:i',
+            format: Ext.Object.isEmpty(record.get('editorConfig')) ? record.get('mask').trim() || 'H:i' : 'H:i',
             increment: 60,
-        });
+        }, record.get('editorConfig')));
     },
 });

package/src/version.js

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