Merge branch 'master' into test-issue

apache · Jan 23, 2025 · 5cde443 · 5cde443
2 parents c34c385 + 783bd8d
commit 5cde443
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 30 deletions.
diff --git a/web-app/src/app/routes/alert/alert-group/alert-group-converge.component.html b/web-app/src/app/routes/alert/alert-group/alert-group-converge.component.html
@@ -82,8 +82,8 @@
       <th nzAlign="center" nzWidth="10%">{{ 'alert.group-converge.group-wait' | i18n }}</th>
       <th nzAlign="center" nzWidth="10%">{{ 'alert.group-converge.group-interval' | i18n }}</th>
       <th nzAlign="center" nzWidth="10%">{{ 'alert.group-converge.repeat-interval' | i18n }}</th>
-      <th nzAlign="center" nzWidth="8%">{{ 'alert.group-converge.enable' | i18n }}</th>
-      <th nzAlign="center" nzWidth="12%">{{ 'common.edit' | i18n }}</th>
+      <th nzAlign="center" nzWidth="8%" nzRight>{{ 'alert.group-converge.enable' | i18n }}</th>
+      <th nzAlign="center" nzWidth="12%" nzRight>{{ 'common.edit' | i18n }}</th>
     </tr>
   </thead>
   <tbody>
@@ -98,10 +98,10 @@
       <td nzAlign="center"> {{ data.groupWait }}{{ 'alert.group-converge.seconds' | i18n }} </td>
       <td nzAlign="center"> {{ data.groupInterval }}{{ 'alert.group-converge.seconds' | i18n }} </td>
       <td nzAlign="center"> {{ data.repeatInterval }}{{ 'alert.group-converge.seconds' | i18n }} </td>
-      <td nzAlign="center">
+      <td nzAlign="center" nzRight>
         <nz-switch [(ngModel)]="data.enable" (ngModelChange)="updateGroupConverge(data)" name="enable"></nz-switch>
       </td>
-      <td nzAlign="center">
+      <td nzAlign="center" nzRight>
         <div class="actions">
           <button
             nz-button

diff --git a/web-app/src/app/routes/alert/alert-inhibit/alert-inhibit.component.html b/web-app/src/app/routes/alert/alert-inhibit/alert-inhibit.component.html
@@ -81,8 +81,8 @@
       <th nzAlign="center" nzWidth="20%">{{ 'alert.inhibit.source_labels' | i18n }}</th>
       <th nzAlign="center" nzWidth="20%">{{ 'alert.inhibit.target_labels' | i18n }}</th>
       <th nzAlign="center" nzWidth="15%">{{ 'alert.inhibit.equal_labels' | i18n }}</th>
-      <th nzAlign="center" nzWidth="8%">{{ 'common.enable' | i18n }}</th>
-      <th nzAlign="center" nzWidth="12%">{{ 'common.edit' | i18n }}</th>
+      <th nzAlign="center" nzWidth="8%" nzRight>{{ 'common.enable' | i18n }}</th>
+      <th nzAlign="center" nzWidth="12%" nzRight>{{ 'common.edit' | i18n }}</th>
     </tr>
   </thead>
   <tbody>
@@ -98,10 +98,10 @@
       <td nzAlign="center">
         <nz-tag *ngFor="let label of data.equalLabels">{{ label }}</nz-tag>
       </td>
-      <td nzAlign="center">
+      <td nzAlign="center" nzRight>
         <nz-switch [(ngModel)]="data.enable" (ngModelChange)="updateInhibit(data)" name="enable"></nz-switch>
       </td>
-      <td nzAlign="center">
+      <td nzAlign="center" nzRight>
         <div class="actions">
           <button nz-button nzType="primary" (click)="editInhibit(data.id)" nz-tooltip [nzTooltipTitle]="'alert.inhibit.edit' | i18n">
             <i nz-icon nzType="edit" nzTheme="outline"></i>

diff --git a/.../app/routes/alert/alert-notice/alert-notice-receiver/alert-notice-receiver.component.html b/.../app/routes/alert/alert-notice/alert-notice-receiver/alert-notice-receiver.component.html
@@ -36,7 +36,7 @@
       <th nzAlign="center" nzWidth="20%">{{ 'alert.notice.receiver.type' | i18n }}</th>
       <th nzAlign="center" nzWidth="20%">{{ 'alert.notice.receiver.setting' | i18n }}</th>
       <th nzAlign="center" nzWidth="20%">{{ 'common.edit-time' | i18n }}</th>
-      <th nzAlign="center" nzWidth="25%">{{ 'common.edit' | i18n }}</th>
+      <th nzAlign="center" nzWidth="15%" nzRight>{{ 'common.edit' | i18n }}</th>
     </tr>
   </thead>
   <tbody>
