From 6d4d725cbdf01d75ccf32447ecdac7c2799de882 Mon Sep 17 00:00:00 2001 From: zhaojisen <1301338853@qq.com> Date: Tue, 14 Jan 2025 11:14:18 +0800 Subject: [PATCH 1/3] Fixed: Fixed the issue that when use keyboard key to switch double tab --- src/app/elements/content/content.component.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/elements/content/content.component.ts b/src/app/elements/content/content.component.ts index 69908d42..f079eb1f 100644 --- a/src/app/elements/content/content.component.ts +++ b/src/app/elements/content/content.component.ts @@ -7,6 +7,7 @@ import {ElementCommandDialogComponent} from '@app/elements/content/command-dialo import {ElementSendCommandWithVariableDialogComponent} from '@app/elements/content/send-command-with-variable-dialog/send-command-with-variable-dialog.component'; import {fromEvent, Subscription} from 'rxjs'; import * as jQuery from 'jquery/dist/jquery.min.js'; +import * as _ from 'lodash'; @Component({ selector: 'elements-content', @@ -92,6 +93,10 @@ export class ElementContentComponent implements OnInit, OnDestroy { } handleKeyDownTabChange() { + const debouncedSwitch = _.debounce((key: string) => { + this.viewSrv.keyboardSwitchTab(key); + }, 500); + this.keyboardSubscription = fromEvent(window, 'keydown').subscribe((event: any) => { if (event.altKey && event.shiftKey && (event.key === 'ArrowRight' || event.key === 'ArrowLeft') && this.viewList.length > 1) { let key = ''; @@ -100,7 +105,7 @@ export class ElementContentComponent implements OnInit, OnDestroy { } else if (event.key === 'ArrowLeft') { key = 'alt+shift+left'; } - this.viewSrv.keyboardSwitchTab(key); + debouncedSwitch(key); } }); } From 24a3a814afa5f962d9668d144ed70fc7fa35d2be Mon Sep 17 00:00:00 2001 From: zhaojisen <1301338853@qq.com> Date: Tue, 14 Jan 2025 11:28:10 +0800 Subject: [PATCH 2/3] Perf: Add start scripts --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 9ba34b54..fbb50436 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "license": "GPLv3", "scripts": { "ng": "ng", + "dev": "NODE_OPTIONS=--openssl-legacy-provider ng serve --hmr --proxy-config proxy.conf.json --host 0.0.0.0 --base-href=/luna/ --disable-host-check", "start": "NODE_OPTIONS=--openssl-legacy-provider ng serve --hmr --proxy-config proxy.conf.json --host 0.0.0.0 --base-href=/luna/ --disable-host-check", "build": "NODE_OPTIONS=--openssl-legacy-provider ng build --prod --base-href=/luna/ --output-path 'luna'", "extract": "ngx-translate-extract --input ./src --output ./src/assets/i18n/*.json --sort --format namespaced-json", From 5357165a7bdc2e891bfadecc79da14fd8644d243 Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Tue, 14 Jan 2025 14:55:55 +0800 Subject: [PATCH 3/3] feat: add translate --- .../connect-token/acl-dialog/acl-dialog.component.html | 2 +- .../services/connect-token/acl-dialog/acl-dialog.component.ts | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/services/connect-token/acl-dialog/acl-dialog.component.html b/src/app/services/connect-token/acl-dialog/acl-dialog.component.html index cff4a0b8..6bc6e790 100644 --- a/src/app/services/connect-token/acl-dialog/acl-dialog.component.html +++ b/src/app/services/connect-token/acl-dialog/acl-dialog.component.html @@ -23,7 +23,7 @@

{{ 'Login reminder' | translate }}

-
{{ 'ACL action "Face Online" not supported for this asset.' |translate }}
+
{{errorDetail }}
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 6e3c76f9..d72a7e4a 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 @@ -49,6 +49,9 @@ export class ElementACLDialogComponent implements OnInit { if (Array.isArray(error)) { error = error.join(' '); } else if (typeof error === 'object') { + if (error.detail) { + error = error.detail; + } error = JSON.stringify(error); } return error;