ru.coon 3.0.48 → 3.0.51

package/CHANGELOG.md

@@ -1,8 +1,38 @@
+# Version 3.0.51, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/64e72d95cacc2f81ab46d1d6d36728f73d0fa68e)
+* ## Features
+* <span style='color:green'>feat: NEVA-974: Доработка передачи в сервиз загрузки файлов обязательного параметра fileTypeId</span> ([5154fb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5154fbb972d7b84a0d880babe97b81fb16f9001c))
+
+* update: CHANGELOG.md ([5d7a42], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5d7a428cd48fd8b9d51cc830171812f0efba13ed))
+
+# Version 3.0.50, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/afdbae38fc7d35cb8df2ad696dc242e0ef3019b1)
+* ## Fixes
+* <span style='color:red'>HT-13994: fix column setVisible bug</span> ([b33727], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b33727b0f0a19ec9a9d502540684ebbc739d4a45))
+* <span style='color:red'> OpenCustomPanelButtonPlugin.getComponentId</span> ([27d009], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/27d009042de742178ecb94de357391524d4aa1fa))
+
+* HT-14010 fix: Исправление ситуации когда из-за невидимой колонки CHCK плагин SelectionModelPlugin не добавляет колонку с чекбоксами ([3b2e73], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3b2e73d1079496de3d6c54376b9ec929ac632cfc))
+* Update 2 files
+
+- /src/report/plugin/grid/SelectionModelPlugin.js ([- /src], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/- /src/report/component/ReportPanel.jsd76c501bac77bb8fe2a51cfb0e0d312c34dfb9a5))
+* HT-14010 ([6a2864], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6a286433acbf0f803c40cbde3cef2a6a7448d20a))
+* HT-14010 Исправления ([430040], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4300402c10c0b8c1d08b7a7da4ac22a43316bf19))
+* update: CHANGELOG.md ([8b9dd8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8b9dd8b58c8532e6554b72dba9e2668899ab5170))
+
+# Version 3.0.49, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b638bfa4b3fbcedd6c23dded5a8229c66078bfb6)
+* ## Fixes
+* <span style='color:red'>fix ReportToolbarOverflow - always show overflow panel</span> ([7ee936], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7ee9365bb07903032896fdf874c15ad43571ef0c))
+
+* HT-14010 fix: Исправление добавления плагина SelectionModelPlugin ([cd3112], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cd3112588153e414b42680967a05f13fe27da9a4))
+* upd ([f547cd], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f547cd566e3cc3407b0bfff6e8f7e8b825a4a3fe))
+* update: CHANGELOG.md ([2b9860], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2b9860b079d51497bb0ca5f5e05d9368b9d6b708))
+
 # Version 3.0.48, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/227c685c3c849b36bec245c8f91c338cb6ea40f7)
 * ## Fixes
 * <span style='color:red'>fix HT-14284 - remove title setting</span> ([29a26d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/29a26d463a68d1755820e08698100eea7fcfb59f))
 
 * HT-13994: Исправление работы плагина, добавление кнопки в тулбар для сброса состояния ([feaee6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/feaee672face5d48cdb74326966df8e1d1f6ede5))
+* HT-14010 fix: Исправление ситуации когда из-за невидимой колонки CHCK плагин SelectionModelPlugin не добавляет колонку с чекбоксами ([9a32ac], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9a32acd36afefb1cf4df4eb070205771ba20c8fa))
+* HT-13973 Исправление отображения рамок у заголовков ReportTree ([f231b4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f231b43f4e65170e68c75425f84f54de64485bea))
+* upd ([cb8dc8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cb8dc83365186de01f750504bf01cabd499cc03a))
 * update: CHANGELOG.md ([c2b6ce], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c2b6ced6aafc5f28fec8ae207689d3eb5899c449))
 
 # Version 3.0.47, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3dd226d0cac935732115784118e6a1acdde75bae)

package/package.json

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

package/src/app/viewPort/CenterView.js

