ru.coon 3.0.69 → 3.0.72

package/.eslintrc.js

@@ -17,6 +17,7 @@ module.exports = {
         'JSON5': 'readonly',
         'Coon': 'writable',
         'Iconpack': 'writable',
+        'Decimal': 'readonly',
     },
     'parserOptions': {
         ecmaVersion: 2020,

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# Version 3.0.72, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c2f5896748cca4a1467fa9dedd00ed69b950c033)
+* ## Fixes
+* <span style='color:red'> исправление отображения кнопок репорта</span> ([45f49f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/45f49ff03cfd18a299ba92a73f415fc86f9c6bbf))
+
+* remove span if no title ([33c3f7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/33c3f713cbee011f31de9a68216b5f615477fb0d))
+* HT-14867 fix: Исправление подсветки выделенной строки. Отключение черезполосной раскраски строки при наличии плагина GridRowStylePlugin. ([650840], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6508409dac9bffbdfd672f2befd4f52e0d7dc40c))
+* update: CHANGELOG.md ([7c81a0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7c81a089d558f6788dd14582814325cd1d331e9c))
+
+# Version 3.0.71, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c392614cffea74a4f5b5886307e26be5fffcb14a)
+* update: CHANGELOG.md ([f10394], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f10394bec0b7055bc79a4716495bc9049e994758))
+
+# Version 3.0.70, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f6109b23cc11c2f08c51e25913c6682f1615e007)
+* update extjs_iconpack to 1.3.32 ([3ecbff], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3ecbff43a095b23a50d5d4d9519d5c9c47a96735))
+* update: CHANGELOG.md ([89b129], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/89b129bf2c7a0ebc036089f75032ab8dd647d99d))
+
 # Version 3.0.69, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/01e9715d7b9ff10d4898cdf49adc51e10f59ab9b)
 * HT-14867 feat: Черезполосная расцветка строк репорта. Исправление работы со свойствами репорта. ([d91a8e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d91a8ef5f74369009e220fee35e12b485cb27cbb))
 * update: CHANGELOG.md ([62d169], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/62d1691d0a2292271bd17353bae0e5eb3fd1ad11))
@@ -28,9 +43,13 @@
 
 # Version 3.0.63, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/eb48b260e66b233a4cad92d0d856d0d8da4c021b)
 # Version 3.0.62, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d8f3faa85fc70860397b0074b43d93aa9b9ffa00)
+* ## Features
+* <span style='color:green'>feat: Форматирование суммирующих строк, автоматическое число разрядов по умолчанию. Closes HT-14817.</span> ([42319f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/42319f2d024ef87e00dadfb112f049c4c20d4c7a))
+
 * ## Fixes
 * <span style='color:red'>fix csrf in ReportTreeStore</span> ([cb402a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cb402a1790a7b1081a5e8a17968db947ba583df9))
 
+* remove default value ([0047e3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0047e3d4507183fa9fbcc32a1ce4b5004fb91524))
 * HT-14775 fix: Исправление ширины системного тулбара ([bdd783], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bdd7836f8eef889ec642e486e896d3910eeb1850))
 * update: CHANGELOG.md ([0624d1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0624d16d97c878b4e695b775a6a08cb00d3f12bd))
 
@@ -44,6 +63,7 @@
 * ## Fixes
 * <span style='color:red'>HT-14119 fix double loading FilterPanel with FilterFormEditingPlugin</span> ([43e7be], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/43e7be1760d09b482bafc8bd9f75d146be266d50))
 
+* Добавлена возможность переноса пунктов меню между рабочими пространствами. Closes NEVA-987. ([5ad5e4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5ad5e47733bcf3bd2770e79e767dc9e2db6401e9))
 * HT-13993 добавлена боковая панель фильтров для репортов ([e2d5c7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e2d5c7436900d232cd48c9389a685affbacf721a))
 * HT-14628 открытие компонента внутри репорта - закрытие через крестик ([fc4f4e], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/fc4f4e9112a3ba1a85cb4a064d65d7a7cfb8cec1))
 * update: CHANGELOG.md ([2ab856], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2ab8566fb3c7400e91d3706a5bd8383d48060556))

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "3.0.69",
+  "version": "3.0.72",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"
@@ -27,7 +27,7 @@
     "ace-diff": "3.0.3",
     "decimal.js-light": "^2.5.1",
     "echarts": "5.3.3",
