Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed issue of acions in list-page. #2181

Merged
merged 2 commits into from
Jul 4, 2024
Merged

Fixed issue of acions in list-page. #2181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b7b0d7
Fixed issue of acions in list-page.
kerwin612 Jul 3, 2024
f1f950e
Merge branch 'master' into patch-33
kerwin612 Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 33 additions & 31 deletions web-app/src/app/routes/alert/alert-center/alert-center.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,37 +174,39 @@
</nz-tag>
</td>
<td nzAlign="center">
<button
*ngIf="data.status != 3"
nz-button
nzType="primary"
(click)="onMarkReadOneAlert(data.id)"
nz-tooltip
[nzTooltipTitle]="'alert.center.deal' | i18n"
>
<i nz-icon nzType="down-circle" nzTheme="outline"></i>
</button>
<button
*ngIf="data.status == 3"
nz-button
nzType="primary"
nzDanger
(click)="onMarkUnReadOneAlert(data.id)"
nz-tooltip
[nzTooltipTitle]="'alert.center.no-deal' | i18n"
>
<i nz-icon nzType="up-circle" nzTheme="outline"></i>
</button>
<button
nz-button
nzType="primary"
nzDanger
(click)="onDeleteOneAlert(data.id)"
nz-tooltip
[nzTooltipTitle]="'alert.center.delete' | i18n"
>
<i nz-icon nzType="delete" nzTheme="outline"></i>
</button>
<div class="actions">
<button
*ngIf="data.status != 3"
nz-button
nzType="primary"
(click)="onMarkReadOneAlert(data.id)"
nz-tooltip
[nzTooltipTitle]="'alert.center.deal' | i18n"
>
<i nz-icon nzType="down-circle" nzTheme="outline"></i>
</button>
<button
*ngIf="data.status == 3"
nz-button
nzType="primary"
nzDanger
(click)="onMarkUnReadOneAlert(data.id)"
nz-tooltip
[nzTooltipTitle]="'alert.center.no-deal' | i18n"
>
<i nz-icon nzType="up-circle" nzTheme="outline"></i>
</button>
<button
nz-button
nzType="primary"
nzDanger
(click)="onDeleteOneAlert(data.id)"
nz-tooltip
[nzTooltipTitle]="'alert.center.delete' | i18n"
>
<i nz-icon nzType="delete" nzTheme="outline"></i>
</button>
</div>
</td>
</tr>
</tbody>
Expand Down
40 changes: 21 additions & 19 deletions web-app/src/app/routes/alert/alert-converge/alert-converge.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,25 +109,27 @@
</td>
<td nzAlign="center">{{ (data.gmtUpdate ? data.gmtUpdate : data.gmtCreate) | date : 'YYYY-MM-dd HH:mm:ss' }}</td>
<td nzAlign="center">
<button
nz-button
nzType="primary"
(click)="onEditAlertConverge(data.id)"
nz-tooltip
[nzTooltipTitle]="'alert.converge.edit' | i18n"
>
<i nz-icon nzType="edit" nzTheme="outline"></i>
</button>
<button
nz-button
nzDanger
nzType="primary"
(click)="onDeleteOneAlertConverge(data.id)"
nz-tooltip
[nzTooltipTitle]="'alert.converge.delete' | i18n"
>
<i nz-icon nzType="delete" nzTheme="outline"></i>
</button>
<div class="actions">
<button
nz-button
nzType="primary"
(click)="onEditAlertConverge(data.id)"
nz-tooltip
[nzTooltipTitle]="'alert.converge.edit' | i18n"
>
<i nz-icon nzType="edit" nzTheme="outline"></i>
</button>
<button
nz-button
nzDanger
nzType="primary"
(click)="onDeleteOneAlertConverge(data.id)"
nz-tooltip
[nzTooltipTitle]="'alert.converge.delete' | i18n"
>
<i nz-icon nzType="delete" nzTheme="outline"></i>
</button>
</div>
</td>
</tr>
</tbody>
Expand Down
88 changes: 46 additions & 42 deletions web-app/src/app/routes/alert/alert-notice/alert-notice.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,25 +132,27 @@
</td>
<td nzAlign="center">{{ (data.gmtUpdate ? data.gmtUpdate : data.gmtCreate) | date : 'YYYY-MM-dd HH:mm:ss' }}</td>
<td nzAlign="center">
<button
(click)="onEditOneNoticeReceiver(data)"
[nzTooltipTitle]="'alert.notice.receiver.edit' | i18n"
nz-button
nz-tooltip
nzType="primary"
>
<i nz-icon nzTheme="outline" nzType="edit"></i>
</button>
<button
(click)="onDeleteOneNoticeReceiver(data.id)"
[nzTooltipTitle]="'alert.notice.receiver.delete' | i18n"
nz-button
nz-tooltip
nzDanger
nzType="primary"
>
<i nz-icon nzTheme="outline" nzType="delete"></i>
</button>
<div class="actions">
<button
(click)="onEditOneNoticeReceiver(data)"
[nzTooltipTitle]="'alert.notice.receiver.edit' | i18n"
nz-button
nz-tooltip
nzType="primary"
>
<i nz-icon nzTheme="outline" nzType="edit"></i>
</button>
<button
(click)="onDeleteOneNoticeReceiver(data.id)"
[nzTooltipTitle]="'alert.notice.receiver.delete' | i18n"
nz-button
nz-tooltip
nzDanger
nzType="primary"
>
<i nz-icon nzTheme="outline" nzType="delete"></i>
</button>
</div>
</td>
</tr>
</tbody>
Expand Down Expand Up @@ -205,25 +207,27 @@
</td>
<td nzAlign="center">{{ (data.gmtUpdate ? data.gmtUpdate : data.gmtCreate) | date : 'YYYY-MM-dd HH:mm:ss' }}</td>
<td nzAlign="center">
<button
(click)="onEditOneNoticeRule(data)"
[nzTooltipTitle]="'alert.notice.rule.edit' | i18n"
nz-button
nz-tooltip
nzType="primary"
>
<i nz-icon nzTheme="outline" nzType="edit"></i>
</button>
<button
(click)="onDeleteOneNoticeRule(data.id)"
[nzTooltipTitle]="'alert.notice.rule.delete' | i18n"
nz-button
nz-tooltip
nzDanger
nzType="primary"
>
<i nz-icon nzTheme="outline" nzType="delete"></i>
</button>
<div class="actions">
<button
(click)="onEditOneNoticeRule(data)"
[nzTooltipTitle]="'alert.notice.rule.edit' | i18n"
nz-button
nz-tooltip
nzType="primary"
>
<i nz-icon nzTheme="outline" nzType="edit"></i>
</button>
<button
(click)="onDeleteOneNoticeRule(data.id)"
[nzTooltipTitle]="'alert.notice.rule.delete' | i18n"
nz-button
nz-tooltip
nzDanger
nzType="primary"
>
<i nz-icon nzTheme="outline" nzType="delete"></i>
</button>
</div>
</td>
</tr>
</tbody>
Expand Down Expand Up @@ -321,7 +325,7 @@
</td>
<td nzAlign="center">{{ (data.gmtUpdate ? data.gmtUpdate : data.gmtCreate) | date : 'YYYY-MM-dd HH:mm:ss' }}</td>
<td nzAlign="center">
<span *ngIf="!data.preset">
<div *ngIf="!data.preset" class="actions">
<button
(click)="onEditOneNoticeTemplate(data)"
[nzTooltipTitle]="'alert.notice.template.edit' | i18n"
Expand All @@ -341,8 +345,8 @@
>
<i nz-icon nzTheme="outline" nzType="delete"></i>
</button>
</span>
<span *ngIf="data.preset">
</div>
<div *ngIf="data.preset" class="actions">
<button
(click)="onShowOneNoticeTemplate(data)"
[nzTooltipTitle]="'alert.notice.template.show' | i18n"
Expand All @@ -352,7 +356,7 @@
>
<i nz-icon nzTheme="outline" nzType="eye"></i>
</button>
</span>
</div>
</td>
</tr>
</tbody>
Expand Down
60 changes: 31 additions & 29 deletions web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,35 +144,37 @@
<nz-switch [(ngModel)]="data.enable" (ngModelChange)="updateAlertDefine(data)" name="enable"></nz-switch>
</td>
<td nzAlign="center">
<button
nz-button
nzType="primary"
(click)="onOpenConnectModal(data.id, data.app)"
nz-tooltip
[disabled]="data.preset"
[nzTooltipTitle]="'alert.setting.connect' | i18n"
>
<i nz-icon nzType="link" nzTheme="outline"></i>
</button>
<button
nz-button
nzType="primary"
(click)="onEditOneAlertDefine(data.id)"
nz-tooltip
[nzTooltipTitle]="'alert.setting.edit' | i18n"
>
<i nz-icon nzType="edit" nzTheme="outline"></i>
</button>
<button
nz-button
nzDanger
nzType="primary"
(click)="onDeleteOneAlertDefine(data.id)"
nz-tooltip
[nzTooltipTitle]="'alert.setting.delete' | i18n"
>
<i nz-icon nzType="delete" nzTheme="outline"></i>
</button>
<div class="actions">
<button
nz-button
nzType="primary"
(click)="onOpenConnectModal(data.id, data.app)"
nz-tooltip
[disabled]="data.preset"
[nzTooltipTitle]="'alert.setting.connect' | i18n"
>
<i nz-icon nzType="link" nzTheme="outline"></i>
</button>
<button
nz-button
nzType="primary"
(click)="onEditOneAlertDefine(data.id)"
nz-tooltip
[nzTooltipTitle]="'alert.setting.edit' | i18n"
>
<i nz-icon nzType="edit" nzTheme="outline"></i>
</button>
<button
nz-button
nzDanger
nzType="primary"
(click)="onDeleteOneAlertDefine(data.id)"
nz-tooltip
[nzTooltipTitle]="'alert.setting.delete' | i18n"
>
<i nz-icon nzType="delete" nzTheme="outline"></i>
</button>
</div>
</td>
</tr>
</tbody>
Expand Down
34 changes: 21 additions & 13 deletions web-app/src/app/routes/alert/alert-silence/alert-silence.component.html
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,19 +118,27 @@
<nz-switch [(ngModel)]="data.enable" (ngModelChange)="updateAlertSilence(data)" name="enable"></nz-switch>
</td>
<td nzAlign="center">
<button nz-button nzType="primary" (click)="onEditAlertSilence(data.id)" nz-tooltip [nzTooltipTitle]="'alert.silence.edit' | i18n">
<i nz-icon nzType="edit" nzTheme="outline"></i>
</button>
<button
nz-button
nzDanger
nzType="primary"
(click)="onDeleteOneAlertSilence(data.id)"
nz-tooltip
[nzTooltipTitle]="'alert.silence.delete' | i18n"
>
<i nz-icon nzType="delete" nzTheme="outline"></i>
</button>
<div class="actions">
<button
nz-button
nzType="primary"
(click)="onEditAlertSilence(data.id)"
nz-tooltip
[nzTooltipTitle]="'alert.silence.edit' | i18n"
>
<i nz-icon nzType="edit" nzTheme="outline"></i>
</button>
<button
nz-button
nzDanger
nzType="primary"
(click)="onDeleteOneAlertSilence(data.id)"
nz-tooltip
[nzTooltipTitle]="'alert.silence.delete' | i18n"
>
<i nz-icon nzType="delete" nzTheme="outline"></i>
</button>
</div>
</td>
</tr>
</tbody>
Expand Down
11 changes: 11 additions & 0 deletions web-app/src/app/routes/monitor/monitor-form/monitor-form.component.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
:host {
::ng-deep {
.ant-collapse-content-box {
:last-child {
.ant-form-item {
margin-bottom: 0!important;
}
}
}
}
}
2 changes: 1 addition & 1 deletion web-app/src/app/routes/monitor/monitor-form/monitor-form.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { ParamDefine } from '../../../pojo/ParamDefine';
@Component({
selector: 'app-monitor-form',
templateUrl: './monitor-form.component.html',
styles: []
styleUrls: ['./monitor-form.component.less']
})
export class MonitorFormComponent {
@Input() monitor!: any;
Expand Down
Loading
Loading