Merge pull request #8377 from aluanhaddad/patch-8

Changed model from (string | Object) to (string | { [key: string]: an…
This commit is contained in:
Horiuchi_H
2016-03-16 10:50:28 +09:00

View File

@@ -16,32 +16,34 @@ declare module 'angular-formly' {
declare module AngularFormly {
interface IFieldArray extends Array<IFieldConfigurationObject | IFieldGroup> {
interface IFieldArray extends Array<IFieldConfigurationObject | IFieldGroup> {
}
}
interface IFieldGroup {
data?: {
[key: string]: any;
};
[key: string]: any;
};
className?: string;
elementAttributes?: string;
fieldGroup?: IFieldArray;
fieldGroup?: IFieldArray;
form?: Object;
hide?: boolean;
hideExpression?: string | IExpressionFunction;
key?: string | number;
model?: string | Object;
options?: IFormOptionsAPI;
templateOptions?: ITemplateOptions;
wrapper?: string | string[];
model?: string | {
[key: string]: any;
};
options?: IFormOptionsAPI;
templateOptions?: ITemplateOptions;
wrapper?: string | string[];
}
interface IFormOptionsAPI {
data?: {
[key: string]: any;
};
[key: string]: any;
};
fieldTransform?: Function;
formState?: Object;
removeChromeAutoComplete?: boolean;
@@ -182,8 +184,8 @@ declare module AngularFormly {
* see http://docs.angular-formly.com/docs/field-configuration-object#data-object
*/
data?: {
[key: string]: any;
};
[key: string]: any;
};
/**
@@ -287,7 +289,9 @@ declare module AngularFormly {
*
* see http://docs.angular-formly.com/docs/field-configuration-object#model-object--string
*/
model?: Object | string;
model?: string | {
[key: string]: any;
};
/**
@@ -543,8 +547,8 @@ declare module AngularFormly {
defaultOptions?: IFieldConfigurationObject | Function;
controller?: Function | string | any[];
data?: {
[key: string]: any;
};
[key: string]: any;
};
extends?: string;
link?: ng.IDirectiveLinkFn;
overwriteOk?: boolean;
@@ -612,7 +616,9 @@ declare module AngularFormly {
//The index of the field the form is on (in ng-repeat)
index: number;
//the model of the form (or the model specified by the field if it was specified).
model: Object | string;
model?: string | {
[key: string]: any;
};
//Shortcut to options.validation.errorExistsAndShouldBeVisible
showError: boolean;
//Shortcut to options.templateOptions