-    "extjs_iconpack": "1.3.27",
+    "extjs_iconpack": "1.3.32",
     "json5": "2.2.3",
     "object-hash": "^3.0.0",
     "sigma-printjs": "^1.0.3",

package/src/app/viewPort/CenterView.js

@@ -129,7 +129,7 @@ Ext.define('Coon.app.viewPort.CenterView', {
         this.add(component);
 
         component.on('titlechange', function(_, title) {
-            title = title || Coon.format.withHint('<span style="color:red">---</span>', 'заголовок не задан');
+            title = title || Coon.format.withHint('', 'заголовок не задан');
             if (typeof title !== 'string') {
                 if (typeof title.getTitle !== 'function') {
                     return;

package/src/common/panel/WindowWrap.js

@@ -162,7 +162,7 @@ Ext.define('Coon.common.panel.WindowWrap', {
         }, this);
 
         this.content.on('titlechange', function(_, title) {
-            title = title || Coon.format.withHint('<span style="color:red">---</span>', 'заголовок не задан');
+            title = title || Coon.format.withHint('', 'заголовок не задан');
             if (typeof title !== 'string') {
                 if (typeof title.getTitle !== 'function') {
                     return;

package/src/format.js

@@ -98,7 +98,7 @@ Ext.define('Coon.format', {
             return v;
         }
         let format = '0,000.';
-        const digitsRight = precision ? precision : this.actualNumberPrecision(vNumber);
+        const digitsRight = precision >= 0 ? precision : this.actualNumberPrecision(vNumber);
         let i;
         for (i = 0; i < digitsRight; i++) {
             format += '0';

package/src/nav/editor/menu/NavMenuTreeController.js

@@ -13,10 +13,14 @@ Ext.define('Coon.nav.editor.menu.NavMenuTreeController', {
             loadMenuData: 'loadMenuData',
             setRootMenu: 'setRootMenu',
             itemdblclick: 'openFormEdit',
+            beforedrop: 'onMenuTreeBeforeDrop',
             drop: 'saveMenuOrder',
             itemcontextmenu: 'showContextMenu',
         },
     },
+    init() {
+        Ext.on('nav:item:workspace-change', this.onItemWorkspaceChange.bind(this));
+    },
 
     /**
      * Построение дерева меню для выбранного рабочего пространства
@@ -409,4 +413,26 @@ Ext.define('Coon.nav.editor.menu.NavMenuTreeController', {
             html: `Взаимодействие с элементами меню происходит по нажатию на правую кнопку мыши.`,
         }).show();
     },
+
+    onMenuTreeBeforeDrop(node, {records}) {
+        return typeof records[0].get('LEAF_SW') !== 'undefined';
+    },
+
+    onItemWorkspaceChange(records, newWorkspaceCd) {
+        if (Array.isArray(records)) {
+            for (const record of records) {
+                record.set('WORKSPACE_CD', newWorkspaceCd);
+                record.set('index', -1);
+            }
+            this.getView().mask();
+            Promise.all(this.getDataPromises(records)).catch((error) => {
+                Coon.log.debug(error);
+                this.getView().unmask();
+                Ext.Msg.alert('Ошибка', error.toString());
+            }).finally(() => {
+                this.getView().unmask();
+                this.reloadMenu();
+            });
+        }
+    },
 });

package/src/nav/editor/menu/NavMenuTreeView.js

@@ -22,6 +22,7 @@ Ext.define('Coon.nav.editor.menu.NavMenuTreeView', {
                 enableDrag: true,
                 allowContainerDrop: true,
                 appendOnly: false,
+                ddGroup: 'gridTreeDD',
             },
         },
     },

package/src/nav/editor/workspace/NavWorkspaceListController.js

@@ -6,12 +6,13 @@ Ext.define('Coon.nav.editor.workspace.NavWorkspaceListController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.NavWorkspaceListController',
     id: 'NavWorkspaceListController',
-
+    requires: ['Coon.util'],
     listen: {
         component: {
             'NavWorkspaceListView': {
                 select: 'selectWorkspace',
                 itemdblclick: 'openFormEditWorkspace',
+                beforedrop: 'onWorkspaceListBeforeDrop',
                 drop: 'onSaveWorkspaceOrder',
                 itemcontextmenu: 'showWorkspaceContextMenu',
             },
@@ -109,6 +110,28 @@ Ext.define('Coon.nav.editor.workspace.NavWorkspaceListController', {
         }, this);
     },
 
+    onWorkspaceListBeforeDrop: function(node, {records}, overModel, dropPosition, dropHandlers) {
+        if (!records[0].get('leaf')) {
+            return true;
+        }
+        if (records[0].get('WORKSPACE_CD') === overModel.get('WORKSPACE_CD')) {
+            return false;
+        }
+        const targetWorkspace = overModel.get('DESCRIPTION');
+        const infoStr = records.length === 1 ? `"${records[0].get('DESCR')}"` : Coon.util.pluralize(records.length, ['пункт', 'пункта', 'пунктов']) +
+            ' меню';
+        dropHandlers.wait = true;
+        Ext.MessageBox.confirm(
+            `Подтверждение`,
+            `Вы уверены, что хотите перенести ${infoStr} в "${targetWorkspace}"?`,
+            (btn) => {
+                if (btn === 'yes') {
+                    Ext.fireEvent('nav:item:workspace-change', records, overModel.get('WORKSPACE_CD'));
+                }
+            });
+        dropHandlers.cancelDrop();
+    },
+
     /**
      * Срабатывает при перетаскивании рабочего пространства, сохраняет порядок отображения
      */

package/src/nav/editor/workspace/NavWorkspaceListView.js

@@ -21,6 +21,7 @@ Ext.define('Coon.nav.editor.workspace.NavWorkspaceListView', {
             gridviewdragdrop: {
                 enableDrop: true,
                 enableDrag: true,
+                ddGroup: 'gridTreeDD',
             },
         },
     },

package/src/report/component/ReportPanel.js

@@ -866,11 +866,6 @@ Ext.define('Coon.report.component.ReportPanel', {
             }
             config[prefix + 'type'] = plugin[ns.$uiElement].xtype || plugin[ns.$xtype];
             config[ns.$sortSequence] = plugin[ns.$sortSequence] || null;
-            config.pluginConfig = {
-                properties: Object.assign({}, config),
-                type,
-                name: prefix + 'type',
-            };
             return config;
         });
     },

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

@@ -54,8 +54,10 @@
   .x-grid-cell.filtered-cell {
     //background-color: #fff6e8;
   }
+}
+.ReportGrid:not(.gridrowstyleplugin) {
   .x-grid-with-row-lines.enable-striped-rows {
-    .x-grid-item-alt:not(.inheritParentBgColor, .x-grid-item-over) {
+    .x-grid-item-alt:not(.x-grid-item-selected, .x-grid-item-over) {
       background-color: rgba(137, 204, 198, 0.07);
     }
   }

package/src/report/model/SummaryPluginBean.js

@@ -1,6 +1,5 @@
 Ext.define('Coon.report.model.SummaryPluginBean', {
     extend: 'Ext.data.Model',
-    requires: 'Coon.report.model.SummaryPluginBeanFields',
     fields: [
         {
             name: 'columnName',
@@ -12,9 +11,8 @@ Ext.define('Coon.report.model.SummaryPluginBean', {
         },
         {
             name: 'precNum',
-            type: 'int',
             validators: ['presence'],
-            defaultValue: 2,
+            defaultValue: 'Не изменять',
         }
     ],
 });

package/src/report/plugin/configPanel/SummaryPluginConfigPanelSummaryGrid.js

@@ -55,10 +55,21 @@ Ext.define('Coon.report.plugin.configPanel.SummaryPluginConfigPanelSummaryGrid',
             ],
         };
 
-        const numberField = Ext.create('Ext.form.field.Number', {
-            allowBlank: true,
-            allowDecimals: false,
-            minValue: 0,
+        const precisionEditor = Ext.create({
+            xtype: 'BaseComboBox',
+            valueField: 'id',
+            displayField: 'text',
+            store: {
+                data: [
+                    {id: 'Не изменять', text: 'Не изменять'},
+                    {id: 0, text: '0'},
+                    {id: 1, text: '1'},
+                    {id: 2, text: '2'},
+                    {id: 3, text: '3'},
+                    {id: 4, text: '4'},
+                    {id: 5, text: '5'}
+                ],
+            },
         });
 
         this.columns = {
@@ -70,7 +81,7 @@ Ext.define('Coon.report.plugin.configPanel.SummaryPluginConfigPanelSummaryGrid',
                     xtype: 'hintColumn',
                     editor: summaryTypeEditor,
                 },
-                {header: 'Число разрядов', dataIndex: ns.$precNum, xtype: 'hintColumn', editor: numberField}
+                {header: 'Отображаемое число разрядов', dataIndex: ns.$precNum, editor: precisionEditor}
             ],
             defaults: {
                 sortable: true,

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

@@ -271,7 +271,6 @@ Ext.define('Coon.report.plugin.grid.GridRowStylePlugin', {
             if (uniqCls) {
                 grid.addCls(uniqCls);
             }
-            grid.addCls('gridrowstyleplugin');
         }
         if (this.treeNodesColors !== false && this.treeNodesColors !== '') {
             const proto = Ext.ClassManager.classes[Ext.ClassManager.aliasToName['widget.'+grid.xtype]].prototype;

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

@@ -10,7 +10,7 @@ Ext.define('Coon.report.plugin.grid.GroupRowsPlugin', {
     extend: 'Coon.report.plugin.grid.ToolbarButtonPlugin',
     alias: 'plugin.GroupRowsPlugin',
     uses: [],
-    requires: ['Ext.grid.feature.Grouping'],
+    requires: ['Coon.report.plugin.grid.SummaryPlugin'],
     isSingle: true,
     configurePanelWizard: 'GroupRowsPluginConfigPanel',
 
@@ -75,47 +75,7 @@ Ext.define('Coon.report.plugin.grid.GroupRowsPlugin', {
     },
 
     setSummaryConfigColumn: function() {
-        const columns = this.component.getColumns();
-
-        this.valueConfig.forEach((config) => {
-            const column = columns.find((col) => col.dataIndex === config.columnName);
-            if (column) {
-                let summaryType = config.summaryType;
-                if (summaryType === 'sum') {
-                    summaryType = function(records, fieldValues) {
-                        let result = 0;
-                        if (!Ext.isEmpty(fieldValues)) {
-                            fieldValues.forEach((value) => {
-                                const nextValue = parseFloat(value) || 0;
-
-                                const resultString = '' + result;
-                                const stringValue = '' + nextValue;
-
-                                const resultPrecision = resultString.includes('.') ? resultString.substring(resultString.indexOf('.') + 1).length : 0;
-                                const currentPrecision = stringValue.includes('.') ? stringValue.substring(stringValue.indexOf('.') + 1).length : 0;
-
-                                const maxPrecision = Math.max(resultPrecision, currentPrecision);
-                                const mp = Math.pow(10, maxPrecision);
-                                result = (result * mp + (nextValue * mp)) / mp;
-                            });
-                        }
-                        return result;
-                    };
-                }
-                column.setConfig('summaryType', summaryType);
-                const summaryRendererConfig = config.summaryRenderer || column.getConfig('summaryRenderer');
-                if (summaryRendererConfig && Ext.isFunction(summaryRendererConfig)) {
-                    column.setConfig('summaryRenderer', summaryRendererConfig);
-                } else if (config.precNum) {
-                    const summaryRenderer = function(value) {
-                        const precNum = config.precNum;
-                        const formatString = precNum ? `0.${'0'.repeat(precNum)}` : '0';
-                        return Number.isNaN(value) ? '' : Ext.util.Format.number(value, formatString);
-                    };
-                    column.setConfig('summaryRenderer', summaryRenderer);
-                }
-            }
-        });
+        Coon.report.plugin.grid.SummaryPlugin.applySummaryConfig(this.valueConfig, this.component.getColumns());
     },
 
     getFields: function(context) {

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

@@ -8,6 +8,34 @@ Ext.define('Coon.report.plugin.grid.SummaryPlugin', {
     parameters: [],
     configurePanelWizard: 'SummaryPluginConfigPanel',
 
+    statics: {
+        applySummaryConfig(valueConfig, columns) {
+            valueConfig.forEach((config) => {
+                const column = columns.find((col) => col.dataIndex === config.columnName);
+                if (column) {
+                    let summaryType = config.summaryType;
+                    if (summaryType === 'sum') {
+                        summaryType = function(records, fieldValues) {
+                            return fieldValues.reduce((a, b = 0) => new Decimal(a).plus(new Decimal(b)), 0);
+                        };
+                    }
+                    column.setConfig('summaryType', summaryType);
+                    const summaryRendererConfig = config.summaryRenderer || column.getConfig('summaryRenderer');
+                    if (typeof summaryRendererConfig === 'function') {
+                        column.setConfig('summaryRenderer', summaryRendererConfig);
+                    } else if (typeof config.precNum !== 'undefined') {
+                        const decSeparator = column.xtype === 'MoneyColumn' ? '.' : ',';
+                        const precision = Number.isNaN(config.precNum) ? undefined : config.precNum;
+                        const summaryRenderer = (value) => {
+                            return Number.isNaN(value) ? '' : Coon.format.bigNumFormat(value, decSeparator, ' ', precision);
+                        };
+                        column.setConfig('summaryRenderer', summaryRenderer);
+                    }
+                }
+            });
+        },
+    },
+
     constructor: function(config) {
         if (Ext.isEmpty(config.valueConfig)) {
             config.valueConfig = [];
@@ -28,59 +56,7 @@ Ext.define('Coon.report.plugin.grid.SummaryPlugin', {
     },
 
     setColumns: function() {
-        const columns = this.grid.getColumns();
-        for (let i = 0; i < this.valueConfig.length; i++) {
-            let column = undefined;
-            for (let j = 0; j < columns.length; j++) {
-                if (columns[j].dataIndex === this.valueConfig[i].columnName) {
-                    column = columns[j];
-                    break;
-                }
-            }
-            if (column) {
-                let summaryType = this.valueConfig[i].summaryType;
-                if (summaryType === 'sum') {
-                    summaryType = function(records, fieldValues) {
-                        let result = 0;
-                        if (!Ext.isEmpty(fieldValues)) {
-                            for (let i = 0; i < fieldValues.length; i++) {
-                                let nextValue = fieldValues[i];
-                                if (!Ext.isNumeric(nextValue)) {
-                                    nextValue = Number(parseInt(nextValue, 10));
-                                    if (isNaN(nextValue)) {
-                                        nextValue = 0;
-                                    }
-                                }
-                                const resultString = '' + result;
-                                const stringValue = '' + nextValue;
-                                const resultPrecision = resultString.length - (resultString.indexOf('.') == -1 ?
-                                    resultString.length :
-                                    (resultString.indexOf('.') + 1));
-                                const currentPrecision = stringValue.length - (stringValue.indexOf('.') == -1 ?
-                                    stringValue.length :
-                                    (stringValue.indexOf('.') + 1));
-                                const maxPrecision = Math.max(resultPrecision, currentPrecision);
-                                const mp = Math.pow(10, maxPrecision);
-                                result = (result * mp + (nextValue * mp)) / mp;
-                            }
-                        }
-                        return result;
-                    };
-                }
-                column.setConfig('summaryType', summaryType);
-                const summaryRendererConfig = this.valueConfig[i].summaryRenderer || column.getConfig('summaryRenderer');
-                if (summaryRendererConfig && Ext.isFunction(summaryRendererConfig)) {
-                    column.setConfig('summaryRenderer', summaryRendererConfig);
-                } else if (this.valueConfig[i].precNum) {
-                    const summaryRenderer = function(value) {
-                        const precNum = this.valueConfig[i].precNum;
-                        const formatString = precNum ? `0.${'0'.repeat(precNum)}` : '0';
-                        return Number.isNaN(value) ? '' : Ext.util.Format.number(value, formatString);
-                    }.bind(this);
-                    column.setConfig('summaryRenderer', summaryRenderer);
-                }
-            }
-        }
+        this.self.applySummaryConfig(this.valueConfig, this.grid.getColumns());
     },
 
     findAndActivateSummaryFeature: function() {

package/src/uielement/component/UiCustomController.js

@@ -153,7 +153,7 @@ Ext.define('Coon.uielement.component.UiCustomController', {
             if (!typeof title === 'string') {
                 return;
             }
-            title = title || Coon.format.withHint('<span style="color:red">---</span>', 'заголовок не задан');
+            title = title || Coon.format.withHint('', 'заголовок не задан');
             view.titleText = title;
             if (
                 view.tab && typeof view.tab.setTooltip === 'function'

package/src/version.js

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