ru.coon 2.7.14 → 2.7.16

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+# Version 2.7.16, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7470e85348491fcb984af32ac03d0f18ef6c7198)
+* ## Fixes
+* <span style='color:red'> Не удаляются св-ва репорта HT-8501</span> ([6e2784], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6e2784c51f2fd41f1d403882cb57c2da3e71ee06))
+
+* upd ([7ff561], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7ff561c6399b72eb779e615700e211ded1902154))
+* update: CHANGELOG.md ([e4d031], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e4d031a2fe4e3d25048e2296c8c46e04adec2802))
+
+# Version 2.7.15, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1e27a6d56071c26951813a36d45daf805a6f750d)
+* ## Features
+* <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))
+
+* ## Fixes
+* <span style='color:red'> HT-8257: publish state only on tab change and prepare data to save</span> ([81e5a6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/81e5a64bf6c1f106f477877a94d61d5da55faf36))
+
+* HT-7448 feat: В ExecuteCommandPluginConfigPanelFormEditor первая вкладка - Параметры. В списке выбора команд выбранная команда отображается без пути. ([f375d4], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f375d4fed40c394cde8b4a92f8ec2e1ea8419093))
+* update: CHANGELOG.md ([13e1ac], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/13e1ac4f0c51b95aaecfb0a6bd8b32f4370db067))
+
 # Version 2.7.14, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8e9321ed8ae4de458b50e7821b2ff5169eabb199)
 * ## Fixes
 * <span style='color:red'> BFL-3938: check plugin attribute is no=t empty and check row objects</span> ([94ce92], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/94ce92a1ee3d9a7313462b061a1b7ec8868c3275))
@@ -50,6 +68,9 @@
 * update: CHANGELOG.md ([52f34d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/52f34db2ead3febb4225a85f3c2a1522d536a9e7))
 
 # Version 2.7.7, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f0c25945de971960d59df2b576e159e08fb535ef)
+* ## Features
+* <span style='color:green'>feat: TR-67883: refactor & MR menu edtor</span> ([dc91a8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/dc91a8795fe541cccacc5b51a0738ae330d697df))
+
 * HT-7850 fix: В FilterConditionToolbar убрано отображение чипов для скрытых полей фильтра. ([8b16f9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8b16f9de62121e0d9d562dcd6e032655d100a417))
 * update: CHANGELOG.md ([e0b4b0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e0b4b04a9ddfe329cdcbb440f61d33219ce1cf73))
 

package/package.json

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

package/src/common/component/editor/CharacteristicGridCopyPlugin.js