@@ -128,7 +128,8 @@ Ext.define('Coon.app.viewPort.CenterView', {
 
         this.add(component);
 
-        component.on('titlechange', function(view, title) {
+        component.on('titlechange', function(_, title) {
+            title = title || '<span style="color:red">ошибка</span>';
             if (typeof title !== 'string') {
                 if (typeof title.getTitle !== 'function') {
                     return;

package/src/common/panel/dropzone/UniversalMultiUploadForm.js

@@ -98,6 +98,8 @@ Ext.define('Coon.common.panel.dropzone.UniversalMultiUploadForm', {
          * @param {Object}
          */
         headers: {},
+
+        fileTypeId: 'UNKNOWN',
     },
 
     layout: {

package/src/common/panel/dropzone/UniversalMultiUploadFormController.js

@@ -129,7 +129,13 @@ Ext.define('Coon.common.panel.dropzone.UniversalMultiUploadFormController', {
     submitFunction: async function() {
         if (this.validate()) {
             const parameters = this.collectParams();
+            const fileTypeId = this.getView().getFileTypeId();
+            if (!fileTypeId) {
+                Ext.Msg.alert('Сообщение системы', 'Не определен параметр fileTypeId');
+                return;
+            }
             const formData = new FormData();
+            formData.append('fileTypeId', fileTypeId);
             for (const key in parameters) {
                 formData.append(key, parameters[key]);
             }

package/src/overrides/grid/header/Container.js

@@ -0,0 +1,20 @@
+Ext.define('overrides.grid.header.Container', {
+    override: 'Ext.grid.header.Container',
+
+    getHeaderMenu: function() {
+        const menu = this.getMenu();
+        let item;
+
+        if (menu) {
+            item = menu.child('#columnItem');
+
+            if (item) {
+                item.menu.hideOnScroll = false;
+
+                return item.menu;
+            }
+        }
+
+        return null;
+    },
+});

package/src/report/component/ReportPanel.js

@@ -935,17 +935,6 @@ Ext.define('Coon.report.component.ReportPanel', {
         return plugins;
     },
 
-    checkPluginsFeaturesCompat(plugins, features) {
-        const selectionModelFeature = features.find((feature) => feature.ftype === 'SelectionModelFeature');
-        if (selectionModelFeature) {
-            const index = plugins.findIndex((item) => item.ptype === 'SelectionModelPlugin');
-            if (index !== -1) {
-                Coon.log.warn('Из-за наличия SelectionModelFeature отключен SelectionModelPlugin');
-                plugins.splice(index, 1);
-            }
-        }
-    },
-
     createGrid: function(reportBean) {
         const ns = Coon.report.model.ReportBeanFields;
         const gridPlugins = this.getPluginConfigByType(
@@ -955,18 +944,26 @@ Ext.define('Coon.report.component.ReportPanel', {
         );
 
         const features = this.getPluginConfigByType('GRID_FEATURE', 'f', reportBean[ns.$plugins]);
-
         const plugins = this.mixPlugins(gridPlugins, [
             {ptype: 'GridContextPlugin'},
             {ptype: 'GridContextMenu'},
             {ptype: 'gridexporter'},
             {ptype: 'AddFilterConditionPlugin'},
             {ptype: 'CalculatorPlugin'},
-            {ptype: 'GridRowCountPlugin'},
-            {ptype: 'SelectionModelPlugin', defaultMode: true}
+            {ptype: 'GridRowCountPlugin'}
         ]);
 
-        this.checkPluginsFeaturesCompat(plugins, features);
+        const selectionModelPlugin = Coon.report.plugin.grid.SelectionModelPlugin;
+        if (
+            selectionModelPlugin.isPluginDefaultModeValid(
+                this.gridProperties,
+                reportBean,
+                plugins,
+                features
+            )
+        ) {
+            plugins.push(selectionModelPlugin.defaultModeConfig);
+        }
 
         plugins.sort(this.raiseUpGroupButton);
 

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

@@ -5,6 +5,7 @@ Ext.define('Coon.report.component.reportpanel.ReportTree', {
         'Coon.report.component.ReportTree'
     ],
     xtype: 'ReportTree',
+    cls: 'ReportTree',
     allowDeselect: false,
     frame: false,
     columnLines: true,

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

@@ -0,0 +1,19 @@
+.ReportTree {
+  .x-grid-header-ct {
+
+    .x-column-header-group, .x-column-header-sub-group {
+      border-right: 1px solid $panel-header-background-color !important;
+    }
+
+    .x-group-header {
+      .x-column-header-group-item {
+        border-top: 1px solid $panel-header-background-color !important;
+        border-right: 1px solid $panel-header-background-color;
+      }
+
+      .x-column-header-sub-group {
+        border-top: 1px solid $panel-header-background-color;
+      }
+    }
+  }
+}

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

@@ -113,17 +113,18 @@ Ext.define('Coon.report.plugin.grid.OpenCustomPanelButtonPlugin', {
         return this.properties.reportId;
     },
 
-    getComponentId() {
-        return this.uiElementCd ? this.getUIElement() : this.getReportId();
+    getComponentId(config) {
+        return config.isCustomPanel ? this.getUIElement() : this.getReportId();
     },
 
     makeComponentConfig(config, params) {
+        const componentId = this.getComponentId(config);
         if (config.isReport) {
             config.params.params = Ext.apply({}, params);
         }
         const componentContextId = Coon.util.ContextManager.generateKey({
             params: config.params,
-            id: this.getComponentId(),
+            id: componentId,
             xtype: config.xtype,
             source: this.$className.split('.').pop(),
         });
@@ -140,7 +141,9 @@ Ext.define('Coon.report.plugin.grid.OpenCustomPanelButtonPlugin', {
                 componentConfig: {
                     parentComponent: this.getCmp(),
                     context: Object.assign(
-                        {id: this.getComponentId()},
+                        {
+                            id: componentId,
+                        },
                         config.params
                     ),
                 },

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

@@ -25,6 +25,33 @@ Ext.define('Coon.report.plugin.grid.SelectionModelPlugin', {
         getModes: (mode) => ['SINGLE', 'SIMPLE', 'MULTI'].find((m) => !mode || m === mode),
     },
 
+    statics: {
+        defaultModeConfig: {
+            ptype: 'SelectionModelPlugin',
+            defaultMode: true,
+        },
+
+        isPluginDefaultModeValid(gridProperties, bean, plugins, features) {
+            if (!Ext.isObject(bean)) {
+                throw new Error('Не определена конфигурация отчета!');
+            }
+            const isTree = Ext.isObject(bean.properties) && bean.properties.isTree;
+            const checkColumn = bean.fields.find((field) => field.reportFieldCd === 'CHCK');
+            const selModel = gridProperties.selModel;
+            const selectionModelPluginExist = plugins.find((plugin) => plugin.ptype === 'SelectionModelPlugin');
+            const selectionModelFeatureExist = features.find((feature) => feature.ftype === 'SelectionModelFeature');
+
+            const hasBlockingConditions = 
+                selectionModelPluginExist ||
+                selectionModelFeatureExist ||
+                checkColumn ||
+                isTree ||
+                selModel;
+    
+            return !hasBlockingConditions;
+        },
+    },
+
     init: function(grid) {
         grid.addCls(
             this.ptype
@@ -34,7 +61,7 @@ Ext.define('Coon.report.plugin.grid.SelectionModelPlugin', {
         }, this);
 
         grid.on('beforerender', function() {
-            if (this.defaultMode && this.checkDefaultModeImplementation()) {
+            if (this.defaultMode) {
                 this.defaultModeInit();
             } else {
                 this.byConfigInit();
@@ -55,23 +82,6 @@ Ext.define('Coon.report.plugin.grid.SelectionModelPlugin', {
         }, this);
     },
 
-    checkDefaultModeImplementation() {
-        const grid = this.getCmp();
-        const reportPanel = grid.reportPanel;
-        let status = true;
-        if (grid.columns.find((el) => el.dataIndex === 'CHCK')) {
-            status = false;
-        } else if (grid.view.isTreeView) {
-            status = false;
-        }
-        if (reportPanel) {
-            if (reportPanel.gridProperties && reportPanel.gridProperties.selModel) {
-                status = false;
-            }
-        }
-        return status;
-    },
-
     byConfigInit() {
         const grid = this.getCmp();
         const selModel = grid.getSelectionModel();

package/src/report/toolbar/ReportGridToolbar.scss

@@ -6,4 +6,9 @@
   .x-menu-item-overflowed {
     display: none;
   }
+
+  .x-btn-default-toolbar-small {
+    max-height: 30px;
+    padding: 6px 8px;
+  }
 }

package/src/report/toolbar/layout/ReportToolbarOverflow.js

@@ -366,7 +366,7 @@ Ext.define('Coon.report.toolbar.layout.ReportToolbarOverflow', {
             }
         }
         this.menuButton.setOverflowIndicator(indicator);
-        this.enableMenuButton(indicator);
+        // this.enableMenuButton(indicator);
         owner.resumeLayouts();
     },
 

package/src/version.js

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