ru.coon 3.0.16 → 3.0.17

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 3.0.17, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0dcb35eed6ba22aaca715caec2b37099e186dcfa)
+* HT-12960 #feat доработка пункта контекстного меню с кнопками калькулятор ([ed4cdb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ed4cdbe1f7152f362c35896adea0131ba76b917c))
+* update: CHANGELOG.md ([bccfcb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bccfcbbaa044a23a919d7a572b562a113e750ed2))
+
 # Version 3.0.16, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8c523f942539c21495d27f79366c3429cfbba26a)
 * ## Fixes
 * <span style='color:red'>fix</span> ([e33cdc], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e33cdc8c5ee5899795915cfe174ad874a952b2bf))

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "3.0.16",
+  "version": "3.0.17",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"

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

@@ -4,63 +4,110 @@ Ext.define('Coon.report.component.calculator.ReportCalculatorMenuItem', {
     xtype: 'ReportCalculatorMenuItem',
     cls: 'ReportCalculatorMenuItem',
     defaultListenerScope: true,
+    referenceHolder: true,
+
     viewModel: {
         data: {
-            isHiddenAll: false,
+            oneCellValue: 0,
+            summaryValue: 0,
+            oneCellValueVisible: false,
+            summaryValueVisible: false,
+            valueVariant: 'cell',
+        },
+        formulas: {
+            isHiddenAll: {
+                get: function(data) {
+                    return !data('oneCellValueVisible') && !data('summaryValueVisible');
+                },
+            },
         },
     },
     margin: '0 0 0 48',
     bodyPadding: '5 0 0 0',
-    layout: {type: 'hbox'},
+    layout: {type: 'hbox', align: 'stretch'},
     items: [
         {
             xtype: 'container',
-            layout: {type: 'hbox', align: 'stretch'},
-            defaults: {
-                margin: '0 0 0 6',
-                cls: 'calculator-contextmenu-button-type1',
-            },
+            flex: 1,
+            layout: {type: 'vbox', align: 'stretch'},
             items: [
                 {
-                    xtype: 'button',
-                    margin: '0 0 0 0',
-                    iconCls: 'svg-icon svg-icon-calculator',
-                    eventName: 'openCalculator',
-                    handler: 'onClickButton',
-                },
-                {
-                    xtype: 'button',
-                    text: 'M=',
-                    eventName: 'setMemory',
-                    handler: 'onClickButton',
-                    width: 46,
+                    xtype: 'radiogroup',
+                    simpleValue: true,
                     hidden: true,
+                    columns: 1,
+                    vertical: true,
                     bind: {
                         hidden: '{isHiddenAll}',
+                        value: '{valueVariant}',
                     },
+                    items: [
+                        {
+                            bind: {
+                                boxLabel: '{oneCellValue}',
+                                visible: '{oneCellValueVisible}',
+                            },
+                            inputValue: 'cell',
+                        },
+                        {
+                            bind: {
+                                boxLabel: '<span class="sum-icon">&sum;</span> {summaryValue}',
+                                visible: '{summaryValueVisible}',
+                            },
+                            inputValue: 'range',
+                        }
+                    ],
                 },
                 {
-                    xtype: 'button',
-                    text: 'M+',
-                    eventName: 'addMemory',
-                    handler: 'onClickButton',
-                    width: 46,
-                    hidden: true,
-                    bind: {
-                        hidden: '{isHiddenAll}',
-                    },
-                },
-                {
-                    xtype: 'button',
-                    text: 'M-',
-                    eventName: 'subtractMemory',
-                    handler: 'onClickButton',
-                    width: 46,
-                    margin: '0 6 0 6',
-                    hidden: true,
-                    bind: {
-                        hidden: '{isHiddenAll}',
+                    xtype: 'container',
+                    layout: {type: 'hbox', align: 'stretch'},
+                    defaults: {
+                        margin: '0 0 0 6',
+                        cls: 'calculator-contextmenu-button-type1',
                     },
+                    items: [
+                        {
+                            xtype: 'button',
+                            margin: '0 0 0 0',
+                            iconCls: 'svg-icon svg-icon-calculator',
+                            eventName: 'openCalculator',
+                            handler: 'onClickButton',
+                        },
+                        {
+                            xtype: 'button',
+                            text: 'M=',
+                            eventName: 'setMemory',
+                            handler: 'onClickButton',
+                            width: 46,
+                            hidden: true,
+                            bind: {
+                                hidden: '{isHiddenAll}',
+                            },
+                        },
+                        {
+                            xtype: 'button',
+                            text: 'M+',
+                            eventName: 'addMemory',
+                            handler: 'onClickButton',
+                            width: 46,
+                            hidden: true,
+                            bind: {
+                                hidden: '{isHiddenAll}',
+                            },
+                        },
+                        {
+                            xtype: 'button',
+                            text: 'M-',
+                            eventName: 'subtractMemory',
+                            handler: 'onClickButton',
+                            width: 46,
+                            margin: '0 6 0 6',
+                            hidden: true,
+                            bind: {
+                                hidden: '{isHiddenAll}',
+                            },
+                        }
+                    ],
                 }
             ],
         },
@@ -85,11 +132,29 @@ Ext.define('Coon.report.component.calculator.ReportCalculatorMenuItem', {
     },
 
     onClickButton(button) {
-        this.fireEvent(button.eventName, button.text);
+        const vm = this.getViewModel();
+        const value = vm.get('valueVariant') === 'cell' ?
+            vm.get('oneCellValue'):
+            vm.get('summaryValue');
+
+        this.fireEvent(button.eventName, button.text, value);
     },
 
-    setHiddenMemoryButtons(isHidden) {
-        this.getViewModel().set('isHiddenAll', isHidden);
+    /**
+     * Установка свойств, влияющих на видимость радиокнопок
+     * @param {boolean} oneCellValueVisible
+     * @param {boolean} summaryValueVisible
+     */
+    setVisibleValueVariants(oneCellValueVisible, summaryValueVisible) {
+        this.getViewModel().set({
+            oneCellValueVisible,
+            summaryValueVisible,
+        });
+        if (!oneCellValueVisible && summaryValueVisible) {
+            this.getViewModel().set('valueVariant', 'range');
+        } else if (oneCellValueVisible && !summaryValueVisible) {
+            this.getViewModel().set('valueVariant', 'cell');
+        }
     },
 
     isItemHidden() {
@@ -98,4 +163,15 @@ Ext.define('Coon.report.component.calculator.ReportCalculatorMenuItem', {
     isItemDisabled() {
         return false;
     },
+    /**
+     * Установка значений
+     * @param {number} value значение ячейки
+     * @param {number} summaryValue сумма значений ячеек по выделенным записям
+     */
+    setValueByContext(value, summaryValue) {
+        this.getViewModel().set({
+            oneCellValue: `${value}`,
+            summaryValue: `${summaryValue}`,
+        });
+    },
 });

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

@@ -38,4 +38,14 @@
       padding: 6px 6px;
     }
   }
+
+  .x-form-item-body-default {
+    min-height: 22px !important;
+  }
+  .x-form-cb-wrap-default {
+    height: 24px !important;
+  }
+  .sum-icon {
+    color: gray !important;
+  }
 }

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

@@ -1,3 +1,6 @@
+/**
+ * todo: Вынести бизнеслогику и хранение стейтов в отдельный класс singleton.
+ */
 Ext.define('Coon.report.component.calculator.ReportCalculatorPanel', {
     extend: 'Ext.panel.Panel',
     alias: 'widget.ReportCalculatorPanel',

package/src/report/component/settings/property/ReportPropertyForm.js

@@ -0,0 +1,73 @@
+Ext.define('Coon.report.component.settings.property.ReportPropertyForm', {
+    extend: 'Ext.panel.Panel',
+    xtype: 'ReportPropertyForm',
+    layout: {
+        type: 'vbox',
+        align: 'stretch',
+    },
+    padding: 16,
+    bind: {
+        disabled: '{!reportPropertyGrid.selection}',
+    },
+    items: [
+        {
+            xtype: 'panel',
+            itemId: 'editPropertyForm',
+            layout: {
+                type: 'vbox',
+                align: 'stretch',
+            },
+            reference: 'propForm',
+            defaults: {
+                margin: 8,
+            },
+            items: [
+                {
+                    xtype: 'panel',
+                    itemId: 'description',
+                    flex: 1,
+                    frame: true,
+                    bodyStyle: {
+                        fontSize: '16px',
+                        padding: '8px',
+                        lineHeight: '1.2',
+                        color: 'gray',
+                        wordBreak: 'break-word',
+                    },
+                },
+                {
+                    xtype: 'textarea',
+                    name: 'value',
+                    flex: 1,
+                    // anchor: '95%',
+                    allowBlank: false,
+                    grow: true,
+                    minHeight: 100,
+                    fieldLabel: 'значение',
+                    bind: {
+                        disabled: '{reportPropertyGrid.selection.isDeleted}',
+                        value: '{locals.propValue}',
+                    },
+                }
+            ],
+            buttons: [
+                {
+                    text: 'удалить',
+                    handler: 'onRemoveProp',
+                    bind: {
+                        text: '{reportPropertyGrid.selection.isDeleted ? "восстановить" : "удалить"}',
+                    },
+                },
+                {
+                    text: 'подтвердить',
+                    disabled: true,
+                    itemId: 'submit',
+                    handler: 'onChangeValue',
+                    bind: {
+                        disabled: '{locals.originalPropValue === locals.propValue}',
+                    },
+                }
+            ],
+        }
+    ],
+});

package/src/report/component/settings/property/ReportPropertyGrid.js

@@ -0,0 +1,42 @@
+Ext.define('Coon.report.component.settings.property.ReportPropertyGrid', {
+    extend: 'Ext.grid.Panel',
+    xtype: 'ReportPropertyGrid',
+    layout: 'fit',
+    store: {
+        type: 'json',
+        sorters: [
+            {
+                property: 'key',
+                direction: 'ASC',
+            }
+        ],
+    },
+    viewConfig: {
+        getRowClass(record) {
+            const {isDeleted, isNew} = record.getData();
+            if (isDeleted) {
+                return 'is-deleted';
+            }
+            if (isNew) {
+                return 'is-new';
+            }
+        },
+    },
+    columns: {
+        defaults: {xtype: 'HintColumn', hintProperty: 'description', sortable: false, menuDisabled: true, flex: 1},
+        items: [
+            {
+                dataIndex: 'key',
+                text: 'свойство',
+                maxWidth: 250,
+                renderer(v, mt, rec) {
+                    if (rec.get('dict')) {
+                        mt.tdStyle = 'color: blue;font-weight: bold';
+                    }
+                    return v;
+                },
+            },
+            {dataIndex: 'value', text: 'значение', minWidth: 120}
+        ],
+    },
+});

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

@@ -38,10 +38,65 @@ Ext.define('Coon.report.plugin.grid.CalculatorPlugin', {
             isVisibleMemoryButtons = this.canBeingNumber(this.columnValue)!==false;
         }
         if (showReportCalculator) {
-            this.calculatorButtons.setHiddenMemoryButtons(!isVisibleMemoryButtons);
+            const selected = this.getSelected();
+            const dataIndex = this.column && this.column.dataIndex;
+            this.calculatorButtons.setVisibleValueVariants(
+                isVisibleMemoryButtons,
+                selected.length > 1 && this.atLeastOneCanBeingNumber(selected, dataIndex)
+            );
+            this.calculatorButtons.setValueByContext(this.columnValue, this.sumFieldValueByRecords(selected, dataIndex));
         }
     },
 
+    /**
+     *
+     * @param {Array<Ext.data.Model|Object>} selected
+     * @param {string} dataIndex
+     * @returns {boolean}
+     */
+    atLeastOneCanBeingNumber(selected, dataIndex) {
+        return Array.isArray(selected) && selected.reduce((acc, record) => {
+            const cellValue = record.isModel ? record.get(dataIndex) : record[dataIndex];
+            return acc? true: this.canBeingNumber(cellValue);
+        }, false);
+    },
+
+    /**
+     *
+     * @param {Array<Ext.data.Model|Object>} selected
+     * @param {string} dataIndex
+     * @returns {number}
+     */
+    sumFieldValueByRecords(selected, dataIndex) {
+        return selected.reduce((acc, record) => {
+            const cellValue = record.isModel ? record.get(dataIndex) : record[dataIndex];
+
+            return window.Decimal(acc).plus(window.Decimal(this.canBeingNumber(cellValue) !== false ? cellValue : 0));
+        }, 0);
+    },
+
+    getSelected() {
+        const sm = this.grid.getSelectionModel();
+        const checkColumnName = this.grid.checkColumn || this.grid.ownerCt.checkColumn ||
+            this.grid.ownerCt.ownerCt.checkColumn || (this.grid.properties && this.grid.properties['checkColumn']);
+        const checkedRecords = this.grid.getCheckedRecords();
+        let selectedRecords = [];
+        if (checkColumnName) {
+            const store = this.grid.getStore();
+            const records = store.getRange(0, store.getCount());
+            for (let i = 0; i < records.length; i++) {
+                if (records[i].get(checkColumnName) === true) {
+                    selectedRecords.push(records[i]);
+                }
+            }
+        } else if (checkedRecords && checkedRecords.length) {
+            selectedRecords = checkedRecords;
+        } else {
+            selectedRecords = Coon.Function.getDataFromSelectionModel(sm, false);
+        }
+        return selectedRecords;
+    },
+
     canBeingNumber(cellValue) {
         if (typeof cellValue === 'number' && !isNaN(cellValue)) {
             return cellValue;
@@ -60,20 +115,19 @@ Ext.define('Coon.report.plugin.grid.CalculatorPlugin', {
             return false;
         }
     },
-    setCalcOperation(text) {
+    setCalcOperation(text, value) {
+        Coon.log.log('setCalcOperation', {text, value});
         const vm = Coon.report.component.calculator.ReportCalculatorPanel.getViewModel();
-        const cellValue = Ext.isString(this.columnValue) ? Number(this.columnValue.replace(',', '.').replaceAll(' ', '')):
-            this.columnValue;
         const memory = vm.get('memory') || 0;
         switch (text) {
         case 'M=':
-            vm.set('memory', cellValue);
+            vm.set('memory', value);
             break;
         case 'M+':
-            vm.set('memory', window.Decimal(memory).plus(window.Decimal(cellValue)));
+            vm.set('memory', window.Decimal(memory).plus(window.Decimal(value)));
             break;
         case 'M-':
-            vm.set('memory', window.Decimal(memory).minus(window.Decimal(cellValue)));
+            vm.set('memory', window.Decimal(memory).minus(window.Decimal(value)));
             break;
         }
         this.closeMenu();

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

@@ -86,7 +86,8 @@ Ext.define('Coon.report.plugin.grid.GridContextMenu', {
     },
 
     cellContextMenuHandler: function(view, td, cellIndex, record, tr, rowIndex, event) {
-        this.grid.getSelectionModel().select(rowIndex);
+        // В режиме Multi выделение записи где возникло событие контекстного меню приводит к отмене всех выделенных строк
+        // this.grid.getSelectionModel().select(rowIndex);
         if (record) {
             this.showContextMenu({view, td, cellIndex, record, tr, rowIndex, event, hasContext: true});
         }

package/src/version.js

@@ -1,4 +1,4 @@
 Ext.define('Coon.version', {
     singleton: true,
-    number: '3.0.16',
+    number: '3.0.17',
 });