mirror of
https://github.com/ant-design/ant-design.git
synced 2025-01-18 06:03:38 +08:00
Merge branch 'master' of github.com:ant-design/ant-design
This commit is contained in:
commit
41266f6374
@ -24,7 +24,7 @@ const Complete = React.createClass({
|
||||
},
|
||||
handleChange(value) {
|
||||
this.setState({
|
||||
dataSource: [
|
||||
dataSource: !value ? [] : [
|
||||
value,
|
||||
value + value,
|
||||
value + value + value,
|
||||
|
@ -37,7 +37,10 @@ export type WrappedFormUtils = {
|
||||
/** 设置一组输入控件的值*/
|
||||
setFields(obj: Object): void;
|
||||
/** 校验并获取一组输入域的值与 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` 相似,但校验完后,如果校验不通过的菜单域不在可见范围内,则自动滚动进可见范围 */
|
||||
validateFieldsAndScroll(
|
||||
fieldNames?: Array<string>,
|
||||
@ -65,12 +68,12 @@ export type WrappedFormUtils = {
|
||||
/** 校验规则,参见 [async-validator](https://github.com/yiminghe/async-validator) */
|
||||
rules?: Array<any>;
|
||||
/** 是否和其他控件互斥,特别用于 Radio 单选控件 */
|
||||
exclusive: boolean;
|
||||
exclusive?: boolean;
|
||||
}): Array<any>;
|
||||
}
|
||||
|
||||
export interface FormComponentProps {
|
||||
form: WrappedFormUtils;
|
||||
form?: WrappedFormUtils;
|
||||
}
|
||||
|
||||
export class FormComponent extends React.Component<FormComponentProps, {}> {
|
||||
|
@ -27,6 +27,7 @@ export interface ColProps {
|
||||
md?: number | ColSize;
|
||||
lg?: number | ColSize;
|
||||
prefixCls?: string;
|
||||
style?: React.CSSProperties;
|
||||
}
|
||||
|
||||
const Col: React.StatelessComponent<ColProps> = (props) => {
|
||||
|
@ -97,3 +97,8 @@ pre,
|
||||
samp {
|
||||
font-family: @code-family;
|
||||
}
|
||||
|
||||
// Utility classes
|
||||
.clearfix {
|
||||
.clearfix();
|
||||
}
|
@ -87,6 +87,7 @@ export interface TableProps {
|
||||
title?: (currentPageData: Object[]) => React.ReactNode;
|
||||
scroll?: { x?: boolean | number, y?: boolean | number};
|
||||
childrenColumnName?: 'string';
|
||||
bodyStyle?: React.CSSProperties;
|
||||
}
|
||||
|
||||
export interface TableContext {
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "antd",
|
||||
"version": "2.0.0-beta.8",
|
||||
"version": "2.0.0-beta.9",
|
||||
"title": "Ant Design",
|
||||
"description": "An enterprise-class UI design language and React-based implementation",
|
||||
"homepage": "http://ant.design/",
|
||||
|
@ -63,7 +63,6 @@
|
||||
|
||||
.banner-text-wrapper .start-button {
|
||||
margin-bottom: 24px;
|
||||
overflow: auto;
|
||||
|
||||
> a {
|
||||
float: right;
|
||||
|
@ -25,7 +25,7 @@ export default class Banner extends React.Component {
|
||||
<h2 key="h2">ANT <p>DESIGN</p></h2>
|
||||
<p key="content"><FormattedMessage id="app.home.slogan" /></p>
|
||||
<span className="line" key="line" />
|
||||
<div key="button" className="start-button">
|
||||
<div key="button" className="start-button clearfix">
|
||||
<Link to="/docs/spec/introduce">
|
||||
<Icon type="smile-circle" />
|
||||
<FormattedMessage id="app.home.start" />
|
||||
|
Loading…
Reference in New Issue
Block a user