ru.coon 3.0.55 → 3.0.56

package/CHANGELOG.md

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

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "3.0.55",
+  "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/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/uielement/component/UiCustomController.js

@@ -173,7 +173,7 @@ Ext.define('Coon.uielement.component.UiCustomController', {
                 this.getViewModel().bind(`{${context}}`, function(contextValue) {
                     setupTitle(
                         this.makeComponentTitle(staticText, contextValue),
-                        {silent: true}
+                        {silent: false}
                     );
                 }, this);
             } else {
@@ -190,22 +190,4 @@ Ext.define('Coon.uielement.component.UiCustomController', {
             setupTitle(title);
         }
     },
-
-    setupTitle(title, options = {}) {
-        if (!typeof title === 'string') {
-            return;
-        }
-        title = title || Coon.format.withHint('<span style="color:red">---</span>', 'заголовок не задан');
-        this.getView().titleText = title;
-        if (!options.silent) {
-            this.getView().fireEvent('titlechange', this.getView(), title);
-        }
-        if (
-            this.getView().tab &&
-            typeof this.getView().tab.setTooltip === 'function'
-        ) {
-            this.getView().tab.setTooltip(title);
-        }
-    },
-
 });

package/src/uielement/component/UiCustomPanel.js

@@ -69,6 +69,21 @@ Ext.define('Coon.uielement.component.UiCustomPanel', {
             this.viewModel.setData(data);
         }
         this.callParent();
+        if (this.componentTitle?.forceShowHeader) {
+            this.on('titlechange', this.forceShowHeader, this);
+        }
+    },
+
+    forceShowHeader(_, title) {
+        if (typeof title !== 'string' || !title) {
+            return;
+        }
+        if (this.header && typeof this.header.show === 'function') {
+            this.header.show();
+        } else {
+            this.header = {title};
+            this.updateHeader(true);
+        }
     },
 
     convertRowData(rowData) {

package/src/version.js

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