ru.coon 2.8.42 → 2.8.44

package/CHANGELOG.md

@@ -1,7 +1,17 @@
-# Version 2.8.42, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/310f5fc88e30b43444661c922e945e7cc774e424)
+# Version 2.8.44, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/50df0b225f3a1efaaa05828e6445e74667856840)
+* ## Features
+* <span style='color:green'>feat: HT-11254: Доработана возможность прокидывать функции в свойства элементов</span> ([94e499], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/94e499f50bc145ebc6fca12a75905ae0fb82b54b))
+
+* update: CHANGELOG.md ([eaa39d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/eaa39d7b4b4c67e22b2c457a513e3f7aa0489a5c))
+
+# Version 2.8.43, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/044b4f591c34eb73673a766fb6a59c361900e9c7)
+# Version 2.8.42, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3167961fc1b81e3228f4b35669e8a58561bb2aa4)
+* ## Features
+* <span style='color:green'>feat: HT-11274: Скрываю части текста в зависимости от количества ошибок</span> ([2b896d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2b896d31464c3b9376f86cc774c02e6eccf2477b))
+
 * ## Fixes
-* <span style='color:red'>fix log.js / ReportFormCommonPanelController(field.clear() -> field.reset())</span> ([65b474], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/65b4742eccf6b98419ec6402871fc6e2b2d42e88))
-* <span style='color:red'>fix few files</span> ([dc6ee1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dc6ee1d19be856796d8d2f5f9b4fc26ce95138c8))
+* <span style='color:red'>fix</span> ([ad1bcd], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ad1bcdfd3f50ea1aba06dc737671706a81bb5f0e))
+* <span style='color:red'> made plugin deprecated</span> ([69e1bd], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/69e1bde0543dbb757fe91d7545cf6b3de36624b5))
 
 * update: CHANGELOG.md ([1ead0c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1ead0c63f6c4c0423354ab2f41d5b5cb03eb7e0f))
 
@@ -22,7 +32,6 @@
 * ## Fixes
 * <span style='color:red'> HT-11130 FilterConditionToolbar location and width</span> ([9dddf6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9dddf6739c500bb2a1f5a2a6558a9021ff40f192))
 
-* HT-11129 устранение замечаний ([3fa826], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3fa826c9c083ac3f95266555b5dcb257bf5446fa))
 * update: CHANGELOG.md ([2191ec], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2191eceb941229d37de6cafd03e47132a38fe8ec))
 
 # Version 2.8.39, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4b6a41e64accf9c50f08e6404130431c4543fdb3)
@@ -35,7 +44,6 @@
 * ## Features
 * <span style='color:green'>feat: opa show user roles in roleEditPanel</span> ([3e4b47], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3e4b47dd951b1869d3bf3814dad6a035c6607fc2))
 
-* HT-11129 бэкграунд полей с фокусом у FilterPanel ([496dfb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/496dfb646a59d9c13c8989a5b40eb3179eb64c44))
 * update: CHANGELOG.md ([73d1e1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/73d1e1c828d201e6ae53c19106feed024cfb6c56))
 
 # Version 2.8.37, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c1a016edfea1ebf863a02984d5a9589c69d75de3)
@@ -59,7 +67,6 @@
 * <span style='color:red'> edit user roles</span> ([939a2d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/939a2d6bb50daddd8ed265c04f9e355e53c37098))
 
 * Revert "Merge branch 'TR-69858' into 'develop'" ([f03f50], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f03f5087de3f78048cfa554985fe342ebfcb2792))
-* HT-11129 :feat Переход по элементам формы при нажатии клавиши «Tab». Новый плагин для FilterPanel ([08785a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/08785a94165969ea406a8f894272414d71f0d778))
 * update: CHANGELOG.md ([a4a1e9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a4a1e9873b0dbaf25ab17d854eb3bfee81924d0f))
 
 # Version 2.8.34, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/74999de9bdff9c55e4f0b1d8840558559f532fa8)

package/package.json

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

package/src/app/viewPort/CenterViewController.js

