Browse Source

Add PropData on ExtensibleForm Template

pull/13700/head
Mahmut Gundogdu 4 years ago
parent
commit
eb0405bc76
  1. 4
      npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts
  2. 10
      npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts

4
npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts

@ -1,5 +1,5 @@
import {Component, Inject} from '@angular/core'; import {Component, Inject} from '@angular/core';
import {FORM_PROP_DATA_STREAM, FormProp, EXTENSIBLE_FORM_VIEW_PROVIDER} from "@abp/ng.theme.shared/extensions"; import {EXTENSIONS_FORM_PROP, FormProp, EXTENSIBLE_FORM_VIEW_PROVIDER} from "@abp/ng.theme.shared/extensions";
import {FormGroup} from "@angular/forms"; import {FormGroup} from "@angular/forms";
@Component({ @Component({
@ -23,7 +23,7 @@ export class PersonalSettingsHalfRowComponent {
public id: string; public id: string;
public formGroup: FormGroup public formGroup: FormGroup
constructor(@Inject(FORM_PROP_DATA_STREAM) private propData: FormProp) { constructor(@Inject(EXTENSIONS_FORM_PROP) private propData: FormProp) {
this.displayName = propData.displayName this.displayName = propData.displayName
this.name = propData.name this.name = propData.name
this.id = propData.id this.id = propData.id

10
npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts

@ -1,4 +1,4 @@
import { FORM_PROP, FORM_PROP_DATA } from './../../tokens/extensions.token'; import { EXTENSIONS_FORM_PROP_DATA, EXTENSIONS_FORM_PROP } from './../../tokens/extensions.token';
import {ABP, AbpValidators, ConfigStateService, TrackByService} from '@abp/ng.core'; import {ABP, AbpValidators, ConfigStateService, TrackByService} from '@abp/ng.core';
import { import {
AfterViewInit, AfterViewInit,
@ -31,7 +31,7 @@ import {FormProp} from '../../models/form-props';
import {PropData} from '../../models/props'; import {PropData} from '../../models/props';
import {selfFactory} from '../../utils/factory.util'; import {selfFactory} from '../../utils/factory.util';
import {addTypeaheadTextSuffix} from '../../utils/typeahead.util'; import {addTypeaheadTextSuffix} from '../../utils/typeahead.util';
@Component({ @Component({
selector: 'abp-extensible-form-prop', selector: 'abp-extensible-form-prop',
templateUrl: './extensible-form-prop.component.html', templateUrl: './extensible-form-prop.component.html',
@ -188,12 +188,12 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit {
this.injectorForCustomComponent = Injector.create({ this.injectorForCustomComponent = Injector.create({
providers: [ providers: [
{ {
provide: FORM_PROP, provide: EXTENSIONS_FORM_PROP,
useValue: currentProp useValue: currentProp
}, },
{ {
provide: FORM_PROP_DATA, provide: EXTENSIONS_FORM_PROP_DATA,
useValue: (data?.currentValue as PropData)?.record useValue: (data?.currentValue as PropData)?.record
}, },
{ provide: ControlContainer, useExisting: FormGroupDirective } { provide: ControlContainer, useExisting: FormGroupDirective }
], ],

Loading…
Cancel
Save