ru.coon 3.0.54 → 3.0.56

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+# Version 3.0.56, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6d42b7aef8ee61964f826099feaaf68cd7299303)
+* ## Features
+* <span style='color:green'>feat: add forceShowHeader</span> ([7ce368], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7ce368898a1809f08aaa8331af2bdef4f40366da))
+
+* HT-14299: изменение вида несохраненных изменений в вертикальных табах ([590315], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/59031554ed302eabdc194e916e44c3a8a3c77371))
+* HT-14580: повторный вход при завершении сессии ([66c811], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/66c81121345e02ec436a9ec3308db087030a25ac))
+* update: CHANGELOG.md ([0cd2cb], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0cd2cb99bbdcdf6d8cf83c29c744dd0f02daa497))
+
+# Version 3.0.55, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/3aa9d1a7bd56ffe2e12a7470620065930b6c9002)
+* ## Fixes
+* <span style='color:red'>fix HT-14573: DFVCharacteristicField completeEdit on select</span> ([683c19], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/683c19de5c78219346d6529d1f223afe16b480c5))
+
+* HT-14532 feat: Четыре режима SelectionModelPlugin ([92c4a8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/92c4a8edcf4fd2cf79633732cd2e801a8ee4fd53))
+* HT-13994: исправление ошибок при удалении колонок ([d47f7a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d47f7a00098c312b2ea2a665dfbea5aebfe0e9ac))
+* update: CHANGELOG.md ([af2f08], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/af2f08fd3487b410c8ea7b7824da5a43289c4444))
+
 # Version 3.0.54, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/91b425e436e17c3f26aa3c6eabb1c23ac52686c1)
 * ## Fixes
 * <span style='color:red'> src/util:mapObject acc[rule.to] or defValue</span> ([f2355c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f2355c41590bd574c51fdd6ed4a231ef59c29477))

package/package.json

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

package/src/TabPanel.js

@@ -71,9 +71,10 @@ Ext.define('Coon.TabPanel', {
         }
         if (isDirty) {
             component.tab.addCls(this.tabDirtyCls);
+            component.tab.setTooltip('Несохраненные изменения');
         } else {
             component.tab.removeCls(this.tabDirtyCls);
+            component.tab.setTooltip('');
         }
     },
-
 });

package/src/app/Application.js

@@ -71,7 +71,11 @@ Ext.define('Coon.app.Application', {
         }
     },
 
