ru.coon 2.5.32 → 2.5.34

package/CHANGELOG.md

@@ -1,14 +1,31 @@
+# Version 2.5.34, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/83a61a9400eca79d2a71c3e7d0b2e834c6df1cec)
+* ## Fixes
+* <span style='color:red'> BFL-8646: fix object value and assign object params</span> ([15d3e8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/15d3e8515a3ecefa750c06b85387d57f101e24fe))
+
+* update: CHANGELOG.md ([a4612b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a4612b5a0e83714c0bf5ab766458cdf0949f1daa))
+
+# Version 2.5.33, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3c703020664a8b7ecc9b4fdbc0d82e6121769531)
+* ## Fixes
+* <span style='color:red'> CRM-7853 ParameterizedReportCombo исправлена логика работы при включенном parseParameters</span> ([bf36ba], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/bf36ba56567b934fe6d2cd1ac809e3d66cf3041f))
+
+* HT-6956 refactoring ([8299b8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8299b8595ec257d77af8b0a8fd70e585db4049be))
+* update: CHANGELOG.md ([e05890], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e05890df52732c73a6f8d7be5b54a40ca212bc7a))
+
 # Version 2.5.32, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/de81a198b0ffcbe7ea296f9568023ab135bdb832)
 * update: CHANGELOG.md ([79085d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/79085d7c621b2ebeb592dbff958a4a29d276aa90))
 
 # Version 2.5.31, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/51eafa59b0b64087dacaafd66b754c04ada7e027)
 * ## Features
+* <span style='color:green'>feat: HT-6956 add SQL beautifier</span> ([a3968b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a3968bb98d16fbc294d355930b53f5e707d52ad7))
+* <span style='color:green'>feat: BFL-8598 добавлена возможность скрытия легенды обязательных полей</span> ([1ac031], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1ac031674684a282c769ea74bc9bd1b0f04484bc))
 * <span style='color:green'>feat: HT-4550 changed to Ext.ajax</span> ([3a4af5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3a4af588bb24b481c427749ca8d658edc9d42a57))
 * <span style='color:green'>feat: Replace 'require' with 'import', cleanup dependencies. Related to TR-67434.</span> ([3ee407], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3ee40770a402547fa72a1cc5d1bc20e297186ebb))
+* <span style='color:green'>feat: BFL-8598 добавлена возможность скрытия легенды обязательных полей</span> ([653e77], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/653e77bea52407f1f713aa015e5862ccae9f26c6))
 * <span style='color:green'>feat: HT-4550 add new Coon.util method, fetch instead of XMLHttpRequest</span> ([748421], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7484218eddd0e2b2e0863e88bb595aa79c8c0009))
 
 * ## Fixes
 * <span style='color:red'> HT-4550 refactor</span> ([b87c1b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b87c1b54d15ea311968f8fe5ed1c15afd41391c2))
+* <span style='color:red'> BFL-8598 рефакторинг FilterPanel</span> ([e71eb6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e71eb655d3d35e50f200d3b0aafe4955c5dc583f))
 * <span style='color:red'> Update Coon.log.isProduction</span> ([9c7f2d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9c7f2db552b265a203ca60d79205149b863760a2))
 * <span style='color:red'> Removed obsolete dependencies. Related to TR-67434.</span> ([1229d5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1229d5fc23c6c754acde1b62bed531630d7b67cf))
 
@@ -30,6 +47,12 @@
 * update: CHANGELOG.md ([104edb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/104edb305212754136d1ae57beaec1e9052dac80))
 
 # Version 2.5.28, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1234c97e665cf63c2ab2a4a0048f26b99c815f04)
+* ## Features
+* <span style='color:green'>feat: BFL-8383 fix</span> ([ddf6d3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ddf6d3e1817d1a0ab2750c2048f7af92fc042d25))
+* <span style='color:green'>feat: BFL-8383 механизм сравнения конфигураций кастомных панелей</span> ([f2a79c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f2a79ccb4e435a3644f6fa958734c634b9bb0956))
+* <span style='color:green'>feat: BFL-8383 механизм сравнения конфигураций кастомных панелей</span> ([6de2bc], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6de2bcdd4fe34aefde78f20a843ed90b9964ee36))
+* <span style='color:green'>feat: BFL-8383 механизм сравнения конфигураций кастомных панелей</span> ([e466a9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e466a978e0ee25633c5f87ee480ae3b3a30d9f95))
+
 * ## Fixes
 * <span style='color:red'> TR-67140 method renamed</span> ([129cb9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/129cb965f9c1be60ca5ba877f35eedbead2dc815))
 
@@ -44,6 +67,8 @@
 
 # Version 2.5.26, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/da7767ea8d5507d8b2081aeaf13f46c21010f0d2)
 * ## Features