@@ -22,7 +22,7 @@ Ext.define('Coon.common.component.editor.CharacteristicGridCopyPlugin', {
         }
 
         if (!this.copyConfig || !this.slaveConfig || !Object.keys(this.slaveConfig).length) {
-            Coon.log.error(`[CharacteristicGridCopyPlugin error], invalid format of copyConfig`);
+            // Coon.log.error(`[CharacteristicGridCopyPlugin error], invalid format of copyConfig`);
             return;
         }
 

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

@@ -0,0 +1,15 @@
+Ext.define('Coon.common.field.checkbox.ToggleBox', {
+    extend: 'Ext.form.field.Checkbox', // Ext.form.field.Base
+    xtype: ['togglebox', 'ToggleBox'],
+
+    // // inputEl should always retain the same size, never stretch
+    // stretchInputElFixed: false,
+
+    baseCls: 'ext-togglebox',
+
+    fieldIconCls: 'offIcon',
+
+    tpl: `
+        <span class={fieldIconCls} />
+    `,
+});

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

@@ -0,0 +1,9 @@
+.ext-togglebox {
+    .onIcon {
+        background-image: url("data:image/svg+xml,%3Csvg width='25' height='16' viewBox='0 0 25 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M8 0C3.58172 0 0 3.58172 0 8C0 12.4183 3.58172 16 8 16H17C21.4183 16 25 12.4183 25 8C25 3.58172 21.4183 0 17 0H8ZM17 13C19.7614 13 22 10.7614 22 8C22 5.23858 19.7614 3 17 3C14.2386 3 12 5.23858 12 8C12 10.7614 14.2386 13 17 13Z' fill='black'/%3E%3C/svg%3E");
+    }
+    .offIcon {
+        background-image: url("data:image/svg+xml,%3Csvg width='25' height='16' viewBox='0 0 25 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M0 8C0 3.58172 3.58172 0 8 0H17C21.4183 0 25 3.58172 25 8C25 12.4183 21.4183 16 17 16H8C3.58172 16 0 12.4183 0 8ZM13 8C13 10.7614 10.7614 13 8 13C5.23858 13 3 10.7614 3 8C3 5.23858 5.23858 3 8 3C10.7614 3 13 5.23858 13 8Z' fill='black'/%3E%3C/svg%3E");
+    }
+}
+

package/src/common/field/combo/CommandComboBox.js

@@ -11,7 +11,7 @@ Ext.define('Coon.common.field.combo.CommandComboBox', {
     getData: Coon.util.getAllCommandsList,
     errorMsgCls: 'combo-field-error',
     validator(value) {
-        const isValid = !!this.getStore().findRecord('description', value);
+        const isValid = this.getStore().findBy((record) => record.get('description') === value || record.get('xtype') === value) !== -1;
         return isValid || `команда ${value} не найдена!`;
     },
     listConfig: {

package/src/nav/AppNavigationMenuController.js

@@ -9,6 +9,7 @@ Ext.define('Coon.nav.AppNavigationMenuController', {
     menuReady: false,
     selectThenMenuReady: undefined,
     addWorkspaceToUrl: false,
+    menuUpdate: false,
     init: function(view) {
         view.updateSelection = this.updateSelection.bind(this);
         view.getMenuReady = this.getMenuReady.bind(this);
@@ -17,7 +18,6 @@ Ext.define('Coon.nav.AppNavigationMenuController', {
         view.changeWorkspace = this.changeWorkspace.bind(this);
         this.view.on('selectionchange', this.onSelectMenuItem, this);
         this.loadMenu();
-        view.getFirstAvailable = this.getFirstAvailable.bind(this);
         Ext.on('route:initial', (route) => {
             this.selectThenMenuReady = route.id;
         });
@@ -53,7 +53,9 @@ Ext.define('Coon.nav.AppNavigationMenuController', {
 
     updateMenu: function() {
         Coon.nav.MenuEntity.menuItems = null;
-        this.loadMenu();
+        this.menuUpdate = true;
+        const menuItem = this.getViewModel().get('menuItem');
+        this.loadMenu(menuItem ? menuItem.get('UI_ELEMENT_CD') : null);
     },
 
     getMenuReady: function() {
@@ -133,8 +135,8 @@ Ext.define('Coon.nav.AppNavigationMenuController', {
         this.goTo(item && item.get('UI_ELEMENT_CD'));
     },
 
-    selectMenuItem: function(uiElementCd) {
-        if (!this.menuReady) {
+    selectMenuItem: function(uiElementCd, preventViewEvent) {
+        if (!this.menuReady || !uiElementCd) {
             return;
         }
         const vm = this.getViewModel();
@@ -169,10 +171,13 @@ Ext.define('Coon.nav.AppNavigationMenuController', {
         this.locals[menuItem.WORKSPACE_CD] = uiElementCd;
         treeList.setSelection(node);
         vm.set('menuItem', node);
-        this.fireViewEvent('select', node);
+        if (!preventViewEvent) {
+            this.fireViewEvent('select', node);
+        }
+
         return node;
     },
-    loadMenu() {
+    loadMenu(uiElementCd) {
         Coon.nav.MenuEntity.get().then((menu) => {
             if (Array.isArray(menu)) {
                 const dataList = this.prepareMenuData(menu);
@@ -225,7 +230,13 @@ Ext.define('Coon.nav.AppNavigationMenuController', {
                 this.menuReady = true;
                 this.fireViewEvent('menuReady');
                 Ext.fireEvent('nav:ready');
-                this.onMenuReady();
+                if (this.menuUpdate === true) {
+                    this.menuUpdate = false;
+                    this.changeWorkspace(this.getViewModel().get('workspace'), false);
+                    this.selectMenuItem(uiElementCd, true);
+                } else {
+                    this.onMenuReady();
+                }
             }
         });
     },

package/src/nav/editor/NavigateElementEditorView.js

@@ -9,7 +9,6 @@ Ext.define('Coon.nav.editor.NavigateElementEditorView', {
     ui: 'NavigateElementEditorView',
 
     viewModel: 'NavigateElementEditorViewModel',
-    controller: 'NavigateElementEditorController',
 
     requires: [
         'Coon.nav.editor.NavigateElementEditorViewModel',
@@ -24,16 +23,18 @@ Ext.define('Coon.nav.editor.NavigateElementEditorView', {
 
     items: [
         {
-            xtype: 'panel',
+            xtype: 'fieldset',
             title: 'Информация по использованию',
             itemId: 'menuEditorInformation',
             reference: 'menuEditorInformation',
             collapsible: true,
+            collapsed: true,
             layout: {
                 type: 'hbox',
                 align: 'stretch',
             },
-            flex: 0.3,
+            flex: 1,
+            scrollable: 'y',
             margin: '10 10 0 10',
             items: [
                 {
@@ -65,7 +66,7 @@ Ext.define('Coon.nav.editor.NavigateElementEditorView', {
                 type: 'hbox',
                 align: 'stretch',
             },
-            flex: 2,
+            flex: 4,
             defaults: {
                 margin: 10,
             },

package/src/nav/editor/menu/NavMenuTreeController.js

@@ -214,8 +214,10 @@ Ext.define('Coon.nav.editor.menu.NavMenuTreeController', {
                 height: 650,
             });
             const menuId = record.get('MENU_ENTRY_CD');
+            const isBrokenMenuItem = record.get('isBroken');
+            const nestedItems = record.get('children');
             openWindow.on('afterrender', function() {
-                Coon.Function.executeComponentDoInit(form, {menuId});
+                Coon.Function.executeComponentDoInit(form, {menuId, isBrokenMenuItem, nestedItems});
             });
             openWindow.show();
             openWindow.on('close', this.reloadMenu, this);
@@ -229,44 +231,52 @@ Ext.define('Coon.nav.editor.menu.NavMenuTreeController', {
      * @returns массив promise
      */
 
-    getMenuData: function(menuEntries, parent) {
+    getDataPromises: function(menuEntries) {
         return menuEntries.reduce((acc, menuEntry) => {
-            acc.push(Coon.util.promisifyCmd('command.GetMenuCommand', menuEntry.get('MENU_ENTRY_CD'))
-                .then((response) => {
-                    response.parentMenuId = parent;
-                    return response;
-                })
-            );
+            acc.push(Coon.util.promisifyCmd('command.SaveMenuCommand', {
+                description: menuEntry.get('DESCR'),
+                icon: menuEntry.get('iconCls'),
+                leafSwitch: menuEntry.get('leaf'),
+                menuId: menuEntry.get('MENU_ENTRY_CD'),
+                menuType: menuEntry.get('MENU_TYPE'),
+                sortSequence: menuEntry.get('index'),
+                parentMenuId: menuEntry.parentNode.get('MENU_ENTRY_CD'),
+                uiElementId: menuEntry.get('UI_ELEMENT_CD'),
+                visibleSwitch: menuEntry.get('isVisible'),
+                workspaceId: menuEntry.get('WORKSPACE_CD'),
+            }));
             if (menuEntry.hasChildNodes()) {
-                acc.push(...this.getMenuData(menuEntry.childNodes, menuEntry.get('MENU_ENTRY_CD')));
+                acc.push(...this.getDataPromises(menuEntry.childNodes));
             }
             return acc;
         }, []);
     },
 
+    /**
+     * Функция задаёт пунктам меню порядок сортировки и вызывает команду сохранения
+     * @param {Array} data массив пунктов меню
+     * @param {String} parent название родительского меню
+     * @returns массив из promise
+     */
+    getListMenuItemPromises: function(data) {
+        return data.map((menuEntry, index) => Coon.util.promisifyCmd('command.SaveMenuCommand', menuEntry));
+    },
+
     /**
      * Срабатывает при перетаскивании меню, сохраняет порядок отображения
      */
 
-    saveMenuOrder: function() {
-        const mt = this.getView();
-        mt.mask();
-        Promise.all(this.getMenuData(this.getView().getStore().getRoot().childNodes))
-            .then((data) => {
-                data.forEach((menu, index) => {
-                    menu.sortSequence = index;
-                    Coon.util.promisifyCmd('command.SaveMenuCommand', menu)
-                        .catch((error) => {
-                            Coon.log.debug(error);
-                            Ext.Msg.alert(error.toString());
-                        });
-                });
-                mt.unmask();
-            })
-            .catch((error) => {
-                Coon.log.debug(error);
-                Ext.Msg.alert(error.toString());
-            });
+    saveMenuOrder: function(a, c, d) {
+        const menuTree = this.getView();
+        menuTree.mask();
+        Promise.all(this.getDataPromises(menuTree.getRootNode().childNodes)).catch((error) => {
+            Coon.log.debug(error);
+            menuTree.unmask();
+            Ext.Msg.alert('Ошибка', error.toString());
+        }).finally(() => {
+            menuTree.unmask();
+            Ext.fireEvent('nav:reload');
+        });
     },
 
     /**

package/src/nav/editor/menu/form/NavMenuFormView.js

@@ -21,12 +21,13 @@ Ext.define('Coon.nav.editor.menu.form.NavMenuFormView', {
     },
     bodyPadding: 5,
 
-    bbar: [
-        '->',
+    buttons: [
         {
             xtype: 'button',
             text: 'Сохранить',
             handler: 'saveHandler',
+            formBind: true,
+            ui: 'orange-button',
         }
     ],
 
@@ -134,6 +135,15 @@ Ext.define('Coon.nav.editor.menu.form.NavMenuFormView', {
                 disabled: '{!menu.parentMenuId}',
             },
             readOnly: true,
+        },
+        {
+            xtype: 'displayfield',
+            bind: {
+                hidden: '{!isBrokenMenuItem}',
+            },
+            value: `<span style='color:red'>Ошибка:
+            </span>Элемент меню является некорректным, т.к имеет одновременно признак группы и признак пункта меню. 
+            Определитесь какому типу должен соответствовать данный элемент.`,
         }
 
     ],

package/src/nav/editor/menu/form/NavMenuFormViewController.js

@@ -92,15 +92,30 @@ Ext.define('Coon.nav.editor.menu.form.NavMenuFormViewController', {
         if (this.validate()) {
             const vm = this.getViewModel();
             const commandClass = vm.get('newMenu') ? 'AddMenuCommand' : 'SaveMenuCommand';
-            Coon.util.promisifyCmd('command.' + commandClass, this.getSavedData())
-                .then((menuBean) => {
-                    vm.set('menu', menuBean);
-                    this.getView().close();
-                    Ext.fireEvent('nav:reload');
+            const data = this.getSavedData();
+            Coon.util.promisifyCmd({
+                command: 'command.GetDynamicReportDataCommand',
+                params: {reportId: 'MENU_ALLITEMS', parameterList: `[{"type":"MENU_ENTRY_CD","value":"${data.menuId}"}]`},
+            })
+                .then((resp) => {
+                    if (resp.totalCount > 0) {
+                        Ext.Msg.alert('Ошибка', `Пункт мено с идентификатором ${data.menuId} уже существует`);
+                    } else {
+                        Coon.util.promisifyCmd('command.' + commandClass, data)
+                            .then((menuBean) => {
+                                vm.set('menu', menuBean);
+                                this.getView().close();
+                                Ext.fireEvent('nav:reload');
+                            })
+                            .catch((error) => {
+                                Coon.log.debug(error);
+                                Ext.Msg.alert('Ошибка', error.toString());
+                            });
+                    }
                 })
                 .catch((error) => {
                     Coon.log.debug(error);
-                    Ext.Msg.alert(error.toString());
+                    Ext.Msg.alert('Ошибка', error.toString());
                 });
         }
     },

package/src/nav/editor/menu/form/NavMenuFormViewModel.js

@@ -20,5 +20,7 @@ Ext.define('Coon.nav.editor.menu.form.NavMenuFormViewModel', {
             leafSwitch: true,
         },
         newMenu: true,
+        isBrokenMenuItem: false,
+        nestedItems: false,
     },
 });

package/src/nav/editor/workspace/NavWorkspaceListController.js

@@ -12,7 +12,7 @@ Ext.define('Coon.nav.editor.workspace.NavWorkspaceListController', {
             'NavWorkspaceListView': {
                 select: 'selectWorkspace',
                 itemdblclick: 'openFormEditWorkspace',
-                drop: 'saveWorkspaceOrder',
+                drop: 'onSaveWorkspaceOrder',
                 itemcontextmenu: 'showWorkspaceContextMenu',
             },
         },
@@ -98,6 +98,7 @@ Ext.define('Coon.nav.editor.workspace.NavWorkspaceListController', {
                 Coon.util.promisifyCmd('command.DeleteWorkspaceCommand', workspace)
                     .then(() => {
                         Ext.Msg.alert('Сообщение', 'Рабочее пространство удалено');
+                        Ext.fireEvent('nav:reload');
                         this.reloadWorkspaceList();
                     })
                     .catch((error) => {
@@ -111,38 +112,31 @@ Ext.define('Coon.nav.editor.workspace.NavWorkspaceListController', {
     /**
      * Срабатывает при перетаскивании рабочего пространства, сохраняет порядок отображения
      */
-    saveWorkspaceOrder: function() {
+    onSaveWorkspaceOrder: function() {
         const workspaceListView = this.getView();
         const workspaces = workspaceListView.getStore().getRange();
-
         workspaceListView.mask();
-        const workspacePromises = workspaces.map((workspaceEntry) => {
-            return Coon.util.promisifyCmd('command.GetWorkspaceCommand', workspaceEntry.get('WORKSPACE_CD'));
-        });
 
+        const workspacePromises = workspaces.map((workspaceEntry, index) => {
+            const workspace = {
+                description: workspaceEntry.get('DESCRIPTION'),
+                icon: workspaceEntry.get('ICON'),
+                workspaceId: workspaceEntry.get('WORKSPACE_CD'),
+                sortSequence: index,
+            };
+            return Coon.util.promisifyCmd('command.SaveWorkspaceCommand', workspace);
+        });
 
-        return Promise.all(workspacePromises)
-            .then((data) => {
-                data.forEach((workspace, index) => {
-                    workspace.sortSequence = index;
-                    Coon.util.promisifyCmd('command.SaveWorkspaceCommand', workspace)
-                        .catch((error) => {
-                            Coon.log.debug(error);
-                            Ext.Msg.alert(error.toString());
-                        });
-                });
-                workspaceListView.unmask();
-            })
-            .catch((error) => {
-                Coon.log.debug(error);
-                Ext.Msg.alert(error.toString());
-            });
+        Promise.all(workspacePromises).catch((error) => {
+            Coon.log.debug(error);
+            workspaceListView.unmask();
+            Ext.Msg.alert('Ошибка', error.toString());
+        }).finally(() => {
+            workspaceListView.unmask();
+            Ext.fireEvent('nav:reload');
+        });
     },
 
-    /**
-     * Обновляет отображения списка рабочих пространств
-     */
-
     reloadWorkspaceList: function() {
         this.init();
         this.getView().getStore().reload();

package/src/nav/editor/workspace/form/NavWorkspaceFormController.js

@@ -97,6 +97,7 @@ Ext.define('Coon.nav.editor.workspace.form.NavWorkspaceFormController', {
             Coon.util.promisifyCmd('command.' + commandClass, vm.get('workspace'))
                 .then((workspaceBean) => {
                     vm.set('workspace', workspaceBean);
+                    Ext.fireEvent('nav:reload');
                     this.getView().close();
                 })
                 .catch((error) => {

package/src/nav/editor/workspace/form/NavWorkspaceFormView.js

@@ -28,6 +28,8 @@ Ext.define('Coon.nav.editor.workspace.form.NavWorkspaceFormView', {
         {
             text: 'Сохранить',
             handler: 'saveHandler',
+            formBind: true,
+            ui: 'orange-button',
         }
     ],
 

package/src/report/component/ReportPanel.js

@@ -780,7 +780,10 @@ Ext.define('Coon.report.component.ReportPanel', {
 
         const defaultGridConfig = Coon.report.component.ReportPanel.getColumnsConfig(reportBean[ns.$fields], gridConfig);
 
-        const widget = Ext.widget(this.getIsTree() ? 'ReportTree' : 'ReportGrid', Ext.apply(defaultGridConfig, this.gridProperties));
+        const widget = Ext.widget(
+            this.getIsTree() ? 'ReportTree' : 'ReportGrid',
+            Ext.apply(defaultGridConfig, this.gridProperties, {reportId: reportBean[ns.$reportId]})
+        );
         widget.on('buttonIsAdded', this.sortButtons, this);
         return widget;
     },

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

@@ -50,7 +50,28 @@ Ext.define('Coon.report.component.reportpanel.ReportGrid', {
         this.bbar = Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(this.bbar || [])});
         this.fbar = Ext.create({xtype: 'toolbar', hidden: true, enableOverflow: true, items: [].concat(this.fbar || [])});
 
-
+        const plugins = this.plugins;
+        delete this.plugins;
+        const pluginErrors = [];
+        if (Array.isArray(plugins)) {
+            plugins.forEach((plugin) => {
+                try {
+                    this.addPlugin(plugin);
+                } catch (e) {
+                    pluginErrors.push(e.message);
+                }
+            });
+        }
+        if (pluginErrors.length) {
+            const trace = ['CM_REPORT_CD: ' + this.reportId].concat(Array.from(new Set(pluginErrors))).join('\n');
+            Coon.log.error(trace);
+            Ext.create('Coon.report.component.ErrorWindow', {
+                autoShow: true,
+                title: 'Ошибка инициализации отчета',
+                trace,
+                message: 'Произошла ошибка при инициализации плагинов отчета, некоторые функции будут не доступны.',
+            });
+        }
         this.callParent();
         this.relayEvents(this.getStore(), ['datachanged', 'load']);
     },

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

@@ -9,6 +9,11 @@ Ext.define('Coon.report.component.settings.property.ReportPropertiesPanelControl
     dictionary: Coon.report.component.settings.property.ReportPropertyDictionary,
 
     init: function(view) {
+        view.up().on('beforetabchange', (cmp, newTab, oldTab) => {
+            if (oldTab.id === view.id) {
+                this.recordChangeHandler();
+            }
+        }, this);
         view.validate = this.validate.bind(this);
         view.getData = this.getData.bind(this);
         view.setData = this.setData.bind(this);
@@ -130,7 +135,7 @@ Ext.define('Coon.report.component.settings.property.ReportPropertiesPanelControl
         const value = vm.get('editorValue');
         const record = vm.get('propertyGrid.selection');
         record.set('value', value);
-        this.getView().fireEvent('propertyChanged');
+        // this.getView().fireEvent('propertyChanged');
     },
 
     onShowContextMenu: function(_, record, __, ___, e) {
@@ -160,7 +165,6 @@ Ext.define('Coon.report.component.settings.property.ReportPropertiesPanelControl
         }
         this.lookup('descriptionField').reset();
         this.lookup('propertyValueContainer').removeAll();
-        this.getView().fireEvent('propertyChanged');
     },
 
     onAddHandler() {

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

@@ -2,7 +2,10 @@ Ext.define('Coon.report.plugin.grid.UpdateGridPlugin', {
     extend: 'Ext.AbstractPlugin',
     alias: 'plugin.UpdateGridPlugin',
     uses: [],
-    requires: [],
+    requires: [
+        'Coon.report.command.GetDynamicReportDataCommand',
+        'Coon.log'
+    ],
     alternateClassName: [
         'Sigma.common.grid.plugin.UpdateGridPlugin',
         'Sigma.common.plugin.grid.UpdateGridPlugin'
@@ -41,8 +44,7 @@ Ext.define('Coon.report.plugin.grid.UpdateGridPlugin', {
     },
 
     execute: function(parameters) {
-        const command = Ext.create('Coon.report.command.GetDynamicReportDataCommand');
-        command.on('complete', Ext.bind(this.updateRecords, this), this);
+        const command = Ext.create('command.GetDynamicReportDataCommand');
         parameters = parameters || {};
         const params = [];
         for (const key in parameters) {
@@ -50,14 +52,16 @@ Ext.define('Coon.report.plugin.grid.UpdateGridPlugin', {
                 params.push({type: key, value: parameters[key]});
             }
         }
+        command.on('complete', (response) => this.updateRecords.call(this, response, params));
         command.execute(this.reportID, Ext.encode(params));
     },
 
-    updateRecords: function(response) {
+    updateRecords: function(response, params) {
         if (!response.list || response.list.length === 0) {
             return;
         } else if (response.list.length > 1) {
             Ext.Msg.alert('Сообщение системы', 'Отчет, используемый для обновления записи, вернул больше одной строки');
+            Coon.log.error(`[UpdateGridPlugin] Отчет ${this.reportID} вернул больше одной строки. Параметры: `, params);
         } else {
             this.setDataToRecords(response.list[0]);
         }

package/src/uielement/plugin/configPanel/executeCommand/ExecuteCommandPluginConfigPanelFormEditor.js

@@ -209,6 +209,7 @@ Ext.define('Coon.uielement.plugin.configPanel.executeCommand.ExecuteCommandPlugi
                 xtype: 'CommandComboBox',
                 reference: 'commandComboBox',
                 fieldLabel: 'Команда',
+                displayField: 'xtype',
                 bind: '{ctype}',
                 listeners: {
                     change: this.onChangeCommand.bind(this),
@@ -226,6 +227,36 @@ Ext.define('Coon.uielement.plugin.configPanel.executeCommand.ExecuteCommandPlugi
                 xtype: 'tabpanel',
                 flex: 1,
                 items: [
+                    {
+                        xtype: 'panel',
+                        title: 'Параметры',
+                        tooltip: 'Настройка параметров команды',
+                        layout: 'fit',
+                        tbar: [
+                            {
+                                text: 'Загрузить параметры',
+                                tooltip: 'Параметры, определенные в классе команды, будут созданы в редакторе с пустыми значениями.' +
+                                    'Если параметры уже определены в редакторе, то они не будут изменены.',
+                                ui: 'blue-text-button-border',
+                                hidden: true,
+                                bind: {
+                                    hidden: '{!commandComboBox.selection}',
+                                },
+                                handler: this.loadParametersHandler.bind(this),
+                            }
+                        ],
+                        items: [
+                            {
+                                xtype: 'UiAceEditorPanel',
+                                reference: 'parametersRef',
+                                hideSearchPanel: true,
+                                layout: 'fit',
+                                bind: {
+                                    value: '{parameters}',
+                                },
+                            }
+                        ],
+                    },
                     {
                         xtype: 'panel',
                         title: 'Настройки',
@@ -358,36 +389,6 @@ Ext.define('Coon.uielement.plugin.configPanel.executeCommand.ExecuteCommandPlugi
                             }
                         ],
                     },
-                    {
-                        xtype: 'panel',
-                        title: 'Параметры',
-                        tooltip: 'Настройка параметров команды',
-                        layout: 'fit',
-                        tbar: [
-                            {
-                                text: 'Загрузить параметры',
-                                tooltip: 'Параметры, определенные в классе команды, будут созданы в редакторе с пустыми значениями.' +
-                                    'Если параметры уже определены в редакторе, то они не будут изменены.',
-                                ui: 'blue-text-button-border',
-                                hidden: true,
-                                bind: {
-                                    hidden: '{!commandComboBox.selection}',
-                                },
-                                handler: this.loadParametersHandler.bind(this),
-                            }
-                        ],
-                        items: [
-                            {
-                                xtype: 'UiAceEditorPanel',
-                                reference: 'parametersRef',
-                                hideSearchPanel: true,
-                                layout: 'fit',
-                                bind: {
-                                    value: '{parameters}',
-                                },
-                            }
-                        ],
-                    },
                     {
                         title: 'Отражение результатов',
                         scrollable: true,

package/src/version.js

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

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/nav/editor/NavigateElementEditorController.js

@@ -1,34 +0,0 @@
-/**
- * Контроллер рабочих пространств
- * @class Coon.nav.editor.workspace.NavWorkspaceListController
- */
-Ext.define('Coon.nav.editor.NavigateElementEditorController', {
-    extend: 'Ext.app.ViewController',
-    alias: 'controller.NavigateElementEditorController',
-
-    init: function() {
-        const me = this.lookup('menuEditorInformation');
-        const menuNavEditorHelp = localStorage.getItem('menuNavEditorHelp');
-        me.setCollapsed(!!menuNavEditorHelp);
-        let icon;
-        if (me.getCollapsed()) {
-            icon = 'x-fa fa-chevron-down';
-        } else {
-            icon = 'x-fa fa-chevron-up';
-        }
-        me.addTool({
-            iconCls: icon,
-            listeners: {
-                click: function() {
-                    !menuNavEditorHelp && localStorage.setItem('menuNavEditorHelp', 'collapsed');
-                    me.setCollapsed(!me.getCollapsed());
-                    if (me.getCollapsed()) {
-                        this.setIconCls('x-fa fa-chevron-down');
-                    } else {
-                        this.setIconCls('x-fa fa-chevron-up');
-                    }
-                },
-            },
-        });
-    },
-});

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

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