Browse Source

Merge pull request #18322 from abpframework/auto-merge/rel-8-0/2308

Merge branch dev with rel-8.0
pull/18324/head
maliming 3 years ago
committed by GitHub
parent
commit
25c32f5a95
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.ts

8
npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.ts

@ -1,5 +1,5 @@
import { EXTENSIONS_FORM_PROP, EXTENSIONS_FORM_PROP_DATA } from './../../tokens/extensions.token'; import { EXTENSIONS_FORM_PROP, EXTENSIONS_FORM_PROP_DATA } from './../../tokens/extensions.token';
import { ABP, CoreModule, TrackByService } from '@abp/ng.core'; import { ABP, CoreModule, ShowPasswordDirective, TrackByService } from '@abp/ng.core';
import { import {
AfterViewInit, AfterViewInit,
ChangeDetectionStrategy, ChangeDetectionStrategy,
@ -33,7 +33,6 @@ import { debounceTime, distinctUntilChanged, switchMap } from 'rxjs/operators';
import { import {
DateAdapter, DateAdapter,
DisabledDirective, DisabledDirective,
PasswordComponent,
TimeAdapter, TimeAdapter,
} from '@abp/ng.theme.shared'; } from '@abp/ng.theme.shared';
import { EXTRA_PROPERTIES_KEY } from '../../constants/extra-properties'; import { EXTRA_PROPERTIES_KEY } from '../../constants/extra-properties';
@ -60,8 +59,8 @@ import {CreateInjectorPipe} from "../../pipes/create-injector.pipe";
DisabledDirective, DisabledDirective,
NgxValidateCoreModule, NgxValidateCoreModule,
NgbTypeaheadModule, NgbTypeaheadModule,
PasswordComponent, CreateInjectorPipe,
CreateInjectorPipe ShowPasswordDirective
], ],
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
providers: [ExtensibleFormPropService], providers: [ExtensibleFormPropService],
@ -91,6 +90,7 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit {
injectorForCustomComponent?: Injector; injectorForCustomComponent?: Injector;
asterisk = ''; asterisk = '';
containerClassName = 'mb-2'; containerClassName = 'mb-2';
showPassword = false;
options$: Observable<ABP.Option<any>[]> = of([]); options$: Observable<ABP.Option<any>[]> = of([]);
validators: ValidatorFn[] = []; validators: ValidatorFn[] = [];
readonly!: boolean; readonly!: boolean;

Loading…
Cancel
Save