ru.coon 2.5.67 → 2.6.0

package/src/chart/ChartComponent.js

@@ -1,14 +1,14 @@
-Ext.define('Coon.chart.ChartComponent', {
-    extend: 'Ext.Component',
-    xtype: 'ChartComponent',
-
-    minHeight: 200,
-
-    initComponent() {
-        this.setHtml('<div>Здесь будет диаграмма</div>');
-        this.callParent(arguments);
-        this.on('boxready', function() {
-            this.fireEvent('ready');
-        }, this);
-    },
-});
+Ext.define('Coon.chart.ChartComponent', {
+    extend: 'Ext.Component',
+    xtype: 'ChartComponent',
+
+    minHeight: 200,
+
+    initComponent() {
+        this.setHtml('<div>Здесь будет диаграмма</div>');
+        this.callParent(arguments);
+        this.on('boxready', function() {
+            this.fireEvent('ready');
+        }, this);
+    },
+});

package/src/chart/editor/CoonChartEditor.js

@@ -1,189 +1,189 @@
-Ext.define('Coon.chart.editor.CoonChartEditor', {
-    extend: 'Ext.panel.Panel',
-    xtype: 'CoonChartEditor',
-
-    config: {},
-
-    requires: [
-        'Coon.chart.editor.CoonChartEditorController',
-        'Coon.chart.editor.CoonChartEditorViewModel',
-        'Coon.chart.CoonChart',
-        'Coon.uielement.component.settings.UiAceEditor',
-        'Coon.chart.editor.DataSourceChartBindForm'
-    ],
-
-    viewModel: {
-        type: 'CoonChartEditorViewModel',
-    },
-
-    controller: 'CoonChartEditorController',
-
-    bind: {
-        title: '{title}',
-    },
-
-    layout: 'border',
-
-    items: [
-        {
-            xtype: 'panel',
-            flex: 1,
-            split: true,
-            region: 'west',
-            layout: {
-                type: 'vbox',
-                align: 'stretch',
-            },
-            // defaults: {
-            //     flex: 1,
-            // },
-            items: [
-                {
-                    xtype: 'panel',
-                    title: 'Параметры',
-                    layout: {
-                        type: 'vbox',
-                        align: 'stretch',
-                    },
-                    collapsible: true,
-                    defaults: {
-                        margin: 10,
-                        flex: 1,
-                    },
-                    items: [{
-                        xtype: 'panel',
-                        layout: {
-                            type: 'hbox',
-                            align: 'stretch',
-                        },
-                        defaults: {
-                            flex: 1,
-                        },
-                        items: [
-                            {
-                                fieldLabel: 'CoonChartId',
-                                reference: 'CoonChartId',
-                                xtype: 'textfield',
-                                bind: {
-                                    value: '{coonChart.id}',
-                                    readOnly: '{editorMode === "add"}',
-                                },
-                            },
-                            {
-                                fieldLabel: 'Description',
-                                reference: 'description',
-                                xtype: 'textfield',
-                                bind: '{coonChart.description}',
-                            }
-                        ],
-                    },
-                    {
-                        xtype: 'combo',
-                        fieldLabel: 'тип диаграммы',
-                        reference: 'chartType',
-                        editable: false,
-                        bind: {
-                            value: '{coonChart.chartType}',
-                        },
-                        store: ['bar', 'pie'],
-                    },
-                    {
-                        xtype: 'radiogroup',
-                        reference: 'sourceType',
-                        items: [
-                            {boxLabel: 'репорт', name: 'sourceType', inputValue: 'report'},
-                            {boxLabel: 'команда', name: 'sourceType', inputValue: 'command'}
-                        ],
-                    },
-                    {
-                        xtype: 'AbstractComponentComboBox',
-                        fieldLabel: 'команда',
-                        reference: 'command',
-                        displayField: 'name',
-                        valueField: 'value',
-                        getData() {
-                            return [];
-                        },
-                        bind: {
-                            value: '{coonChart.commandSourceId}',
-                            hidden: '{coonChart.sourceType === "report"}',
-                        },
-                    },
-                    {
-                        xtype: 'textfield',
-                        fieldLabel: 'reportId',
-                        reference: 'reportSourceField',
-                        bind: {
-                            value: '{coonChart.reportSourceId}',
-                            hidden: '{coonChart.sourceType === "command"}',
-                        },
-                    },
-                    {
-                        xtype: 'textfield',
-                        fieldLabel: 'parameters',
-                        reference: 'parametersField',
-                        bind: {
-                            value: '{coonChart.parameters}',
-                        },
-                    }
-                    ],
-                    buttons: [
-                        {text: 'загрузить данные', itemId: 'configDataSourceBindBtn'}
-                    ],
-                },
-                {
-                    xtype: 'panel',
-                    flex: 3,
-                    reference: 'configTabPanel',
-                    layout: {
-                        type: 'hbox',
-                        align: 'stretch',
-                    },
-                    items: [
-                        // {
-                        //     xtype: 'panel',
-                        //     title: 'конфигурация',
-                        //     layout: {
-                        //         type: 'vbox',
-                        //         align: 'stretch',
-                        //     },
-                        //     flex: 1,
-                        //     items: [
-                        //         {
-                        //             xtype: 'UiAceEditor',
-                        //             reference: 'UiAceEditor',
-                        //             flex: 1,
-                        //             margin: 10,
-                        //         }
-                        //     ],
-                        // },
-                        {
-                            xtype: 'DataSourceChartBindForm',
-                            flex: 1,
-                            scrollable: true,
-                        }
-                    ],
-                }
-            ],
-        },
-        {
-            xtype: 'CoonChart',
-            title: 'тестовая диаграмма',
-            reference: 'SampleChart',
-            collapsible: true,
-            collapseDirection: 'right',
-            region: 'center',
-            split: true,
-            width: 800,
-            flex: 1,
-        }
-    ],
-
-    buttons: [
-        {text: 'отменить', itemId: 'cancel', handler(btn) {
-            btn.up('CoonChartEditor').close();
-        }},
-        {text: 'подтвердить', itemId: 'submit'}
-    ],
-
-});
+Ext.define('Coon.chart.editor.CoonChartEditor', {
+    extend: 'Ext.panel.Panel',
+    xtype: 'CoonChartEditor',
+
+    config: {},
+
+    requires: [
+        'Coon.chart.editor.CoonChartEditorController',
+        'Coon.chart.editor.CoonChartEditorViewModel',
+        'Coon.chart.CoonChart',
+        'Coon.uielement.component.settings.UiAceEditor',
+        'Coon.chart.editor.DataSourceChartBindForm'
+    ],
+
+    viewModel: {
+        type: 'CoonChartEditorViewModel',
+    },
+
+    controller: 'CoonChartEditorController',
+
+    bind: {
+        title: '{title}',
+    },
+
+    layout: 'border',
+
+    items: [
+        {
+            xtype: 'panel',
+            flex: 1,
+            split: true,
+            region: 'west',
+            layout: {
+                type: 'vbox',
+                align: 'stretch',
+            },
+            // defaults: {
+            //     flex: 1,
+            // },
+            items: [
+                {
+                    xtype: 'panel',
+                    title: 'Параметры',
+                    layout: {
+                        type: 'vbox',
+                        align: 'stretch',
+                    },
+                    collapsible: true,
+                    defaults: {
+                        margin: 10,
+                        flex: 1,
+                    },
+                    items: [{
+                        xtype: 'panel',
+                        layout: {
+                            type: 'hbox',
+                            align: 'stretch',
+                        },
+                        defaults: {
+                            flex: 1,
+                        },
+                        items: [
+                            {
+                                fieldLabel: 'CoonChartId',
+                                reference: 'CoonChartId',
+                                xtype: 'textfield',
+                                bind: {
+                                    value: '{coonChart.id}',
+                                    readOnly: '{editorMode === "add"}',
+                                },
+                            },
+                            {
+                                fieldLabel: 'Description',
+                                reference: 'description',
+                                xtype: 'textfield',
+                                bind: '{coonChart.description}',
+                            }
+                        ],
+                    },
+                    {
+                        xtype: 'combo',
+                        fieldLabel: 'тип диаграммы',
+                        reference: 'chartType',
+                        editable: false,
+                        bind: {
+                            value: '{coonChart.chartType}',
+                        },
+                        store: ['bar', 'pie'],
+                    },
+                    {
+                        xtype: 'radiogroup',
+                        reference: 'sourceType',
+                        items: [
+                            {boxLabel: 'репорт', name: 'sourceType', inputValue: 'report'},
+                            {boxLabel: 'команда', name: 'sourceType', inputValue: 'command'}
+                        ],
+                    },
+                    {
+                        xtype: 'AbstractComponentComboBox',
+                        fieldLabel: 'команда',
+                        reference: 'command',
+                        displayField: 'name',
+                        valueField: 'value',
+                        getData() {
+                            return [];
+                        },
+                        bind: {
+                            value: '{coonChart.commandSourceId}',
+                            hidden: '{coonChart.sourceType === "report"}',
+                        },
+                    },
+                    {
+                        xtype: 'textfield',
+                        fieldLabel: 'reportId',
+                        reference: 'reportSourceField',
+                        bind: {
+                            value: '{coonChart.reportSourceId}',
+                            hidden: '{coonChart.sourceType === "command"}',
+                        },
+                    },
+                    {
+                        xtype: 'textfield',
+                        fieldLabel: 'parameters',
+                        reference: 'parametersField',
+                        bind: {
+                            value: '{coonChart.parameters}',
+                        },
+                    }
+                    ],
+                    buttons: [
+                        {text: 'загрузить данные', itemId: 'configDataSourceBindBtn'}
+                    ],
+                },
+                {
+                    xtype: 'panel',
+                    flex: 3,
+                    reference: 'configTabPanel',
+                    layout: {
+                        type: 'hbox',
+                        align: 'stretch',
+                    },
+                    items: [
+                        // {
+                        //     xtype: 'panel',
+                        //     title: 'конфигурация',
+                        //     layout: {
+                        //         type: 'vbox',
+                        //         align: 'stretch',
+                        //     },
+                        //     flex: 1,
+                        //     items: [
+                        //         {
+                        //             xtype: 'UiAceEditor',
+                        //             reference: 'UiAceEditor',
+                        //             flex: 1,
+                        //             margin: 10,
+                        //         }
+                        //     ],
+                        // },
+                        {
+                            xtype: 'DataSourceChartBindForm',
+                            flex: 1,
+                            scrollable: true,
+                        }
+                    ],
+                }
+            ],
+        },
+        {
+            xtype: 'CoonChart',
+            title: 'тестовая диаграмма',
+            reference: 'SampleChart',
+            collapsible: true,
+            collapseDirection: 'right',
+            region: 'center',
+            split: true,
+            width: 800,
+            flex: 1,
+        }
+    ],
+
+    buttons: [
+        {text: 'отменить', itemId: 'cancel', handler(btn) {
+            btn.up('CoonChartEditor').close();
+        }},
+        {text: 'подтвердить', itemId: 'submit'}
+    ],
+
+});

