ru.coon 3.0.16 → 3.0.18

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# Version 3.0.18, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bb39afb212a53701712c8b7fe902731447b750b3)
+* HT-12682 ([cb7749], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cb7749c37221e2300ef9fd808d7dd1bbe6485d16))
+* upd ([b7296d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b7296d96541755709adbb4d128482076014d7a28))
+* upd ([db6372], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/db637292f38afade2e8ea9960f667b0f1dfeca7f))
+* upd ([c0f74f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c0f74f9e5bd6dbbdbc47aa8d29ab47f8532de78b))
+* upd ([8b4435], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8b44350dad3b194814defe9b0b97a60ad58bfb80))
+* HT-12690 fix: Исправление разметки выбора значения для калькулятора ([437375], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/437375141d61cb8148320db5922c70ad5f3f51cd))
+* update: CHANGELOG.md ([4bab06], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4bab06487f996c9e55e3e01e1c6fb58950451cee))
+
+# Version 3.0.17, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0dcb35eed6ba22aaca715caec2b37099e186dcfa)
+* upd ([175d4c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/175d4c78d3374ac64bd3a9c484671e40fee6f093))
+* HT-12960 #feat доработка пункта контекстного меню с кнопками калькулятор ([ed4cdb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ed4cdbe1f7152f362c35896adea0131ba76b917c))
+* up ([476a5f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/476a5f80e0cbe013581c17b45701585dc37eabd2))
+* 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.18",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"

package/src/Function.js

