ru.coon 3.0.60 → 3.0.61

package/CHANGELOG.md

@@ -1,7 +1,15 @@
-# Version 3.0.60, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b3ba3aeb89954b8e1650cb40e052a4509b4809fb)
+# Version 3.0.61, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0a79e6af1f962bbf5062d7a242281b679c4b0f35)
+* update: CHANGELOG.md ([dcc546], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dcc5460b35c3144e1f382de27906035b5a6057d8))
+
+# Version 3.0.60, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/af6f2371e1efe0721b4d2419eb765236ad3678b2)
+* ## Features
+* <span style='color:green'>feat: [ControlColumnByParamPlugin] Добавлена поддержка диапазона чисел. Resolve HT-14601.</span> ([3fc25d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3fc25d2a05b22f90b02aa2d2798e2ce23d3a5197))
+
 * ## Fixes
-* <span style='color:red'>fix validator, util.getByPath</span> ([608e70], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/608e7096603a0ed31656b0f45686bab7a4ee302b))
+* <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))
 
+* 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 ([e42a2a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e42a2a6fb8b511ba174ab5060fc84c683a046945))
 
 # Version 3.0.59, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/065a134b1f6c6211d56ef758b127778d5e104faa)

package/package.json

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

package/src/common/plugin/form/RequiredFlagPlugin.js