+* <span style='color:green'>feat: BFL-8383 механизм сравнения конфигураций кастомных панелей</span> ([ced608], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ced608b24610366e2fac65f7a9b546d31b6b34b8))
+* <span style='color:green'>feat: HT-6956 add SQL beautifier</span> ([c8e391], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c8e391e07989f4e04dc5229ba8a1671ea84f9027))
 * <span style='color:green'>feat: TR-67310 исправление ситуации когда defaultFocus на поле в состоянии disabled приводит к возврату фокуса на предыдущий элемент</span> ([335b93], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/335b9374874e2406e6f5c80daada6ba49eef05dc))
 
 * ## Fixes
@@ -55,11 +80,13 @@
 # Version 2.5.25, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/598185e8f86f9268fd2b75354a0807450368af05)
 * ## Features
 * <span style='color:green'>feat: HT-6865  доработка сервиса начитывания репортов</span> ([d5204c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d5204c0e6470e9f4858b800da4bfb779bd9d3d6a))
+* <span style='color:green'>feat: BFL-8383 механизм сравнения конфигураций кастомных панелей</span> ([4514f1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4514f131b714942a8314d772726ce33989d334fa))
 
 * ## Fixes
 * <span style='color:red'> HT-4550 fix excel file download</span> ([b81e8d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b81e8d28b762e38362624149ddaaf9d9b5daa272))
 * <span style='color:red'> HT-4550 fix excel file download</span> ([e4844c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e4844c0511d5401d1659be45539fe390bc50aa16))
 * <span style='color:red'> HT-4550 fix excel file download</span> ([a7b080], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a7b080f4a12fc6c0abd31fc06f623fc5122d4951))
+* <span style='color:red'>Fix:TR-67289 fix keymap on GenerateTokenPanel</span> ([e28741], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e2874137ce85818e6f9c71f91b397a17e0eb4d72))
 
 * CRM-7619 Доработка ReportLookupCombo дефолтными параметрами ([b9ddb1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b9ddb10c22f857d4bf33a3f66ec0ee46d8ea2add))
 * update: CHANGELOG.md ([e8d820], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e8d82018b4cb33252c4bc997473449a4bf9d94a0))
@@ -70,6 +97,7 @@
 
 # Version 2.5.23, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2bd9602f16f9aec3aedc7bff149d7c7357afb558)
 * ## Features
+* <span style='color:green'>feat: HT-6956 add SQL beautifier</span> ([8d7883], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8d7883cdcda181c7e6cfa3da73276059242fafee))
 * <span style='color:green'>feat: Добавить возможность выполнять репорт без кеша. Closes BFL-8384.</span> ([0ef6d5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0ef6d559e8fca3f626747a8d60a21a0c1c6cc076))
 
 * ## Fixes

package/index.js

@@ -7,6 +7,7 @@ import xAceJson from 'ace-builds/src-noconflict/mode-json5';
 import xAceLangTool from 'ace-builds/src-noconflict/ext-language_tools';
 import xAceSnippets from 'ace-builds/src-noconflict/snippets/snippets';
 import JSON5 from 'json5';
+import {format as formatSQL} from 'sql-formatter';
 import 'extjs_iconpack';
 import 'ace-diff/dist/ace-diff.min.css';
 import 'ace-builds/src-noconflict/worker-json';
@@ -33,4 +34,5 @@ Object.assign(Ext || {}, {
     xAceJson,
     xAceLangTool,
     xAceSnippets,
+    formatSQL
 });

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "2.5.32",
+  "version": "2.5.34",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"
@@ -29,7 +29,8 @@
     "extjs_iconpack": "1.3.15",
     "json5": "2.2.3",
     "object-hash": "^3.0.0",
