[web-app]bugfix:fix input blocking when input error in dark theme (ap…

…ache#157)
brave4Time · May 29, 2022 · 6b1841c · 6b1841c
1 parent 3d98cde
commit 6b1841c
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 28 deletions.
diff --git a/web-app/src/app/layout/basic/basic.component.ts b/web-app/src/app/layout/basic/basic.component.ts
@@ -73,7 +73,7 @@ import { CONSTS } from 'src/app/shared/consts';
         <router-outlet></router-outlet>
       </ng-template>
     </layout-default>
-    <global-footer style="border-top: 1px solid #e5e5e5; min-height: 120px; text-shadow: 0 1px 0 #fff;margin:0;">
+    <global-footer style="border-top: 1px solid #e5e5e5; min-height: 120px; margin:0;">
       <div style="margin-top: 30px">
         HertzBeat {{ version }}<br />
         Copyright

diff --git a/web-app/src/app/layout/passport/passport.component.html b/web-app/src/app/layout/passport/passport.component.html
@@ -10,7 +10,7 @@
     </div>
     <router-outlet></router-outlet>
     <global-footer [links]="links">
-      <div style="margin-top: 0px">
+      <div style="margin-top: 0">
         HertzBeat {{ version }}<br />
         Copyright
         <i nz-icon nzType="copyright" nzTheme="outline"></i>

diff --git a/web-app/src/app/layout/passport/passport.component.ts b/web-app/src/app/layout/passport/passport.component.ts
@@ -2,7 +2,6 @@ import { Component, Inject, OnInit } from '@angular/core';
 import { I18NService } from '@core';
 import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
 import { ALAIN_I18N_TOKEN } from '@delon/theme';
-
 import { CONSTS } from 'src/app/shared/consts';
 
 @Component({

diff --git a/web-app/src/app/routes/alert/alert-center/alert-center.component.ts b/web-app/src/app/routes/alert/alert-center/alert-center.component.ts
@@ -6,8 +6,8 @@ import { NzNotificationService } from 'ng-zorro-antd/notification';
 import { NzTableQueryParams } from 'ng-zorro-antd/table';
 
 import { Alert } from '../../../pojo/Alert';
-import { AlertService } from '../../../service/alert.service';
 import { Tag } from '../../../pojo/Tag';
+import { AlertService } from '../../../service/alert.service';
 
 @Component({
   selector: 'app-alert-center',

diff --git a/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.spec.ts b/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.spec.ts
@@ -8,9 +8,8 @@ describe('MonitorDataChartComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ MonitorDataChartComponent ]
-    })
-    .compileComponents();
+      declarations: [MonitorDataChartComponent]
+    }).compileComponents();
   });
 
   beforeEach(() => {

diff --git a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts
@@ -9,10 +9,10 @@ import { switchMap } from 'rxjs/operators';
 import { Monitor } from '../../../pojo/Monitor';
 import { Param } from '../../../pojo/Param';
 import { ParamDefine } from '../../../pojo/ParamDefine';
+import { Tag } from '../../../pojo/Tag';
 import { AppDefineService } from '../../../service/app-define.service';
 import { MonitorService } from '../../../service/monitor.service';
 import { TagService } from '../../../service/tag.service';
-import { Tag } from '../../../pojo/Tag';
 
 @Component({
   selector: 'app-monitor-add',

diff --git a/web-app/src/app/routes/setting/setting.module.ts b/web-app/src/app/routes/setting/setting.module.ts
@@ -1,21 +1,32 @@
 import { NgModule, Type } from '@angular/core';
 import { SharedModule } from '@shared';
-
-import { SettingRoutingModule } from './setting-routing.module';
-import { SettingTagsComponent } from './tags/tags.component';
-import { NzDividerModule } from 'ng-zorro-antd/divider';
 import { NzBreadCrumbModule } from 'ng-zorro-antd/breadcrumb';
 import { NzCascaderModule } from 'ng-zorro-antd/cascader';
 import { NzCollapseModule } from 'ng-zorro-antd/collapse';
+import { NzDividerModule } from 'ng-zorro-antd/divider';
 import { NzListModule } from 'ng-zorro-antd/list';
 import { NzSwitchModule } from 'ng-zorro-antd/switch';
-import { ColorPickerModule } from 'ngx-color-picker';
 import { NzTagModule } from 'ng-zorro-antd/tag';
+import { ColorPickerModule } from 'ngx-color-picker';
+
+import { SettingRoutingModule } from './setting-routing.module';
+import { SettingTagsComponent } from './tags/tags.component';
 
 const COMPONENTS: Array<Type<void>> = [SettingTagsComponent];
 
 @NgModule({
-  imports: [SharedModule, SettingRoutingModule, NzDividerModule, NzBreadCrumbModule, NzCascaderModule, NzCollapseModule, NzListModule, NzSwitchModule, ColorPickerModule, NzTagModule],
+  imports: [
+    SharedModule,
+    SettingRoutingModule,
+    NzDividerModule,
+    NzBreadCrumbModule,
+    NzCascaderModule,
+    NzCollapseModule,
+    NzListModule,
+    NzSwitchModule,
+    ColorPickerModule,
+    NzTagModule
+  ],
   declarations: COMPONENTS
 })
 export class SettingModule {}
diff --git a/web-app/src/app/routes/setting/tags/tags.component.spec.ts b/web-app/src/app/routes/setting/tags/tags.component.spec.ts
@@ -1,4 +1,5 @@
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+
 import { SettingTagsComponent } from './tags.component';
 
 describe('SettingTagsComponent', () => {
@@ -7,11 +8,11 @@ describe('SettingTagsComponent', () => {
 
   beforeEach(
     waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ SettingTagsComponent ]
+      TestBed.configureTestingModule({
+        declarations: [SettingTagsComponent]
+      }).compileComponents();
     })
-    .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(SettingTagsComponent);

diff --git a/web-app/src/app/routes/setting/tags/tags.component.ts b/web-app/src/app/routes/setting/tags/tags.component.ts
@@ -4,12 +4,12 @@ import { ALAIN_I18N_TOKEN } from '@delon/theme';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { NzNotificationService } from 'ng-zorro-antd/notification';
 import { NzTableQueryParams } from 'ng-zorro-antd/table';
+import { finalize } from 'rxjs/operators';
 
-import { Tag } from '../../../pojo/Tag';
-import { TagService } from '../../../service/tag.service';
 import { AlertDefine } from '../../../pojo/AlertDefine';
-import { finalize } from 'rxjs/operators';
 import { NoticeReceiver } from '../../../pojo/NoticeReceiver';
+import { Tag } from '../../../pojo/Tag';
+import { TagService } from '../../../service/tag.service';
 
 @Component({
   selector: 'app-setting-tags',

diff --git a/web-app/src/app/shared/components/key-value-input/key-value-input.component.spec.ts b/web-app/src/app/shared/components/key-value-input/key-value-input.component.spec.ts
@@ -8,9 +8,8 @@ describe('KeyValueInputComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ KeyValueInputComponent ]
-    })
-    .compileComponents();
+      declarations: [KeyValueInputComponent]
+    }).compileComponents();
   });
 
   beforeEach(() => {

diff --git a/web-app/src/app/shared/consts.ts b/web-app/src/app/shared/consts.ts
@@ -1,3 +1,3 @@
 export const CONSTS = {
-    VERSION: 'v1.0-beta.8'
-};
+  VERSION: 'v1.0'
+};
diff --git a/web-app/src/polyfills.ts b/web-app/src/polyfills.ts
@@ -58,8 +58,7 @@
 /***************************************************************************************************
  * Zone JS is required by default for Angular itself.
  */
-import 'zone.js';  // Included with Angular CLI.
-
+import 'zone.js'; // Included with Angular CLI.
 
 /***************************************************************************************************
  * APPLICATION IMPORTS

diff --git a/web-app/src/styles/theme.less b/web-app/src/styles/theme.less
@@ -26,6 +26,11 @@
     border-color: #ff4081;
 }
 
+// bugfix https://github.com/dromara/hertzbeat/issues/133
+.ant-form-item-has-error :not(.ant-input-disabled):not(.ant-input-borderless).ant-input, .ant-form-item-has-error :not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper, .ant-form-item-has-error :not(.ant-input-disabled):not(.ant-input-borderless).ant-input:hover, .ant-form-item-has-error :not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper:hover {
+  background: inherit;
+}
+
 .ant-radio-wrapper:hover .ant-radio,
 .ant-radio:hover .ant-radio-inner,
 .ant-radio-input:focus + .ant-radio-inner {