-    onLoginSuccessful() {
+    onLoginSuccessful(loginReason) {
+        if (loginReason === 'reAuth') {
+            this.reAuthorize('destroy');
+            return;
+        }
         this.createFxAnim(this.getApplicationMainView(), false, async function() {
             this.getApplicationMainView().destroy();
             this.setApplicationMainView(Ext.create({
@@ -86,6 +90,58 @@ Ext.define('Coon.app.Application', {
         this.getApplicationMainView().show();
     },
 
+    reAuthorize(action) {
+        if (action === 'show') {
+            this.reAuthWindow = this.getReAuthWindow();
+            this.reAuthWindow.show();
+            return;
+        }
+        if (action === 'destroy' && this.reAuthWindow) {
+            this.reAuthWindow.destroy();
+            this.reAuthWindow = undefined;
+            return;
+        }
+    },
+
+    getReAuthWindow() {
+        const panel = {
+            xtype: 'panel',
+            layout: {
+                type: 'vbox',
+                align: 'stretch',
+            },
+            padding: 10,
+            items: [
+                {
+                    html: 'Для продолжения работы войдите в систему.',
+                },
+                {
+                    height: 220,
+                    layout: {
+                        type: 'vbox',
+                        align: 'stretch',
+                        pack: 'end',
+                    },
+                    items: [
+                        {
+                            xtype: 'LoginForm',
+                            loginReason: 'reAuth',
+                        }
+                    ],
+                }
+
+            ],
+        };
+        return Ext.widget('WindowWrap', {
+            title: 'Сообщение системы',
+            width: 400,
+            height: 300,
+            closable: false,
+            maximizable: false,
+            items: panel,
+        });
+    },
+
     afterLoad: async function() {
         this.appRouter.onBeforeRouteEnterFailedFn = this.processNotAuthorizedAction;
         Ext.on('auth:loginSuccessful', this.onLoginSuccessful, this);

package/src/app/login/LoginForm.js

@@ -14,12 +14,20 @@ Ext.define('Coon.app.login.LoginForm', {
         type: 'vbox',
         align: 'stretch',
     },
+
+    config: {
+        loginReason: 'auth',
+    },
+
     plugins: [
         {
             ptype: 'EnterConfirmFormPlugin',
             confirmHandler(panel) {
                 panel.fireEvent('submit');
             },
+        },
+        {
+            ptype: 'FormFieldFocusPlugin',
         }
     ],
     defaults: {

package/src/app/login/LoginForm.scss

@@ -17,7 +17,7 @@
           $background-color-pressed: $base-color,
           $background-color-focus-over: transparentize($base-color, 20%),
           $background-color-focus-pressed: $base-color,
-          $background-color-disabled: null,
+          $background-color-disabled: #6b9bb8,
           $font-weight: normal,
           $color: white
   );

package/src/app/login/LoginFormController.js

@@ -115,7 +115,7 @@ Ext.define('Coon.app.login.LoginFormController', {
                 localStorage.setItem('CSRFToken', token);
             }
 
-            Ext.fireEvent('auth:loginSuccessful');
+            Ext.fireEvent('auth:loginSuccessful', this.getView().getLoginReason());
         }, this);
         tokenCommand.execute();
     },

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

@@ -348,9 +348,17 @@ Ext.define('Coon.common.component.editor.DFVTypeEditor', {
             this.field.on('load', function() {
                 this.field.setValue(value);
             }, this, {single: true});
+            this.field.on('select', this.afterEdit, this);
             this.field.doInit();
         }
     },
+
+    afterEdit: function() {
+        this.completeEdit && this.completeEdit();
+        if (this.boundEl || (this.context && this.context.getCell)) {
+            this.restoreCell();
+        }
+    },
 });
 
 /**

package/src/common/panel/SmartForm.js

@@ -8,6 +8,11 @@ Ext.define('Coon.common.panel.SmartForm', {
     },
 
     initComponent: function() {
+        if (!this.plugins) {
+            this.plugins = [];
+        }
+        this.plugins.push({ptype: 'FormFieldFocusPlugin'});
+
         this.callParent(arguments);
 
         this.groupsFieldValidationPlugin = this.findPlugin('ReportGroupsFieldValidationPlugin');

package/src/overrides/panel/TabPanel.scss

@@ -46,25 +46,12 @@
         .x-tab-bar-body-default {
             padding: 0;
         }
-    }
 
-    .tab-dirty {
-        position: relative;
-        .x-tab-inner {
+        .tab-dirty {
             position: relative;
-            overflow: visible;
-
-            &::before {
-                content: '';
-                display: block;
-                width: 5px;
-                height: 5px;
-                background: $base-color-light;
-                border-radius: 50%;
-                position: absolute;
-                left: -10px;
-                top: calc(1em / 2);
-                transform: translateY(-50%);
+            .x-tab-inner {
+                font-weight: 600;
+                font-style: italic;
             }
         }
     }

package/src/report/component/ReportPanel.js

@@ -721,6 +721,7 @@ Ext.define('Coon.report.component.ReportPanel', {
 
     configureGrid: function(ReportBean) {
         this.grid = this.createGrid(ReportBean);
+        this.grid.getPluginProperty = (key) => this.getPluginProperty(key, this.grid);
         // this.grid.on('added', this.chipsInit, this);
         this.centerPanel.add(this.grid);
         this.initGridEvents();
@@ -850,6 +851,7 @@ Ext.define('Coon.report.component.ReportPanel', {
     configureNorthPanel: function(reportFormBean) {
         this.northPanel.filterPlugins = this.getPluginConfigByType('FILTER_PLUGIN', 'p');
         this.northPanel.configureFilterPanel(reportFormBean);
+        this.northPanel.getPluginProperty = (key) => this.getPluginProperty(key, this.northPanel.filterPanel);
     },
 
     getPluginConfigByType: function(type, prefix, pluginList) {
@@ -1292,4 +1294,21 @@ Ext.define('Coon.report.component.ReportPanel', {
         }
         return this.grid.getStore().getDataSource().getCount() === 0;
     },
+
+    /**
+     * Способ получения свойства плагина в контексте scope. Если scope не передается, то поиск плагина будет в контексте отчета.
+     * Плагин и свойство задаются в строке key с разделителем "точка".
+     * @param {String} key плагин плюс свойство плагина
+     * @param scope контекст
+     * @returns {*|undefined}
+     */
+    getPluginProperty(key, scope) {
+        scope = scope || this;
+        if (!Ext.isString(key) || !/\./.test(key)) {
+            return;
+        }
+        const [pluginName, propertyName] = key.split('.');
+        const plugin = scope.findPlugin(pluginName);
+        return plugin ? plugin[propertyName] : undefined;
+    },
 });

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

@@ -116,14 +116,7 @@ Ext.define('Coon.report.component.reportpanel.ReportGrid', {
     },
 
     getCheckedRecords() {
-        if (this.getFeature('SelectionModelFeature')) {
-            return this.checkedRecords;
-        } else if (this.findPlugin('SelectionModelPlugin')?.defaultMode) {
-            // В этой конфигурации плагина реализована синхронизация выделения с чекбоксами.
-            return this.getSelectionModel().getSelection();
-        } else {
-            return this.checkedRecords;
-        }
+        return this.checkedRecords;
     },
 
     getFeature(ftype) {

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

@@ -205,27 +205,6 @@ Ext.define('Coon.report.plugin.configPanel.GridToolbarButtonPluginConfigPanel',
     },
 
     controller: {
-        bindings: {
-            onContextChange: '{context}',
-        },
-
-        onContextChange(context) {
-            const dependOnGridParameters = this.view.down('[name=dependOnGridParameters]');
-            if (dependOnGridParameters) {
-                const data = JSON.parse(JSON.stringify(context.parameters));
-                data.map((item) => {
-                    item.descriptionFull = `${item.reportParameterCd} (${item.description})`;
-                    return item;
-                });
-                const store = dependOnGridParameters.getStore();
-                store.loadData(data);
-
-                // hack: to visually display value in the field
-                const values = dependOnGridParameters.getValue();
-                dependOnGridParameters.setValue(values);
-            }
-        },
-
         setHideMsgValue() {
             this.getViewModel().set('hideAddActionColumnMsg',
                 this.lookup('actionColumnRef').collapsed ||
@@ -234,6 +213,28 @@ Ext.define('Coon.report.plugin.configPanel.GridToolbarButtonPluginConfigPanel',
         },
     },
 
+    setContext: function(context) {
+        this.callParent(arguments);
+        const dependOnGridParameter = this.down('[name=dependOnGridParameters]');
+        if (dependOnGridParameter) {
+            const data = context.parameters.map((item) => {
+                item.descriptionFull = `${item.reportParameterCd} (${item.description})`;
+                return item;
+            });
+            dependOnGridParameter.getStore().loadData(data);
+        }
+        const reportFieldsCombo = this.down('[name=singleClickDataIndex]');
+        if (reportFieldsCombo) {
+            const reportFields = context.fields.map(
+                ({viewComboDescription: description, reportFieldCd: value}) => ({
+                    value,
+                    description,
+                })
+            );
+            reportFieldsCombo.getStore().loadData(reportFields);
+        }
+    },
+
     createActionColumnFieldSet: function() {
         return {
             xtype: 'fieldset',
@@ -275,4 +276,24 @@ Ext.define('Coon.report.plugin.configPanel.GridToolbarButtonPluginConfigPanel',
             name: 'handleNewObjectEvent',
         };
     },
+
+    createActOnOnSingleClickControl() {
+        return {
+            xtype: 'BaseComboBox',
+            loadOnRender: false,
+            displayField: 'description',
+            valueField: 'value',
+            store: {
+                fields: ['description', 'value'],
+            },
+            fieldLabel: 'Активировать по одиночному клику на поле',
+            name: 'singleClickDataIndex',
+            bind: {
+                disabled: '{actOnDoubleClick.checked}',
+            },
+            reference: 'singleClickDataIndexRef',
+            flex: 1,
+            resettable: true,
+        };
+    },
 });

package/src/report/plugin/configPanel/GridToolbarButtonPluginConfigPanel.scss

@@ -0,0 +1,5 @@
+.x-grid-cell.GTBP-clickable-cell {
+  text-decoration: underline;
+  cursor: pointer;
+  color: var(--base-color);
+}

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

@@ -59,7 +59,18 @@ Ext.define('Coon.report.plugin.configPanel.OpenURLButtonPluginConfigPanel', {
                     this.createDependsOnGridRow(),
                     this.createDependsOnGridParameter(),
                     this.createAddButtonPanel(),
-                    this.createActOnDoubleClickCheckBox(),
+                    {
+                        xtype: 'fieldset',
+                        items: [
+                            Object.assign(this.createActOnDoubleClickCheckBox(), {
+                                reference: 'actOnDoubleClick',
+                                bind: {
+                                    disabled: '{!singleClickDataIndexRef.selection}',
+                                },
+                            }),
+                            this.createActOnOnSingleClickControl()
+                        ],
+                    },
                     this.createHotKeyPanel(),
                     this.createVisibilityKeyPanel(),
                     this.url,

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

@@ -7,6 +7,7 @@ Ext.define('Coon.report.plugin.configPanel.RestoreSelectionPluginConfigPanel', {
 
     description: 'Восстанавливает выделение после перезагрузки',
     tags: ['Поведение', 'Выделение'],
+    isSingle: true,
 
     config: {
         pluginTypeSettings: {

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

@@ -39,19 +39,43 @@ Ext.define('Coon.report.plugin.configPanel.SelectionModelPluginConfigPanel', {
                         value: '{description}',
                     },
                 },
+                // {
+                //     xtype: 'checkbox',
+                //     boxLabel: 'Режим по умолчанию',
+                //     bind: {
+                //         value: '{defaultMode}',
+                //     },
+                //     readOnly: true,
+                // },
                 {
-                    xtype: 'checkbox',
-                    boxLabel: 'Режим по умолчанию',
-                    bind: {
-                        value: '{defaultMode}',
-                    },
+                    html: `Описание режимов плагина SelectionModelPlugin в 
+                           <a href="https://confluence.sigma-it.ru/pages/viewpage.action?pageId=619754033" target="_blank">
+                            confluence.sigma-it.ru.
+                           </a>`,
+                    padding: '0 0 10px',
                 },
                 {
-                    html: '<a href="https://confluence.sigma-it.ru" target="_blank">Описание режима по умолчанию.</a>',
+                    xtype: 'radiogroup',
+                    simpleValue: true,
+                    vertical: true,
+                    columns: 1,
+                    items: [
+                        {boxLabel: 'гибрид(по умолчанию SINGLE)', inputValue: 'hybridSingleDefault', checked: true},
+                        {boxLabel: 'гибрид(по умолчанию MULTI)', inputValue: 'hybridMultiDefault'},
+                        {boxLabel: 'только SINGLE(колонка с чекбоксами скрыта)', inputValue: 'singleOnly'},
+                        {boxLabel: 'только MULTI', inputValue: 'multiOnly'}
+                    ],
+                    reference: 'defaultModeVariants',
+                    // disabled: true,
+                    bind: {
+                        // disabled: '{!defaultMode}',
+                        value: '{defaultModeVariant}',
+                    },
                 },
                 {
                     xtype: 'container',
                     margin: '20 0 0 0',
+                    hidden: true,
                     bind: {
                         disabled: '{defaultMode}',
                     },

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

@@ -50,7 +50,7 @@ Ext.define('Coon.report.plugin.configPanel.SummaryPluginConfigPanelSummaryGrid',
                 ['min', 'min (Минимальное значение в столбце)'],
                 ['max', 'max (Максимальное значение в столбце)'],
                 ['count', 'count (Количество значений в столбце)'],
-                ['average', 'average (Среднее значениче в столбце)'],
+                ['average', 'average (Среднее значение в столбце)'],
                 ['unique', 'unique (Кастомная функция агрегации, указывается с помощью summaryRenderer в свойствах поля)']
             ],
         };

package/src/report/plugin/configPanel/openCustomPanelButtonPlugin/OpenCustomPanelButtonPluginConfigPanel.js

@@ -47,11 +47,28 @@ Ext.define('Coon.report.plugin.configPanel.OpenCustomPanelButtonPluginConfigPane
                 this.createAddButtonPanel(),
                 {
                     xtype: 'fieldset',
+                    title: 'активация по одинарному/двойному клику мышью(взаимоисключающие)',
+                    layout: {type: 'hbox', align: 'middle'},
+                    defaults: {
+                        frame: true,
+                        flex: 1,
+                    },
                     items: [
+                        {
+                            xtype: 'button',
+                            maxWidth: 130,
+                            margin: '0 18 0 0',
+                            text: 'отменить',
+                            handler(btn) {
+                                const view = btn.up('fieldset');
+                                view.query('combo, checkbox:not(#mouseActivationBlock)')
+                                    .forEach((field) => field.reset());
+                            },
+                        },
                         Object.assign(this.createActOnDoubleClickCheckBox(), {
                             reference: 'actOnDoubleClick',
                             bind: {
-                                disabled: '{actOnSingleClick.checked}',
+                                disabled: '{singleClickDataIndexRef.selection}',
                             },
                         }),
                         this.createActOnOnSingleClickControl()
@@ -62,7 +79,6 @@ Ext.define('Coon.report.plugin.configPanel.OpenCustomPanelButtonPluginConfigPane
                 this.createNewObjectCreated(),
                 {
                     boxLabel: 'Открыть экземпляр старой версии биллинга',
-
                     xtype: 'checkbox',
                     name: 'oldFrame',
                 },
@@ -319,14 +335,6 @@ Ext.define('Coon.report.plugin.configPanel.OpenCustomPanelButtonPluginConfigPane
             gridSourceMapping.updateParametersList(context.parameters);
             gridSourceMapping.updateTypeEditor(context.additionalContext);
         }
-        this.reportFieldsCombo.getStore().loadData(
-            context.fields.map(
-                ({viewComboDescription: description, reportFieldCd: value}) => ({
-                    value,
-                    description,
-                })
-            )
-        );
     },
 
     doInit: function(config) {
@@ -513,41 +521,4 @@ Ext.define('Coon.report.plugin.configPanel.OpenCustomPanelButtonPluginConfigPane
             ],
         };
     },
-
-    createActOnOnSingleClickControl() {
-        this.reportFieldsCombo = Ext.create({
-            xtype: 'BaseComboBox',
-            loadOnRender: false,
-            displayField: 'description',
-            valueField: 'value',
-            store: Ext.create('Coon.report.store.RefStore'),
-            fieldLabel: 'Поле',
-            name: 'singleClickDataIndex',
-            bind: {
-                disabled: '{!actOnSingleClick.checked}',
-            },
-            flex: 1,
-        });
-        return {
-            xtype: 'fieldcontainer',
-            layout: {
-                type: 'vbox',
-                align: 'stretch',
-            },
-            items: [
-                {
-                    xtype: 'checkbox',
-                    boxLabel: 'Активировать по одиночному клику на поле',
-                    boxLabelAlign: 'after',
-                    reference: 'actOnSingleClick',
-                    name: 'actOnSingleClick',
-                    bind: {
-                        disabled: '{actOnDoubleClick.checked}',
-                    },
-                    flex: 1,
-                },
-                this.reportFieldsCombo
-            ],
-        };
-    },
 });

package/src/report/plugin/configPanel/openCustomPanelButtonPlugin/OpenCustomPanelButtonPluginConfigPanel.scss

@@ -15,8 +15,3 @@
     }
   }
 }
-.x-grid-cell.OCPBP-clickable-cell {
-  text-decoration: underline;
-  cursor: pointer;
-  color: var(--base-color);
-}