ru.coon 2.8.65 → 3.0.2

package/src/report/component/calculator/ReportCalculatorPanel.js

@@ -0,0 +1,363 @@
+Ext.define('Coon.report.component.calculator.ReportCalculatorPanel', {
+    extend: 'Ext.panel.Panel',
+    alias: 'widget.ReportCalculatorPanel',
+    xtype: 'ReportCalculatorPanel',
+    id: 'ReportCalculatorPanel',
+    cls: 'ReportCalculatorPanel',
+    uses: [],
+    requires: [],
+    title: 'Калькулятор',
+    width: 396,
+    height: 255,
+    floating: true,
+    draggable: true,
+    closable: true,
+    closeAction: 'hide',
+    controller: 'ReportCalculatorController',
+    viewModel: {
+        data: {
+            operand1: null,
+            operand2: null,
+            operator: '',
+            equal: ' ',
+            memory: null,
+            isDisabledAll: false,
+        },
+        formulas: {
+            isDisabledEX: function(get) {
+                return !(get('operand1') && !get('operand2'));
+            },
+        },
+    },
+    layout: {
+        type: 'vbox', align: 'stretch',
+    },
+    singleton: true,
+    bodyPadding: '10 20 20 20',
+    items: [
+        {
+            xtype: 'ReportCalculatorField',
+            reference: 'ReportCalculatorField',
+            bind: {
+                fieldLabel: '{operand1} {operator} {operand2} {equal}',
+            },
+            listeners: {
+                change: 'onFieldChange',
+            },
+        },
+        {
+            layout: {
+                type: 'hbox',
+                align: 'stretch',
+            },
+            defaults: {
+                width: 46,
+                margin: 2,
+            },
+            items: [
+                {
+                    xtype: 'button',
+                    cls: 'calculator2-button-type',
+                    focusCls: 'calculator2-button-type',
+                    text: 'EX',
+                    handler: 'swapOperands',
+                    bind: {
+                        disabled: '{isDisabledEX}',
+                    },
+                },
+                {
+                    xtype: 'button',
+                    cls: 'calculator1-button-type',
+                    focusCls: 'calculator1-button-type',
+                    text: 'MR',
+                    handler: 'enterMemoryValue',
+                    bind: {
+                        disabled: '{isDisabledAll}',
+                    },
+                },
+                {
+                    xtype: 'button',
+                    cls: 'calculator1-button-type',
+                    focusCls: 'calculator1-button-type',
+                    text: '7',
+                    margin: '2 2 2 10',
+                    handler: 'enterNumber',
+                },
+                {
+                    xtype: 'button',
+                    cls: 'calculator1-button-type',
+                    focusCls: 'calculator1-button-type',
+                    text: '8',
+                    handler: 'enterNumber',
+                },
+                {
+                    xtype: 'button',
+                    cls: 'calculator1-button-type',
+                    focusCls: 'calculator1-button-type',
+                    text: '9',
+                    handler: 'enterNumber',
+                },
+                {
+                    xtype: 'button',
+                    cls: 'calculator2-button-type',
+                    focusCls: 'calculator2-button-type',
+                    text: '÷',
+                    handler: 'selectOperator',
+                    bind: {
+                        disabled: '{isDisabledAll}',
+                    },
+                },
+                {
+                    xtype: 'button',
+                    text: '+/-',
+                    cls: 'calculator2-button-type',
+                    focusCls: 'calculator2-button-type',
+                    handler: 'toggleSign',
+                    bind: {
+                        disabled: '{isDisabledAll}',
+                    },
+                }
+            ],
+        },
+        {
+            layout: {
+                type: 'hbox',
+                align: 'stretch',
+            },
+            defaults: {
+                width: 46,
+                margin: 2,
+            },
+            items: [
+                {
+                    xtype: 'button',
+                    text: '←',
+                    cls: 'calculator2-button-type',
+                    focusCls: 'calculator2-button-type',
+                    handler: 'deleteSymbol',
+                },
+                {
+                    xtype: 'button',
+                    text: 'M=',
+                    cls: 'calculator1-button-type',
+                    focusCls: 'calculator1-button-type',
+                    handler: 'setMemory',
+                    bind: {
+                        disabled: '{isDisabledAll}',
+                    },
+                },
+                {
+                    xtype: 'button',
+                    cls: 'calculator1-button-type',
+                    focusCls: 'calculator1-button-type',
+                    text: '4',
+                    margin: '2 2 2 10',
+                    handler: 'enterNumber',
+                },
+                {
+                    xtype: 'button',
+                    cls: 'calculator1-button-type',
+                    focusCls: 'calculator1-button-type',
+                    text: '5',
+                    handler: 'enterNumber',
+                },
+                {
+                    xtype: 'button',
+                    cls: 'calculator1-button-type',
+                    focusCls: 'calculator1-button-type',
+                    text: '6',
+                    handler: 'enterNumber',
+                },
+                {
+                    xtype: 'button',
+                    text: '×',
+                    cls: 'calculator2-button-type',
+                    focusCls: 'calculator2-button-type',
+                    handler: 'selectOperator',
+                    bind: {
+                        disabled: '{isDisabledAll}',
+                    },
+                },
+                {
+                    xtype: 'button',
+                    text: '-',
+                    cls: 'calculator2-button-type',
+                    focusCls: 'calculator2-button-type',
+                    handler: 'selectOperator',
+                    bind: {
+                        disabled: '{isDisabledAll}',
+                    },
+                }
+            ],
+        },
+        {
+            layout: {
+                type: 'hbox', align: 'stretch',
+            },
+            items: [
+                {
+                    layout: {
+                        type: 'vbox', align: 'stretch',
+                    },
+                    defaults: {
+                        width: 46,
+                        margin: 2,
+                        cls: 'calculator2-button-type',
+                        focusCls: 'calculator2-button-type',
+                    },
+                    items: [
+                        {
+                            xtype: 'button',
+                            text: 'CE',
+                            handler: 'deleteTextfield',
+                        },
+                        {
+                            xtype: 'button',
+                            text: 'C',
+                            handler: 'deleteAll',
+                        }
+                    ],
+                },
+                {
+                    layout: {
+                        type: 'vbox', align: 'stretch',
+                    },
+                    defaults: {
+                        width: 46,
+                        margin: 2,
+                        cls: 'calculator1-button-type',
+                        focusCls: 'calculator1-button-type',
+                    },
+                    items: [
+                        {
+                            xtype: 'button',
+                            text: 'M+',
+                            handler: 'addMemory',
+                            bind: {
+                                disabled: '{isDisabledAll}',
+                            },
+                        },
+                        {
+                            xtype: 'button',
+                            text: 'M-',
+                            handler: 'subtractMemory',
+                            bind: {
+                                disabled: '{isDisabledAll}',
+                            },
+                        }
+                    ],
+                },
+                {
+                    layout: {
+                        type: 'vbox',
+                        align: 'stretch',
+                    },
+                    margin: '0 0 0 8',
+                    defaults: {
+                        width: 46,
+                        margin: '2',
+                        cls: 'calculator1-button-type',
+                        focusCls: 'calculator1-button-type',
+                    },
+                    items: [
+                        {
+                            xtype: 'button',
+                            text: '1',
+                            handler: 'enterNumber',
+                        },
+                        {
+                            xtype: 'button',
+                            text: '0',
+                            handler: 'enterNumber',
+                        }
+                    ],
+                },
+                {
+                    layout: {
+                        type: 'vbox', align: 'stretch',
+                    },
+                    defaults: {
+                        width: 46,
+                        margin: 2,
+                        cls: 'calculator1-button-type',
+                        focusCls: 'calculator1-button-type',
+                    },
+                    items: [
+                        {
+                            xtype: 'button',
+                            text: '2',
+                            handler: 'enterNumber',
+                        },
+                        {
+                            xtype: 'button',
+                            text: '00',
+                            handler: 'enterNumber',
+                            bind: {
+                                disabled: '{isDisabledAll}',
+                            },
+                        }
+                    ],
+                },
+                {
+                    layout: {
+                        type: 'vbox', align: 'stretch',
+                    },
+                    defaults: {
+                        width: 46,
+                        margin: 2,
+                    },
+                    items: [
+                        {
+                            xtype: 'button',
+                            cls: 'calculator1-button-type',
+                            focusCls: 'calculator1-button-type',
+                            text: '3',
+                            handler: 'enterNumber',
+                        },
+                        {
+                            xtype: 'button',
+                            cls: 'calculator1-button-type',
+                            focusCls: 'calculator1-button-type',
+                            text: '.',
+                            handler: 'enterSeparator',
+                            bind: {
+                                disabled: '{isDisabledAll}',
+                            },
+                        }
+                    ],
+                },
+                {
+                    xtype: 'button',
+                    width: 46,
+                    margin: 2,
+                    cls: 'calculator2-button-type',
+                    focusCls: 'calculator2-button-type',
+                    text: '+',
+                    handler: 'selectOperator',
+                    bind: {
+                        disabled: '{isDisabledAll}',
+                    },
+                },
+                {
+                    xtype: 'button',
+                    width: 46,
+                    margin: 2,
+                    cls: 'calculator2-button-type',
+                    focusCls: 'calculator2-button-type',
+                    text: '=',
+                    handler: 'calculate',
+                    bind: {
+                        disabled: '{isDisabledAll}',
+                    },
+                }
+            ],
+        }
+    ],
+    open() {
+        const CALC_WIDTH_OFFSET = 444;
+        const CALC_HEIGHT_OFFSET = 335;
+        const calcSize = Ext.getBody().getViewSize();
+        const calcPanel = Coon.report.component.calculator.ReportCalculatorPanel;
+        calcPanel.showAt([calcSize.width - CALC_WIDTH_OFFSET, calcSize.height - CALC_HEIGHT_OFFSET]);
+    },
+});

