ru.coon 2.7.33 → 2.7.35

package/CHANGELOG.md

@@ -1,4 +1,24 @@
+# Version 2.7.35, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8a36c677b3a30a03bfb3b7045d0c663fdf090bf3)
+* update: CHANGELOG.md ([78b2a5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/78b2a5573bdea9aede4f354a0584f5e606f7c573))
+
+# Version 2.7.34, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9e609fb8d3d88af639747d63fc85cbb46440ac6d)
+* ## Features
+* <span style='color:green'>feat: HT-8422: custom menu for filter editing, upgrade interface</span> ([0eb548], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0eb54815eb605b638868a77b3a334e779fc62b77))
+* <span style='color:green'>feat: HT-9095: move expander left, add padding-right (expander under text), update layout on item collapse</span> ([d246e1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d246e1c110e98959b25e8f4a976104ebb2ea8921))
+* <span style='color:green'>feat: HT-8492: create new type field</span> ([6c4d96], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6c4d967fa5e3a9fc787d692a2828ba1e3c0959d3))
+
+* ## Fixes
+* <span style='color:red'> HT-8148 CopyRowsFromGrid: exportAllRows default false</span> ([9be836], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9be8360fbc00aca06777895a34279463cf1a3696))
+* <span style='color:red'> HT-9046 Ошибки на "чипах" репортов</span> ([baacd7], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/baacd776084b5e89a5df8e94c323510df291f910))
+
+* HT-8438 feat: Переименование кнопки Отмена на Закрыть в MainUploadPanel. ([d7fdaa], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d7fdaa103a8cd181d8ee483a137c81e900a846f0))
+* update: CHANGELOG.md ([f4992d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f4992d42314d91d12402df364984b72e14beee51))
+
 # Version 2.7.33, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e47cc0c267a947daeb5624b8f174b5a8a8e22375)
+* ## Features
+* <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([4f43e8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4f43e856c4a041b681460a74d7819678a71c85f2))
+* <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([5d0074], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5d0074b69a22905e54922dd96b008f0b252a8099))
+
 * ## Fixes
 * <span style='color:red'> add requiredAuth property support for MainUploadPanel, BFL-13506</span> ([cf56d8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cf56d8856ffd43090110911e176e3ca37ee7c050))
 
@@ -7,6 +27,7 @@
 # Version 2.7.32, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/40925f0ca399d6d5da42511e20b8c7fa10acadaf)
 * ## Features
 * <span style='color:green'>feat: HT-8492: create new type field</span> ([0657da], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0657da1e4ba8e54a47eaca571cf71596c8107c7c))
+* <span style='color:green'>feat: HT-8422: make interface</span> ([9204dc], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9204dcabf8d689acf4ec9341fe97a26193b12e23))
 
 * update: CHANGELOG.md ([1e8b7b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1e8b7b6e038fb0ea66ce786f648af3e4934afc11))
 
@@ -21,6 +42,9 @@
 * update: CHANGELOG.md ([935b5a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/935b5a73025d3ff9cdf61188e1b3fb1f754b84da))
 
 # Version 2.7.30, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a72ce199d2d79b7a5dcb52cc81cd68e46f34829a)
+* ## Features
+* <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([97cda5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/97cda502cccce84bd63fd23a9f4b82fb42caa65b))
+
 * ## Fixes
 * <span style='color:red'> HT-8422: set filter panel height on afterlayout</span> ([d65a92], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d65a9277c2fcedaba912ff40ba7a912049bdd7f7))
 * <span style='color:red'> HT-8131 add universal button for collapse/expand report lines in a hierarchy</span> ([0a7edf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0a7edf4357213fd7872ecb361ce47261b3102b4c))
@@ -44,6 +68,9 @@
 * update: CHANGELOG.md ([6b1c8b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6b1c8b9cfb4519d95713d70996f2d8f816bcaea4))
 
 # Version 2.7.27, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c59dc7400f5e4ee4f7bbfcd42f4aa371d9b2e68f)
