From cbfd20e7f2b1b0ae8716facfa8b360b4de69ac23 Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Wed, 12 Feb 2025 11:10:53 +0800 Subject: [PATCH 1/6] fix: fix error display --- .../services/connect-token/acl-dialog/acl-dialog.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/services/connect-token/acl-dialog/acl-dialog.component.ts b/src/app/services/connect-token/acl-dialog/acl-dialog.component.ts index d72a7e4a..45091cd3 100644 --- a/src/app/services/connect-token/acl-dialog/acl-dialog.component.ts +++ b/src/app/services/connect-token/acl-dialog/acl-dialog.component.ts @@ -51,8 +51,9 @@ export class ElementACLDialogComponent implements OnInit { } else if (typeof error === 'object') { if (error.detail) { error = error.detail; + } else { + error = JSON.stringify(error); } - error = JSON.stringify(error); } return error; } From 7ef294d8e85228b69f4e72c66ae5dfe184ebe18e Mon Sep 17 00:00:00 2001 From: zhaojisen <1301338853@qq.com> Date: Thu, 13 Feb 2025 17:17:51 +0800 Subject: [PATCH 2/6] Fixed: Fixed PR-BP languange Dailog Adapatation --- src/app/elements/connect/connect.component.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/elements/connect/connect.component.ts b/src/app/elements/connect/connect.component.ts index d549c9a6..2d81391d 100644 --- a/src/app/elements/connect/connect.component.ts +++ b/src/app/elements/connect/connect.component.ts @@ -234,17 +234,20 @@ export class ElementConnectComponent implements OnInit, OnDestroy { } getConnectData(accounts: Account[], asset: Asset): Promise { + let dialogWidth = '600px'; const preConnectData = this._appSvc.getPreConnectData(asset); const isValid = this.checkPreConnectDataForAuto(asset, accounts, preConnectData); if (isValid) { return Promise.resolve(preConnectData); } - + if (this._i18n.getLangCode() === 'pt-br') { + dialogWidth = '730px' + } this._appSvc.connectDialogShown = true; const dialogRef = this._dialog.open(ElementConnectDialogComponent, { minHeight: '300px', height: 'auto', - width: '600px', + width: dialogWidth, data: {accounts, asset, preConnectData} }); From 8b128921e4c3bae684c8f58c7c7dd039e40af26e Mon Sep 17 00:00:00 2001 From: zhaojisen <1301338853@qq.com> Date: Mon, 17 Feb 2025 19:14:48 +0800 Subject: [PATCH 3/6] Fixed: KOKO component still accepts input when encountering 401 error --- src/app/services/http.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/services/http.ts b/src/app/services/http.ts index ba4954c1..7c783a31 100644 --- a/src/app/services/http.ts +++ b/src/app/services/http.ts @@ -55,9 +55,11 @@ export class HttpService { async handleError(error: HttpErrorResponse) { if (error.status === 401 && User.logined) { const msg = await this._i18n.t('LoginExpireMsg'); - if (confirm(msg)) { - window.open('/core/auth/login/?next=/luna/', '_blank'); + const isConfirm = confirm(msg); + if (isConfirm) { + return window.open('/core/auth/login/?next=/luna/', '_blank'); } + window.location.reload(); } else if (error.status === 403) { const msg = await this._i18n.t('No permission'); alert(msg); From 664bff82b7f17f0a9ca52a18b19c6969585abd3d Mon Sep 17 00:00:00 2001 From: zhaojisen <1301338853@qq.com> Date: Tue, 18 Feb 2025 11:23:30 +0800 Subject: [PATCH 4/6] Fixed: Fix: Text overlap issue caused by assignment --- .../content-window/content-view/content-view.component.css | 1 + .../elements/content/content-window/content-window.component.css | 1 + 2 files changed, 2 insertions(+) diff --git a/src/app/elements/content/content-window/content-view/content-view.component.css b/src/app/elements/content/content-window/content-view/content-view.component.css index e449bd00..1bf00e2a 100644 --- a/src/app/elements/content/content-window/content-view/content-view.component.css +++ b/src/app/elements/content/content-window/content-view/content-view.component.css @@ -3,6 +3,7 @@ display: flex; flex-direction: column; height: 100%; + overflow-y: scroll; } .head { diff --git a/src/app/elements/content/content-window/content-window.component.css b/src/app/elements/content/content-window/content-window.component.css index 64e31c19..d7793288 100644 --- a/src/app/elements/content/content-window/content-window.component.css +++ b/src/app/elements/content/content-window/content-window.component.css @@ -18,6 +18,7 @@ div, elements-term, elements-guacamole { display: flex; flex-flow: row wrap; align-content: flex-start; + overflow-y: scroll; } .sub-view { From 9139c2770e1c07a7e38438634ba87caa0aba86f5 Mon Sep 17 00:00:00 2001 From: Bryan Date: Wed, 19 Feb 2025 18:35:47 +0800 Subject: [PATCH 5/6] Revert "Fixed: KOKO component still accepts input when encountering 401 error" This reverts commit 8b128921e4c3bae684c8f58c7c7dd039e40af26e. --- src/app/services/http.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/app/services/http.ts b/src/app/services/http.ts index 7c783a31..ba4954c1 100644 --- a/src/app/services/http.ts +++ b/src/app/services/http.ts @@ -55,11 +55,9 @@ export class HttpService { async handleError(error: HttpErrorResponse) { if (error.status === 401 && User.logined) { const msg = await this._i18n.t('LoginExpireMsg'); - const isConfirm = confirm(msg); - if (isConfirm) { - return window.open('/core/auth/login/?next=/luna/', '_blank'); + if (confirm(msg)) { + window.open('/core/auth/login/?next=/luna/', '_blank'); } - window.location.reload(); } else if (error.status === 403) { const msg = await this._i18n.t('No permission'); alert(msg); From c3bb42575946c5d7f575a56002f15eab5a822f8e Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Wed, 19 Feb 2025 19:14:53 +0800 Subject: [PATCH 6/6] feat: add i18n --- src/app/elements/face-monitor/face-monitor.component.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/elements/face-monitor/face-monitor.component.html b/src/app/elements/face-monitor/face-monitor.component.html index a299ff7b..2fc92b65 100644 --- a/src/app/elements/face-monitor/face-monitor.component.html +++ b/src/app/elements/face-monitor/face-monitor.component.html @@ -1,6 +1,7 @@
- ● [{{ monitoringTabCount }}]个会话正在被监控中 + ● [{{ monitoringTabCount }} + ]{{ 'SessionIsBeingMonitored' | translate }}