Merge branch 'master' of github.com:ant-design/ant-design

This commit is contained in:
afc163 2016-09-19 17:43:01 +08:00
commit 41266f6374
8 changed files with 16 additions and 7 deletions

View File

@ -24,7 +24,7 @@ const Complete = React.createClass({
}, },
handleChange(value) { handleChange(value) {
this.setState({ this.setState({
dataSource: [ dataSource: !value ? [] : [
value, value,
value + value, value + value,
value + value + value, value + value + value,

View File

@ -37,7 +37,10 @@ export type WrappedFormUtils = {
/** 设置一组输入控件的值*/ /** 设置一组输入控件的值*/
setFields(obj: Object): void; setFields(obj: Object): void;
/** 校验并获取一组输入域的值与 Error */ /** 校验并获取一组输入域的值与 Error */
validateFields(fieldNames?: Array<string>, options?: Object, callback?: (erros: any, values: any) => void): any; validateFields(fieldNames: Array<string>, options: Object, callback: (erros: any, values: any) => void): any;
validateFields(fieldNames: Array<string>, callback: (erros: any, values: any) => void): any;
validateFields(options: Object, callback: (erros: any, values: any) => void): any;
validateFields(callback: (erros: any, values: any) => void): any;
/** 与 `validateFields` 相似,但校验完后,如果校验不通过的菜单域不在可见范围内,则自动滚动进可见范围 */ /** 与 `validateFields` 相似,但校验完后,如果校验不通过的菜单域不在可见范围内,则自动滚动进可见范围 */
validateFieldsAndScroll( validateFieldsAndScroll(
fieldNames?: Array<string>, fieldNames?: Array<string>,
@ -65,12 +68,12 @@ export type WrappedFormUtils = {
/** 校验规则,参见 [async-validator](https://github.com/yiminghe/async-validator) */ /** 校验规则,参见 [async-validator](https://github.com/yiminghe/async-validator) */
rules?: Array<any>; rules?: Array<any>;
/** 是否和其他控件互斥,特别用于 Radio 单选控件 */ /** 是否和其他控件互斥,特别用于 Radio 单选控件 */
exclusive: boolean; exclusive?: boolean;
}): Array<any>; }): Array<any>;
} }
export interface FormComponentProps { export interface FormComponentProps {
form: WrappedFormUtils; form?: WrappedFormUtils;
} }
export class FormComponent extends React.Component<FormComponentProps, {}> { export class FormComponent extends React.Component<FormComponentProps, {}> {

View File

@ -27,6 +27,7 @@ export interface ColProps {
md?: number | ColSize; md?: number | ColSize;
lg?: number | ColSize; lg?: number | ColSize;
prefixCls?: string; prefixCls?: string;
style?: React.CSSProperties;
} }
const Col: React.StatelessComponent<ColProps> = (props) => { const Col: React.StatelessComponent<ColProps> = (props) => {

View File

@ -97,3 +97,8 @@ pre,
samp { samp {
font-family: @code-family; font-family: @code-family;
} }
// Utility classes
.clearfix {
.clearfix();
}

View File

@ -87,6 +87,7 @@ export interface TableProps {
title?: (currentPageData: Object[]) => React.ReactNode; title?: (currentPageData: Object[]) => React.ReactNode;
scroll?: { x?: boolean | number, y?: boolean | number}; scroll?: { x?: boolean | number, y?: boolean | number};
childrenColumnName?: 'string'; childrenColumnName?: 'string';
bodyStyle?: React.CSSProperties;
} }
export interface TableContext { export interface TableContext {

View File

@ -1,6 +1,6 @@
{ {
"name": "antd", "name": "antd",
"version": "2.0.0-beta.8", "version": "2.0.0-beta.9",
"title": "Ant Design", "title": "Ant Design",
"description": "An enterprise-class UI design language and React-based implementation", "description": "An enterprise-class UI design language and React-based implementation",
"homepage": "http://ant.design/", "homepage": "http://ant.design/",

View File

@ -63,7 +63,6 @@
.banner-text-wrapper .start-button { .banner-text-wrapper .start-button {
margin-bottom: 24px; margin-bottom: 24px;
overflow: auto;
> a { > a {
float: right; float: right;

View File

@ -25,7 +25,7 @@ export default class Banner extends React.Component {
<h2 key="h2">ANT <p>DESIGN</p></h2> <h2 key="h2">ANT <p>DESIGN</p></h2>
<p key="content"><FormattedMessage id="app.home.slogan" /></p> <p key="content"><FormattedMessage id="app.home.slogan" /></p>
<span className="line" key="line" /> <span className="line" key="line" />
<div key="button" className="start-button"> <div key="button" className="start-button clearfix">
<Link to="/docs/spec/introduce"> <Link to="/docs/spec/introduce">
<Icon type="smile-circle" /> <Icon type="smile-circle" />
<FormattedMessage id="app.home.start" /> <FormattedMessage id="app.home.start" />