@@ -119,7 +119,7 @@
         <span *ngIf="data.type == 13">{{ data.gotifyToken }}</span>
       </td>
       <td nzAlign="center">{{ (data.gmtUpdate ? data.gmtUpdate : data.gmtCreate) | date : 'YYYY-MM-dd HH:mm:ss' }}</td>
-      <td nzAlign="center">
+      <td nzAlign="center" nzRight>
         <div class="actions">
           <button
             (click)="onEditOneNoticeReceiver(data)"

diff --git a/web-app/src/app/routes/alert/alert-notice/alert-notice-rule/alert-notice-rule.component.html b/web-app/src/app/routes/alert/alert-notice/alert-notice-rule/alert-notice-rule.component.html
@@ -37,8 +37,8 @@
       <th nzAlign="center" nzWidth="15%">{{ 'alert.notice.template.name' | i18n }}</th>
       <th nzAlign="center" nzWidth="10%">{{ 'alert.notice.rule.all' | i18n }}</th>
       <th nzAlign="center" nzWidth="10%">{{ 'common.enable' | i18n }}</th>
-      <th nzAlign="center" nzWidth="15%">{{ 'common.edit-time' | i18n }}</th>
-      <th nzAlign="center" nzWidth="20%">{{ 'common.edit' | i18n }}</th>
+      <th nzAlign="center" nzWidth="20%">{{ 'common.edit-time' | i18n }}</th>
+      <th nzAlign="center" nzWidth="15%" nzRight>{{ 'common.edit' | i18n }}</th>
     </tr>
   </thead>
   <tbody>
@@ -62,7 +62,7 @@
         <nz-switch [(ngModel)]="data.enable" (ngModelChange)="updateNoticeRule(data)"></nz-switch>
       </td>
       <td nzAlign="center">{{ (data.gmtUpdate ? data.gmtUpdate : data.gmtCreate) | date : 'YYYY-MM-dd HH:mm:ss' }}</td>
-      <td nzAlign="center">
+      <td nzAlign="center" nzRight>
         <div class="actions">
           <button
             (click)="onEditOneNoticeRule(data)"

diff --git a/.../app/routes/alert/alert-notice/alert-notice-template/alert-notice-template.component.html b/.../app/routes/alert/alert-notice/alert-notice-template/alert-notice-template.component.html
@@ -41,7 +41,7 @@
       <th nzAlign="center" nzWidth="15%">{{ 'alert.notice.template.type' | i18n }}</th>
       <th nzAlign="center" nzWidth="15%">{{ 'alert.notice.template.preset' | i18n }}</th>
       <th nzAlign="center" nzWidth="20%">{{ 'common.edit-time' | i18n }}</th>
-      <th nzAlign="center" nzWidth="15%">{{ 'common.edit' | i18n }}</th>
+      <th nzAlign="center" nzWidth="15%" nzRight>{{ 'common.edit' | i18n }}</th>
     </tr>
   </thead>
   <tbody>
@@ -106,7 +106,7 @@
         </span>
       </td>
       <td nzAlign="center">{{ (data.gmtUpdate ? data.gmtUpdate : data.gmtCreate) | date : 'YYYY-MM-dd HH:mm:ss' }}</td>
-      <td nzAlign="center">
+      <td nzAlign="center" nzRight>
         <div *ngIf="!data.preset" class="actions">
           <button
             (click)="onEditOneNoticeTemplate(data)"

diff --git a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
@@ -97,8 +97,8 @@
       <th nzAlign="center" nzWidth="24%">{{ 'alert.setting.expr' | i18n }}</th>
       <th nzAlign="center" nzWidth="20%">{{ 'alert.setting.template' | i18n }}</th>
       <th nzAlign="center" nzWidth="8%">{{ 'label.bind' | i18n }}</th>
-      <th nzAlign="center" nzWidth="8%">{{ 'alert.setting.enable' | i18n }}</th>
-      <th nzAlign="center" nzWidth="8%">{{ 'common.edit' | i18n }}</th>
+      <th nzAlign="center" nzWidth="8%" nzRight>{{ 'alert.setting.enable' | i18n }}</th>
+      <th nzAlign="center" nzWidth="8%" nzRight>{{ 'common.edit' | i18n }}</th>
     </tr>
   </thead>
   <tbody>
@@ -122,10 +122,10 @@
       <td nzAlign="center">
         <nz-tag *ngFor="let item of data.labels | keyvalue">{{ item.key }}:{{ item.value }}</nz-tag>
       </td>
