ru.coon 2.7.34 → 2.7.35

package/CHANGELOG.md

@@ -1,6 +1,11 @@
+# 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))
@@ -22,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))
 

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "2.7.34",
+  "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();

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

@@ -14,6 +14,7 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditor', {
             UI_ELEMENT_CD: null,
             description: null,
             configStoreSelection: null,
+            settingsText: 'Настройки',
         },
         stores: {
             configStore: {
@@ -63,12 +64,16 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditor', {
                         },
                         {
                             xtype: 'panel',
-                            title: 'Доп настройки',
+                            collapsible: true,
+                            collapsed: true,
+                            title: 'Дополнительные настройки',
                             height: 200,
                             layout: 'fit',
                             items: [
                                 {
-                                    xtype: 'UiAceEditorField',
+                                    xtype: 'UiAceEditor',
+                                    flex: true,
+                                    scrollable: 'y',
                                     reference: 'rawValueField',
                                     margin: '5px 0',
                                     bind: {
@@ -131,6 +136,7 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditor', {
                             },
                             columns: [
                                 {text: 'Переменная', dataIndex: 'property', flex: 1, filter: {type: 'string'}},
+                                {text: 'Заголовок', dataIndex: 'title', editor: {xtype: 'textfield'}, flex: 1, filter: {type: 'string'}},
                                 {
                                     text: 'Тип',
                                     dataIndex: 'type',
@@ -144,10 +150,7 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditor', {
                                         valueField: 'key',
                                     },
                                     flex: 1,
-                                },
-                                {text: 'Заголовок', dataIndex: 'title', editor: {xtype: 'textfield'}, flex: 1, filter: {type: 'string'}}
-                                /* {text: '№', dataIndex: 'order', editor: {xtype: 'numberfield'}, width: 30}*/
-                                /* {text: 'Описание', dataIndex: 'description', editor: {xtype: 'textfield'}, flex: 1}*/
+                                }
                             ],
                             plugins: [
                                 {ptype: 'cellediting', clicksToEdit: 2},
@@ -174,8 +177,10 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditor', {
             collapseMode: 'header',
             collapsed: true,
             header: {
-                iconCls: 'x-fa fa-th',
                 title: 'Настройки',
+                bind: {
+                    title: '{settingsText}',
+                },
             },
             bind: {
                 activeItem: '{activeForm}',
@@ -183,19 +188,22 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditor', {
             tools: [
                 {
                     iconCls: 'fa fa-columns',
+                    tooltip: 'Задать количество колонок',
                     callback: 'fieldsToCols',
                 },
-                {
+                /* {
                     iconCls: 'fa fa-sitemap',
                     callback: 'openMenuEditorWindow',
                 },
                 {
                     iconCls: 'fa fa-cog',
+
                     callback: 'openConfigEditorWindow',
-                },
+                },*/
                 {
                     iconCls: 'fa fa-eye',
                     hidden: true,
+                    tooltip: 'Отобразить скрытые поля',
                     bind: {
                         hidden: '{viewMode === true}',
                     },
@@ -206,6 +214,7 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditor', {
                 {
                     iconCls: 'fa fa-eye-slash',
                     hidden: true,
+                    tooltip: 'Убрать скрытые поля',
                     bind: {
                         hidden: '{viewMode === false}',
                     },
@@ -215,6 +224,7 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditor', {
                 },
                 {
                     iconCls: 'fa fa-cogs', // Reply icon
+                    tooltip: 'Управление настройками поля',
                     bind: {
                         hidden: '{activeForm !== 0}',
                     },
@@ -224,6 +234,7 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditor', {
                 },
                 {
                     iconCls: 'fa fa-reply', // Reply icon
+                    tooltip: 'Вернуться к настройкам',
                     hidden: true,
                     bind: {
                         hidden: '{activeForm !== 1}',
@@ -235,6 +246,7 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditor', {
                 {
                     type: 'pin',
                     itemId: 'pinned',
+                    tooltip: 'Закрепить/открепить панель',
                     callback(view, tool) {
                         if (tool.type === 'pin') {
                             tool.setType('unpin');

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

@@ -7,14 +7,17 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditorController', {
         id: null,
         description: null,
     },
+    defaultMenuId: undefined/* 'filterFormEditorMenu'*/,
+    storageMenuId: undefined,
     activeResizer: null,
     paramsList: {},
     init(view) {
         view.doInit = this.doInit.bind(this);
+        this.defaultMenuId = view.defaultMenuId ? view.defaultMenuId : undefined;
         this.getViewModel().bind('{viewMode}', 'changeViewMode', this);
         this.getViewModel().bind('{description}', (description) => {
             const window = this.getView().up('WindowWrap');
-            if (window) {
+            if (window && !this.defaultMenuId) {
                 window.setTitle(description ? 'Редактирование формы ' + description : 'Создание новой формы');
             }
         }, this);
@@ -59,8 +62,10 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditorController', {
         }
         return cfg;
     },
-    openMenuEditorWindow() {
-        const window = Ext.create('Coon.common.component.formeditor.UiCFMenuEditorWindow');
+    openMenuEditorWindow(defaultMenuId) {
+        const window = Ext.create('Coon.common.component.formeditor.UiCFMenuEditorWindow', {
+            defaultMenuId: defaultMenuId,
+        });
         window.show();
     },
     openConfigEditorWindow() {
@@ -115,26 +120,84 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditorController', {
     },
     showWindowWrapTools() {
         const me = this;
+        let mountCmp = undefined;
         if (this.getView().up().xtype === 'WindowWrap') {
-            const header = this.getView().up().header;
-            Ext.ComponentQuery.query('[dataType=widgetPanelBtn]', header).map((item) => {
+            mountCmp = this.getView().up().header;
+            Ext.ComponentQuery.query('[dataType=widgetPanelBtn]', mountCmp).map((item) => {
                 item.destroy();
             });
-            this.getView().up().header.insert(1, {
+            mountCmp.insert(1, {
+                xtype: 'tool',
+                tooltip: 'Справочник доступных компонентов',
+                dataType: 'widgetPanelBtn',
+                reference: 'componentsKlsToolButton',
+                handler: me.openConfigEditorWindow.bind(me),
+                style: {
+                    marginRight: '5px',
+                },
+                iconCls: 'svg-icon-tool svg-icon-apps',
+            });
+            mountCmp.insert(2, {
+                xtype: 'tool',
+                tooltip: 'Настройка компонентов меню',
+                dataType: 'widgetPanelBtn',
+                reference: 'menuEditorToolButton',
+                handler: me.openMenuEditorWindow.bind(me, this.defaultMenuId),
+                iconCls: 'svg-icon-tool svg-icon-flow-chart',
+                style: {
+                    marginRight: '5px',
+                },
+            });
+            mountCmp.insert(3, {
                 xtype: 'tool',
                 tooltip: 'Сохранить',
                 dataType: 'widgetPanelBtn',
                 reference: 'saveToolButton',
                 handler: me.saveForm.bind(me),
                 iconCls: 'svg-icon-tool svg-icon-save-view',
+                style: {
+                    marginRight: '5px',
+                },
             });
-            this.getView().up().header.insert(2, {
+            mountCmp.insert(4, {
                 xtype: 'tool',
                 dataType: 'widgetPanelBtn',
-                tooltip: 'Настройки',
+                tooltip: 'Настройки редактируемой формы',
                 handler: me.onSettingsClick.bind(me),
                 iconCls: 'svg-icon-tool svg-icon-settings',
+                style: {
+                    marginRight: '5px',
+                },
             });
+        } else {
+            const query = this.getView().up().query('[reference="mountButtons"]');
+            if (query && query.length) {
+                mountCmp = query[0];
+                Ext.ComponentQuery.query('[dataType=widgetPanelBtn]', mountCmp).map((item) => {
+                    item.destroy();
+                });
+                mountCmp.add([{
+                    xtype: 'tool',
+                    tooltip: 'Справочник доступных компонентов',
+                    dataType: 'widgetPanelBtn',
+                    reference: 'componentsKlsToolButton',
+                    handler: me.openConfigEditorWindow.bind(me),
+                    style: {
+                        marginRight: '5px',
+                    },
+                    iconCls: 'svg-icon svg-icon-apps',
+                }, {
+                    xtype: 'tool',
+                    tooltip: 'Настройка компонентов меню',
+                    dataType: 'widgetPanelBtn',
+                    reference: 'menuEditorToolButton',
+                    handler: me.openMenuEditorWindow.bind(me, this.defaultMenuId),
+                    iconCls: 'svg-icon svg-icon-flow-chart',
+                    style: {
+                        marginRight: '5px',
+                    },
+                }]);
+            }
         }
     },
     applySettings() {
@@ -498,10 +561,14 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditorController', {
         form.removeAll();
         rawValueField.setValue('{}');
         if (field) {
+            this.getViewModel().set('settingsText', `Настройки ${field.xtype}`);
             field.up('UiCFCell').getController().setResizer();
             this.getViewModel().set('focusedFieldXType', field.xtype);
             if (Ext.isObject(field.rawCfg)) {
-                rawValueField.setValue(JSON.stringify(field.rawCfg));
+                rawValueField.setValue(JSON5.stringify(field.rawCfg, {
+                    space: 4,
+                    quote: '\'',
+                }));
             }
 
             const doForm = () => {
@@ -666,6 +733,7 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditorController', {
                             });
                             break;
                         }
+                        fieldCfg.fieldLabel = `${fieldCfg.name} - ${fieldCfg.fieldLabel || fieldCfg.boxLabel}`;
                         form.add(fieldCfg);
                     });
                 }
@@ -679,6 +747,7 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditorController', {
             }
         } else {
             this.getViewModel().set('focusedFieldXType', null);
+            this.getViewModel().set('settingsText', `Настройки`);
             if (this.activeResizer) {
                 this.activeResizer.destroy();
                 this.activeResizer = null;
@@ -773,21 +842,28 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditorController', {
             const props = this.getAllProperties(field.xtype).concat(Object.keys(ownCfg));
             const fieldCfg = Coon.UiCFFieldsConfig.getFieldUserCfg(field.xtype);
             const usedProps = this.lookup('configGrid').getStore().getRange().map((item) => item.get('property'));
-            const data = props.sort().filter((item) => usedProps.indexOf(item) < 0).map((item) => {
-                return {
-                    key: field.xtype,
-                    visible: typeof fieldCfg[item] !== 'undefined' ? true : false,
-                    property: item,
-                    title: typeof fieldCfg[item] !== 'undefined' ? fieldCfg[item]['description'] :
-                        typeof ownCfg[item] !== 'undefined' ? ownCfg[item]['description'] : '',
-                    description: typeof fieldCfg[item] !== 'undefined' ? fieldCfg[item]['text'] :
-                        typeof ownCfg[item] !== 'undefined' ? ownCfg[item]['text'] : '',
-                    type: typeof fieldCfg[item] !== 'undefined' ? fieldCfg[item]['type'] :
-                        typeof ownCfg[item] !== 'undefined' ? ownCfg[item]['type'] : this.detectPropertyType(field[item]),
-                    order: typeof fieldCfg[item] !== 'undefined' ? fieldCfg[item]['order'] :
-                        typeof ownCfg[item] !== 'undefined' ? ownCfg[item]['order'] : '',
-                };
-            });
+            const data =Object.values(
+                props.sort().filter((item) => usedProps.indexOf(item) < 0).map((item) => {
+                    return {
+                        key: field.xtype,
+                        visible: typeof fieldCfg[item] !== 'undefined' ? true : false,
+                        property: item,
+                        title: typeof fieldCfg[item] !== 'undefined' ? fieldCfg[item]['description'] :
+                            typeof ownCfg[item] !== 'undefined' ? ownCfg[item]['description'] : '',
+                        description: typeof fieldCfg[item] !== 'undefined' ? fieldCfg[item]['text'] :
+                            typeof ownCfg[item] !== 'undefined' ? ownCfg[item]['text'] : '',
+                        type: typeof fieldCfg[item] !== 'undefined' ? fieldCfg[item]['type'] :
+                            typeof ownCfg[item] !== 'undefined' ? ownCfg[item]['type'] : this.detectPropertyType(field[item]),
+                        order: typeof fieldCfg[item] !== 'undefined' ? fieldCfg[item]['order'] :
+                            typeof ownCfg[item] !== 'undefined' ? ownCfg[item]['order'] : '',
+                    };
+                }).reduce((c, e) => {
+                    if (!c[e.property]) {
+                        c[e.property] = e;
+                    }
+                    return c;
+                }, {})
+            );
             if (!data.length) {
                 return false;
             }
@@ -829,21 +905,28 @@ Ext.define('Coon.common.component.formeditor.UiCustomFormEditorController', {
             const ownCfg = Coon.UiCFFieldsConfig.getOwnProperties(field.xtype);
             const props = this.getAllProperties(field.xtype).concat(Object.keys(ownCfg));
             const fieldCfg = Coon.UiCFFieldsConfig.getFieldUserCfg(field.xtype);
-            const data = props.filter((item) => typeof fieldCfg[item] !== 'undefined').map((item) => {
-                return {
-                    key: field.xtype,
-                    visible: typeof fieldCfg[item] !== 'undefined' ? true : false,
-                    property: item,
-                    title: typeof fieldCfg[item] !== 'undefined' ? fieldCfg[item]['description'] :
-                        typeof ownCfg[item] !== 'undefined' ? ownCfg[item]['description'] : '',
-                    description: typeof fieldCfg[item] !== 'undefined' ? fieldCfg[item]['text'] :
-                        typeof ownCfg[item] !== 'undefined' ? ownCfg[item]['text'] : '',
-                    type: typeof fieldCfg[item] !== 'undefined' ? fieldCfg[item]['type'] :
-                        typeof ownCfg[item] !== 'undefined' ? ownCfg[item]['type'] : this.detectPropertyType(field[item]),
-                    order: typeof fieldCfg[item] !== 'undefined' && fieldCfg[item]['order'] >= 0 ? fieldCfg[item]['order'] :
-                        typeof ownCfg[item] !== 'undefined' && ownCfg[item]['order'] >= 0 ? ownCfg[item]['order'] : 1000,
-                };
-            });
+            const data = Object.values(
+                props.filter((item) => typeof fieldCfg[item] !== 'undefined').map((item) => {
+                    return {
+                        key: field.xtype,
+                        visible: typeof fieldCfg[item] !== 'undefined' ? true : false,
+                        property: item,
+                        title: typeof fieldCfg[item] !== 'undefined' ? fieldCfg[item]['description'] :
+                            typeof ownCfg[item] !== 'undefined' ? ownCfg[item]['description'] : '',
+                        description: typeof fieldCfg[item] !== 'undefined' ? fieldCfg[item]['text'] :
+                            typeof ownCfg[item] !== 'undefined' ? ownCfg[item]['text'] : '',
+                        type: typeof fieldCfg[item] !== 'undefined' ? fieldCfg[item]['type'] :
+                            typeof ownCfg[item] !== 'undefined' ? ownCfg[item]['type'] : this.detectPropertyType(field[item]),
+                        order: typeof fieldCfg[item] !== 'undefined' && fieldCfg[item]['order'] >= 0 ? fieldCfg[item]['order'] :
+                            typeof ownCfg[item] !== 'undefined' && ownCfg[item]['order'] >= 0 ? ownCfg[item]['order'] : 1000,
+                    };
+                }).reduce((c, e) => {
+                    if (!c[e.property]) {
+                        c[e.property] = e;
+                    }
+                    return c;
+                }, {})
+            );
             data.sort((a, b) => (a.order > b.order) ? 1 : ((b.order > a.order) ? -1 : 0));
             store.loadData(data);
         };

package/src/report/plugin/configPanel/FilterFormEditingPluginConfigPanel.js

@@ -15,14 +15,20 @@ Ext.define('Coon.report.plugin.configPanel.FilterFormEditingPluginConfigPanel',
     scrollable: true,
     createItems: function() {
         this.layout = 'fit';
-        this.tbar = [{
-            text: 'Сравнить',
-            handler: this.onCompareClick.bind(this),
-        }, {
-            text: 'Заполнить из параметров',
-            handler: this.onResetClick.bind(this),
-        }];
-        return [{reference: 'editor', xtype: 'UiCustomFormEditor'}];
+        this.tbar ={
+            reference: 'mountButtons',
+            items: [
+                {
+                    text: 'Сравнить',
+                    handler: this.onCompareClick.bind(this),
+                }, {
+                    text: 'Заполнить из параметров',
+                    handler: this.onResetClick.bind(this),
+                },
+                {xtype: 'tbfill'}
+            ],
+        };
+        return [{reference: 'editor', xtype: 'UiCustomFormEditor', defaultMenuId: 'filterFormEditorMenu'}];
     },
     onResetClick() {
         const me = this;
@@ -141,7 +147,6 @@ Ext.define('Coon.report.plugin.configPanel.FilterFormEditingPluginConfigPanel',
     addItem(fieldName) {
         const vm = this.up('ReportFormEditPanel').getViewModel();
         const parameters = vm.get('report.parameters');
-        // const countCols = this.getCountCols();
         if (parameters && parameters.length) {
             const field = this.createFilterItem(this.createFieldCfg([parameters.find((param) => param.reportParameterCd === fieldName)]).pop());
             const formContainer = this.editor.down('UiCFContainer');
@@ -217,7 +222,6 @@ Ext.define('Coon.report.plugin.configPanel.FilterFormEditingPluginConfigPanel',
     generateFields() {
         const vm = this.up('ReportFormEditPanel').getViewModel();
         const parameters = vm.get('report.parameters');
-        // const countCols = this.getCountCols();
         if (parameters && parameters.length) {
             const data = this.createFieldCfg(parameters);
             let tpl = '{"xtype":"UiCFContainer","cls":"UiCFContainer","items":[';
@@ -394,10 +398,4 @@ Ext.define('Coon.report.plugin.configPanel.FilterFormEditingPluginConfigPanel',
         }*/
         return config;
     },
-    getCountCols() {
-        const vm = this.up('ReportFormEditPanel').getViewModel();
-        const properties = vm.get('report.properties');
-        const cols = properties.find((prop) => prop.key === 'filterItemsOnRow');
-        return cols ? cols.value : false;
-    },
 });

package/src/version.js

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

package/src/common/field/checkbox/RoundCheckbox.js

@@ -1,5 +0,0 @@
-Ext.define('Coon.common.field.checkbox.RoundCheckbox', {
-    extend: 'Ext.form.field.Checkbox',
-    cls: 'RoundCheckbox',
-    xtype: ['roundcheckbox', 'RoundCheckbox'],
-});

package/src/common/field/checkbox/RoundCheckbox.scss

@@ -1,48 +0,0 @@
-.x-form-fieldCheckbox {
-  .x-form-field {
-    position: relative;
-  }
-  
-  .x-form-field label {
-    background-color: #fff;
-    border: 1px solid #ccc;
-    border-radius: 50%;
-    cursor: pointer;
-    height: 28px;
-    left: 0;
-    position: absolute;
-    top: 0;
-    width: 28px;
-  }
-  
-  .x-form-field label:after {
-    border: 2px solid #fff;
-    border-top: none;
-    border-right: none;
-    content: "";
-    height: 6px;
-    left: 7px;
-    opacity: 0;
-    position: absolute;
-    top: 8px;
-    transform: rotate(-45deg);
-    width: 12px;
-  }
-  
-  .x-form-field input[type="checkbox"] {
-    visibility: hidden;
-  }
-  
-  .x-form-field input[type="checkbox"]:checked + label {
-    background-color: #66bb6a;
-    border-color: #66bb6a;
-  }
-  
-  .x-form-field input[type="checkbox"]:checked + label:after {
-    opacity: 1;
-  }
-  
-  .x-form-item-body, .x-form-cb-wrap-inner {
-    margin: 0 auto;
-  }
-}

package/src/nav/MenuLoader.js

@@ -1,23 +0,0 @@
-Ext.define('Coon.nav.MenuLoader', {
-    singleton: true,
-
-    isLoaded: false,
-
-    load() {
-        return Coon.util.promisifyCmd('command.GetDynamicReportDataCommand', 'MENU_ALLITEMS')
-            .then((data) => {
-                if (Array.isArray(data.list)) {
-                    this.uiElementMap = data.list.reduce();
-                }
-                this.isLoaded = true;
-            });
-    },
-
-    get() {
-
-    },
-
-    isValidMenuItem(uiEmentId) {
-        return this.uiElementMap.has(uiEmentId);
-    },
-});

package/src/report/plugin/grid/ExportReportDataToFilePlugin.md

@@ -1,7 +0,0 @@
-**спецификация:**
-
-входные параметры:
-
-- exportFileFormat [xls/pdf]
-- allowUserSelectColumnsToUpload
-- addToSearchButton добавить в кнопку "поиск", в этом случае в качестве параметра отправляем текущие параметры из FilterPanel(useRawFilterParams: true)