ru.coon 2.5.68 → 2.6.1

package/CHANGELOG.md

@@ -1,10 +1,26 @@
+# Version 2.6.1, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2b7d5d8cd09bf94320d149f9cf3aa78ef27594a8)
+* ## Fixes
+* <span style='color:red'> HT-7281 GridEditorPlugin editor dependField</span> ([e9c537], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e9c53704ee957042292ed639343bf217c8cdeca8))
+
+* HT-8006 hotfix ([6569c3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6569c3b6e197471fabb6af4da5c3212fd7079be2))
+* update: CHANGELOG.md ([e7b502], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e7b50227f8ddeaac7322ce3e436c2c0b5fd12163))
+
+# 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 +46,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.1",
   "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,