package/src/report/component/calculator/ReportCalculatorPanel.scss

@@ -0,0 +1,86 @@
+$focus-background-color: rgba(254, 249, 233, 1) !default;
+
+.ReportCalculatorPanel {
+    .calculator1-button-type {
+        border: 1px solid #BACBE0 !important;
+        border-radius: 6px;
+    }
+    .calculator1-button-type.x-btn-default-small {
+        padding: 6px 12px;
+    }
+    .calculator1-button-type .x-btn-inner-default-small {
+        font-size: 13px;
+        font-weight: 400 !important;
+        line-height: 16px;
+        padding: 0;
+    }
+    .calculator1-button-type .x-btn-inner {
+        color: #111111;
+    }
+    .calculator1-button-type.x-btn-over {
+        background-color: #F5F5F5;
+    }
+    .calculator1-button-type.x-btn-pressed {
+        background-color: #F8F8F8;
+    }
+    .calculator1-button-type.x-btn-over .x-btn-inner {
+        color: #111111 !important;
+    }
+    .calculator1-button-type.x-btn-pressed .x-btn-inner {
+        color: #445B69 !important;
+    }
+    .calculator1-button-type.x-btn-disabled {
+        background-color: #FFFFFF !important;
+        border: 1px solid  #ECECEC !important;
+    }
+    .calculator1-button-type.x-btn-disabled .x-btn-inner {
+        color: #A9A9A9;
+    }
+
+
+    .calculator2-button-type {
+        border: 1px solid #BACBE0 !important;
+        border-radius: 6px;
+    }
+    .calculator2-button-type.x-btn-default-small {
+        padding: 6px 12px;
+        background-color: #F5F8FA !important;
+    }
+    .calculator2-button-type .x-btn-inner-default-small {
+        font-size: 13px;
+        font-weight: 400 !important;
+        line-height: 16px;
+        padding: 0;
+    }
+    .calculator2-button-type .x-btn-inner {
+        color: #1E3B4C;
+    }
+    .calculator2-button-type.x-btn-over {
+        background-color: #F5F5F5;
+    }
+    .calculator2-button-type.x-btn-pressed {
+        background-color: #F8F8F8;
+    }
+    .calculator2-button-type.x-btn-over .x-btn-inner {
+        color: #111111 !important;
+    }
+    .calculator2-button-type.x-btn-pressed .x-btn-inner {
+        color: #445B69 !important;
+    }
+    .calculator2-button-type.x-btn-disabled {
+        background-color: #FFFFFF !important;
+        border: 1px solid  #ECECEC !important;
+    }
+    .calculator2-button-type.x-btn-disabled .x-btn-inner {
+        color: #A9A9A9;
+    }
+
+    .x-form-type-text:has(*:focus) {
+        background-color: $focus-background-color;
+        background-clip: content-box;
+  
+        .x-form-item-body {
+        background-color: $focus-background-color;
+        }
+    }
+}