@@ -1,14 +1,8 @@
 Ext.define('Coon.app.viewPort.CenterViewController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.CenterViewController',
-
-    requires: [
-        'Coon.util',
-        'Coon.Function'
-    ],
-
+    requires: ['Coon.util', 'Coon.Function'],
     cache: new Map(),
-
     privates: {
         paramsToObject(params) {
             const entries = [];
@@ -48,81 +42,21 @@ Ext.define('Coon.app.viewPort.CenterViewController', {
             typeof c.doInit === 'function' && c.doInit.call(c, id);
         },
     },
-
-    getPanelConfig(id, filterDefaults, paramsObject) {
-        return Coon.util.promisifyCmd(
-            'Coon.uielement.command.GetUIElementCommand',
-            id
-        ).then((config) => {
-            if (typeof config === 'object') {
-                if (typeof config.propertyData === 'string') {
-                    config.propertyData = JSON5.parse(
-                        config.propertyData,
-                        (key, value) => {
-                            if (value === 'true') {
-                                return true;
-                            }
-                            if (value === 'false') {
-                                return false;
-                            }
-                            return value;
-                        }
-                    );
-                }
-                config = Object.assign(
-                    {xtype: config.xtype, itemId: id},
-                    config.propertyData
-                );
-                if (config.xtype === 'ReportPanel') {
-                    Object.assign(config, {
-                        filterDefaults,
-                        listeners: {
-                            'router:activate': this.onActivateComponent.bind(
-                                this,
-                                paramsObject
-                            ),
-                        },
-                    });
-                } else if (config.xtype === 'UiCustomPanel') {
-                    Object.assign(config, {
-                        listeners: {
-                            'router:activate': this.onActivateComponent.bind(
-                                this,
-                                paramsObject
-                            ),
-                            'afterrender': (panel) =>
-                                Coon.Function.executeComponentDoInit(panel, paramsObject),
-                        },
-                    });
-                } else {
-                    Object.assign(config, {
-                        listeners: {
-                            'afterrender': (panel) =>
-                                Coon.Function.executeComponentDoInit(panel, paramsObject),
-                        },
-                    });
-                }
-            }
-            return config;
-        });
-    },
-
     async create(id, type = 'panel', params = [], useCache = true) {
+        const cacheKey = useCache && JSON.stringify({id, type, params});
         let config;
         if (!id) {
             return config;
         }
-
-        const cacheKey = JSON.stringify({id, type, params});
-        const cachedComponent = useCache && this.cache.get(cacheKey);
-        if (cachedComponent) {
-            return cachedComponent;
+        if (cacheKey) {
+            const cached = this.cache.get(cacheKey);
+            if (cached) {
+                return cached;
+            }
         }
-
         const paramsObject = this.paramsToObject(params);
         const filterDefaults =
             (paramsObject && Object.assign(paramsObject, {doFilter: true})) || {};
-
         switch (String(type).toUpperCase()) {
         case 'REPORT':
             config = {
@@ -139,7 +73,59 @@ Ext.define('Coon.app.viewPort.CenterViewController', {
             break;
         case 'PANEL':
             try {
-                config = await this.getPanelConfig(id, filterDefaults, paramsObject);
+                config = await Coon.util.promisifyCmd(
+                    'Coon.uielement.command.GetUIElementCommand',
+                    id
+                );
+                if (typeof config === 'object') {
+                    if (typeof config.propertyData === 'string') {
+                        config.propertyData = JSON5.parse(
+                            config.propertyData,
+                            (key, value) => {
+                                if (value === 'true') {
+                                    return true;
+                                }
+                                if (value === 'false') {
+                                    return false;
+                                }
+                                return value;
+                            }
+                        );
+                    }
+                    config = Object.assign(
+                        {xtype: config.xtype, itemId: id},
+                        config.propertyData
+                    );
+                    if (config.xtype === 'ReportPanel') {
+                        Object.assign(config, {
+                            filterDefaults,
+                            listeners: {
+                                'router:activate': this.onActivateComponent.bind(
+                                    this,
+                                    paramsObject
+                                ),
+                            },
+                        });
+                    } else if (config.xtype === 'UiCustomPanel') {
+                        Object.assign(config, {
+                            listeners: {
+                                'router:activate': this.onActivateComponent.bind(
+                                    this,
+                                    paramsObject
+                                ),
+                                'afterrender': (panel) =>
+                                    Coon.Function.executeComponentDoInit(panel, paramsObject),
+                            },
+                        });
+                    } else {
+                        Object.assign(config, {
+                            listeners: {
+                                'afterrender': (panel) =>
+                                    Coon.Function.executeComponentDoInit(panel, paramsObject),
+                            },
+                        });
+                    }
+                }
             } catch (e) {
                 Coon.log.error(e.message);
             }

package/src/common/component/formeditor/UiCFCell.js

@@ -10,4 +10,7 @@ Ext.define('Coon.common.component.formeditor.UiCFCell', {
     layout: 'fit',
     items: [
     ],
+    listeners: {
+        beforeadd: 'onBeforeAdd',
+    },
 });

package/src/common/component/formeditor/UiCFCellController.js

@@ -9,6 +9,21 @@ Ext.define('Coon.common.component.formeditor.UiCFCellController', {
         this.setDefaultMenuItems();
         this.initMouseEvents();
     },
+    onBeforeAdd(cell, component, index, eOpts) {
+        // console.log(component);
+        if (component.initialConfig.rawCfg) {
+            Object.keys(component.initialConfig.rawCfg).forEach((key) => {
+                const value = component.initialConfig.rawCfg[key]+'';
+                if (value && Coon.format.startsWith(value, 'function')) {
+                    try {
+                        component[key] = eval('(' + value + ')').call(component);
+                    } catch (e) {
+                        Coon.log.error(`[UiCFCellController] for property:${key} & value:${value}, error: ${e}`);
+                    }
+                }
+            });
+        }
+    },
     setDefaultMenuItems() {
         const rowCnt = this.getUiCFRowController();
         this.menuItems = {

package/src/log.js

@@ -15,11 +15,13 @@ Ext.define('Coon.log', {
 
     locals: {},
 
-    constructor(config) {
+    constructor() {
         const me = this;
-        this.initConfig(config);
         if (!this.getInit() && this.isDebug) {
             this.setInit(true);
+            if (this.isDebug) {
+                this.injectViewer();
+            }
         }
         this.consoleError = window.console.error;
         this.getConsoleError = function() {
@@ -32,16 +34,15 @@ Ext.define('Coon.log', {
     },
 
     subscribeToLogErrors() {
-        const me = this;
         Ext.on('appready', function() {
-            me.getConsoleError().error = function(...args) {
-                me.error(...args);
+            Coon.log.getConsoleError().error = function(...args) {
+                Coon.log.error(...args);
             };
             window.onerror = function(msg, url, lineNumber) {
-                me.error(`at line: ${lineNumber} ${msg}`);
+                Coon.log.error(`at line: ${lineNumber} ${msg}`);
             };
             window.addEventListener('unhandledrejection', function(e) {
-                me.error(e.reason.message);
+                Coon.log.error(e.reason.message);
                 return false;
             });
         });
@@ -68,6 +69,15 @@ Ext.define('Coon.log', {
         cmp && Coon.log.debug(cmp.$className, cmp.xtype, Coon.log.searchXtype(cmp));
     },
 
+    injectViewer() {
+        document.body.addEventListener('mouseover', (e) => {
+            if (Coon.log.getPopup()) {
+                const id = e.target.id;
+                Coon.log.handler(id);
+            }
+        });
+    },
+
     isDebug: !!['1', 'true'].includes(Ext.util.Cookies.get('coon_log_debug')),
 
     setDebug(flag) {

package/src/report/component/ReportPanel.js

@@ -338,14 +338,7 @@ Ext.define('Coon.report.component.ReportPanel', {
 
         this.layout = 'card';
 
-        this._visibleFieldsMap = new Map();
-
-        // для совместимости со старым кодом.
-        this.dockedItems = [].concat(this.dockedItems || []);
-
-
-        this.dockedItems.push({
-            xtype: 'NorthPanel',
+        this.northPanel = Ext.widget('NorthPanel', {
             hideFilterPanel: this.hideFilterPanel,
             hideFilterButtons: this.hideFilterButtons,
             findButtonConfig: this.findButtonConfig || {},
@@ -357,23 +350,7 @@ Ext.define('Coon.report.component.ReportPanel', {
             header: false,
         });
 
-        this.items = [
-            Ext.apply(this.centerProperties, {
-                xtype: 'panel',
-                itemId: 'centerPanel',
-                region: 'center',
-                minHeight: 100,
-                layout: 'fit',
-                cls: 'buttonsCenterFilterPanel',
-            })
-        ];
-
-        this.callParent();
-
-        this.centerPanel = this.down('panel#centerPanel');
-        this.northPanel = this.down('NorthPanel');
-        this.filterContainer = this.northPanel.filterContainer;
-
+        this._visibleFieldsMap = new Map();
         this.northPanel.on('hide', function() {
             this.query('[validate][isReportFilterField][hidden=false]').forEach((field) => {
                 this._visibleFieldsMap.set(field, field.hidden);
@@ -388,6 +365,24 @@ Ext.define('Coon.report.component.ReportPanel', {
             });
         }, this);
 
+        // для совместимости со старым кодом.
+        this.filterContainer = this.northPanel.filterContainer;
+        this.centerPanel = Ext.widget('panel', Ext.apply(this.centerProperties, {
+            region: 'center',
+            minHeight: 100,
+            layout: 'fit',
+            cls: 'buttonsCenterFilterPanel',
+        }));
+        this.dockedItems = [].concat(this.dockedItems || []);
+
+
+        this.dockedItems.push(this.northPanel);
+
+        this.items = [
+            this.centerPanel
+        ];
+
+        this.callParent();
 
         if (this.reportID) {
             this.reportId = this.reportID;
@@ -722,8 +717,7 @@ Ext.define('Coon.report.component.ReportPanel', {
             return acc;
         }, new Map());
 
-        const configProperties = Coon.Function.convertAdvancedProperties(reportFormBean[ns.$properties]);
-        Ext.merge(this, configProperties, {configProperties});
+        Ext.merge(this, Coon.Function.convertAdvancedProperties(reportFormBean[ns.$properties]));
         if (this.getToggleFilterPanel() && !this.hideFilterPanel) {
             this.addTool({
                 iconCls: 'x-fa fa-eye-slash',

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

@@ -159,7 +159,7 @@ Ext.define('Coon.report.component.reportpanel.CopyReportPanelController', {
             .catch((error) => {
                 Coon.log.debug(error);
                 this.getViewModel().set('isReportIDValid', false);
-                this.lookup('copyToFieldRef') && this.lookup('copyToFieldRef').markInvalid('ReportID уже существует!');
+                this.lookup('copyToFieldRef').markInvalid('ReportID уже существует!');
                 Ext.Msg.alert('Ошибка', error.toString());
             })
             .finally(() => {

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

@@ -66,7 +66,8 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
         let rowCount = 0;
         for (let i = 0; i < configurationList.length; i++) {
             const configuration = configurationList[i];
-            if (currentLayout === null || (visibleCount >= this.itemsOnRow && configuration.visibleSwitch)) {
+            const ns = Coon.report.model.ReportParameterBeanFields;
+            if (currentLayout === null || (visibleCount >= this.itemsOnRow && configuration[ns.$visibleSwitch])) {
                 if (currentLayout !== null) {
                     height += currentLayout.height;
                     this.items.push(currentLayout);
@@ -92,7 +93,7 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
                 currentLayout.height = configuration.height;
             }
             const filterItem = this.createFilterItem(configuration);
-            if (configuration.visibleSwitch) {
+            if (configuration[ns.$visibleSwitch]) {
                 visibleCount += configuration.weight;
             }
             currentLayout.add(filterItem);
@@ -120,14 +121,15 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
     },
 
     createFilterItem: function(configuration) {
+        const ns = Coon.report.model.ReportParameterBeanFields;
+
         const defaultConfig = {
             // isReportFilterField флаг, позволяющий компоненту понимать,что он является частью фильтр панели отчета.
             isReportFilterField: true,
-            defaultFocus: configuration.defaultFocus,
-            fieldLabel: configuration.description,
-            allowBlank: !configuration.requiredSwitch,
-            hidden: !configuration.visibleSwitch,
-            name: configuration.reportParameterCd,
+            fieldLabel: configuration[ns.$description],
+            allowBlank: !configuration[ns.$requiredSwitch],
+            hidden: !configuration[ns.$visibleSwitch],
+            name: configuration[ns.$reportParameterCd],
             labelWidth: configuration.labelWidth || 80,
             triggers: {
                 clear: {
@@ -143,7 +145,7 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
             },
         };
         let config;
-        switch (configuration.reportParameterTypeLookup) {
+        switch (configuration[ns.$reportParameterTypeLookup]) {
         case 'DATETIME':
             config = {
                 xtype: 'DateTimeField',
@@ -166,10 +168,10 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
             };
             break;
         case 'DATE':
-            if (configuration.properties['periodEnd']) {
+            if (configuration[ns.$properties]['periodEnd']) {
                 config = Object.assign(
                     {xtype: 'DatePickerPresetsField'},
-                    configuration.properties
+                    configuration[ns.$properties]
                 );
             } else {
                 config = {
@@ -203,15 +205,15 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
             break;
         }
 
-        config = Ext.apply(config, Coon.Function.convertAdvancedProperties(configuration.properties), defaultConfig);
+        config = Ext.apply(config, Coon.Function.convertAdvancedProperties(configuration[ns.$properties]), defaultConfig);
         if (!Ext.isDefined(config.width) && !Ext.isDefined(config.flex)) {
             config.flex = 1;
         }
         const field = Ext.widget(config);
         field.on('change', this.setClearTrigger, this);
         // Установка значения по-умолчанию
-        const value = configuration.defaultValue;
-        const visibleValue = configuration.defaultValueDescription;
+        const value = configuration[ns.$defaultValue];
+        const visibleValue = configuration[ns.$defaultValueDescription];
         if (!Ext.isEmpty(value)) {
             field.on('afterrender', function() {
                 field.setValue(value);

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

@@ -1,4 +1,3 @@
-$focus-background-color: rgba(254, 249, 233, 1) !default;
 .FilterPanel {
   .x-form-type-checkbox {
 
@@ -12,19 +11,6 @@ $focus-background-color: rgba(254, 249, 233, 1) !default;
   //.x-form-text-field-body-default {
   //  background-color: rgba(87,255,93,0.19) !important;
   //}
-  .x-field:has(*:focus) {
-    background-color: $focus-background-color;
-    background-clip: content-box;
-
-    .x-form-item-body {
-      background-color: $focus-background-color;
-    }
-  }
-
-  .x-form-cb-wrap-inner:has(*:focus)    {
-    background-color: $focus-background-color;
-  }
-
 }
 
 

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

@@ -137,12 +137,17 @@ Ext.define('Coon.report.component.report.NorthPanel', {
             }
         ];
 
-        this.reportPanel = this.up('ReportPanel,ReportFilterForm');
-        this.searchButton.handler = this.reportPanel ? Ext.bind(this.reportPanel.filterHandler, this.reportPanel) : Ext.emptyFn;
-        this.clearButton.handler = Ext.bind(function() {
-            this.clearFilter();
-            this.clearData();
-        }, this.reportPanel);
+        /**
+         * Только при добавлении компонента в ReportPanel можно получить ссылку на родителя
+         */
+        this.on('added', function() {
+            this.reportPanel = this.findParentByType('ReportPanel') || this.findParentByType('ReportFilterForm');
+            this.searchButton.handler = this.reportPanel ? Ext.bind(this.reportPanel.filterHandler, this.reportPanel) : Ext.emptyFn;
+            this.clearButton.handler = Ext.bind(function() {
+                this.clearFilter();
+                this.clearData();
+            }, this.reportPanel);
+        }, this);
 
         this.callParent();
     },
@@ -161,26 +166,21 @@ Ext.define('Coon.report.component.report.NorthPanel', {
     },
 
     configureFilterPanel: function(reportFormBean) {
-        const report = this.up('ReportPanel');
-        const properties = report && report.configProperties ||
-            Coon.Function.convertAdvancedProperties(reportFormBean.properties) || {};
+        const ns = Coon.report.model.ReportBeanFields;
+        const properties = Coon.Function.convertAdvancedProperties(reportFormBean[ns.$properties]) || {};
         Ext.merge(this, properties);
         this.filterPlugins.push({
             ptype: 'EnterConfirmFormPlugin',
             confirmHandler: this.reportPanel ? Ext.bind(this.reportPanel.filterHandler, this.reportPanel) : Ext.emptyFn,
         });
-        this.filterPlugins.push({
-            ptype: 'FormFieldFocusPlugin',
-            defaultFocusFirstField: true,
-        });
 
         const [enableHighlightingRequiredFields, hiddenLegend] = this.hasPropertiesFilterPanel(reportFormBean.plugins, properties);
         this.hiddenLegend = !!hiddenLegend;
         this.enableHighlightingRequiredFields = enableHighlightingRequiredFields;
         const filterPanel = Ext.widget('FilterPanel', {
-            configurationList: reportFormBean.parameters,
+            configurationList: reportFormBean[ns.$parameters],
             itemsOnRow: properties['filterItemsOnRow'] || 2,
-            enableHighlightingRequiredFields,
+            enableHighlightingRequiredFields: enableHighlightingRequiredFields,
             plugins: this.filterPlugins,
         });
         this.filterPanel = filterPanel;

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

@@ -119,7 +119,7 @@ Ext.define('Coon.report.component.settings.property.ReportPropertiesPanelControl
         const editor = this.getPropertyValueEditor(record);
         if (editor && typeof editor.setValue === 'function') {
             this.lookup('propertyValueContainer').add(editor);
-            editor.setBind({value: '{propertyGrid.selection.value || propertyGrid.selection.defaultVal}'});
+            editor.setBind({value: '{propertyGrid.selection.value}'});
         } else {
             Coon.log.debug('HASN`T EDITOR', record.getData(), editor);
         }

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

@@ -193,13 +193,6 @@ Ext.define('Coon.report.component.settings.property.ReportPropertyDictionary', {
                     leaf: true,
                     singleValue: true,
                     description: 'Свойство даёт возможность скрывать/показывать признак обязательности заполнения полей.',
-                },
-                {
-                    id: 'formFieldFocusPluginConfig',
-                    leaf: true,
-                    defaultVal: '{disabled: false, defaultFocusFirstField: true}',
-                    description: 'Свойства, передаваемые плагину formFieldFocusPlugin, используемому в фильтр панели репорта ',
-                    propertyValueType: 'object',
                 }
             ],
         },

package/src/report/plugin/form/ReportGroupsFieldValidationPlugin.js

@@ -118,9 +118,11 @@ Ext.define('Coon.report.plugin.form.ReportGroupsFieldValidationPlugin', {
             }
         } else {
             valid = true;
+            let counter = 0;
             for (const group of groups) {
                 if (!this.checkValidityOfGroup(group)) {
                     invalidMessage += `${group.checkResult}`;
+                    counter++;
                     valid = false;
                 }
             }
@@ -133,9 +135,7 @@ Ext.define('Coon.report.plugin.form.ReportGroupsFieldValidationPlugin', {
                 }, this);
             }
             if (invalidMessage) {
-                invalidMessage = `<br>Все группы полей обязательны для заполнения: 
-                <ul>${invalidMessage}</ul>
-                `;
+                invalidMessage = (counter > 1 ? 'Все группы полей обязательны для заполнения: ' : '') + `<ul>${invalidMessage}</ul>`;
             }
         }
         return {valid, invalidMessage};
@@ -160,7 +160,7 @@ Ext.define('Coon.report.plugin.form.ReportGroupsFieldValidationPlugin', {
                 }
                 if (this.isPluginEnabled(currentField)) {
                     currentField.changeFieldFlag(Ext.isEmpty(currentField.getValue()));
-                    currentField.setFlagColor(Ext.isEmpty(currentField.getValue()) ? this.requiredFieldColorState1: this.requiredFieldColorState2);
+                    currentField.setFlagColor(Ext.isEmpty(currentField.getValue()) ? this.requiredFieldColorState1 : this.requiredFieldColorState2);
                 }
             }
             group.checkResult = this.getCheckResultAnd(valid, group);
@@ -219,9 +219,9 @@ Ext.define('Coon.report.plugin.form.ReportGroupsFieldValidationPlugin', {
 
         if (!group.invertValue) {
             return !valid ?
-                this.fieldCount(group)===1 ?
-                    `<li>Поле ${fieldNames} не заполнено.</li>`:
-                    `<li>Все поля группы (${fieldNames}) обязательны для заполнения.</li>`:
+                this.fieldCount(group) === 1 ?
+                    `<li>Поле ${fieldNames} не заполнено.</li>` :
+                    `<li>Все поля группы (${fieldNames}) обязательны для заполнения.</li>` :
                 '';
         } else {
             // Инвертирование пока отключено
@@ -229,7 +229,7 @@ Ext.define('Coon.report.plugin.form.ReportGroupsFieldValidationPlugin', {
             // !(true && true)=false
             // !(true && false)=true
             // !(false && false)=true
-            return !valid ? '': `<li>Из группы параметров (${fieldNames}) хотя бы один должен быть не заполнен`;
+            return !valid ? '' : `<li>Из группы параметров (${fieldNames}) хотя бы один должен быть не заполнен`;
         }
     },
 
@@ -243,9 +243,9 @@ Ext.define('Coon.report.plugin.form.ReportGroupsFieldValidationPlugin', {
         const fieldNames = this.wrapFieldNames(group);
         if (!group.invertValue) {
             return !valid ?
-                this.fieldCount(group)===1 ?
-                    `<li>Поле ${fieldNames} не заполнено.</li>`:
-                    `<li>Хотя бы одно из полей группы (${fieldNames}) обязательно для заполнения.</li>`:
+                this.fieldCount(group) === 1 ?
+                    `<li>Поле ${fieldNames} не заполнено.</li>` :
+                    `<li>Хотя бы одно из полей группы (${fieldNames}) обязательно для заполнения.</li>` :
                 '';
         } else {
             // Инвертирование пока отключено
@@ -253,7 +253,7 @@ Ext.define('Coon.report.plugin.form.ReportGroupsFieldValidationPlugin', {
             // !(false || false)=true
             // !(false || true)=false
             // !(true || true)=false
-            return !valid ? '': `<li>Все поля (${fieldNames}) группы д.быть пустыми.`;
+            return !valid ? '' : `<li>Все поля (${fieldNames}) группы д. быть пустыми.`;
         }
     },
 });

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

@@ -10,6 +10,7 @@ Ext.define('Coon.report.plugin.grid.ExecuteCallbackFunctionPlugin', {
         handler: null,
         configurePanelWizard: 'ExecuteCallbackFunctionConfigPanel',
     },
+    isDeprecated: true,
 
     init(report) {
         this.report = report;

package/src/version.js

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

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

@@ -1,150 +0,0 @@
-/**
- * Плагин нормализует поведение переноса фокуса с поля на поле в FilterPanel по нажатию TAB и SHIFT+TAB.
- * Включает на полях формы свойство enableKeyEvents.
- */
-Ext.define('Coon.report.component.reportpanel.FormFieldFocusPlugin', {
-    extend: 'Ext.AbstractPlugin',
-    alias: 'plugin.FormFieldFocusPlugin',
-    id: 'FormFieldFocusPlugin',
-    // Установить фокус по умолчанию на первое поле
-    defaultFocusFirstField: true,
-    // Установить фокус на это поле.
-    defaultFocusField: undefined,
-    // Отключение плагина можно сделать путем установки свойства репорта formFieldFocusPluginConfig
-    disabled: false,
-
-    constructor: function(config) {
-        Ext.apply(this, config || {});
-        this.callParent([config]);
-    },
-
-    init: function(formPanel) {
-        const report = formPanel.reportPanel;
-        if (report) {
-            const config = report.configProperties.get('formFieldFocusPluginConfig');
-            if (Ext.isObject(config) && config.disabled) {
-                return;
-            }
-        }
-        this.fields = Coon.Function.getFormFields(formPanel);
-        if (!this.fields.length) {
-            return;
-        }
-
-        this.getCmp().on('afterrender', function() {
-            this.preprocessFields();
-            this.setFocus();
-            const centerView = this.getCmp().up('centerview');
-            if (centerView) {
-                const container = centerView.getLayout().getActiveItem();
-                container.on('activate', this.restoreFocus, this);
-            }
-        }, this);
-    },
-
-    getFields() {
-        return this.fields.filter((field) => this.isFieldFocusable(field));
-    },
-
-    buildFieldFocusIds() {
-        this.visibleFields = this.getFields();
-        this.visibleFields
-            .forEach((field, idx) => {
-                this.setFieldFocusId(field, idx);
-            }, this);
-    },
-
-    setFieldFocusId(field, idx) {
-        const fieldsCount = this.visibleFields.length;
-        field.prevFocusId = idx === 0 ? fieldsCount - 1 : idx - 1;
-        field.focusId = idx;
-        field.nextFocusId = idx === fieldsCount - 1 ? 0 : idx + 1;
-    },
-
-    preprocessFields() {
-        this.fields.sort(function(a, b) {
-            return a.orderSq - b.orderSq;
-        });
-        this.buildFieldFocusIds();
-        this.visibleFields
-            .forEach((field, idx) => {
-                if (field.defaultFocus) {
-                    this.defaultFocusField = field;
-                }
-                this.setFieldFocusId(field, idx);
-                field.enableKeyEvents = true;
-                field.on({
-                    specialkey: this.onSpecialkeyPress,
-                    focus() {
-                        this.setLastFocus(idx);
-                    },
-                    show: this.buildFieldFocusIds,
-                    hide: this.buildFieldFocusIds,
-                    scope: this,
-                });
-            });
-    },
-
-    setFocus() {
-        if (!this.visibleFields.length) {
-            return;
-        }
-        if (this.defaultFocusFirstField) {
-            let fieldForFocus = this.defaultFocusField;
-            if (!fieldForFocus && this.defaultFocusFirstField) {
-                if (this.isFieldFocusable(this.visibleFields[0])) {
-                    fieldForFocus = this.visibleFields[0].focus(false, 100);
-                } else {
-                    fieldForFocus = this.getNextField(this.visibleFields[0]);
-                }
-            }
-            if (fieldForFocus && this.isFieldFocusable(fieldForFocus)) {
-                fieldForFocus.focus(false, 100);
-            }
-        }
-    },
-
-    restoreFocus() {
-        const lastFocusedFIeld = this.getLastFocusedFIeld();
-        if (lastFocusedFIeld) {
-            lastFocusedFIeld.focus(false, 100);
-            return;
-        }
-    },
-
-    getFieldByFocusId(focusId) {
-        return this.getCmp().down(`[focusId=${focusId}]`);
-    },
-
-    getNextField(field) {
-        return this.getFieldByFocusId(field.nextFocusId);
-    },
-
-    getPrevField(field) {
-        return this.getFieldByFocusId(field.prevFocusId);
-    },
-
-    setLastFocus(focusId) {
-        this.lastFocusId = focusId;
-    },
-
-    getLastFocusedFIeld() {
-        const field = this.getFieldByFocusId(this.lastFocusId) || this.visibleFields[0];
-        return this.isFieldFocusable(field) && field;
-    },
-
-    onSpecialkeyPress: function(field, e) {
-        const shiftKey = e.shiftKey;
-        if (e.keyCode === e.TAB) {
-            e.stopEvent();
-            const nextFocusField = shiftKey ? this.getPrevField(field) : this.getNextField(field);
-            if (nextFocusField) {
-                nextFocusField.focus(false, 100);
-            }
-        }
-    },
-
-    isFieldFocusable(field) {
-        return field && !field.isHidden() && !field.readOnly && field.focusable;
-    },
-});