ru.coon 2.5.34 → 2.5.35

package/src/report/plugin/configPanel/openCustomPanelButtonPlugin/ReportFormContextXTypeMappingGrid.js

@@ -1,71 +1,71 @@
-Ext.define('Coon.report.plugin.configPanel.ReportFormContextXTypeMappingGrid', {
-    extend: 'Ext.grid.GridPanel',
-    alias: 'widget.ReportFormContextXTypeMappingGrid',
-    uses: [],
-    requires: [
-        'Coon.report.model.ComboValueWrapper',
-        'Coon.report.model.ComboValueWrapperFields',
-        'Coon.report.plugin.grid.GridStoreDependency',
-        'Coon.report.store.RefStore'
-    ],
-    controller: 'ReportFormContextXTypeMappingGridController',
-    frame: true,
-    selModel: 'cellmodel',
-    plugins: [{ptype: 'cellediting', clicksToEdit: 2}],
-    columns: [
-        {
-            text: 'Тип панели',
-            xtype: 'hintColumn',
-            dataIndex: 'xtype',
-            width: 300,
-            editor: 'PanelComboBox',
-        },
-        {
-            text: 'Тип источника',
-            xtype: 'hintColumn',
-            dataIndex: 'sourceType',
-            width: 200,
-        },
-        {
-            text: 'Источник в репорте',
-            xtype: 'hintColumn',
-            dataIndex: 'sourceName',
-            dependOnColumnDataIndex: 'sourceType',
-            width: 200,
-        },
-        {
-            text: '= значению',
-            xtype: 'hintColumn',
-            dataIndex: 'value',
-            width: 100,
-            editor: 'textfield',
-        }],
-    store: {
-        fields: ['xtype', 'sourceType', 'sourceName', 'value'],
-    },
-    fieldList: [],
-    parameterList: [],
-    additionalContext: [],
-    dockedItems: [{
-        xtype: 'toolbar',
-        dock: 'top',
-        itemId: 'toptoolbar',
-        items: [
-            {
-                xtype: 'button',
-                text: 'Добавить',
-                ui: 'blue-text-button-border',
-                handler: 'addHandler',
-            },
-            {
-                xtype: 'button',
-                text: 'Удалить',
-                ui: 'blue-text-button-border',
-                handler: 'deleteHandler',
-            }
-        ],
-    }],
-    listeners: {
-        beforeedit: 'beforeEditHandler',
-    },
-});
+Ext.define('Coon.report.plugin.configPanel.ReportFormContextXTypeMappingGrid', {
+    extend: 'Ext.grid.GridPanel',
+    alias: 'widget.ReportFormContextXTypeMappingGrid',
+    uses: [],
+    requires: [
+        'Coon.report.model.ComboValueWrapper',
+        'Coon.report.model.ComboValueWrapperFields',
+        'Coon.report.plugin.grid.GridStoreDependency',
+        'Coon.report.store.RefStore'
+    ],
+    controller: 'ReportFormContextXTypeMappingGridController',
+    frame: true,
+    selModel: 'cellmodel',
+    plugins: [{ptype: 'cellediting', clicksToEdit: 2}],
+    columns: [
+        {
+            text: 'Тип панели',
+            xtype: 'hintColumn',
+            dataIndex: 'xtype',
+            width: 300,
+            editor: 'PanelComboBox',
+        },
+        {
+            text: 'Тип источника',
+            xtype: 'hintColumn',
+            dataIndex: 'sourceType',
+            width: 200,
+        },
+        {
+            text: 'Источник в репорте',
+            xtype: 'hintColumn',
+            dataIndex: 'sourceName',
+            dependOnColumnDataIndex: 'sourceType',
+            width: 200,
+        },
+        {
+            text: '= значению',
+            xtype: 'hintColumn',
+            dataIndex: 'value',
+            width: 100,
+            editor: 'textfield',
+        }],
+    store: {
+        fields: ['xtype', 'sourceType', 'sourceName', 'value'],
+    },
+    fieldList: [],
+    parameterList: [],
+    additionalContext: [],
+    dockedItems: [{
+        xtype: 'toolbar',
+        dock: 'top',
+        itemId: 'toptoolbar',
+        items: [
+            {
+                xtype: 'button',
+                text: 'Добавить',
+                ui: 'blue-text-button-border',
+                handler: 'addHandler',
+            },
+            {
+                xtype: 'button',
+                text: 'Удалить',
+                ui: 'blue-text-button-border',
+                handler: 'deleteHandler',
+            }
+        ],
+    }],
+    listeners: {
+        beforeedit: 'beforeEditHandler',
+    },
+});

