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

Add support for password type to the app-multi-func-input component. #2132

Merged
merged 4 commits into from
Jun 25, 2024
Merged

Add support for password type to the app-multi-func-input component. #2132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c67a5e7
Optimize the code and enrich the functionality of the `app-multi-func…
kerwin612 Jun 25, 2024
c2a7bfd
Merge branch 'master' into patch-15
kerwin612 Jun 25, 2024
c56a95e
Merge branch 'master' into patch-15
tomsun28 Jun 25, 2024
d1ea259
Merge branch 'master' into patch-15
tomsun28 Jun 25, 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
48 changes: 18 additions & 30 deletions web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,21 +89,15 @@
>{{ paramDefine.name }}
</nz-form-label>
<nz-form-control *ngIf="paramDefine.type === 'password'" nzSpan="8" [nzErrorTip]="'validation.required' | i18n">
<nz-input-group [nzSuffix]="suffixTemplate" style="width: 100%">
<input
[type]="passwordVisible ? 'text' : 'password'"
nz-input
placeholder="input password"
[required]="paramDefine.required"
[(ngModel)]="params[i].paramValue"
[id]="paramDefine.field"
[name]="paramDefine.field"
[placeholder]="paramDefine.placeholder ? paramDefine.placeholder : ''"
/>
</nz-input-group>
<ng-template #suffixTemplate>
<i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'" (click)="passwordVisible = !passwordVisible"></i>
</ng-template>
<app-multi-func-input
[placeholder]="paramDefine.placeholder ? paramDefine.placeholder : ''"
[(value)]="params[i].paramValue"
[required]="paramDefine.required"
[name]="paramDefine.field"
[id]="paramDefine.field"
groupStyle="width: 100%"
type="password"
/>
</nz-form-control>

<nz-form-label *ngIf="paramDefine.type === 'number'" nzSpan="7" [nzRequired]="paramDefine.required" [nzFor]="paramDefine.field"
Expand Down Expand Up @@ -238,21 +232,15 @@
>{{ paramDefine.name }}
</nz-form-label>
<nz-form-control *ngIf="paramDefine.type === 'password'" nzSpan="8" [nzErrorTip]="'validation.required' | i18n">
<nz-input-group [nzSuffix]="suffixTemplate" style="width: 100%">
<input
[type]="passwordVisible ? 'text' : 'password'"
nz-input
placeholder="input password"
[required]="paramDefine.required"
[(ngModel)]="advancedParams[i].paramValue"
[id]="paramDefine.field"
[name]="paramDefine.field"
[placeholder]="paramDefine.placeholder ? paramDefine.placeholder : ''"
/>
</nz-input-group>
<ng-template #suffixTemplate>
<i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'" (click)="passwordVisible = !passwordVisible"></i>
</ng-template>
<app-multi-func-input
[placeholder]="paramDefine.placeholder ? paramDefine.placeholder : ''"
[(value)]="advancedParams[i].paramValue"
[required]="paramDefine.required"
[name]="paramDefine.field"
[id]="paramDefine.field"
groupStyle="width: 100%"
type="password"
/>
</nz-form-control>

<nz-form-label
Expand Down
2 changes: 0 additions & 2 deletions web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ export class MonitorEditComponent implements OnInit {
collector: string = '';
profileForm: FormGroup = new FormGroup({});
detected: boolean = false;
passwordVisible: boolean = false;
isSpinning: boolean = false;
spinningTip: string = 'Loading...';

Expand All @@ -75,7 +74,6 @@ export class MonitorEditComponent implements OnInit {
.pipe(
switchMap((paramMap: ParamMap) => {
this.isSpinning = true;
this.passwordVisible = false;
let id = paramMap.get('monitorId');
this.monitor.id = Number(id);
// 查询监控信息
Expand Down
48 changes: 18 additions & 30 deletions web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,21 +98,15 @@
>{{ paramDefine.name }}
</nz-form-label>
<nz-form-control *ngIf="paramDefine.type === 'password'" nzSpan="8" [nzErrorTip]="'validation.required' | i18n">
<nz-input-group [nzSuffix]="suffixTemplate" style="width: 100%">
<input
[type]="passwordVisible ? 'text' : 'password'"
nz-input
[required]="paramDefine.required"
placeholder="input password"
[(ngModel)]="params[i].paramValue"
[id]="paramDefine.field"
[name]="paramDefine.field"
[placeholder]="paramDefine.placeholder ? paramDefine.placeholder : ''"
/>
</nz-input-group>
<ng-template #suffixTemplate>
<i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'" (click)="passwordVisible = !passwordVisible"></i>
</ng-template>
<app-multi-func-input
[placeholder]="paramDefine.placeholder ? paramDefine.placeholder : ''"
[(value)]="params[i].paramValue"
[required]="paramDefine.required"
[name]="paramDefine.field"
[id]="paramDefine.field"
groupStyle="width: 100%"
type="password"
/>
</nz-form-control>

<nz-form-label *ngIf="paramDefine.type === 'number'" nzSpan="7" [nzRequired]="paramDefine.required" [nzFor]="paramDefine.field"
Expand Down Expand Up @@ -247,21 +241,15 @@
>{{ paramDefine.name }}
</nz-form-label>
<nz-form-control *ngIf="paramDefine.type === 'password'" nzSpan="8" [nzErrorTip]="'validation.required' | i18n">
<nz-input-group [nzSuffix]="suffixTemplate" style="width: 100%">
<input
[type]="passwordVisible ? 'text' : 'password'"
nz-input
placeholder="input password"
[required]="paramDefine.required"
[(ngModel)]="advancedParams[i].paramValue"
[id]="paramDefine.field"
[name]="paramDefine.field"
[placeholder]="paramDefine.placeholder ? paramDefine.placeholder : ''"
/>
</nz-input-group>
<ng-template #suffixTemplate>
<i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'" (click)="passwordVisible = !passwordVisible"></i>
</ng-template>
<app-multi-func-input
[placeholder]="paramDefine.placeholder ? paramDefine.placeholder : ''"
[(value)]="advancedParams[i].paramValue"
[required]="paramDefine.required"
[name]="paramDefine.field"
[id]="paramDefine.field"
groupStyle="width: 100%"
type="password"
/>
</nz-form-control>

<nz-form-label
Expand Down
2 changes: 0 additions & 2 deletions web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ export class MonitorNewComponent implements OnInit {
collectors!: Collector[];
collector: string = '';
detected: boolean = false;
passwordVisible: boolean = false;
// 是否显示加载中
isSpinning: boolean = false;
spinningTip: string = 'Loading...';
Expand Down Expand Up @@ -83,7 +82,6 @@ export class MonitorNewComponent implements OnInit {
}
this.titleSvc.setTitleByI18n(`monitor.app.${this.monitor.app}`);
this.detected = false;
this.passwordVisible = false;
this.isSpinning = true;
return this.appDefineSvc.getAppParamsDefine(this.monitor.app);
})
Expand Down
13 changes: 9 additions & 4 deletions web-app/src/app/shared/components/multi-func-input/multi-func-input.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,21 @@
<nz-input-group [nzSuffix]="inputClearTpl" [style]="groupStyle">
<input
nz-input
[(ngModel)]="inputValue"
[placeholder]="placeholder"
[type]="type"
[id]="id"
[type]="passwordVisible ? 'text' : type"
[name]="name"
[style]="inputStyle"
[required]="required"
[placeholder]="placeholder"
[nzSize]="size"
[(ngModel)]="inputValue"
(ngModelChange)="onChange()"
/>
</nz-input-group>
<ng-template #inputClearTpl>
@if (allowClear && inputValue) {
<span nz-icon class="ant-input-clear-icon" nzTheme="fill" nzType="close-circle" (click)="inputValue = null; onChange()"></span>
<i nz-icon class="ant-input-clear-icon" nzTheme="fill" nzType="close-circle" (click)="inputValue = null; onChange()"></i>
} @if (type === 'password') {
<i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'" (click)="passwordVisible = !passwordVisible"></i>
}
</ng-template>
8 changes: 8 additions & 0 deletions web-app/src/app/shared/components/multi-func-input/multi-func-input.component.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
:host {
::ng-deep {
.ant-input-suffix {
display: flex;
gap: 4px;
}
}
}
4 changes: 4 additions & 0 deletions web-app/src/app/shared/components/multi-func-input/multi-func-input.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ import { NzSizeLDSType } from 'ng-zorro-antd/core/types';
export class MultiFuncInputComponent implements OnInit {
constructor() {}

@Input() id!: string;
@Input() value!: any;
@Input() name!: string;
@Input() required!: boolean;
@Input() groupStyle!: string;
@Input() inputStyle!: string;
@Input() placeholder!: string;
Expand All @@ -38,6 +41,7 @@ export class MultiFuncInputComponent implements OnInit {
@Output() readonly valueChange = new EventEmitter<string>();

inputValue: any | undefined;
passwordVisible: boolean = false;

ngOnInit(): void {
this.inputValue = this.value;
Expand Down
Loading