+* ## Features
+* <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([1428a9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1428a9b3baed2f41dcf5b454f5b13959700f11d6))
+
 * ## Fixes
 * <span style='color:red'> HT-8707 checking the component is rendered</span> ([d1fd00], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d1fd008a47ca9a0f2d7a2404c1b21e1d7aa8b2a7))
 * <span style='color:red'> Запрещен ввод значений в характеристики типа FKV, отсутствующих в списке выбора. Closes HT-8762.</span> ([dece4f], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dece4f2ce361c8c54d11a54dc469099698338c46))
@@ -151,7 +178,9 @@
 
 # Version 2.7.15, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1e27a6d56071c26951813a36d45daf805a6f750d)
 * ## Features
+* <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([849569], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/849569ae71cf1996b287c33df5c037d2257b1029))
 * <span style='color:green'>feat: HT-8131 add universal button for collapse/expand report lines in a hierarchy</span> ([9e7242], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9e7242dadb2907ac135dd9e6bd2bf7309ef5996f))
+* <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([ca384d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ca384dc967e98e9366bdbe3afbed6558c45b9678))
 * <span style='color:green'>feat: Вывод сообщения об ошибках при инициализации плагинов отчета. Closes HT-8531.</span> ([a35d09], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a35d09c39f20263dd032f6accc9d175a8241e111))
 * <span style='color:green'>feat: Добавлено логирование ошибки, при возврате отчетом более одной строки. Related to HT-8223.</span> ([34491c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/34491c4ee3f5dc6d26f5c04652796d563c9fb6c4))
 * <span style='color:green'>feat: HT-8131 add universal button for collapse/expand report lines in a hierarchy</span> ([4da24d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4da24d2084419d57871be03bda1d714bc3e2cc7b))
@@ -389,6 +418,9 @@
 * update: CHANGELOG.md ([471cb3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/471cb32a135f4ce1e9ed5c7e03ea5ab143b84893))
 
 # Version 2.6.12, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3fbd123cd431a5a382b5929913df42fabddebea0)
+* ## Features
+* <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([d2d66d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d2d66de15b77e01bf96a49ade94b7a6ca65cde1e))
+
 * ## Fixes
 * <span style='color:red'>BFL-11558 hot fix</span> ([66e78d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/66e78dfde422a1b5938be7d43b607eadac52bd04))
 
@@ -429,6 +461,7 @@ This reverts commit ec83613d1dd2673b448c9fabee62287e9160f6bf. ([e6e94a], [link](
 # Version 2.6.7, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6802942bc71e923767f61cfc703ea6385d7f932e)
 * ## Features
 * <span style='color:green'>feat: HT-8060: if we have grid AutoSize option true and have saved grid columns config set it in false</span> ([2c6e2d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/2c6e2d28a88cfbd383ea963e35cd7289e8412c49))
+* <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([5f91bd], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5f91bd8847c6ccd524f09b19789b5ac08f7345c6))
 
 * ## Fixes
 * <span style='color:red'> HT-7489 убрана лишняя зависимость mode-sql</span> ([f8ae6d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f8ae6d20e8285ddeaaa9063f1e9f5524ed0832d5))
@@ -491,6 +524,7 @@ This reverts commit ec83613d1dd2673b448c9fabee62287e9160f6bf. ([e6e94a], [link](
 
 # Version 2.6.0, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/78a28499d4ba7dc466ba5ff5a4b815d191c349bf)
 * ## Features
+* <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([0ce0c9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0ce0c9c6e57c3dcf2c6f195abc3d65a71ddff478))
 * <span style='color:green'>feat: HT-7986: chars editor interface upgrade</span> ([9af20a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9af20aa30d2b1fa494994e0cf7d84b26b19604e0))
 * <span style='color:green'>feat: HT-7986: chars editor interface upgrade</span> ([ccf1d4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ccf1d42831f67ca298e2598422430da06b01ab49))
 
@@ -737,6 +771,10 @@ fix ExecuteCommandPlugin - remove reject on failure if command hasnt erorHandler
 * update: CHANGELOG.md ([0ba408], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0ba4083336d6e3a3ea078bb20c8bf40e8c19c9c7))
 
 # Version 2.5.45, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f1e28ba95e77bbe4be40d19ea9fde58a74fbb645)
+* ## Features
+* <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([c8c4cb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c8c4cb9c90246e73808061371e145bc9ce1412ec))
+* <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([b145cb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b145cb9ef0a36d48ca04c0910152c66ec8ed03cd))
+
 * ## Fixes
 * <span style='color:red'> hot-fix: move EditorJs to coon from project</span> ([12daf8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/12daf8abb9dbaf48910870616b0e6d52f3b2bbfd))
 
@@ -867,6 +905,7 @@ fix ExecuteCommandPlugin - remove reject on failure if command hasnt erorHandler
 
 # Version 2.5.31, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/51eafa59b0b64087dacaafd66b754c04ada7e027)
 * ## Features
+* <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([e24426], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e24426d69b5746beb618716ea408a52859608700))
 * <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))