package/src/report/plugin/configPanel/reportGroupsFieldValidationPlugin/RequiredParametersTree.js

@@ -1,157 +1,157 @@
-Ext.define('Coon.report.plugin.configPanel.reportGroupsFieldValidationPlugin.RequiredParametersTree', {
-    extend: 'Ext.tree.Panel',
-    alias: 'widget.RequiredParametersTree',
-    uses: [],
-    requires: [
-        'Ext.tree.Column',
-        'Ext.tree.plugin.TreeViewDragDrop'
-    ],
-    title: 'Группы',
-    margin: '0 50px 0 0',
-    viewConfig: {
-        plugins: {
-            treeviewdragdrop: {
-                enableDrop: true,
-                enableDrag: true,
-                appendOnly: true,
-            },
-        },
-    },
-    plugins: {
-        ptype: 'cellediting',
-        clicksToEdit: 2,
-        listeners: {
-            beforeedit: function(context, row) {
-                return (row.record && !row.record.get('leaf'));
-            },
-        },
-    },
-    rootVisible: false,
-    store: {
-        type: 'tree',
-        root: {text: 'Группы', expanded: true, children: []},
-    },
-    columns: [
-        {
-            xtype: 'treecolumn',
-            text: 'Группа',
-            dataIndex: 'text',
-            flex: 2,
-            editor: {
-                xtype: 'textfield',
-            },
-        },
-        {
-            text: 'Тип группы',
-            dataIndex: 'typeOfGroup',
-            flex: 1,
-            renderer: function(value) {
-                if (value === 'and') {
-                    return 'И';
-                }
-                if (value === 'or') {
-                    return 'ИЛИ';
-                }
-            },
-            editor: {
-                xtype: 'combobox',
-                store: {
-                    fields: ['type', 'description'],
-                    data: [{type: 'and', description: 'И'}, {type: 'or', description: 'ИЛИ'}],
-                },
-                displayField: 'description',
-                valueField: 'type',
-                allowBlank: false,
-            },
-        }
-        // todo: Есть вопрос по назначению данного улучшения. Пока отключено
-        // {
-        //     header: 'Инвертировать значение',
-        //     tooltip: 'Инвертировать значение',
-        //     dataIndex: 'invertValue',
-        //     xtype: 'checkcolumn',
-        //     renderer: function(value, metaData, record) {
-        //         if (record.get('leaf')) {
-        //             metaData.tdCls += ' ' + this.disabledCls;
-        //             metaData.tdStyle = 'color: rgba(0,0,0,0)';
-        //         }
-        //         return this.defaultRenderer(value, metaData);
-        //     },
-        // }
-    ],
-
-    initComponent: function() {
-        this.deleteBtn = Ext.widget('button', {
-            handler: this.deleteGroup.bind(this),
-            ui: 'green-button',
-            text: `Удалить группу`,
-            disabled: true,
-            reference: 'deleteBtn',
-        });
-        this.tbar = [
-            {
-                xtype: 'button',
-                handler: this.addGroup.bind(this),
-                ui: 'orange-button',
-                text: `Добавить группу`,
-            },
-            this.deleteBtn
-        ];
-        this.callParent();
-        this.on('beforedrop', this.onDrop, this);
-        this.on('selectionChange', this.onSelectionChange, this);
-    },
-
-    onDrop: function(row, data, node, dropPosition, dropHandlers) {
-        const reportFormEditPanel = this.getView().up('ReportFormEditPanel');
-        dropHandlers.wait = true;
-        if (node && data.records[0].get('leaf')) {
-            dropHandlers.processDrop();
-            const parameterName = data.records[0].get('reportParameterCd');
-            if (parameterName) {
-                const parameters = reportFormEditPanel.getViewModel().get('report.parameters');
-                if (parameters) {
-                    for (const parameter of parameters) {
-                        if (parameter.reportParameterCd === parameterName) {
-                            parameter.requiredSwitch = true;
-                        }
-                    }
-                }
-            }
-            reportFormEditPanel.down('ReportFormParametersGrid').fireEvent('updateGrid');
-        } else {
-            dropHandlers.cancelDrop();
-        }
-    },
-
-    onSelectionChange: function(_, selected) {
-        const selectionNode = selected[0];
-        if (selectionNode) {
-            this.deleteBtn.setDisabled(selectionNode.get('leaf') === true);
-        }
-    },
-
-    addGroup() {
-        const rootNode = this.getStore().getRoot();
-        const node = {text: 'Группа', expanded: true, typeOfGroup: 'and', children: [], leaf: false, invertValue: null};
-        rootNode.appendChild(node);
-        this.getStore().sync();
-    },
-
-    deleteGroup() {
-        const configPanelView = this.up('ReportGroupsFieldValidationPluginConfigPanel');
-        const selectionNode = this.getSelectionModel().getSelection()[0];
-        if (selectionNode) {
-            const parameterTree = configPanelView.down('#parameterTree');
-            if (parameterTree && !Ext.isEmpty(selectionNode.childNodes)) {
-                const parameters = [...selectionNode.childNodes];
-                parameterTree.getRootNode().appendChild(parameters);
-                parameterTree.getStore().sync();
-            }
-            selectionNode.remove(true);
-            this.getStore().remove(selectionNode);
-        }
-        this.getStore().sync();
-        configPanelView.down('#parameterTree').getStore().sync();
-    },
-});
+Ext.define('Coon.report.plugin.configPanel.reportGroupsFieldValidationPlugin.RequiredParametersTree', {
+    extend: 'Ext.tree.Panel',
+    alias: 'widget.RequiredParametersTree',
+    uses: [],
+    requires: [
+        'Ext.tree.Column',
+        'Ext.tree.plugin.TreeViewDragDrop'
+    ],
+    title: 'Группы',
+    margin: '0 50px 0 0',
+    viewConfig: {
+        plugins: {
+            treeviewdragdrop: {
+                enableDrop: true,
+                enableDrag: true,
+                appendOnly: true,
+            },
+        },
+    },
+    plugins: {
+        ptype: 'cellediting',
+        clicksToEdit: 2,
+        listeners: {
+            beforeedit: function(context, row) {
+                return (row.record && !row.record.get('leaf'));
+            },
+        },
+    },
+    rootVisible: false,
+    store: {
+        type: 'tree',
+        root: {text: 'Группы', expanded: true, children: []},
+    },
+    columns: [
+        {
+            xtype: 'treecolumn',
+            text: 'Группа',
+            dataIndex: 'text',
+            flex: 2,
+            editor: {
+                xtype: 'textfield',
+            },
+        },
+        {
+            text: 'Тип группы',
+            dataIndex: 'typeOfGroup',
+            flex: 1,
+            renderer: function(value) {
+                if (value === 'and') {
+                    return 'И';
+                }
+                if (value === 'or') {
+                    return 'ИЛИ';
+                }
+            },
+            editor: {
+                xtype: 'combobox',
+                store: {
+                    fields: ['type', 'description'],
+                    data: [{type: 'and', description: 'И'}, {type: 'or', description: 'ИЛИ'}],
+                },
+                displayField: 'description',
+                valueField: 'type',
+                allowBlank: false,
+            },
+        }
+        // todo: Есть вопрос по назначению данного улучшения. Пока отключено
+        // {
+        //     header: 'Инвертировать значение',
+        //     tooltip: 'Инвертировать значение',
+        //     dataIndex: 'invertValue',
+        //     xtype: 'checkcolumn',
+        //     renderer: function(value, metaData, record) {
+        //         if (record.get('leaf')) {
+        //             metaData.tdCls += ' ' + this.disabledCls;
+        //             metaData.tdStyle = 'color: rgba(0,0,0,0)';
+        //         }
+        //         return this.defaultRenderer(value, metaData);
+        //     },
+        // }
+    ],
+
+    initComponent: function() {
+        this.deleteBtn = Ext.widget('button', {
+            handler: this.deleteGroup.bind(this),
+            ui: 'green-button',
+            text: `Удалить группу`,
+            disabled: true,
+            reference: 'deleteBtn',
+        });
+        this.tbar = [
+            {
+                xtype: 'button',
+                handler: this.addGroup.bind(this),
+                ui: 'orange-button',
+                text: `Добавить группу`,
+            },
+            this.deleteBtn
+        ];
+        this.callParent();
+        this.on('beforedrop', this.onDrop, this);
+        this.on('selectionChange', this.onSelectionChange, this);
+    },
+
+    onDrop: function(row, data, node, dropPosition, dropHandlers) {
+        const reportFormEditPanel = this.getView().up('ReportFormEditPanel');
+        dropHandlers.wait = true;
+        if (node && data.records[0].get('leaf')) {
+            dropHandlers.processDrop();
+            const parameterName = data.records[0].get('reportParameterCd');
+            if (parameterName) {
+                const parameters = reportFormEditPanel.getViewModel().get('report.parameters');
+                if (parameters) {
+                    for (const parameter of parameters) {
+                        if (parameter.reportParameterCd === parameterName) {
+                            parameter.requiredSwitch = true;
+                        }
+                    }
+                }
+            }
+            reportFormEditPanel.down('ReportFormParametersGrid').fireEvent('updateGrid');
+        } else {
+            dropHandlers.cancelDrop();
+        }
+    },
+
+    onSelectionChange: function(_, selected) {
+        const selectionNode = selected[0];
+        if (selectionNode) {
+            this.deleteBtn.setDisabled(selectionNode.get('leaf') === true);
+        }
+    },
+
+    addGroup() {
+        const rootNode = this.getStore().getRoot();
+        const node = {text: 'Группа', expanded: true, typeOfGroup: 'and', children: [], leaf: false, invertValue: null};
+        rootNode.appendChild(node);
+        this.getStore().sync();
+    },
+
+    deleteGroup() {
+        const configPanelView = this.up('ReportGroupsFieldValidationPluginConfigPanel');
+        const selectionNode = this.getSelectionModel().getSelection()[0];
+        if (selectionNode) {
+            const parameterTree = configPanelView.down('#parameterTree');
+            if (parameterTree && !Ext.isEmpty(selectionNode.childNodes)) {
+                const parameters = [...selectionNode.childNodes];
+                parameterTree.getRootNode().appendChild(parameters);
+                parameterTree.getStore().sync();
+            }
+            selectionNode.remove(true);
+            this.getStore().remove(selectionNode);
+        }
+        this.getStore().sync();
+        configPanelView.down('#parameterTree').getStore().sync();
+    },
+});

