ru.coon 2.7.1 → 2.7.3

package/src/report/component/settings/context/ReportFormContextParametersGrid.js

@@ -6,10 +6,7 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
         'Coon.report.model.ReportNavigationContextBeanFields',
         'Coon.report.model.ComboValueWrapperFields',
         'Coon.report.model.ComboValueWrapper',
-        'Coon.report.model.ReportParameterMaintenanceBeanFields',
-        'Coon.report.model.ReportFieldMaintenanceBeanFields',
         'Coon.report.model.ReportNavigationContextBean',
-        'Coon.report.store.ReportNavigationContextStore',
         'Coon.report.plugin.grid.GridStoreDependency',
         'Coon.report.store.RefStore'
     ],
@@ -79,7 +76,9 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
             }];
         }
 
-        this.store = Ext.create('Coon.report.store.ReportNavigationContextStore');
+        this.store = new Ext.data.Store({
+            fields: Coon.report.model.ReportNavigationContextBeanFields,
+        });
 
         const numEditor = Ext.create('Ext.form.field.Number', {
             allowDecimals: false,
@@ -99,8 +98,8 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
 
         this.valueEditor = Ext.create('Coon.common.field.combo.BaseComboBox', {
             loadOnRender: false,
-            displayField: Coon.report.model.ComboValueWrapperFields.$description,
-            valueField: Coon.report.model.ComboValueWrapperFields.$value,
+            displayField: 'description',
+            valueField: 'value',
             store: Ext.create('Coon.report.store.RefStore'),
             allowBlank: false,
         });
@@ -109,14 +108,13 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
             allowBlank: false,
         });
 