-    "sigma-printjs": "^1.0.1"
+    "sigma-printjs": "^1.0.1",
+    "sql-formatter": "^13.0.0"
   },
   "devDependencies": {
     "eslint": "^8.15.0",

package/src/report/component/ParameterizedReportCombo.js

@@ -1,44 +1,76 @@
+/**
+ * @param {boolean} parseParameters включает возможность задавать правила фильтрации для репортов
+ * внутри ParameterizedReportCombo и его наследников
+ * @param {Array<object>} searchParams список параметров фильтрации для используемого репорта и их правила
+ * @example
+ *  regExp и fn задают правила, по которым сопоставляется value с параметром, по которому будет запущен поиск в репорте.
+ *  regExp и fn - не обязательные, в случае их отсуствия поиск будет выполняться по указанному параметру.
+ *  {
+ *      xtype: 'SimplestReportCombo',
+ *      valueField: 'PERSON_ID',
+ *      displayField: 'CONTACT_NAME',
+ *      reportId: 'CLIENT_CONTACTS',
+ *      listConfig: {
+ *        itemCls: 'tablecell',
+ *        tpl:
+ *         '<div>' +
+ *         '<tpl for=".">' +
+ *         '<div class="tablecell">' +
+ *         '<div class="customer">{CONTACT_NAME}</div>' +
+ *         '<div class="headname"> </div>' +
+ *         '<div class="address">{ADDRESS}</div>' +
+ *         '</div>' +
+ *         '</tpl>' +
+ *         '</div>',
+ *            },
+ *     searchParams: [
+ *         {
+ *             fieldName: 'PER_INN',  // репорт будет запушен по этому параметру, если value не подойдет ни под одно из правил
+ *             label: 'ИНН',
+ *         },
+ *        {
+ *             fieldName: 'DOG_NUM',
+ *             label: '№ договора ЭС',
+ *             regExp: /(^[0-9]{6}$)|(^[0-9]{14}$)/,
+ *         },
+ *         {
+ *             fieldName: 'PER_FULL_NAME',
+ *             label: 'Наименование',
+ *             fn: function(value, lastValue) {
+ *                 return lastValue ? lastValue + ' ' + value : value;
+ *                }
+ *         }
+ *           ]
+ *  }
+ *
+ */
 Ext.define('Coon.report.component.ParameterizedReportCombo', {
     extend: 'Coon.common.field.combo.BaseComboBox',
     alias: 'widget.ParameterizedReportCombo',
     cls: 'ParameterizedReportCombo',
     uses: [],
     config: {
-        settings: [
-            {
-                fieldName: 'PER_INN',
-                label: 'ИНН',
-                regExp: /(^[0-9]{10,12}$)/,
-            }, {
-                fieldName: 'DOG_NUM',
-                label: '№ договора ЭС',
-                regExp: /(^[0-9]{6}$)|(^[0-9]{14}$)/,
-            }, {
-                fieldName: 'PHONE_NUMBER',
-                label: 'Телефон',
-                regExp: /^(([1-9]){3}-([0-9]){2}-([0-9]){2})$|^((\+7|7|8)+([0-9]){10})$/,
-            },
-            /* {
-                fieldName: 'DPS_NUM',
-                label: '№ договора ДПС',
-                regExp : /^[0-9]{14}$/
-            },*/{
-                fieldName: 'PER_FULL_NAME',
-                label: 'Наименование',
-                fn: function(value, lastValue) {
-                    return lastValue ? lastValue + ' ' + value : value;
-                },
-            }
-        ],
-
         fieldSplitter: ' ',
         parseParameters: true,
         checkChangeBuffer: 700,
         memberFn: {},
+        searchParams: [],
+    },
+
+    statics: {
+        searchRules: [],
+        setSearchRules: function(params) {
+            this.searchRules = params;
+        },
     },
 
     initComponent: function() {
         if (this.parseParameters) {
+            if (!Ext.isEmpty(this.settings)) {
+                const params = Array.isArray(this.settings) ? this.settings : [this.settings];
+                this.setSearchParams(params);
+            }
+
             const templateString =
                 '<div class="header">' +
                 '<tpl if="this.hasParams()">' +
@@ -66,8 +98,11 @@ Ext.define('Coon.report.component.ParameterizedReportCombo', {
             const memberFn = Ext.applyIf(this.memberFn || {}, {
                 getLastOptions: function() {
                     const data = [];
-                    for (let i = 0; i < this.combo.settings.length; i++) {
-                        const obj = this.combo.settings[i];
+                    const searchParamsConfig = !Ext.isEmpty(this.getSearchParams()) ?
+                        this.getSearchParams() :
+                        Coon.report.component.ParameterizedReportCombo.searchRules;
+                    for (let i = 0; i < searchParamsConfig.length; i++) {
+                        const obj = searchParamsConfig[i];
                         if (this.combo.lastOptions[obj['fieldName']]) {
                             data.push({LABEL: obj.label, VALUE: this.combo.lastOptions[obj['fieldName']]});
                         }
@@ -93,42 +128,103 @@ Ext.define('Coon.report.component.ParameterizedReportCombo', {
         this.callParent();
         if (this.parseParameters) {
             this.on('change', function(combo, value) {
-                if ((value === this.getRawValue() || !value)&& this.getRawValue() != '') {
+                if ((value === this.getRawValue() || !value)&& this.getRawValue() !== '') {
                     this.parseParams(value);
                 }
             }, this);
+
+            this.store.on('load', this.expand, this, {single: true});
         }
     },
 
-    parseParams: function(searchString) {
-        if (searchString) {
-            const params = {};
-            const searchArray = searchString.split(this.fieldSplitter);
-            for (let i=0; i < searchArray.length; i++) {
-                for (let j=0; j < this.settings.length; j++) {
-                    const rule = this.settings[j];
-                    const name = rule.fieldName;
-                    if (!name) {
-                        return;
-                    }
-                    if (!Ext.isEmpty(rule.regExp) && searchArray[i].search(rule.regExp) !== -1) {
-                        params[name] = searchArray[i];
-                        break;
-                    } else if (!Ext.isEmpty(rule.fn)) {
-                        params[name] = rule.fn(searchArray[i], params[name]);
-                        break;
-                    } else if (Ext.isEmpty(rule.fn) && Ext.isEmpty(rule.regExp)) {
-                        params[name] = params[name] ? params[name] + ' ' + searchArray[i] : searchArray[i];
-                    }
+    defineSearchParams() {
+        const params = {};
+        const searchString = this.getRawValue();
+        const searchArray = searchString.split(this.fieldSplitter);
+        for (let i=0; i < searchArray.length; i++) {
+            const searchParamsConfig = !Ext.isEmpty(this.getSearchParams()) ?
+                this.getSearchParams() :
+                Coon.report.component.ParameterizedReportCombo.searchRules;
+            for (let j=0; j < searchParamsConfig.length; j++) {
+                const rule = searchParamsConfig[j];
+                const name = rule.fieldName;
+                if (!name) {
+                    return;
+                }
+                if (!Ext.isEmpty(rule.regExp) && searchArray[i].search(rule.regExp) !== -1) {
+                    params[name] = searchArray[i];
+                    break;
+                } else if (!Ext.isEmpty(rule.fn)) {
+                    params[name] = rule.fn(searchArray[i], params[name]);
+                    break;
+                } else if (Ext.isEmpty(rule.fn) && Ext.isEmpty(rule.regExp)) {
+                    params[name] = params[name] ? params[name] + ' ' + searchArray[i] : searchArray[i];
                 }
             }
-            this.lastOptions = params;
+        }
+        return params;
+    },
+
+    parseParams: function(searchString) {
+        if (searchString) {
+            this.lastOptions = this.defineSearchParams();
         } else {
             this.lastOptions = undefined;
         }
-        this.on('load', this.expand, this, {single: true});
         this.doInit(this.lastOptions);
     },
 
+    doLocalQuery: function(queryPlan) {
+        const me = this;
+        const queryString = queryPlan.query;
+        const store = me.getStore();
+        let value = queryString;
+
+        me.clearLocalFilter();
+
+        // Querying by a string...
+        if (queryString !== null) {
+            // User can be typing a regex in here, if it's invalid
+            // just swallow the exception and move on
+            if (me.enableRegEx) {
+                try {
+                    value = new RegExp(value);
+                } catch (e) {
+                    value = null;
+                }
+            }
+
+            if (!this.parseParameters) {
+                // Must set changingFilters flag for this.checkValueOnChange.
+                // the suppressEvents flag does not affect the filterchange event
+                me.changingFilters = true;
+                const filter = me.queryFilter = new Ext.util.Filter({
+                    id: me.id + '-filter',
+                    anyMatch: me.anyMatch,
+                    caseSensitive: me.caseSensitive,
+                    root: 'data',
+                    property: me.displayField,
+                    value: value,
+                });
+
+                store.addFilter(filter, true);
+                me.changingFilters = false;
+            }
+        }
+
+        // Expand after adjusting the filter if there are records or if emptyText is configured.
+        if (me.store.getCount() || me.getPicker().emptyText) {
+            // The filter changing was done with events suppressed, so
+            // refresh the picker DOM while hidden and it will layout on show.
+            me.getPicker().refresh();
+            me.expand();
+        } else {
+            me.collapse();
+        }
+
+        me.afterQuery(queryPlan);
+    },
+
+
     doInit: Ext.emptyFn,
 });

package/src/report/component/ReportLookupCombo.js

@@ -240,11 +240,20 @@ Ext.define('Coon.report.component.ReportLookupCombo', {
      * @param {string} value
      */
     loadReportData(value) {
+        if (Ext.isObject(value)) {
+            if (typeof value.isModel === 'function' && value.isModel() && this.valueField) {
+                value = value.get(this.valueField);
+            } else {
+                Coon.log.error('ReportLookupCombo has an object value param in loadReportData function!');
+                return false;
+            }
+        }
         if (value && this._cachedValue === value && this.getStore().getData().length) {
             this.selectRecordByValue(value);
             return;
         }
         const parameters = Object.assign(
+            {},
             this.getFilterDefaults(),
             this.params,
             {
@@ -335,7 +344,7 @@ Ext.define('Coon.report.component.ReportLookupCombo', {
             this.setViewModelValue(record);
         }
         this.store.loadData([record]);
-        this.select(record);
+        this.setValue(record[this.valueField]);
     },
 
     /**
@@ -386,6 +395,7 @@ Ext.define('Coon.report.component.ReportLookupCombo', {
             });
             win.show();
             const parameters = Object.assign(
+                {},
                 this.getFilterDefaults(),
                 this.params || {}
             );

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

@@ -27,6 +27,7 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
             border: false,
         },
         enableHighlightingRequiredFields: false,
+        hiddenLegend: false,
     },
     initComponent: function() {
         this.layout = {
@@ -104,7 +105,7 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
             this.items.push(currentLayout);
         }
 
-        if (this.enableHighlightingRequiredFields && this.hasVisibleAndRequired()) {
+        if (this.isLegendHidden()) {
             this.legend = this.buildLegend();
             height += this.legend.height;
             this.items.push(this.legend);
@@ -113,16 +114,20 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
         this.height = Math.max(height, 50);
     },
 
+    isLegendHidden: function() {
+        return this.enableHighlightingRequiredFields && this.hasRequired() && !this.hiddenLegend;
+    },
+
     /**
      * Проверка наличия в репорте обязательных видимых параметров.
      * @returns {boolean|T}
      */
-    hasVisibleAndRequired() {
+    hasRequired() {
         const ns = Coon.report.model.ReportParameterBeanFields;
         if (!this.configurationList.length) {
             return false;
         }
-        return (this.configurationList || []).find((configuration) =>
+        return (this.configurationList).find((configuration) =>
             configuration[ns.$requiredSwitch] === true && configuration[ns.$visibleSwitch] === true);
     },
 
@@ -306,15 +311,11 @@ Ext.define('Coon.report.component.reportpanel.FilterPanel', {
      * @param {string} msg сообщение о невалидности
      */
     searchButtonToggle(isValid, msg) {
-        if (this.enableHighlightingRequiredFields) {
-            if (this.hasVisibleAndRequired()) {
-                if (this.legend) {
-                    this.legend.setTooltipMsg(isValid ? '': msg);
-                    this.legend.fireEvent('validitychange', isValid);
-                }
-                this.fireEvent('searchbuttontoggle', isValid, 'Обязательные поля не заполнены!');
-            }
+        if (this.isLegendHidden()) {
+            this.legend.setTooltipMsg(isValid ? '': msg);
+            this.legend.fireEvent('validitychange', isValid);
         }
+        this.fireEvent('searchbuttontoggle', isValid, 'Обязательные поля не заполнены!');
     },
 
     /**

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

@@ -96,13 +96,14 @@ Ext.define('Coon.report.component.report.NorthPanel', {
             confirmHandler: this.reportPanel ? Ext.bind(this.reportPanel.filterHandler, this.reportPanel): Ext.emptyFn,
         });
 
-        const enableHighlightingRequiredFields = this.isEnableHighlightingRequiredFields(reportFormBean.plugins, properties);
+        const [enableHighlightingRequiredFields, hiddenLegend] = this.hasPropertiesFilterPanel(reportFormBean.plugins, properties);
 
         const filterPanel = Ext.widget('FilterPanel', {
             configurationList: reportFormBean[ns.$parameters],
             itemsOnRow: properties['filterItemsOnRow'] || 2,
             enableHighlightingRequiredFields: enableHighlightingRequiredFields,
             plugins: this.filterPlugins,
+            hiddenLegend: hiddenLegend,
         });
         filterPanel.on('searchbuttontoggle', function(isValid, errorMessage) {
             this.searchButton.setDisabled(!isValid);
@@ -128,18 +129,20 @@ Ext.define('Coon.report.component.report.NorthPanel', {
     },
 
     /**
-     * Определение свойства, регулирующего применение плагина RequiredFlagPlugin.
+     * Определение свойств, регулирующего применение плагина RequiredFlagPlugin и скрытия легенды.
      * @param {Array} plugins
      * @param {Object} properties
      * @returns {*|boolean|boolean}
      */
-    isEnableHighlightingRequiredFields: function(plugins, properties) {
+    hasPropertiesFilterPanel: function(plugins, properties) {
         const isValidationPlugin = (plugins || []).find((item) => item.uiElement.xtype === 'ReportGroupsFieldValidationPlugin');
         // При наличии плагина валидации параметров по группам обязательно используем RequiredFlagPlugin
         if (isValidationPlugin) {
-            return true;
+            const hiddenLegend = JSON.parse(isValidationPlugin.uiElement.propertyData).hiddenLegend;
+            return [true, hiddenLegend];
         }
-        return this.enableHighlightingRequiredFields || properties.enableHighlightingRequiredFields;
+        const enableHighlightingRequiredFields = this.enableHighlightingRequiredFields || properties.enableHighlightingRequiredFields;
+        return [enableHighlightingRequiredFields, false];
     },
 
     clear() {

package/src/report/component/settings/common/ReportFormCommonPanel.js

@@ -109,11 +109,12 @@ Ext.define('Coon.report.component.settings.common.ReportFormCommonPanel', {
                     text: 'Предпросмотр SQL',
                     ui: 'blue-text-button-border',
                     handler: 'sqlPreviewHandler',
+                    margin: '0 0 0 20px',
                 },
                 {
                     xtype: 'segmentedbutton',
                     stateId: 'ReportFormCommonPanel.sqlmode',
-                    margin: '0 0 0 50px',
+                    margin: '0 0 0 20px',
                     items: [
                         {
                             itemId: 'sql',
@@ -127,6 +128,20 @@ Ext.define('Coon.report.component.settings.common.ReportFormCommonPanel', {
                             handler: 'chooseSqlMode',
                         }
                     ],
+                },
+                {
+                    xtype: 'splitbutton',
+                    margin: '0 0 0 20px',
+                    ui: 'blue-text-button-border',
+                    text: 'Украсить SQL',
+                    handler: 'beautifySQL',
+                    menu: [
+                        {
+                            xtype: 'menuitem',
+                            text: 'Настройка форматирования',
+                            handler: 'openBeautifierSettings',
+                        }
+                    ],
                 }
             ],
         },

package/src/report/component/settings/common/ReportFormCommonPanelController.js

@@ -1,10 +1,28 @@
 Ext.define('Coon.report.component.settings.common.ReportFormCommonPanelController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.ReportFormCommonPanelController',
+    defaultBeautifierConfig: {
+        language: 'plsql',
+        keywordCase: 'upper',
+        logicalOperatorNewline: 'before',
+        denseOperators: false,
+        useTabs: false,
+        tabWidth: 1,
+        newlineBeforeSemicolon: false,
+        indentStyle: 'standard',
+    },
+
+    init() {
+        this.beautifierConfig = Ext.apply({}, this.defaultBeautifierConfig);
+    },
 
     chooseSqlMode: function(button) {
+        const vm = this.getViewModel();
         const editor = this.lookup('reportSQLField').editor;
+        const language = button.itemId === 'sql' ? 'plsql' : 'postgresql';
         editor.session.setMode(`ace/mode/${button.itemId}`);
+        this.defaultBeautifierConfig.language = language;
+        vm.set('language', language);
     },
 
     reportTypeChangeHandler: function(field) {
@@ -27,7 +45,6 @@ Ext.define('Coon.report.component.settings.common.ReportFormCommonPanelControlle
         return Coon.Function.validateAllFieldsOnForm(this.getView());
     },
 
-
     clear: function() {
         Coon.Function.clearAllFieldsOnForm(this);
     },
@@ -41,8 +58,66 @@ Ext.define('Coon.report.component.settings.common.ReportFormCommonPanelControlle
             items: panel,
         });
         win.show();
-        win.content.doInit(
-            this.getViewModel().get('report')
-        );
+        win.content.doInit(this.getViewModel().get('report'));
+    },
+
+    openBeautifierSettings: function() {
+        const win = Ext.create('widget.WindowWrap', {items: [{xtype: 'ReportSqlBeautifierPanel'}],
+            dockedItems: [{
+                xtype: 'toolbar',
+                dock: 'bottom',
+                items: ['->',
+                    {
+                        xtype: 'button',
+                        ui: 'orange-button',
+                        text: 'Сохранить',
+                        handler: () => this.saveBeautifierConfig(win),
+                    },
+                    {
+                        xtype: 'button',
+                        ui: 'orange-button',
+                        text: 'Отмена',
+                        handler: () => win.close(),
+                    }
+                ],
+            }]});
+        this.setBeautifierConfigFieldsData(win);
+        win.show();
+    },
+
+    saveBeautifierConfig: function(win) {
+        const newBeautifierConfig = this.getBeautifierConfigFieldsData(win);
+        this.beautifierConfig = newBeautifierConfig;
+        win.close();
+    },
+
+    setBeautifierConfigFieldsData: function(win) {
+        Object.keys(this.beautifierConfig).map((key) => {
+            const field = win.down(`#${key}`);
+            if (field) {
+                field.setValue(this.beautifierConfig[key]);
+            }
+        });
+    },
+
+    getBeautifierConfigFieldsData: function(win) {
+        const config = {};
+        Object.keys(this.beautifierConfig).map((key) => {
+            const field = win.down(`#${key}`);
+            if (field) {
+                config[key] = field.getValue();
+            }
+        });
+        return config;
+    },
+
+    beautifySQL: function() {
+        try {
+            const editor = this.lookup('reportSQLField').editor;
+            this.beautifierConfig.language = this.defaultBeautifierConfig.language;
+            editor.getSession().setValue(Ext.formatSQL(editor.getSession().getValue(), this.beautifierConfig));
+        } catch (e) {
+            Coon.log.error(e);
+        }
     },
 });

package/src/report/component/settings/common/ReportSqlBeautifierPanel.js

@@ -0,0 +1,85 @@
+Ext.define('Coon.report.component.settings.common.ReportSqlBeautifierPanel', {
+    extend: 'Ext.panel.Panel',
+    alias: 'widget.ReportSqlBeautifierPanel',
+    xtype: 'ReportSqlBeautifierPanel',
+    header: false,
+
+    title: 'Настройка форматирования',
+    minWidth: 400,
+    layout: {
+        type: 'vbox',
+        align: 'stretch',
+    },
+
+    items: [
+        {
+            xtype: 'ConstantList',
+            margin: '10px',
+            fieldLabel: 'Регистр операторов',
+            itemId: 'keywordCase',
+            data: [
+                ['upper', 'Прописные'],
+                ['lower', 'Строчные']
+            ],
+        },
+        {
+            xtype: 'ConstantList',
+            margin: '10px',
+            fieldLabel: 'Перенос на новую строку OR/AND',
+            itemId: 'logicalOperatorNewline',
+            data: [
+                ['before', 'Перенести до OR/AND'],
+                ['after', 'Перенести после OR/AND']
+            ],
+        },
+        {
+            xtype: 'ConstantList',
+            margin: '10px',
+            fieldLabel: 'Стиль арифметических операторов',
+            itemId: 'denseOperators',
+            data: [
+                [false, 'Пробелы вокруг оператора'],
+                [true, 'Без пробелов']
+            ],
+        },
+        {
+            xtype: 'checkbox',
+            boxLabel: 'Использовать таб вместо пробелов',
+            itemId: 'useTabs',
+            bind: {
+                value: '{beautifier.useTabs}',
+            },
+            margin: '10px',
+        },
+        {
+            xtype: 'numberfield',
+            fieldLabel: 'Количество пробелов в отступе',
+            itemId: 'tabWidth',
+            bind: {
+                disabled: '{beautifier.useTabs}',
+            },
+            margin: '10px',
+        },
+        {
+            xtype: 'ConstantList',
+            margin: '10px',
+            itemId: 'newlineBeforeSemicolon',
+            fieldLabel: 'Положение точки с запятой',
+            data: [
+                [false, 'Не переносить на новую строку'],
+                [true, 'С новой строки']
+            ],
+        },
+        {
+            xtype: 'ConstantList',
+            margin: '10px',
+            fieldLabel: 'Общий стиль форматирования',
+            itemId: 'indentStyle',
+            data: [
+                ['standard', 'Стандартный'],
+                ['tabularLeft', 'Выровнять по левой стороне'],
+                ['tabularRight', 'Выровнять по правой стороне']
+            ],
+        }
+    ],
+});

package/src/report/plugin/configPanel/reportGroupsFieldValidationPlugin/ReportGroupsFieldValidationPluginConfigPanel.js

@@ -36,6 +36,12 @@ Ext.define('Coon.report.plugin.configPanel.reportGroupsFieldValidationPlugin.Rep
             margin: '20 0 20 20',
         });
 
+        this.hiddenLegend = Ext.create('Ext.form.field.Checkbox', {
+            boxLabel: 'Убрать легенду',
+            name: 'hiddenLegend',
+            margin: '0 0 0 20',
+        });
+
         this.parameterTree = Ext.widget('UnusedParametersTree', {
             itemId: 'parameterTree',
             flex: 1,
@@ -48,8 +54,13 @@ Ext.define('Coon.report.plugin.configPanel.reportGroupsFieldValidationPlugin.Rep
 
         return [
             {
+                layout: {
+                    type: 'vbox',
+                    align: 'stretch',
+                },
                 items: [
-                    this.groupRelationCheckbox
+                    this.groupRelationCheckbox,
+                    this.hiddenLegend
                 ],
             },
             {
@@ -134,6 +145,7 @@ Ext.define('Coon.report.plugin.configPanel.reportGroupsFieldValidationPlugin.Rep
         });
         config['validationGroups'] = groups;
         config['groupsRelationType'] = this.groupRelationCheckbox.getValue();
+        config['hiddenLegend'] = this.hiddenLegend.getValue();
         return config;
     },
 });

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

@@ -25,6 +25,7 @@ Ext.define('Coon.report.plugin.form.ReportGroupsFieldValidationPlugin', {
     config: {
         groupsRelationType: '',
         validationGroups: [],
+        hiddenLegend: false,
     },
     isSingle: true,
     customAllowBlankName: 'validateBlankByPlugin',

package/src/security/GenerateTokenPanel.js

@@ -14,7 +14,16 @@ Ext.define('Coon.security.GenerateTokenPanel', {
             pending: true,
         },
     },
-
+    keyMapEnabled: true,
+    keyMap: {
+        Enter: {
+            handler() {
+                if (Coon.Function.validateAllFieldsOnForm(this.getComponent('form'))) {
+                    this.getController().handler();
+                }
+            },
+        },
+    },
     width: 520,
     height: 240,
     bodyPadding: 20,
@@ -23,14 +32,6 @@ Ext.define('Coon.security.GenerateTokenPanel', {
             xtype: 'form',
             itemId: 'form',
             bodyPadding: 10,
-            keyMapEnabled: true,
-            keyMap: {
-                Enter: {
-                    handler() {
-                        this.handler();
-                    },
-                },
-            },
             layout: 'anchor',
             defaults: {
                 anchor: '100%',

package/src/uielement/component/settings/UiCustomPanelEditor.js

@@ -15,6 +15,7 @@ Ext.define('Coon.uielement.component.settings.UiCustomPanelEditor', {
         'Coon.uielement.component.settings.config.UiCPConfigPanel'
     ],
     controller: 'UiCustomPanelEditorController',
+    cls: 'UiCustomPanelEditor',
     viewModel: {
         type: 'UiCustomEditorViewModel',
     },
@@ -198,9 +199,50 @@ Ext.define('Coon.uielement.component.settings.UiCustomPanelEditor', {
                                         {
                                             fieldLabel: 'Description',
                                             reference: 'description',
-                                            allowOnlyWhitespace: false,
                                             xtype: 'textfield',
+                                            allowOnlyWhitespace: false,
                                             bind: '{uiElement.description}',
+                                        },
+                                        {
+                                            xtype: 'fieldset',
+                                            title: 'Сравнение содержимого панелей',
+                                            collapsible: true,
+                                            collapsed: true,
+                                            layout: 'hbox',
+                                            items: [
+                                                {
+                                                    xtype: 'button',
+                                                    ui: 'blue-text-button-border',
+                                                    text: 'Скопировать hash',
+                                                    reference: 'copyHash',
+                                                    handler: 'copyHash',
+                                                    margin: '0 0 0 10',
+                                                },
+                                                {
+                                                    xtype: 'textfield',
+                                                    tooltip: 'Вставить hash для проверки',
+                                                    reference: 'insertHash',
+                                                    margin: '0 0 0 20',
+                                                    width: 400,
+                                                    listeners: {
+                                                        change: 'checkEqualuty',
+                                                    },
+                                                    triggers: {
+                                                        clear: {
+                                                            cls: 'svg-icon svg-icon-cancel-small',
+                                                            tooltip: 'Очистить поле',
+                                                            hidden: false,
+                                                            handler: 'clearTrigger',
+                                                        },
+                                                    },
+                                                },
+                                                {
+                                                    xtype: 'component',
+                                                    reference: 'iconComponent',
+                                                    margin: '6 0 0 0',
+                                                    html: '',
+                                                }
+                                            ],
                                         }
                                     ],
                                 }

package/src/uielement/component/settings/UiCustomPanelEditor.scss

@@ -0,0 +1,10 @@
+.UiCustomPanelEditor {
+    .good-hash {
+        color: #64AA2B;
+        font-size: 19px;
+    }
+    .bad-hash {
+        color: red;
+        font-size: 19px;
+    }
+}

package/src/uielement/component/settings/UiCustomPanelEditorController.js

@@ -8,7 +8,6 @@ Ext.define('Coon.uielement.component.settings.UiCustomPanelEditorController', {
         'Coon.report.component.EXTJSUiPanelImportJsonForm',
         'Coon.uielement.component.settings.UiCustomPanelAnnotationWindow'
     ],
-
     control: {
         'button#searchHandlerBtn': {
             click: 'onSearchHandler',
@@ -153,6 +152,8 @@ Ext.define('Coon.uielement.component.settings.UiCustomPanelEditorController', {
         const plugins = [];
         const aceEditorPlugins = [];
         const parsed = JSON5.parse(UIElementBean.propertyData);
+        const uiElementHash = Coon.util.generateHashFromObj(UIElementBean.propertyData);
+        this.getViewModel().set('uiElementHash', uiElementHash);
         if (parsed.plugins && Ext.isArray(parsed.plugins)) {
             this.updateHandlersStore(parsed.plugins);
             parsed.plugins.forEach(function(plugin) {
@@ -298,6 +299,7 @@ Ext.define('Coon.uielement.component.settings.UiCustomPanelEditorController', {
         command.on('complete', function(uiElementBean) {
             this.initialPropertyData = uiElementBean.propertyData;
             vm.set('uiElement', uiElementBean);
+            vm.set('uiElementHash', Coon.util.generateHashFromObj(uiElementBean.propertyData));
             Ext.Msg.alert('Сообщение системы', 'Данные сохранены');
         }, this);
         command.execute(vm.get('uiElement'));
@@ -482,4 +484,33 @@ Ext.define('Coon.uielement.component.settings.UiCustomPanelEditorController', {
             },
         });
     },
+    copyHash: function() {
+        const hash = this.getViewModel().get('uiElementHash');
+        Coon.util.copyToClipboard(hash);
+    },
+    checkEqualuty: function() {
+        const field = this.lookup('insertHash');
+        const hash = field.getValue();
+        field.setValue(hash.replace(/[^A-Za-z0-9]/g, '').trim());
+        const uiElementHash = this.getViewModel().get('uiElementHash');
+        const iconComponent = this.lookup('iconComponent');
+
+        if (hash === uiElementHash) {
+            iconComponent.setHtml(
+                `<i class="fas fa-check-circle good-hash" 
+                    data-qtip="Введённый хэш идентичен хэшу текущей панели">
+                </i>`
+            );
+        } else {
+            iconComponent.setHtml(
+                `<i class="fas fa-times-circle bad-hash"
+                    data-qtip="Введённый хэш не совпадает с хэшем текущей панели!">
+                </i>`
+            );
+        }
+    },
+    clearTrigger: function(field) {
+        field.clear();
+        this.lookup('iconComponent').setHtml('');
+    },
 });

package/src/version.js

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