@@ -454,6 +454,10 @@ Ext.define('Coon.Function', {
         return Coon.Function.decodeProperties.call(this, listOfProperties, filterFunction, transformTypeFunction);
     },
 
+    isStringContainFunction(value) {
+        return /^function\s*\(.*?\)\s*\{/.test(value);
+    },
+
     decodeProperties: function(properties, filterFn, transformTypeFn) {
         if (!Ext.isObject(properties) && !Ext.isArray(properties)) {
             return properties;
@@ -470,7 +474,7 @@ Ext.define('Coon.Function', {
                     } else {
                         if (Ext.isString(value) && (Coon.format.startsWith(value, '{') && value.lastIndexOf(':') !== -1)) {
                             value = JSON5.parse(value);
-                        } else if (Ext.isString(value) && Coon.format.startsWith(value, 'function')) {
+                        } else if (Ext.isString(value) && Coon.Function.isStringContainFunction(value)) {
                             value = eval('(' + value + ')');
                         } else if (Ext.isString(value) && Coon.format.startsWith(value, '[')) {
                             value = eval(value);

package/src/app/Application.js

@@ -93,7 +93,6 @@ Ext.define('Coon.app.Application', {
             this.afterAuthorized();
         });
         this.getApplicationMainView().show();
-        this.setDefaultWindowTitle();
     },
 
     afterLoad: async function() {
@@ -105,6 +104,9 @@ Ext.define('Coon.app.Application', {
             this.setUserData();
         }
         const isAuthValid = authenticated === true && !requireTwoFactorAuthentication;
+        if (isAuthValid) {
+            this.setDefaultWindowTitle();
+        }
         let view = isAuthValid ? 'mainview' : 'loginview';
 
         if (window.location.href.indexOf('customForm') > -1) {

package/src/app/viewPort/CenterView.js

@@ -12,11 +12,13 @@ Ext.define('Coon.app.viewPort.CenterView', {
         tabLimit: 50,
     },
 
-    plugins: {
-        tabreorderer: {
+    plugins: [
+        // 'tabscrollermenu',
+        {
+            ptype: 'tabreorderer',
             animate: false,
-        },
-    },
+        }
+    ],
 
     frame: true,
 

package/src/report/column/HintColumn.js

@@ -8,7 +8,7 @@ Ext.define('Coon.report.column.HintColumn', {
 
     $metaConfig: {
         type: 'column',
-        description: `компонент выпадающего списка`,
+        description: 'компонент выпадающего списка',
     },
 
     initComponent: function() {

package/src/report/command/GetDynamicReportDataCommand.js

@@ -11,6 +11,8 @@ Ext.define('Coon.report.command.GetDynamicReportDataCommand', {
     ],
     url: '/ReportFormData/get',
 
+    enableFieldTruncate: false,
+
     execute: function(reportId, parameterList, start, limit, necessaryFields) {
         if (Array.isArray(parameterList)) {
             parameterList = Ext.encode(parameterList);
@@ -24,8 +26,12 @@ Ext.define('Coon.report.command.GetDynamicReportDataCommand', {
             start: start,
             limit: limit,
         };
-        if (Array.isArray(necessaryFields) && necessaryFields.length) {
-            params.filterReportFieldCdList = necessaryFields.join(',');
+        if (this.enableFieldTruncate) {
+            if (Array.isArray(necessaryFields) && necessaryFields.length) {
+                params.filterReportFieldCdList = necessaryFields.join(',');
+            }
+        } else {
+            delete params.filterReportFieldCdList;
         }
         this.callParent([params]);
     },

package/src/report/command/GetKeyValueListByReportCommand.js

@@ -15,6 +15,8 @@ Ext.define('Coon.report.command.GetKeyValueListByReportCommand', {
     reportId: undefined,
     parametersList: undefined,
 
+    enableFieldTruncate: false,
+
     /**
      * url запроса.
      **/
@@ -45,10 +47,14 @@ Ext.define('Coon.report.command.GetKeyValueListByReportCommand', {
             parameterList: this.parametersList,
             reportId: this.reportId,
         };
-        if (Array.isArray(necessaryFields) && necessaryFields.length) {
-            params.filterReportFieldCdList = Array.from(
-                new Set([this.keyField, this.valueField, ...necessaryFields])
-            ).join(',');
+        if (this.enableFieldTruncate) {
+            if (Array.isArray(necessaryFields) && necessaryFields.length) {
+                params.filterReportFieldCdList = Array.from(
+                    new Set([this.keyField, this.valueField, ...necessaryFields])
+                ).join(',');
+            }
+        } else {
+            delete params.filterReportFieldCdList;
         }
         this.callParent([params]);
     },

package/src/report/component/ReportPanel.js

@@ -75,6 +75,8 @@ Ext.define('Coon.report.component.ReportPanel', {
         collapseMode: 'mini',
     },
 
+    lazyConfigLoading: true,
+
     locals: {
         plugins: new Map(),
     },
@@ -411,8 +413,14 @@ Ext.define('Coon.report.component.ReportPanel', {
         if (this.reportID) {
             this.reportId = this.reportID;
         }
+
         if (this.reportId) {
-            this.configureReport();
+            if (this.lazyConfigLoading) {
+                // report reads the configuration only after has been laid out for the first time at its initial size
+                this.on('boxready', this.configureReport, this);
+            } else {
+                this.configureReport();
+            }
         }
 
         this.eventDestroier = Ext.on('rezise', this.onWindowResize, this);

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

@@ -4,63 +4,112 @@ 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: `<div class="sum-value-container">
+                                            <div class="sum-icon">&sum;</div><div class="sum-value">{summaryValue}</div>
+                                            </div>`,
+                                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 +134,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 +165,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,20 @@
       padding: 6px 6px;
     }
   }
+
+  .x-form-item-body-default {
+    min-height: 22px !important;
+  }
+  .x-form-cb-wrap-default {
+    height: 24px !important;
+  }
+  .sum-value-container {
+    display: flex;
+  }
+  .sum-icon {
+    color: gray !important;
+  }
+  .sum-value {
+    margin: 2px 0 0 4px
+  }
 }

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/ReportFormEditPanelController.js

@@ -29,6 +29,13 @@ Ext.define('Coon.report.component.settings.ReportFormEditPanelController', {
         this.getView().on('tabchange', function() {
             this.lookupReference('plugins').saveState();
         });
+        this.setEditorTitle(reportID);
+    },
+
+    setEditorTitle(reportID) {
+        this.getView().setTitle(
+            reportID ? `${reportID} - репорт` : 'новый репорт'
+        );
     },
 
     load: function(reportID) {
@@ -234,7 +241,10 @@ Ext.define('Coon.report.component.settings.ReportFormEditPanelController', {
     validate: function(items) {
         let isValid = true;
         for (const key in items.items) {
-            isValid = items.items[key].getController().validate();
+            const component = items.items[key];
+            isValid = component.validate ?
+                component.validate() :
+                component.getController().validate();
             if (!isValid) {
                 this.getView().setActiveTab(items.items[key]);
                 break;

package/src/report/component/settings/ReportFormEditPanelModel.js

@@ -15,17 +15,6 @@ Ext.define('Coon.report.component.settings.ReportFormEditPanelModel', {
         enableAddFieldProps: false,
     },
     formulas: {
-        title: {
-            bind: {
-                isNew: '{isNew}',
-                reportId: '{report.reportId}',
-                reportDescription: '{report.reportDescription}',
-            },
-            get: function(data) {
-                return (data.isNew ? 'Создание SWE репорта ' : 'Редактирование SWE репорта ') +
-                    data.reportId + ' (' + data.reportDescription + ' )';
-            },
-        },
         SQLPARAMS: {
             bind: {
                 bindTo: '{report.SQLText}',