package/src/chart/editor/CoonChartEditorViewModel.js

@@ -1,28 +1,28 @@
-Ext.define('Coon.chart.editor.CoonChartEditorViewModel', {
-    extend: 'Ext.app.ViewModel',
-    alias: 'viewmodel.CoonChartEditorViewModel',
-
-    data: {
-        coonChart: {
-            fieldset: {},
-            sourceType: 'report',
-            reportSourceId: undefined,
-            config: {},
-            propertyData: '{}',
-            chartType: undefined,
-        },
-        editorMode: undefined,
-    },
-    formulas: {
-        title: {
-            bind: '{editorMode}',
-            get: function(editorMode) {
-                if (!editorMode || editorMode === 'add') {
-                    return `Создание диаграммы`;
-                } else {
-                    return `Редактирование диаграммы ${this.get('coonChart.id')}`;
-                }
-            },
-        },
-    },
-});
+Ext.define('Coon.chart.editor.CoonChartEditorViewModel', {
+    extend: 'Ext.app.ViewModel',
+    alias: 'viewmodel.CoonChartEditorViewModel',
+
+    data: {
+        coonChart: {
+            fieldset: {},
+            sourceType: 'report',
+            reportSourceId: undefined,
+            config: {},
+            propertyData: '{}',
+            chartType: undefined,
+        },
+        editorMode: undefined,
+    },
+    formulas: {
+        title: {
+            bind: '{editorMode}',
+            get: function(editorMode) {
+                if (!editorMode || editorMode === 'add') {
+                    return `Создание диаграммы`;
+                } else {
+                    return `Редактирование диаграммы ${this.get('coonChart.id')}`;
+                }
+            },
+        },
+    },
+});