@@ -935,6 +974,7 @@ fix ExecuteCommandPlugin - remove reject on failure if command hasnt erorHandler
 * ## 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))
+* <span style='color:green'>feat: HT-6760 компонент для управления правами кастомных панелей</span> ([92ed5c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/92ed5c448ea3ef1a8ae37951b12139cd6d148612))
 
 * ## 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))
@@ -993,6 +1033,7 @@ isolate lastValue from native ComboBox logic</span> ([57078e], [link](http://git
 # Version 2.5.19, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/60dafd3ee4e54456992b474b81201242521c3991)
 * ## Features
 * <span style='color:green'>feat: HT-4550 configPanel changes</span> ([7d3ac0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7d3ac0a6a4a1124c3b1a240e26a4096635573e6a))
+* <span style='color:green'>feat: BFL-5531 компонент для управления правами кастомных панелей</span> ([7c6c22], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7c6c224a30e08ecafea5f513badfa7c8d25930f6))
 
 * ## Fixes
 * <span style='color:red'>fix HT-7070
@@ -1026,6 +1067,7 @@ fix ReportPropertiesPanelController</span> ([e2b928], [link](http://gitlab-dbr.s
 * <span style='color:green'>feat: TR-67140 разработка универсальной компонент-формы для обработки статуса требуемых полей</span> ([20e76d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/20e76d097db4ddf9120ddc56f86b6470ab7335ca))
 * <span style='color:green'>feat: HT-4550 add localization field property</span> ([b3bd46], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b3bd466dd68c893fefae86ae7e16877aedb861ba))
 * <span style='color:green'>feat BFL-7734: передача headers в ASyncBaseCommand</span> ([ed1202], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ed1202d1f90cb9c73bd858598a28f63b519642c7))
+* <span style='color:green'>feat: BFL-5531 компонент для управления правами кастомных панелей</span> ([fa5ce6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/fa5ce69287e739ef6bf91a8220c5605284ca7b4a))
 
 * ## Fixes
 * <span style='color:red'>fix ReportPanel saving
@@ -1229,12 +1271,16 @@ ReportSqlPreviewPanel - add UiAceEditor as sql preview field(readOnly) with sql
 * update: CHANGELOG.md ([4f30ec], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4f30ec6b33ae95a9ab578bffca7c6dbfb63d564b))
 
 # Version 2.4.42, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3ee58968d5317eada421e0dc7305015761e4bcbe)
+* ## Features
+* <span style='color:green'>feat: BFL-5531 компонент для управления правами кастомных панелей</span> ([6037c3], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6037c35a23354b1cfc0cc5376fe2db6d2080fbb7))
+
 * add SelectIconClassPanel to ru.coon ([409ee0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/409ee069080f9f1bbe08727b850e267707ebdc54))
 * update: CHANGELOG.md ([cab0be], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/cab0beabbbe9e1ada4ccea28763253c0e5feb839))
 
 # Version 2.4.41, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/95627ef5983aa5f2fd5eaf8bd4b808ba169a48fb)
 * ## Features
 * <span style='color:green'>feat: HT-4550 Приведение boolean полей к string при экспорте</span> ([1765f1], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1765f1c1959e585ee724021ceaa840b0fb3c2485))
