Skip to content

Commit

Permalink
Fixed issue of monitor-select-menu-modal
Browse files Browse the repository at this point in the history
  • Loading branch information
kerwin612 committed Jul 3, 2024
1 parent 4f1c62f commit 8bf722c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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] };
Expand Down

0 comments on commit 8bf722c

Please sign in to comment.