package/src/report/plugin/configPanel/reportGroupsFieldValidationPlugin/UnusedParametersTree.js

@@ -1,66 +1,66 @@
-// Дерево параметров
-Ext.define('Coon.report.plugin.configPanel.reportGroupsFieldValidationPlugin.UnusedParametersTree', {
-    extend: 'Ext.tree.Panel',
-    alias: 'widget.UnusedParametersTree',
-    uses: [],
-    requires: [
-        'Ext.tree.Column',
-        'Ext.tree.plugin.TreeViewDragDrop'
-    ],
-
-    title: 'Параметры, не участвующие в проверке',
-    viewConfig: {
-        plugins: {
-            treeviewdragdrop: {
-                allowContainerDrops: true,
-                enableDrop: true,
-                enableDrag: true,
-                appendOnly: true,
-            },
-        },
-    },
-    store: {
-        type: 'tree',
-    },
-    columns: {
-        defaults: {
-            sortable: true,
-            flex: 1,
-        },
-        items: [
-            {text: 'Поле', dataIndex: 'text', xtype: 'treecolumn'}
-        ],
-    },
-
-    initComponent: function() {
-        this.callParent();
-        this.on('beforedrop', this.onDrop, this);
-    },
-
-    onDrop: function(row, data, node, dropPosition, dropHandlers) {
-        dropHandlers.wait = true;
-        if (node && data.records[0].get('leaf')) {
-            dropHandlers.processDrop();
-            this.requiredSwitchChange(data.records[0]);
-        } else {
-            dropHandlers.cancelDrop();
-        }
-        this.getStore().sync();
-    },
-
-    requiredSwitchChange: function(row) { // Делает параметр обязательным при добавлении в группу
-        const parameterName = row.get('reportParameterCd');
-        const editPanel = this.up('ReportFormEditPanel');
-        if (parameterName) {
-            const parameters = editPanel.getViewModel().get('report.parameters');
-            if (parameters) {
-                for (const parameter of parameters) {
-                    if (parameter.reportParameterCd === parameterName) {
-                        parameter.requiredSwitch = false;
-                    }
-                }
-            }
-        }
-        editPanel.down('ReportFormParametersGrid').fireEvent('updateGrid');
-    },
-});
+// Дерево параметров
+Ext.define('Coon.report.plugin.configPanel.reportGroupsFieldValidationPlugin.UnusedParametersTree', {
+    extend: 'Ext.tree.Panel',
+    alias: 'widget.UnusedParametersTree',
+    uses: [],
+    requires: [
+        'Ext.tree.Column',
+        'Ext.tree.plugin.TreeViewDragDrop'
+    ],
+
+    title: 'Параметры, не участвующие в проверке',
+    viewConfig: {
+        plugins: {
+            treeviewdragdrop: {
+                allowContainerDrops: true,
+                enableDrop: true,
+                enableDrag: true,
+                appendOnly: true,
+            },
+        },
+    },
+    store: {
+        type: 'tree',
+    },
+    columns: {
+        defaults: {
+            sortable: true,
+            flex: 1,
+        },
+        items: [
+            {text: 'Поле', dataIndex: 'text', xtype: 'treecolumn'}
+        ],
+    },
+
+    initComponent: function() {
+        this.callParent();
+        this.on('beforedrop', this.onDrop, this);
+    },
+
+    onDrop: function(row, data, node, dropPosition, dropHandlers) {
+        dropHandlers.wait = true;
+        if (node && data.records[0].get('leaf')) {
+            dropHandlers.processDrop();
+            this.requiredSwitchChange(data.records[0]);
+        } else {
+            dropHandlers.cancelDrop();
+        }
+        this.getStore().sync();
+    },
+
+    requiredSwitchChange: function(row) { // Делает параметр обязательным при добавлении в группу
+        const parameterName = row.get('reportParameterCd');
+        const editPanel = this.up('ReportFormEditPanel');
+        if (parameterName) {
+            const parameters = editPanel.getViewModel().get('report.parameters');
+            if (parameters) {
+                for (const parameter of parameters) {
+                    if (parameter.reportParameterCd === parameterName) {
+                        parameter.requiredSwitch = false;
+                    }
+                }
+            }
+        }
+        editPanel.down('ReportFormParametersGrid').fireEvent('updateGrid');
+    },
+});

