From 61838ca6b927dee0770d8d77c347bfbdb27e8e44 Mon Sep 17 00:00:00 2001 From: feng zhi hao Date: Mon, 29 Aug 2016 21:28:39 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=A1=A5=E5=85=85index.d.ts=E4=B8=ADForm?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E7=9A=84=E5=A3=B0=E6=98=8E=20(#2853)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.d.ts | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/index.d.ts b/index.d.ts index 04b00bf51..96b025a70 100644 --- a/index.d.ts +++ b/index.d.ts @@ -560,37 +560,41 @@ export class FormComponent extends React.Component { // function create type CreateFormOptions = { /** 获取一组输入控件的值，如不传入参数，则获取全部组件的值*/ - getFieldsValue():(fieldNames?:Array) => any + getFieldsValue:(fieldNames?:Array) => any /** 获取一个输入控件的值*/ - getFieldValue():(fieldName:string) => any + getFieldValue:(fieldName:string) => any /** 设置一组输入控件的值*/ - setFieldsValue():(obj:Object) => void + setFieldsValue:(obj:Object) => void /** 设置一组输入控件的值*/ - setFields():(obj:Object) => void + setFields:(obj:Object) => void /** 校验并获取一组输入域的值与 Error*/ - validateFields():(fieldNames?:Array, options?:Object, callback?:(erros:any, values:any) => void) => any + validateFields:(fieldNames?:Array, options?:Object, callback?:(erros:any, values:any) => void) => any /** 与 `validateFields` 相似，但校验完后，如果校验不通过的菜单域不在可见范围内，则自动滚动进可见范围 */ - validateFieldsAndScroll():(fieldNames?:Array, options?:Object, callback?:(erros:any, values:any) => void) => any + validateFieldsAndScroll:(fieldNames?:Array, options?:Object, callback?:(erros:any, values:any) => void) => any /** 获取某个输入控件的 Error */ - getFieldError():(name:string) => Object + getFieldError:(name:string) => Object /** 判断一个输入控件是否在校验状态*/ - isFieldValidating():(name:string) => Object + isFieldValidating:(name:string) => Object /**重置一组输入控件的值与状态，如不传入参数，则重置所有组件*/ - resetFields():(names?:Array) => void + resetFields:(names?:Array) => void - getFieldsValue():(id:string, options:{ + getFieldProps:(id:string, options:{ /** 子节点的值的属性，如 Checkbox 的是 'checked'*/ valuePropName?:string, /** 子节点的初始值，类型、可选值均由子节点决定*/ initialValue?:any, /** 收集子节点的值的时机*/ trigger?:string, + /** 可以把 onChange 的参数转化为控件的值，例如 DatePicker 可设为：(date, dateString) => dateString */ + getValueFromEvent: (...args:any[]) => any, /** 校验子节点值的时机*/ validateTrigger?:string, /** 校验规则，参见 [async-validator](https://github.com/yiminghe/async-validator) */ rules?:Array, /** 必填输入控件唯一标志*/ - id?:string + id?:string, + /** 是否和其他控件互斥，特别用于 Radio 单选控件 */ + exclusive: boolean }) => Array } @@ -603,7 +607,7 @@ interface FormProps { horizontal?:boolean, /** 行内排列布局*/ inline?:boolean, - /** 经 `Form.create()` 包装过的组件会自带 `this.props.form` 属性，直接传给 Form 即可*/ + /** 经 `Form.create()` 包装过的组件会自带 `this.props.form` 属性，直接传给 Form 即可。1.7.0 之后无需设置*/ form?:Object, /** 数据验证成功后回调事件*/ onSubmit?:React.FormEventHandler, From bffdf731cd06cc749f2dc2548a5bee601c5cbffe Mon Sep 17 00:00:00 2001 From: ddcat1115 Date: Tue, 30 Aug 2016 17:01:51 +0800 Subject: [PATCH 2/7] fix #2812 (#2875) --- components/table/Table.jsx | 24 ++++-------------------- components/table/style/index.less | 15 +++++++++++++-- package.json | 2 +- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/components/table/Table.jsx b/components/table/Table.jsx index c3c419c00..4649f1eb9 100644 --- a/components/table/Table.jsx +++ b/components/table/Table.jsx @@ -756,8 +756,8 @@ export default class Table extends React.Component { } render() { - const { style, className, rowKey, ...restProps } = this.props; - let data = this.getCurrentPageData(); + const { style, className, ...restProps } = this.props; + const data = this.getCurrentPageData(); let columns = this.renderRowSelection(); const expandIconAsCell = this.props.expandedRowRender && this.props.expandIconAsCell !== false; const locale = this.getLocale(); @@ -765,6 +765,7 @@ export default class Table extends React.Component { const classString = classNames({ [`ant-table-${this.props.size}`]: true, 'ant-table-bordered': this.props.bordered, + 'ant-table-empty': !data.length, }); columns = this.renderColumnsDropdown(columns); @@ -774,23 +775,6 @@ export default class Table extends React.Component { return newColumn; }); - // Empty Data - let emptyRowKey; - if (!data || data.length === 0) { - columns.forEach((column, index) => { - column.render = () => ({ - children: !index ?
{locale.emptyText}
: null, - props: { - colSpan: !index ? columns.length : 0, - }, - }); - }); - emptyRowKey = 'key'; - data = [{ - [emptyRowKey]: 'empty', - }]; - } - let table = ( locale.emptyText} /> ); // if there is no pagination or no data, diff --git a/components/table/style/index.less b/components/table/style/index.less index 7085d39d9..65676ce31 100644 --- a/components/table/style/index.less +++ b/components/table/style/index.less @@ -68,6 +68,7 @@ padding: 16px 8px; background: @table-head-background-color; position: relative; + z-index: 2; top: -1px; border-radius: 0 0 @border-radius-base @border-radius-base; } @@ -245,12 +246,19 @@ .@{table-prefix-cls}-fixed-right { border-left: 1px solid @border-color-split; } + .@{table-prefix-cls}-placeholder { + border-bottom: 0; + } } .@{table-prefix-cls}-thead > tr > th { border-bottom: 1px solid @border-color-split; } + &.@{table-prefix-cls}-empty .@{table-prefix-cls}-thead > tr > th { + border-bottom: 0; + } + .@{table-prefix-cls}-tbody tr:last-child { > th, > td { @@ -268,9 +276,12 @@ } &-placeholder { - height: 65px; - line-height: 65px; + padding: 16px 8px; + background: #fff; + border-bottom: 1px solid @border-color-split;; text-align: center; + position: relative; + z-index: 2; font-size: 12px; color: #999; .anticon { diff --git a/package.json b/package.json index 518c5ed4e..d78aea7a1 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "rc-slider": "~4.0.0", "rc-steps": "~2.1.5", "rc-switch": "~1.4.2", - "rc-table": "~4.4.0", + "rc-table": "~4.6.0", "rc-tabs": "~5.9.2", "rc-time-picker": "~1.1.6", "rc-tooltip": "~3.4.2", From 399b3d589ae91d280d25ee3f062dc1f5952f050a Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Aug 2016 19:33:34 +0800 Subject: [PATCH 3/7] fix Form.create types, close #2885 --- index.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.d.ts b/index.d.ts index 96b025a70..3e6111f56 100644 --- a/index.d.ts +++ b/index.d.ts @@ -91,7 +91,7 @@ type ButtonSize = 'small' | 'large' // Button interface ButtonProps { /** 设置按钮类型，可选值为 `primary` `ghost` 或者不设 */ - type?:ButtonType, + type?:ButtonType, /** 设置 `button` 原生的 `type` 值，可选值请参考 HTML标准*/ htmlType?:string, @@ -552,7 +552,7 @@ export class FormItem extends React.Component { } interface FormComponentProps { - form:CreateFormOptions + form?:CreateFormOptions } export class FormComponent extends React.Component { } From 6ba30bc485b7570ee1140c3818f836ab04100d41 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Aug 2016 21:30:55 +0800 Subject: [PATCH 4/7] Fix calendar card style --- components/calendar/Header.jsx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/components/calendar/Header.jsx b/components/calendar/Header.jsx index 289ee638a..7f434b3b7 100644 --- a/components/calendar/Header.jsx +++ b/components/calendar/Header.jsx @@ -25,6 +25,7 @@ export default class Header extends React.Component { prefixCls: PropTypes.string, selectPrefixCls: PropTypes.string, type: PropTypes.string, + fullscreen: PropTypes.boolean, } getYearSelectElement(year) { @@ -39,10 +40,8 @@ export default class Header extends React.Component { } return (