-      <td nzAlign="center">
+      <td nzAlign="center" nzRight>
         <nz-switch [(ngModel)]="data.enable" (ngModelChange)="updateAlertDefine(data)" name="enable"></nz-switch>
       </td>
-      <td nzAlign="center">
+      <td nzAlign="center" nzRight>
         <div class="actions">
           <button
             nz-button

diff --git a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html
@@ -77,11 +77,11 @@
   <thead>
     <tr>
       <th nzAlign="center" nzLeft nzWidth="3%" [(nzChecked)]="checkedAll" (nzCheckedChange)="onAllChecked($event)"></th>
-      <th nzAlign="center" nzWidth="8%">{{ 'alert.silence.name' | i18n }}</th>
-      <th nzAlign="center" nzWidth="14%">{{ 'alert.silence.type' | i18n }}</th>
-      <th nzAlign="center" nzWidth="8%">{{ 'alert.silence.times' | i18n }}</th>
-      <th nzAlign="center" nzWidth="8%">{{ 'alert.silence.enable' | i18n }}</th>
-      <th nzAlign="center" nzWidth="15%">{{ 'common.edit' | i18n }}</th>
+      <th nzAlign="center" nzWidth="7%">{{ 'alert.silence.name' | i18n }}</th>
+      <th nzAlign="center" nzWidth="7%">{{ 'alert.silence.type' | i18n }}</th>
+      <th nzAlign="center" nzWidth="10%">{{ 'alert.silence.times' | i18n }}</th>
+      <th nzAlign="center" nzWidth="3%" nzRight>{{ 'alert.silence.enable' | i18n }}</th>
+      <th nzAlign="center" nzWidth="5%" nzRight>{{ 'common.edit' | i18n }}</th>
     </tr>
   </thead>
   <tbody>
@@ -106,10 +106,10 @@
           <span>{{ data.times == undefined ? 0 : data.times }}</span>
         </nz-tag>
       </td>
-      <td nzAlign="center">
+      <td nzAlign="center" nzRight>
         <nz-switch [(ngModel)]="data.enable" (ngModelChange)="updateAlertSilence(data)" name="enable"></nz-switch>
       </td>
-      <td nzAlign="center">
+      <td nzAlign="center" nzRight>
         <div class="actions">
           <button
             nz-button

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
@@ -158,7 +158,7 @@
       <th nzAlign="center" nzWidth="10%">{{ 'monitor.app' | i18n }}</th>
       <th nzAlign="center" nzWidth="21%">{{ 'label' | i18n }}</th>
       <th nzAlign="center" nzWidth="14%" nzColumnKey="gmtUpdate" [nzSortFn]="true">{{ 'common.edit-time' | i18n }}</th>
-      <th nzAlign="center" nzWidth="10%">{{ 'common.edit' | i18n }}</th>
+      <th nzAlign="center" nzWidth="10%" nzRight>{{ 'common.edit' | i18n }}</th>
     </tr>
   </thead>
   <tbody>
@@ -212,7 +212,7 @@
         </nz-tag>
       </td>
       <td nzAlign="center">{{ (data.gmtUpdate ? data.gmtUpdate : data.gmtCreate) | date : 'YYYY-MM-dd HH:mm:ss' }}</td>
-      <td nzAlign="center">
+      <td nzAlign="center" nzRight>
         <div class="actions">
           <button nz-button nzType="primary" [routerLink]="['/monitors/' + data.id]" nz-tooltip [nzTooltipTitle]="'monitor.detail' | i18n">
             <i nz-icon nzType="area-chart" nzTheme="outline"></i>

diff --git a/web-app/src/app/routes/setting/collector/collector.component.html b/web-app/src/app/routes/setting/collector/collector.component.html
@@ -100,7 +100,7 @@
       <th nzAlign="center" nzWidth="12%">{{ 'collector.ip' | i18n }}</th>
       <th nzAlign="center" nzWidth="12%">{{ 'collector.version' | i18n }}</th>
       <th nzAlign="center" nzWidth="12%">{{ 'collector.start-time' | i18n }}</th>
-      <th nzAlign="center" nzWidth="13%">{{ 'common.edit' | i18n }}</th>
+      <th nzAlign="center" nzWidth="13%" nzRight>{{ 'common.edit' | i18n }}</th>
     </tr>
   </thead>
   <tbody>
@@ -143,7 +143,7 @@
       <td nzAlign="center">
         {{ (data.collector.gmtUpdate | date : 'YYYY-MM-dd HH:mm:ss')?.trim() }}
       </td>
-      <td nzAlign="center">
+      <td nzAlign="center" nzRight>
         <div class="actions">
           <button
             *ngIf="data.collector.status == 1"