ru.coon 2.5.67 → 2.6.0

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',
@@ -128,6 +145,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 +181,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/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/CharacteristicAddTypeGrid.js

@@ -1,101 +1,101 @@
-Ext.define('Coon.common.component.editor.CharacteristicAddTypeGrid', {
-    extend: 'Ext.grid.Panel',
-    alternateClassName: [
-        'SigmaUtilities.view.common.component.editor.CharacteristicAddTypeGrid'
-    ],
-    alias: 'widget.CharacteristicAddTypeGrid',
-    config: {
-        stripeRows: true,
-        frame: true,
-        selModel: {
-            selType: 'checkboxmodel',
-        },
-    },
-
-    initComponent: function() {
-        this.loadMask = true;
-
-        this.store = Ext.create('Coon.report.store.CharacteristicListStore', {
-            sortInfo: {
-                field: Coon.report.model.CharacteristicBeanFields.$typeDescription,
-                direction: 'ASC',
-            },
-        });
-
-        const ns = Coon.report.model.CharacteristicBeanFields;
-
-        this.features = [{
-            ftype: 'grouping',
-            groupTextTpl: '{text}',
-            showGroupName: false,
-        }];
-
-        this.columns = {
-            items: [
-                {header: 'Характеристика', dataIndex: ns.$typeDescription, xtype: 'hintColumn', width: 250},
-                {header: 'Значение по умолчанию', dataIndex: ns.$valueDescription, xtype: 'hintColumn', width: 200},
-                {header: 'Группа', dataIndex: ns.$groupDescription, xtype: 'hintColumn', hidden: true}
-            ],
-            defaults: {
-                sortable: true,
-                width: 20,
-            },
-        };
-
-        this.callParent();
-
-        this.on('rowdblclick', function() {
-            this.fireEvent('select', this);
-        }, this);
-    },
-
-    /**
-     * Инициализация
-     */
-    doInit: function(records) {
-        this.clear();
-
-        const ns = Coon.report.model.CharacteristicBeanFields;
-
-        let withGroups = false;
-        Ext.each(records, function(type) {
-            if (type.get(ns.$group)) {
-                withGroups = true;
-                return false;
-            }
-        }, this);
-
-        this.getStore().add(records);
-
-        if (withGroups) {
-            this.getStore().group(ns.$groupDescription);
-        }
-
-        if (this.rendered) {
-            this.getView().refresh(true);
-        }
-    },
-
-    /**
-     * Перезагрузить содержимое таблицы
-     */
-    reload: function() {
-        this.getStore().reload();
-    },
-
-    /**
-     * Очистка
-     */
-    clear: function() {
-        this.getStore().removeAll();
-    },
-
-    validate: function() {
-        return (this.getSelection()) ? true : false;
-    },
-
-    getSelected: function() {
-        const records = this.getSelection();
-        return Coon.Function.serializeRecords(records, false);
-    },
-});
+Ext.define('Coon.common.component.editor.CharacteristicAddTypeGrid', {
+    extend: 'Ext.grid.Panel',
+    alternateClassName: [
+        'SigmaUtilities.view.common.component.editor.CharacteristicAddTypeGrid'
+    ],
+    alias: 'widget.CharacteristicAddTypeGrid',
+    config: {
+        stripeRows: true,
+        frame: true,
+        selModel: {
+            selType: 'checkboxmodel',
+        },
+    },
+
+    initComponent: function() {
+        this.loadMask = true;
+
+        this.store = Ext.create('Coon.report.store.CharacteristicListStore', {
+            sortInfo: {
+                field: Coon.report.model.CharacteristicBeanFields.$typeDescription,
+                direction: 'ASC',
+            },
+        });
+
+        const ns = Coon.report.model.CharacteristicBeanFields;
+
+        this.features = [{
+            ftype: 'grouping',
+            groupTextTpl: '{text}',
+            showGroupName: false,
+        }];
+
+        this.columns = {
+            items: [
+                {header: 'Характеристика', dataIndex: ns.$typeDescription, xtype: 'hintColumn', width: 250},
+                {header: 'Значение по умолчанию', dataIndex: ns.$valueDescription, xtype: 'hintColumn', width: 200},
+                {header: 'Группа', dataIndex: ns.$groupDescription, xtype: 'hintColumn', hidden: true}
+            ],
+            defaults: {
+                sortable: true,
+                width: 20,
+            },
+        };
+
+        this.callParent();
+
+        this.on('rowdblclick', function() {
+            this.fireEvent('select', this);
+        }, this);
+    },
+
+    /**
+     * Инициализация
+     */
+    doInit: function(records) {
+        this.clear();
+
+        const ns = Coon.report.model.CharacteristicBeanFields;
+
+        let withGroups = false;
+        Ext.each(records, function(type) {
+            if (type.get(ns.$group)) {
+                withGroups = true;
+                return false;
+            }
+        }, this);
+
+        this.getStore().add(records);
+
+        if (withGroups) {
+            this.getStore().group(ns.$groupDescription);
+        }
+
+        if (this.rendered) {
+            this.getView().refresh(true);
+        }
+    },
+
+    /**
+     * Перезагрузить содержимое таблицы
+     */
+    reload: function() {
+        this.getStore().reload();
+    },
+
+    /**
+     * Очистка
+     */
+    clear: function() {
+        this.getStore().removeAll();
+    },
+
+    validate: function() {
+        return (this.getSelection()) ? true : false;
+    },
+
+    getSelected: function() {
+        const records = this.getSelection();
+        return Coon.Function.serializeRecords(records, false);
+    },
+});