-        const ns = Coon.report.model.ReportNavigationContextBeanFields;
         this.columns = {
             items: [
-                {required: true, text: '№ п/п', dataIndex: ns.$sortSequence, xtype: 'BigNumColumn', editor: numEditor, flex: .3},
+                {required: true, text: '№ п/п', dataIndex: 'sortSequence', xtype: 'BigNumColumn', editor: numEditor, flex: .3},
                 {
                     required: true,
                     text: 'Параметр',
-                    dataIndex: ns.$reportParameter,
+                    dataIndex: 'reportParameter',
                     xtype: 'hintColumn',
                     editor: paramEditor,
                 },
@@ -124,7 +122,7 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
                     required: true,
                     text: 'Тип',
                     minWidth: 150,
-                    dataIndex: ns.$reportNavigationOptionContextSource,
+                    dataIndex: 'reportNavigationOptionContextSource',
                     xtype: 'hintColumn',
                     editor: this.typeEditor,
                     renderer: Coon.format.comboRenderer(this.typeEditor),
@@ -132,44 +130,49 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
                 },
                 {
                     text: 'Значение',
-                    tooltip: 'название поля таблицы отчета',
-                    dataIndex: ns.$reportNavigationOptionContextSourceValue,
+                    tooltip: 'название поля таблицы отчета/название параметра отчета',
+                    dataIndex: 'reportNavigationOptionContextSourceValue',
                     xtype: 'hintColumn',
                     width: 130,
                     editor: this.valueEditor,
                     renderer: Ext.bind(function(value, meta, record) {
-                        const type = record.get(ns.$reportNavigationOptionContextSource);
+                        const type = record.get('reportNavigationOptionContextSource');
                         let visibleValue;
-                        const fieldsNS = Coon.report.model.ComboValueWrapperFields;
-                        let pos;
+
+                        let found;
                         if (type === 'FLD') {
-                            pos = this.fieldsStore.findExact(fieldsNS.$value, value);
-                            if (pos !== -1) {
-                                visibleValue = this.fieldsStore.getAt(pos).get(fieldsNS.$description);
-                            }
+                            found = this.fieldsStore.findRecord('value', value);
+                            visibleValue = found && found.get('description');
                         } else if (type === 'PRM') {
-                            pos = this.paramsStore.findExact(fieldsNS.$value, value);
-                            if (pos !== -1) {
-                                visibleValue = this.paramsStore.getAt(pos).get(fieldsNS.$description);
-                            }
+                            found = this.paramsStore.findRecord('value', value);
+                            visibleValue = found && found.get('description');
                         } else if (type === 'SELR' || type === 'ALLR' || type === 'RCRD' || type === 'MDFD' || type === 'CHCK') {
-                            for (let i = 0; i < this.storeForSELR.length; i++) {
-                                if (this.storeForSELR[i].value === value) {
-                                    visibleValue = this.storeForSELR[i].description;
-                                }
-                            }
+                            found = this.storeForSELR.find((obj) => obj.value === value);
+                            visibleValue = found && found.description;
                         }
                         return Coon.format.withHint(visibleValue);
                     }, this),
                 },
                 {
                     text: 'Значение по умолчанию',
-                    dataIndex: ns.$defaultValue,
+                    dataIndex: 'defaultValue',
                     xtype: 'hintColumn',
                     editor: valueDefaultEditor,
                     flex: .7,
                 },
-                {text: 'Обязательно', dataIndex: ns.$editable, xtype: 'checkcolumn', editable: true, flex: .35}
+                {
+                    text: 'Обязательно',
+                    dataIndex: 'editable',
+                    xtype: 'checkcolumn',
+                    editable: true,
+                    flex: .35,
+                },
+                {
+                    text: 'Описание',
+                    tooltip: 'Описание параметра отчета',
+                    dataIndex: 'description',
+                    xtype: 'hintColumn',
+                }
             ],
             defaults: {
                 sortable: true,
@@ -196,12 +199,12 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
             });
         } else {
             this.on('beforeedit', function(plugin, context) {
-                if (context.field === ns.$sortSequence) {
+                if (context.field === 'sortSequence') {
                     return context.record.get('isNew');
                 }
 
-                if (context.field === ns.$reportNavigationOptionContextSourceValue) {
-                    const type = context.record.get(ns.$reportNavigationOptionContextSource);
+                if (context.field === 'reportNavigationOptionContextSourceValue') {
+                    const type = context.record.get('reportNavigationOptionContextSource');
                     if (type === 'DFLT') {
                         return false;
                     } else {
@@ -212,9 +215,9 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
             }, this);
 
             this.on('edit', function(plugin, context) {
-                if (context.field === ns.$reportNavigationOptionContextSource) {
-                    context.record.set(ns.$reportNavigationOptionContextSourceValue, null);
-                    context.record.set(ns.$defaultValue, null);
+                if (context.field === 'reportNavigationOptionContextSource') {
+                    context.record.set('reportNavigationOptionContextSourceValue', null);
+                    context.record.set('defaultValue', null);
                 }
                 return true;
             }, this);
@@ -223,15 +226,13 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
 
         this.fieldsStore = Ext.create('Coon.report.store.RefStore');
         this.paramsStore = Ext.create('Coon.report.store.ReportParameterStore');
-        this.typeEditor.getStore().on('load', function() {
-            if (!this.additionalContext || !Ext.isArray(this.additionalContext)) {
-                return;
-            }
-            for (let i = 0; i < this.additionalContext.length; i++) {
-                const record = this.additionalContext[i];
-                if (this.typeEditor.getStore().find('value', record.get('value')) === -1) {
-                    this.typeEditor.getStore().add(record);
-                }
+        this.typeEditor.getStore().on('load', function(store, records) {
+            if (Ext.isArray(this.additionalContext) && records.length) {
+                this.additionalContext.forEach((record) => {
+                    if (record && record.isModel && record.get('value') && store.find('VALUE', record.get('value')) === -1) {
+                        store.add(record);
+                    }
+                });
             }
         }, this);
     },
@@ -302,13 +303,12 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
     },
 
     getData: function() {
-        const records = this.getStore().getRange();
         const recordsToSave = [];
-        for (let i = 0; i < records.length; i++) {
-            if (!records[i].get('isDeleted')) {
-                recordsToSave.push(records[i]);
+        this.store.each((record) => {
+            if (!record.get('isDeleted')) {
+                recordsToSave.push(record);
             }
-        }
+        });
         return Coon.Function.serializeRecords(recordsToSave);
     },
 
@@ -345,32 +345,18 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
     },
 
     changeFieldsList: function(fields) {
-        const ns = Coon.report.model.ComboValueWrapperFields;
-        const cvList = [];
-
-        const fieldNs = Coon.report.model.ReportFieldMaintenanceBeanFields;
-        for (let i = 0; i < fields.length; i++) {
-            const field = fields[i];
-            const obj = {};
-            obj[ns.$value] = field[fieldNs.$reportField];
-            obj[ns.$description] = field[fieldNs.$description];
-            cvList.push(obj);
-        }
+        const cvList = fields.map((field) => ({
+            value: field['reportFieldCd'],
+            description: field['description'],
+        }));
         this.fieldsStore.loadData(cvList);
     },
 
     changeParametersList: function(parameters) {
-        const ns = Coon.report.model.ComboValueWrapperFields;
-        const cvList = [];
-
-        const paramNs = Coon.report.model.ReportParameterMaintenanceBeanFields;
-        for (let i = 0; i < parameters.length; i++) {
-            const param = parameters[i];
-            const obj = {};
-            obj[ns.$value] = param[paramNs.$reportParameter];
-            obj[ns.$description] = param[paramNs.$description];
-            cvList.push(obj);
-        }
+        const cvList = parameters.map((param) => ({
+            value: param['reportParameterCd'],
+            description: param['description'],
+        }));
         this.paramsStore.loadData(cvList);
     },
 
@@ -401,12 +387,10 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
             return;
         }
 
-        const record = Ext.create('Coon.report.model.ReportNavigationContextBean', {
+        this.getStore().insert(0, {
             isNew: true,
             reportNavigationOptionContextSource: 'DFLT',
         });
-        // record.markDirty();
-        this.getStore().insert(0, record);
 
         const editor = this.findPlugin('cellediting');
         editor.startEditByPosition({row: 0, column: 0});
@@ -463,6 +447,7 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
                 default:
                     break;
                 }
+
                 this.loadData(parameters);
             }
         }
@@ -472,37 +457,37 @@ Ext.define('Coon.report.component.settings.common.ReportFormContextParametersGri
         parameters = parameters || [];
         nameField = nameField || 'name';
         isRequiredField = isRequiredField || 'required';
-        const dataForLoad = [];
+
+        let dataForLoad = [];
         if (this.loadParametersSource.field.getValue() !== this.lastSource) {
             this.lastSource = this.loadParametersSource.field.getValue();
-            for (let i = 0; i < parameters.length; i++) {
-                dataForLoad.push(this.getDataForRecord(i, parameters[i][nameField], parameters[i][isRequiredField]));
-            }
+            dataForLoad = parameters.map(function(parameter, i) {
+                return this.getDataForRecord(i, parameter[nameField], parameter[isRequiredField], parameter['description']);
+            }, this);
             this.load(dataForLoad);
         } else {
-            for (let i = 0; i < parameters.length; i++) {
-                if (this.getStore().findExact('reportParameter', parameters[i][nameField]) === -1) {
-                    const record = Ext.create('Coon.report.model.ReportNavigationContextBean',
-                        this.getDataForRecord(i, parameters[i][nameField], parameters[i][isRequiredField]));
-                    dataForLoad.push(record);
+            parameters.forEach(function(parameter, i) {
+                if (!this.getStore().findRecord('reportParameter', parameter[nameField])) {
+                    dataForLoad.push(this.getDataForRecord(i, parameter[nameField], parameter[isRequiredField], parameter['description']));
                 }
-            }
+            }, this);
             if (dataForLoad.length > 0) {
-                this.getStore().insert(this.getStore().getCount(), dataForLoad);
+                this.getStore().add(dataForLoad);
             }
         }
     },
 
-    getDataForRecord: function(i, value, editable) {
+    getDataForRecord: function(i, value, editable, description) {
         return {
             sortSequence: i,
             reportParameter: value,
             isNew: true,
             editable: editable || false,
+            description: description,
         };
     },
     deleteHandler: function() {
-        const record = this.getSelectionModel().getSelection()[0];
+        const record = this.getSelection()[0];
         if (record) {
             this.deleteAction(record);
         }

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

@@ -86,16 +86,18 @@ Ext.define('Coon.report.plugin.configPanel.ExecuteCommandButtonPluginConfigPanel
 
     createItems: function() {
         this.commandCombo = this.createCommandPicker();
+        this.commandCombo.on('change', function(field, newValue) {
+            newValue && this.southRegion.setTitle(`Настройки команды ${newValue}`);
+        }, this);
 
         this.completeHandler = Ext.create({
             xtype: 'UiAceEditorPanel',
-            margin: '8 0',
+            margin: 8,
             frame: true,
             hideSearchPanel: true,
             height: 300,
             text: `
-                completeHandler(запускается после успешного выполнения команды)<br />
-                получает в качестве аргумента data - результат,возвращенный бэкендом
+                completeHandler(запускается после успешного выполнения команды) получает в качестве аргумента data - результат,возвращенный бэкендом
             `,
             name: 'completeHandler',
         });
@@ -107,55 +109,55 @@ Ext.define('Coon.report.plugin.configPanel.ExecuteCommandButtonPluginConfigPanel
                     text: 'вставить отладочную функцию для анализа response',
                     handler(btn) {
                         const fn = `
-console.table(response);
-const getRows = (data, stopRecursion) => Object.entries(data).map(([k, v]) => {
-    if (Ext.isObject) {
-        try {
-            v = JSON.stringify(v)
-        } catch (e) {
-            v = stopRecursion ? 
-                typeof(v) + ' : ' + v.toString() :
-                getRows(v, 'final').map(({name, value}) => name + ':' + value).join(', ')
-        }
-    } else {
-        v = typeof(v) + ' : ' + v.toString()
-    }
-    return {
-        name: k,
-        value: v
-    }
-})
-const win = Ext.widget('WindowWrap', {
-    title: 'содержимое переменной response',
-    width: 800,
-    height: 600,
-    items: [
-        {
-            xtype: 'grid',
-            store: {
-                fields: ['name', 'value']
-            },
-            columns: [
-                {dataIndex: 'name', text: 'свойство', width: 200},
-                {dataIndex: 'value', text: 'значение', flex: 1},
+        console.table(response);
+        const getRows = (data, stopRecursion) => Object.entries(data).map(([k, v]) => {
+            if (Ext.isObject) {
+                try {
+                    v = JSON.stringify(v)
+                } catch (e) {
+                    v = stopRecursion ?
+                        typeof(v) + ' : ' + v.toString() :
+                        getRows(v, 'final').map(({name, value}) => name + ':' + value).join(', ')
+                }
+            } else {
+                v = typeof(v) + ' : ' + v.toString()
+            }
+            return {
+                name: k,
+                value: v
+            }
+        })
+        const win = Ext.widget('WindowWrap', {
+            title: 'содержимое переменной response',
+            width: 800,
+            height: 600,
+            items: [
+                {
+                    xtype: 'grid',
+                    store: {
+                        fields: ['name', 'value']
+                    },
+                    columns: [
+                        {dataIndex: 'name', text: 'свойство', width: 200},
+                        {dataIndex: 'value', text: 'значение', flex: 1},
+                    ]
+                }
             ]
-        }
-    ]
-})
-win.show()
-win.down('grid').store.loadData(getRows(response))`;
+        })
+        win.show()
+        win.down('grid').store.loadData(getRows(response))`;
                         btn.up('UiAceEditorPanel').links.editor.setValue(fn);
                     },
                 }
             ],
-            margin: '8 0',
+            margin: 8,
             frame: true,
             hideSearchPanel: true,
             height: 300,
             text: `
-                errorHandler(обработка ошибки возлагается на эту функцию,<br /> окно ошибки приложения не будет запущено!)<br />
-                параметры функции: response
-            `,
+                        errorHandler(обработка ошибки возлагается на эту функцию,<br /> окно ошибки приложения не будет запущено!)<br />
+                        параметры функции: response
+                    `,
             name: 'errorHandler',
         });
 
@@ -182,9 +184,14 @@ win.down('grid').store.loadData(getRows(response))`;
             flex: 1,
             title: 'Свойства команды',
             autoExpandColumn: 2,
+            loadPropertiesSource: {
+                field: this.commandCombo,
+                type: this.commandCombo.commandType,
+            },
         });
 
         this.tabs = Ext.create('Ext.tab.Panel', {
+            flex: 1,
             activeTab: 0,
             items: [
                 {
@@ -199,17 +206,52 @@ win.down('grid').store.loadData(getRows(response))`;
                         this.fieldConfigGrid
                     ],
                 },
-                this.propertiesGrid
+                this.propertiesGrid,
+                {
+                    title: 'complete handler',
+                    scrollable: true,
+                    layout: 'fit',
+                    items: [
+                        this.completeHandler
+                    ],
+                },
+                {
+                    title: 'error handler',
+                    scrollable: true,
+                    layout: 'fit',
+                    items: [
+                        this.errorHandler
+                    ],
+                }
+            ],
+        });
+        this.southRegion = Ext.create('Ext.panel.Panel', {
+            title: 'Настройки команды',
+            flex: 0.5,
+            minHeight: 300,
+            layout: {
+                type: 'vbox',
+                align: 'stretch',
+            },
+            items: [
+                this.commandCombo,
+                this.tabs
             ],
         });
         return [
             {
                 xtype: 'panel',
-                layout: 'border',
+                layout: {
+                    type: 'vbox', align: 'stretch',
+                },
                 flex: 1,
+                defaults: {
+                    collapsible: true,
+                },
                 items: [
                     {
-                        region: 'center',
+                        title: 'Параметры плагина',
+                        flex: 1,
                         autoScroll: true,
                         layout: 'form',
                         defaults: {
@@ -227,7 +269,6 @@ win.down('grid').store.loadData(getRows(response))`;
                                     this.createHotKeyPanel(),
                                     this.createVisibilityKeyPanel(),
                                     this.isCreatedButtonHidden(),
-                                    this.commandCombo,
                                     this.createConfirmFieldSet(),
                                     this.createSuccessFieldSet(),
                                     {
@@ -280,9 +321,9 @@ win.down('grid').store.loadData(getRows(response))`;
                                         boxLabel: 'useSimpleEngine',
                                         boxLabelAlign: 'after',
                                         name: 'useSimpleEngine',
-                                    },
-                                    this.completeHandler,
-                                    this.errorHandler
+                                    }
+                                    // this.completeHandler,
+                                    // this.errorHandler
                                 ],
                                 defaults: {
                                     labelWidth: 130,
@@ -291,15 +332,7 @@ win.down('grid').store.loadData(getRows(response))`;
                             }
                         ],
                     },
-                    {
-                        region: 'south',
-                        split: true,
-                        height: 200,
-                        layout: 'fit',
-                        items: [
-                            this.tabs
-                        ],
-                    }
+                    this.southRegion
                 ],
             }
         ];

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

@@ -69,24 +69,39 @@ Ext.define('Coon.report.plugin.grid.ExecuteCommandButtonPlugin', {
 
         try {
             const command = Ext.create('command.' + this.ctype, propertyForCommand);
-            if (this.getErrorHandler()) {
+
+            if (typeof this.completeHandler === 'string' && this.completeHandler) {
+                const completeHandler = new Function('data', `
+                    try {
+                        ${this.completeHandler}
+                    } catch (ex) {
+                        Coon.log.error('completeHandler', ex);
+                    }
+                `);
+                this.completeHandler = completeHandler.bind(this.component);
+            }
+
+            if (typeof this.errorHandler === 'string' && this.errorHandler) {
                 const errorHandler = new Function('response', `
                     try {
-                        ${this.getErrorHandler()}
+                        ${this.errorHandler}
                     } catch (ex) {
-                        Coon.log.error(ex)
+                        Coon.log.error('errorHandler', ex);
                     }
                 `);
-                command.processError = errorHandler.bind(this.component);
-                Coon.log.debug('command.processError', command.processError);
+                this.errorHandler = errorHandler.bind(this.component);
             }
+
             command.additionalParameterEventToClose = 'postCompleted';
             if (command.execute) {
                 if (Ext.isFunction(command.on)) {
+                    command.on('failure', function(data) {
+                        Ext.isFunction(this.errorHandler) && this.errorHandler(data);
+                    }, this);
+
                     command.on('complete', function(data) {
-                        if (this.completeHandler && Ext.isFunction(this.completeHandler)) {
-                            this.completeHandler(data);
-                        }
+                        Ext.isFunction(this.completeHandler) && this.completeHandler(data);
+
                         if (this.reloadAfterComplete) {
                             this.component.fireEvent('needReload', this.reloadAfterComplete);
                         }

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

@@ -44,7 +44,7 @@ Ext.define('Coon.report.plugin.grid.ReportColumnStatePlugin', {
             }
         }
     },
-    columnInteractionHandler(_, col) {
+    columnInteractionHandler() {
         const currentState = [];
         const columns = this.grid.getColumns();
         columns.forEach((e) => {
@@ -82,12 +82,15 @@ Ext.define('Coon.report.plugin.grid.ReportColumnStatePlugin', {
                 const stateMap = new Map();
                 currentReportState.forEach((e) => stateMap.set(e.columnId, e));
 
-                columns.forEach((currentColumn, i) => {
-                    const currentColumnState = stateMap.get(currentColumn.dataIndex);
-                    if (currentColumnState) {
-                        currentColumn.setHidden(currentColumnState.hidden);
-                        currentColumn.setWidth(currentColumnState.width ? currentColumnState.width : 100);
-                        columnHeader.moveBefore(currentColumn, columnHeader.getComponent(currentColumnState.position));
+                columns.forEach((column, i) => {
+                    if (column.hidden) {
+                        return;
+                    }
+                    const state = stateMap.get(column.dataIndex);
+                    if (state) {
+                        column.setHidden(state.hidden);
+                        column.setWidth(state.width ? state.width : 100);
+                        columnHeader.moveBefore(column, columnHeader.getComponent(state.position));
                     }
                 });
             }