package/src/report/plugin/form/ComboCustomSort.js

@@ -1,39 +1,39 @@
-Ext.define('Coon.report.plugin.form.ComboCustomSort', {
-    alias: 'plugin.ComboCustomSort',
-    uses: [],
-    requires: [],
-    alternateClassName: [
-        'Sigma.common.behaviors.ComboCustomSort',
-        'Sigma.common.plugin.form.ComboCustomSort'
-    ],
-    field: undefined,
-    sortOrder: 'ASC',
-    sortFunction: undefined,
-
-    constructor: function(config) {
-        config = config || {};
-        Ext.apply(this, config);
-        this.callParent([config]);
-    },
-
-
-    init: function(combo) {
-        const store = combo.store;
-        const comareFunction = function(r1, r2) {
-            const directionModifier = this.sortOrder.toUpperCase() == 'DESC' ? -1 : 1;
-
-            const aData = r1.data[this.field];
-            const bData = r2.data[this.field];
-
-            const compareResult = this.sortFunction.call(this, aData, bData);
-            return directionModifier * compareResult;
-        }.bind(this);
-
-        store.applySort = function() {
-            this.data.sort('ASC', comareFunction);
-            if (this.snapshot && this.snapshot != this.data) {
-                this.snapshot.sort('ASC', comareFunction);
-            }
-        };
-    },
-});
+Ext.define('Coon.report.plugin.form.ComboCustomSort', {
+    alias: 'plugin.ComboCustomSort',
+    uses: [],
+    requires: [],
+    alternateClassName: [
+        'Sigma.common.behaviors.ComboCustomSort',
+        'Sigma.common.plugin.form.ComboCustomSort'
+    ],
+    field: undefined,
+    sortOrder: 'ASC',
+    sortFunction: undefined,
+
+    constructor: function(config) {
+        config = config || {};
+        Ext.apply(this, config);
+        this.callParent([config]);
+    },
+
+
+    init: function(combo) {
+        const store = combo.store;
+        const comareFunction = function(r1, r2) {
+            const directionModifier = this.sortOrder.toUpperCase() == 'DESC' ? -1 : 1;
+
+            const aData = r1.data[this.field];
+            const bData = r2.data[this.field];
+
+            const compareResult = this.sortFunction.call(this, aData, bData);
+            return directionModifier * compareResult;
+        }.bind(this);
+
+        store.applySort = function() {
+            this.data.sort('ASC', comareFunction);
+            if (this.snapshot && this.snapshot != this.data) {
+                this.snapshot.sort('ASC', comareFunction);
+            }
+        };
+    },
+});