iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(forms): make radio button selection logic more flexible (#9646) 

Closes #9558
This commit is contained in:
Kara 2016-06-27 15:29:33 -06:00 committed by GitHub
parent 5cc7b41f39
commit ed0ade6f34
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/@angular/forms/src/directives/radio_control_value_accessor.ts
View File

@ -51,6 +51,7 @@ export class RadioControlRegistry {
private _isSameGroup(
controlPair: [NgControl, RadioControlValueAccessor], accessor: RadioControlValueAccessor) {
if (!controlPair[0].control) return false;
return controlPair[0].control.root === accessor._control.control.root &&
controlPair[1].name === accessor.name;
}

39
modules/@angular/forms/test/integration_spec.ts
View File

@ -615,6 +615,45 @@ export function main() {
});
}));
it('should support removing controls from <type=radio>',
inject(
[TestComponentBuilder, AsyncTestCompleter],
(tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
const t = `
<input type="radio" [formControl]="showRadio" value="yes">
<input type="radio" [formControl]="showRadio" value="no">
<form [formGroup]="form">
<div *ngIf="showRadio.value === 'yes'">
<input type="radio" formControlName="food" value="chicken">
<input type="radio" formControlName="food" value="fish">
</div>
</form>`;
const ctrl = new FormControl('fish');
const showRadio = new FormControl('yes');
const form = new FormGroup({'food': ctrl});
tcb.overrideTemplate(MyComp8, t)
.overrideProviders(MyComp8, providerArr)
.createAsync(MyComp8)
.then((fixture) => {
fixture.debugElement.componentInstance.form = form;
fixture.debugElement.componentInstance.showRadio = showRadio;
showRadio.valueChanges.subscribe((change) => {
(change === 'yes') ? form.addControl('food', new FormControl('fish')) :
form.removeControl('food');
});
fixture.detectChanges();
const input = fixture.debugElement.query(By.css('[value="no"]'));
dispatchEvent(input.nativeElement, 'change');
fixture.detectChanges();
expect(form.value).toEqual({});
async.done();
});
}));
describe('should support <select>', () => {
it('with basic selection',
inject(