package/src/report/component/reportpanel/CopyReportPanelController.js

@@ -159,7 +159,7 @@ Ext.define('Coon.report.component.reportpanel.CopyReportPanelController', {
             .catch((error) => {
                 Coon.log.debug(error);
                 this.getViewModel().set('isReportIDValid', false);
-                this.lookup('copyToFieldRef').markInvalid('ReportID уже существует!');
+                this.lookup('copyToFieldRef') && this.lookup('copyToFieldRef').markInvalid('ReportID уже существует!');
                 Ext.Msg.alert('Ошибка', error.toString());
             })
             .finally(() => {

package/src/report/component/reportpanel/FilterPanel.js

@@ -66,8 +66,7 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
         let rowCount = 0;
         for (let i = 0; i < configurationList.length; i++) {
             const configuration = configurationList[i];
-            const ns = Coon.report.model.ReportParameterBeanFields;
-            if (currentLayout === null || (visibleCount >= this.itemsOnRow && configuration[ns.$visibleSwitch])) {
+            if (currentLayout === null || (visibleCount >= this.itemsOnRow && configuration.visibleSwitch)) {
                 if (currentLayout !== null) {
                     height += currentLayout.height;
                     this.items.push(currentLayout);
@@ -93,7 +92,7 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
                 currentLayout.height = configuration.height;
             }
             const filterItem = this.createFilterItem(configuration);
-            if (configuration[ns.$visibleSwitch]) {
+            if (configuration.visibleSwitch) {
                 visibleCount += configuration.weight;
             }
             currentLayout.add(filterItem);
@@ -121,15 +120,14 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
     },
 
     createFilterItem: function(configuration) {
-        const ns = Coon.report.model.ReportParameterBeanFields;
-
         const defaultConfig = {
             // isReportFilterField флаг, позволяющий компоненту понимать,что он является частью фильтр панели отчета.
             isReportFilterField: true,
-            fieldLabel: configuration[ns.$description],
-            allowBlank: !configuration[ns.$requiredSwitch],
-            hidden: !configuration[ns.$visibleSwitch],
-            name: configuration[ns.$reportParameterCd],
+            defaultFocus: configuration.defaultFocus,
+            fieldLabel: configuration.description,
+            allowBlank: !configuration.requiredSwitch,
+            hidden: !configuration.visibleSwitch,
+            name: configuration.reportParameterCd,
             labelWidth: configuration.labelWidth || 80,
             triggers: {
                 clear: {
@@ -145,7 +143,7 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
             },
         };
         let config;
-        switch (configuration[ns.$reportParameterTypeLookup]) {
+        switch (configuration.reportParameterTypeLookup) {
         case 'DATETIME':
             config = {
                 xtype: 'DateTimeField',
@@ -168,10 +166,10 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
             };
             break;
         case 'DATE':
-            if (configuration[ns.$properties]['periodEnd']) {
+            if (configuration.properties['periodEnd']) {
                 config = Object.assign(
                     {xtype: 'DatePickerPresetsField'},
-                    configuration[ns.$properties]
+                    configuration.properties
                 );
             } else {
                 config = {
@@ -205,15 +203,15 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
             break;
         }
 
-        config = Ext.apply(config, Coon.Function.convertAdvancedProperties(configuration[ns.$properties]), defaultConfig);
+        config = Ext.apply(config, Coon.Function.convertAdvancedProperties(configuration.properties), defaultConfig);
         if (!Ext.isDefined(config.width) && !Ext.isDefined(config.flex)) {
             config.flex = 1;
         }
         const field = Ext.widget(config);
         field.on('change', this.setClearTrigger, this);
         // Установка значения по-умолчанию
-        const value = configuration[ns.$defaultValue];
-        const visibleValue = configuration[ns.$defaultValueDescription];
+        const value = configuration.defaultValue;
+        const visibleValue = configuration.defaultValueDescription;
         if (!Ext.isEmpty(value)) {
             field.on('afterrender', function() {
                 field.setValue(value);

package/src/report/component/reportpanel/FilterPanel.scss

@@ -1,3 +1,4 @@
+$focus-background-color: rgba(254, 249, 233, 1) !default;
 .FilterPanel {
   .x-form-type-checkbox {
 
@@ -11,6 +12,9 @@
   //.x-form-text-field-body-default {
   //  background-color: rgba(87,255,93,0.19) !important;
   //}
-}
 
+  .x-form-cb-wrap-inner:has(*:focus)    {
+    background-color: $focus-background-color;
+  }
 
+}