+* <span style='color:green'>feat: BFL-5531 компонент для управления правами кастомных панелей</span> ([630150], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6301506c6df9c577e12722c902b84a9abeaba946))
 * <span style='color:green'>feat: HT-6314 Изменение отображения CharacteristicGridCopyPlugin</span> ([5fa321], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/5fa3214c6e395bc66804a7acc7fe062780da1dfd))
 
 * add no-console rule to eslint rules ([aa512d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/aa512db0fb0165af39481718d010c9748c5cebb5))
@@ -1694,6 +1740,7 @@ This reverts commit 0797f80cda34caf39cc4c5eb0a9ddd2c53ad1d7f. ([9db6cd], [link](
 
 # Version 2.3.2, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1fad7ad35b2e8126da6b48f87d21813d2d795fd1)
 * ## Features
+* <span style='color:green'>feat: BFL-5531компонент для управления правами кастомных панелей</span> ([4c7521], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4c752166453a9c71330e6a7f1511ed7a5828683c))
 * <span style='color:green'>feat: TR-63829: add Characteristic editing</span> ([58654a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/58654ab2a56f601b263d92dd5dc7a7514d7bd033))
 
 * ## Fixes

package/package.json

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

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

@@ -183,7 +183,8 @@ Ext.define('Coon.common.component.formeditor.UiCFCellController', {
             contextMenu.showAt(event.pageX, event.pageY);
         };
         if (!Coon.UiCFFieldsConfig.menuIsLoaded) {
-            Coon.UiCFFieldsConfig.getMenuCfgFromStorage().then((data) => {
+            const cnt = this.getUiCFEditorController();
+            Coon.UiCFFieldsConfig.getMenuCfgFromStorage(cnt.storageMenuId, cnt.defaultMenuId).then((data) => {
                 doForm();
             });
         } else {

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

@@ -8,7 +8,7 @@ Ext.define('Coon.common.component.formeditor.UiCFConfigEditorWindow', {
         align: 'stretch',
     },
     modal: true,
-    title: 'Редактирование конфига полей',
+    title: 'Справочник доступных компонентов',
     maximized: true,
     buttons: [
         {

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

@@ -87,7 +87,8 @@ Ext.define('Coon.common.component.formeditor.UiCFContainerController', {
             contextMenu.showAt(event.pageX, event.pageY);
         };
         if (!Coon.UiCFFieldsConfig.menuIsLoaded) {
-            Coon.UiCFFieldsConfig.getMenuCfgFromStorage().then((data) => {
+            const cnt = this.getUiCFEditorController();
+            Coon.UiCFFieldsConfig.getMenuCfgFromStorage(cnt.storageMenuId, cnt.defaultMenuId).then((data) => {
                 doForm();
             });
         } else {
@@ -200,15 +201,15 @@ Ext.define('Coon.common.component.formeditor.UiCFContainerController', {
 
     getMenuItems(activeRow) {
         const me = this;
+        const cnt = this.getUiCFEditorController();
         const menuItems = [
             {
                 text: 'добавить', iconCls: 'fa fa-plus',
-                menu: Coon.UiCFFieldsConfig.getMenuCfg(me, 'addRow', activeRow),
+                menu: Coon.UiCFFieldsConfig.getMenuCfg(me, 'addRow', activeRow, cnt.defaultMenuId),
             }
         ];
         // me.addRow(item.type, activeRow);
 
-        const cnt = this.getUiCFEditorController();
         const cell = cnt.copyCell || cnt.cutCell;
         if (cell && cell.getView() && cell.getView().id !== this.getView().id) {
             menuItems[0].menu.push({

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

@@ -5,6 +5,7 @@ Ext.define('Coon.common.component.formeditor.UiCFFieldsConfig', {
     storageElem: null,
     settingsIsLoaded: false,
     storageMenuId: 'UiCFMenuCfg',
+    menuId: 'formEditorMenu',
     storageMenu: null,
     menuIsLoaded: false,
     propsCfg: {},
@@ -60,8 +61,9 @@ Ext.define('Coon.common.component.formeditor.UiCFFieldsConfig', {
             this.UiCFMenuConfig = cfg;
         }
     },
-    getMenuCfgFromStorage() {
-        return Coon.util.promisifyCmd('command.GetUIElementCommand', this.storageMenuId).then((data) => {
+    getMenuCfgFromStorage(storageMenuId, menuId) {
+        return Coon.util.promisifyCmd('command.GetUIElementCommand',
+            storageMenuId ? storageMenuId : this.storageMenuId).then((data) => {
             this.storageMenu = data;
             this.applyMenuCfg(data && data.propertyData ? JSON.parse(data.propertyData) :{});
             this.menuIsLoaded = true;
@@ -70,74 +72,144 @@ Ext.define('Coon.common.component.formeditor.UiCFFieldsConfig', {
             Ext.Msg.alert('Ошибка', error.toString());
         });
     },
-    setMenuCfgToStorage(cfg) {
-        this.storageMenu.propertyData = JSON.stringify(cfg || {});
-        return Coon.util.promisifyCmd('command.SaveUIElementCommand', this.storageMenu).catch((error) => {
+    setMenuCfgToStorage(cfg, storageMenuId, menuId) {
+        if (menuId) {
+            const oldCfg = JSON.parse(this.storageMenu.propertyData);
+            if (Ext.isObject(oldCfg) && oldCfg[menuId]) {
+                oldCfg[menuId] = cfg;
+                this.storageMenu.propertyData = JSON.stringify(oldCfg || {});
+            } else {
+                this.storageMenu.propertyData = JSON.stringify(cfg || {});
+            }
+        } else {
+            this.storageMenu.propertyData = JSON.stringify(cfg || {});
+        }
+        return Coon.util.promisifyCmd('command.SaveUIElementCommand',
+            storageMenuId ? storageMenuId : this.storageMenu).catch((error) => {
             Coon.log.debug(error);
             Ext.Msg.alert('Ошибка', error.toString());
         });
     },
     UiCFMenuConfig: {
-        expanded: true,
-        text: 'Структура меню',
-        fields: [],
-        children: [
-            {
-                text: 'Избранное',
-                leaf: true,
-                expanded: true,
-                fields: [],
-                tag: 'favorite',
-                children: [
-                ],
-            },
-            {
-                text: 'Поля ввода',
-                leaf: false,
-                expanded: true,
-                fields: [],
-                children: [
-                    {
-                        text: 'Бизнес-поля',
-                        leaf: true,
-                        fields: [],
-                    }
-                ],
-            },
-            {
-                text: 'Выбор из списка',
-                leaf: false,
-                fields: [],
-                expanded: true,
-                children: [
-                    {
-                        text: 'Чекбокс',
-                        fields: [],
-                        leaf: true,
-                    },
-                    {
-                        text: 'Радио',
-                        fields: [],
-                        leaf: true,
-                    },
-                    {
-                        text: 'Выбор из отчета',
-                        fields: [],
-                        leaf: true,
-                    }
-                ],
-            },
-            {
-                text: 'Группировка полей',
-                fields: [],
-                leaf: true,
-            },
-            {
-                text: 'Оформление задания',
-                fields: [],
-                leaf: true,
-            }
-        ],
+        formEditorMenu: {
+            expanded: true,
+            text: 'Структура меню',
+            fields: [],
+            children: [
+                {
+                    text: 'Избранное',
+                    leaf: true,
+                    expanded: true,
+                    fields: [],
+                    tag: 'favorite',
+                    children: [
+                    ],
+                },
+                {
+                    text: 'Поля ввода',
+                    leaf: false,
+                    expanded: true,
+                    fields: [],
+                    children: [
+                        {
+                            text: 'Бизнес-поля',
+                            leaf: true,
+                            fields: [],
+                        }
+                    ],
+                },
+                {
+                    text: 'Выбор из списка',
+                    leaf: false,
+                    fields: [],
+                    expanded: true,
+                    children: [
+                        {
+                            text: 'Чекбокс',
+                            fields: [],
+                            leaf: true,
+                        },
+                        {
+                            text: 'Радио',
+                            fields: [],
+                            leaf: true,
+                        },
+                        {
+                            text: 'Выбор из отчета',
+                            fields: [],
+                            leaf: true,
+                        }
+                    ],
+                },
+                {
+                    text: 'Группировка полей',
+                    fields: [],
+                    leaf: true,
+                },
+                {
+                    text: 'Оформление задания',
+                    fields: [],
+                    leaf: true,
+                }
+            ],
+        },
+        filterFormEditorMenu: {
+            expanded: true,
+            text: 'Структура меню',
+            fields: [],
+            children: [
+                {
+                    text: 'Избранное',
+                    leaf: true,
+                    expanded: true,
+                    fields: [],
+                    tag: 'favorite',
+                    children: [
+                    ],
+                },
+                {
+                    text: 'Поля ввода',
+                    leaf: false,
+                    expanded: true,
+                    fields: [],
+                    children: [
+                        {
+                            text: 'Бизнес-поля',
+                            leaf: true,
+                            fields: [],
+                        }
+                    ],
+                },
+                {
+                    text: 'Выбор из списка',
+                    leaf: false,
+                    fields: [],
+                    expanded: true,
+                    children: [
+                        {
+                            text: 'Чекбокс',
+                            fields: [],
+                            leaf: true,
+                        },
+                        {
+                            text: 'Радио',
+                            fields: [],
+                            leaf: true,
+                        },
+                        {
+                            text: 'Выбор из отчета',
+                            fields: [],
+                            leaf: true,
+                        }
+                    ],
+                },
+                {
+                    text: 'Группировка полей',
+                    fields: [],
+                    leaf: true,
+                }
+            ],
+        },
     },
     UiCFFieldsConfig: {
         textfield: {
@@ -426,8 +498,8 @@ Ext.define('Coon.common.component.formeditor.UiCFFieldsConfig', {
             description: 'Изображение',
         },
     },
-    getMenuStructure() {
-        return this.UiCFMenuConfig;
+    getMenuStructure(menuId) {
+        return this.UiCFMenuConfig[menuId ? menuId : this.menuId];
     },
     getFieldsTypes() {
         return Object.keys(this.UiCFFieldsConfig).map((key) => {
@@ -476,15 +548,17 @@ Ext.define('Coon.common.component.formeditor.UiCFFieldsConfig', {
     getFavoriteItemsName() {
         return localStorage.getItem(this.favoriteMenuItemsPath) ? localStorage.getItem(this.favoriteMenuItemsPath).split(',') : []; ;
     },
-    getMenuCfg(scope, fn, active) {
+    getMenuCfg(scope, fn, active, menuId) {
         if (!this.UiCFMenuConfig) {
             return [];
         }
         const favorites = this.getFavoriteItemsName();
         let cfg = [];
         const me = this;
-        if (this.UiCFMenuConfig.fields && this.UiCFMenuConfig.fields.length) {
-            this.UiCFMenuConfig.fields.forEach((field) => {
+        menuId = menuId ? menuId : this.menuId;
+        const menu = this.UiCFMenuConfig[menuId];
+        if (menu.fields && menu.fields.length) {
+            menu.fields.forEach((field) => {
                 cfg.push({
                     text: this.getFieldDescription(field),
                     xtype: 'UiCFFavoriteMenuItem',
@@ -502,8 +576,8 @@ Ext.define('Coon.common.component.formeditor.UiCFFieldsConfig', {
                 });
             });
         }
-        if (this.UiCFMenuConfig.children && this.UiCFMenuConfig.children.length) {
-            cfg = cfg.concat(this.getMenuRecursive(this.UiCFMenuConfig.children, scope, fn, active));
+        if (menu.children && menu.children.length) {
+            cfg = cfg.concat(this.getMenuRecursive(menu.children, scope, fn, active));
         }
         return cfg;
     },

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

@@ -1,6 +1,7 @@
 /* global Ext */
 Ext.define('Coon.common.component.formeditor.UiCFMenuEditorWindow', {
     extend: 'Ext.window.Window',
+    defaultMenuId: undefined,
     xtype: 'UiCFMenuEditorWindow',
     cls: 'UiCFMenuEditorWindow',
     controller: 'UiCFMenuEditorWindowController',
@@ -9,7 +10,7 @@ Ext.define('Coon.common.component.formeditor.UiCFMenuEditorWindow', {
         align: 'stretch',
     },
     modal: true,
-    title: 'Редактирование структуры меню',
+    title: 'Настройка компонентов меню',
     maximized: true,
     buttons: [
         {

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

@@ -1,11 +1,12 @@
 Ext.define('Coon.common.component.formeditor.UiCFMenuEditorWindowController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.UiCFMenuEditorWindowController',
+    defaultMenuId: undefined,
     init: function(view) {
         const vm = this.getViewModel();
-
+        this.defaultMenuId = view.defaultMenuId;
         const doForm = () => {
-            const structure = JSON.parse(JSON.stringify(Coon.UiCFFieldsConfig.getMenuStructure()));
+            const structure = JSON.parse(JSON.stringify(Coon.UiCFFieldsConfig.getMenuStructure(this.defaultMenuId)));
             structure.children.splice(0, 1);
             structure.children.push(Coon.UiCFFieldsConfig.unusedMenuItem);
             vm.getStore('menuStore').setRoot(structure);
@@ -111,8 +112,8 @@ Ext.define('Coon.common.component.formeditor.UiCFMenuEditorWindowController', {
         const savedValues = this.getMenuCfg(this.getViewModel().getStore('menuStore').getRoot().getData());
         savedValues.children.splice(0, 0, Coon.UiCFFieldsConfig.favoriteMenuItem);
         this.getView().mask('Подождите, идет сохранение');
-        Coon.UiCFFieldsConfig.setMenuCfgToStorage(savedValues).then(() => {
-            Coon.UiCFFieldsConfig.UiCFMenuConfig = savedValues;
+        Coon.UiCFFieldsConfig.setMenuCfgToStorage(savedValues, null, this.defaultMenuId).then(() => {
+            Coon.UiCFFieldsConfig.UiCFMenuConfig[this.defaultMenuId || Coon.UiCFFieldsConfig.menuId] = savedValues;
             this.getView().unmask();
             this.closeWindow();
         });

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

@@ -7,6 +7,7 @@ Ext.define('Coon.common.component.formeditor.UiCFPropertiesChooseWindow', {
     maximized: false,
     width: 300,
     height: '90%',
+    layout: 'fit',
     controller: {
         init(view) {
             if (view.initialConfig && view.initialConfig.unusedProps && view.initialConfig.unusedProps.length) {
@@ -49,6 +50,7 @@ Ext.define('Coon.common.component.formeditor.UiCFPropertiesChooseWindow', {
     items: [
         {
             xtype: 'grid',
+            scrollable: 'y',
             selModel: {
                 selType: 'rowmodel',
                 mode: 'MULTI',

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

@@ -19,11 +19,15 @@ Ext.define('Coon.common.component.formeditor.UiCFRowController', {
     getRowIndex() {
         return this.getUiCFContainerController().getRowIndex(this.getView());
     },
+    getUiCFEditorController() {
+        return this.getView().up('UiCustomFormEditor').getController();
+    },
     getMenuItems(activeCell) {
         const me = this;
+        const cnt = this.getUiCFEditorController();
         const menuItems = [{
             text: 'в строку', iconCls: 'fa fa-plus',
-            menu: Coon.UiCFFieldsConfig.getMenuCfg(me, 'addCell', activeCell),
+            menu: Coon.UiCFFieldsConfig.getMenuCfg(me, 'addCell', activeCell, cnt.defaultMenuId),
         }];
         // me.addCell(item.type, activeCell);
         const count = this.getCountRows();