@@ -17,7 +17,6 @@ Ext.define('Coon.common.plugin.form.RequiredFlagPlugin', {
 
     setEnableHighlightingRequiredFields(enableHighlightingRequiredFields) {
         this.enableHighlightingRequiredFields = enableHighlightingRequiredFields;
-        this.changeFieldFlag(this.isRequired());
     },
     getEnableHighlightingRequiredFields() {
         return this.enableHighlightingRequiredFields;
@@ -60,19 +59,6 @@ Ext.define('Coon.common.plugin.form.RequiredFlagPlugin', {
         }
     },
 
-    changeFieldFlag: function(isRequired) {
-        const field = this.field;
-        if (!field) {
-            return;
-        }
-        field.isRequired = isRequired;
-        if (isRequired && this.enableHighlightingRequiredFields) {
-            field.getEl().dom.querySelector('.required-flag').textContent = '*';
-        } else {
-            field.getEl().dom.querySelector('.required-flag').textContent = '';
-        }
-    },
-
     /**
      * Allows specify flag of required field and change its color by requiredFlagColor prop (before rendering) or in runtime by setFlagColor method.
      */
@@ -93,24 +79,9 @@ Ext.define('Coon.common.plugin.form.RequiredFlagPlugin', {
                 return false;
             }
 
-            this.changeFieldFlag(isRequired);
-
             return true;
         }.bind(this);
 
-        field.changeFieldFlag = function(isRequired) {
-            const field = this.field;
-            field.isRequired = isRequired;
-            if (!field.getEl()) {
-                return;
-            }
-            if (isRequired) {
-                field.getEl().dom.querySelector('.required-flag').textContent = '*';
-            } else {
-                field.getEl().dom.querySelector('.required-flag').textContent = '';
-            }
-        }.bind(this);
-
         field.on('afterrender', function(fld) {
             if (fld.lastFlagColor) {
                 fld.setFlagColor(fld.lastFlagColor);

package/src/format.js

@@ -269,4 +269,34 @@ Ext.define('Coon.format', {
         const index = value.lastIndexOf(s);
         return index > 0 && index === (value.length - s.length);
     },
+
+    /**
+     * Преобразует строковое представление чисел в массив чисел.
+     * Поддерживает несколько форматов: диапазон (1-5), числа через запятую (1,3,5), одиночное число (5)
+     * @param {string} str - Строка для преобразования
+     * @returns {number[]} Массив чисел
+     * @example
+     * stringToNumbersArray('1-5');   возвращает [1, 2, 3, 4, 5]
+     * stringToNumbersArray('1,3,5'); возвращает [1, 3, 5]
+     * stringToNumbersArray('7');     возвращает [7]
+     * stringToNumbersArray('');      возвращает []
+     * stringToNumbersArray('abc');   возвращает []
+     */
+    stringToNumbersArray: function(str) {
+        if (!str || typeof str !== 'string') {
+            return [];
+        }
+
+        // Формат "1-5" (диапазон)
+        if (str.includes('-')) {
+            const [start, end] = str.split('-').map(Number);
+            if (!isNaN(start) && !isNaN(end) && start <= end) {
+                return Array.from({length: end - start + 1}, (_, i) => start + i);
+            }
+        }
+
+        // Формат "1,2,3,4,5" или одиночное число "5" (через запятую или одиночное)
+        const numbers = str.split(',').map(Number).filter((n) => !isNaN(n));
+        return numbers.length > 0 ? numbers : [];
+    },
 });

package/src/report/component/ReportFilterForm.js

@@ -120,6 +120,9 @@ Ext.define('Coon.report.component.ReportFilterForm', {
         ], Ext.create('Coon.report.component.ReportPanel'), this, this);
 
         this.setFilterDefaults(this.getFilterDefaults() || {});
+
+        const sideFilterPanelConfig = Ext.apply({enable: false}, this.sideFilterPanelConfig);
+
         this.northPanel = Ext.widget('NorthPanel', {
             hideFilterPanel: this.hideFilterPanel,
             hideFilterButtons: this.hideFilterButtons,
@@ -130,6 +133,7 @@ Ext.define('Coon.report.component.ReportFilterForm', {
             docked: 'top',
             hidden: true,
             header: false,
+            sideFilterPanelConfig: sideFilterPanelConfig,
         });
 
         this._visibleFieldsMap = new Map();
@@ -149,8 +153,8 @@ Ext.define('Coon.report.component.ReportFilterForm', {
 
         // для совместимости со старым кодом.
         this.filterContainer = this.northPanel.filterContainer;
-        this.items = [].concat(this.dockedItems || []);
-        this.items.push(this.northPanel);
+        this.dockedItems = [].concat(this.dockedItems || []);
+        this.dockedItems.push(this.northPanel);
 
         this.callParent();
         if (this.reportID) {
@@ -282,6 +286,10 @@ Ext.define('Coon.report.component.ReportFilterForm', {
 
         reportPanel.northPanel.fillFilter(false, currentParams, reportPanel.getFilterDefaults());
         reportPanel.filterHandler();
+
+        if (this.northPanel.filterConditionToolbar) {
+            this.northPanel.filterConditionToolbar.fireEvent('rememberconditions');
+        }
     },
 
     clearData() {

package/src/report/component/ReportPanel.js

@@ -397,7 +397,10 @@ Ext.define('Coon.report.component.ReportPanel', {
                 itemId: 'centerPanel',
                 region: 'center',
                 minHeight: 100,
-                layout: 'fit',
+                layout: {
+                    type: 'hbox',
+                    align: 'stretch',
+                },
                 cls: 'buttonsCenterFilterPanel',
             })
         ];
@@ -754,25 +757,20 @@ Ext.define('Coon.report.component.ReportPanel', {
     },
 
     openInReport(component, params) {
+        const northPanelHidden = this.northPanel.hidden;
         this.northPanel.hide();
-        this.addDocked({
-            xtype: 'toolbar',
-            itemId: 'backToReportBtn',
-            dock: 'top',
-            items: [
-                {
-                    xtype: 'button',
-                    iconCls: 'x-fa fa-chevron-left',
-                    text: 'вернуться назад',
-                    handler: function() {
-                        component.close();
-                    },
-                }
-            ],
-        }, 0);
+        const backTool = {
+            type: 'close',
+            tooltip: 'Закрыть',
+            handler: function() {
+                component.close();
+            },
+        };
+        component.addTool(backTool);
+        component.addCls('reportInReport');
         component.on('close', function() {
             this.setActiveItem(0);
-            this.northPanel.show();
+            (!northPanelHidden) && this.northPanel.show();
             this.removeDocked(this.down('toolbar#backToReportBtn'));
         }, this);
         this.add(component);
@@ -809,24 +807,24 @@ Ext.define('Coon.report.component.ReportPanel', {
 
         const configProperties = Coon.Function.convertAdvancedProperties(reportFormBean[ns.$properties]);
         Ext.merge(this, configProperties, {configProperties});
-        if (this.getToggleFilterPanel() && !this.hideFilterPanel) {
-            this.addTool({
-                iconCls: 'x-fa fa-eye-slash',
-                tooltipTexts: {
-                    show: 'скрыть панель фильтров',
-                    hide: 'показать панель фильтров',
-                },
-                handler: function(event, toolEl, panelHeader, tool) {
-                    const panel = this.findParentByType('ReportPanel');
-                    panel && panel.northPanel.togglePanel(tool);
-                },
-                listeners: {
-                    afterrender: function(tool) {
-                        tool.setTooltip(tool.tooltipTexts.show);
-                    },
-                },
-            });
-        }
+        // if (this.getToggleFilterPanel() && !this.hideFilterPanel) {
+        //     this.addTool({
+        //         iconCls: 'x-fa fa-eye-slash',
+        //         tooltipTexts: {
+        //             show: 'скрыть панель фильтров',
+        //             hide: 'показать панель фильтров',
+        //         },
+        //         handler: function(event, toolEl, panelHeader, tool) {
+        //             const panel = this.findParentByType('ReportPanel');
+        //             panel && panel.northPanel.togglePanel(tool);
+        //         },
+        //         listeners: {
+        //             afterrender: function(tool) {
+        //                 tool.setTooltip(tool.tooltipTexts.show);
+        //             },
+        //         },
+        //     });
+        // }
 
 
         this.configureGrid(reportFormBean);
@@ -868,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;
         });
     },
@@ -994,6 +987,7 @@ Ext.define('Coon.report.component.ReportPanel', {
             timeout: this.timeout || undefined,
             pageSize: this.pageSize || reportBean[ns.$rowCountPerPageValue],
             sealedColumns: true,
+            flex: 1,
             viewConfig: {
                 emptyText: 'Не найдено записей, удовлетворяющих условию.',
                 enableTextSelection: this.enableTextSelection,

package/src/report/component/ReportPanel.scss

@@ -66,4 +66,17 @@
   .x-group-sub-header {
     border-top: 0px solid #ebecee;
   }
+
+  &.reportInReport {
+    .x-tool-close {
+      background-color: #707070 !important;
+      mask-size: 100%;
+      height: 20px;
+    }
+    .x-panel-header-title-default {
+      font-size: 16px;
+      font-weight: 400;
+      line-height: normal;
+    }
+  }
 }

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

@@ -300,9 +300,9 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
         }
     },
 
-    clearFilter() {
+    clearFilter(fields) {
         Coon.Function.suspendEventsFromFieldsOnForm(this, true);
-        let fields = this.query('field');
+        fields = fields || this.query('field');
         fields = (fields || []).concat(this.query('fieldcontainer'));
         for (let i = 0; i < fields.length; i++) {
             if (fields[i].uncleanable) {

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

@@ -14,6 +14,14 @@ Ext.define('Coon.report.component.reportpanel.FilterPanelLegend', {
         </span>
     </div>`,
 
+    validity: undefined,
+
+    setValidity(isValid) {
+        Ext.defer(() => {
+            this.animateIcon(isValid);
+        }, 100, this);
+    },
+
     initComponent() {
         this.callParent();
         this.on('destroy', this.onDestroy, this);

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

@@ -4,13 +4,13 @@
     font-size: 12px;
     //margin: 5px;
     .required-flag {
-        font-size: 18px;
+        font-size: 12px;
         color: $required-flag-color;
     }
     .required-text {
         color: $required-text-color !important;
         .info-icon {
-            font-size: 14px;
+            font-size: 12px;
         }
     }
     .blink_me {