This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new 1cb293ac0 [bugfix] fixed issue of monitor-select-menu-modal (#2177)
1cb293ac0 is described below
commit 1cb293ac03db97664adaa91d00bbde510bd8bc73
Author: Kerwin Bryant <[email protected]>
AuthorDate: Thu Jul 4 07:47:19 2024 +0800
[bugfix] fixed issue of monitor-select-menu-modal (#2177)
---
.../routes/monitor/monitor-list/monitor-list.component.html | 3 ++-
.../routes/monitor/monitor-list/monitor-list.component.less | 11 +++++++----
.../app/routes/monitor/monitor-list/monitor-list.component.ts | 6 +++---
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git
a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
index 64a58490b..772a39ba1 100755
--- a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
+++ b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
@@ -303,13 +303,14 @@
(nzOnCancel)="onAppSwitchModalCancel()"
nzClosable="false"
nzWidth="30%"
+ nzWrapClassName="monitor-select-menu-modal"
[nzOkText]="null"
[nzCancelText]="null"
[nzOkLoading]="appSearchLoading"
>
<div *nzModalContent class="-inner-content">
<app-monitor-select-menu
- listStyle="border-right: 0px; overflow-y: hidden"
+ listStyle="border-right: 0px"
[searchPlaceholder]="'monitors.center.search.placeholder' | i18n"
[loading]="appSearchLoading"
[data]="appSearchOrigin"
diff --git
a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.less
b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.less
index 59c9fbcdc..667151641 100644
--- a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.less
+++ b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.less
@@ -1,5 +1,8 @@
-@import "~src/styles/theme";
-
-.switch-app:hover {
- background-color: @primary-color;
+::ng-deep {
+ .monitor-select-menu-modal {
+ .ant-spin-container {
+ max-height: 80vh;
+ overflow: hidden;
+ }
+ }
}
diff --git
a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts
b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts
index ab6e0999e..2b1ec35f7 100644
--- a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts
+++ b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts
@@ -507,9 +507,9 @@ export class MonitorListComponent implements OnInit,
OnDestroy {
let appMenus: Record<string, any> = {};
message.data.forEach((app: any) => {
let menus = appMenus[app.category];
- app.categoryLabel =
this.i18nSvc.fanyi(`monitor.category.${app.category}`);
- if (app.categoryLabel == `monitor.category.${app.category}`) {
- app.categoryLabel =
this.i18nSvc.fanyi('monitor.category.custom');
+ app.categoryLabel =
this.i18nSvc.fanyi(`menu.monitor.${app.category}`);
+ if (app.categoryLabel == `menu.monitor.${app.category}`) {
+ app.categoryLabel = app.category.toUpperCase();
}
if (menus == undefined) {
menus = { label: app.categoryLabel, child: [app] };
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
