diff --git a/.eslintrc.js b/.eslintrc.js index 2210c7b93f..aa92f63469 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -36,7 +36,6 @@ const eslintrc = { 'consistent-return': 0, 'no-redeclare': 0, 'react/require-extension': 0, - 'react/jsx-indent': 0, 'jsx-a11y/no-static-element-interactions': 0, 'jsx-a11y/anchor-has-content': 0, 'react/no-danger': 0, diff --git a/components/form/demo/time-related-controls.md b/components/form/demo/time-related-controls.md index 8c252f4e30..23c7590ba2 100644 --- a/components/form/demo/time-related-controls.md +++ b/components/form/demo/time-related-controls.md @@ -72,7 +72,7 @@ class TimeRelatedForm extends React.Component { {...formItemLayout} label="DatePicker[showTime]" > - {getFieldDecorator('date-time-picker', config)( + {getFieldDecorator('date-time-picker', config)( )} @@ -80,7 +80,7 @@ class TimeRelatedForm extends React.Component { {...formItemLayout} label="MonthPicker" > - {getFieldDecorator('month-picker', config)( + {getFieldDecorator('month-picker', config)( )} @@ -88,7 +88,7 @@ class TimeRelatedForm extends React.Component { {...formItemLayout} label="RangePicker" > - {getFieldDecorator('range-picker', rangeConfig)( + {getFieldDecorator('range-picker', rangeConfig)( )} @@ -96,7 +96,7 @@ class TimeRelatedForm extends React.Component { {...formItemLayout} label="RangePicker[showTime]" > - {getFieldDecorator('range-time-picker', rangeConfig)( + {getFieldDecorator('range-time-picker', rangeConfig)( )} @@ -104,7 +104,7 @@ class TimeRelatedForm extends React.Component { {...formItemLayout} label="TimePicker" > - {getFieldDecorator('time-picker', config)( + {getFieldDecorator('time-picker', config)( )} diff --git a/components/layout/demo/basic.md b/components/layout/demo/basic.md index 3915f225f7..fc61462c76 100644 --- a/components/layout/demo/basic.md +++ b/components/layout/demo/basic.md @@ -18,40 +18,40 @@ import { Layout } from 'antd'; const { Header, Footer, Sider, Content } = Layout; ReactDOM.render( -
- -
Header
- Content -
Footer
-
- - -
Header
+
- Sider - Content - -
Footer
- - - -
Header
- - Content - Sider - -
Footer
-
- - - Sider -
Header
Content
Footer
-
-
-
+
+ + +
Header
+ + Sider + Content + +
Footer
+
+ + +
Header
+ + Content + Sider + +
Footer
+
+ + + Sider + +
Header
+ Content +
Footer
+
+
+
, mountNode); ```` diff --git a/components/pagination/demo/total.md b/components/pagination/demo/total.md index 3cce6e3dd4..dabc370abf 100644 --- a/components/pagination/demo/total.md +++ b/components/pagination/demo/total.md @@ -17,20 +17,20 @@ You can show the total number of data by setting `showTotal`. import { Pagination } from 'antd'; ReactDOM.render( -
- `Total ${total} items`} - pageSize={20} - defaultCurrent={1} - /> -
- `${range[0]}-${range[1]} of ${total} items`} - pageSize={20} - defaultCurrent={1} - /> -
+
+ `Total ${total} items`} + pageSize={20} + defaultCurrent={1} + /> +
+ `${range[0]}-${range[1]} of ${total} items`} + pageSize={20} + defaultCurrent={1} + /> +
, mountNode); ```` diff --git a/components/table/demo/edit-cell.md b/components/table/demo/edit-cell.md index e580f17729..2ef1cf6050 100644 --- a/components/table/demo/edit-cell.md +++ b/components/table/demo/edit-cell.md @@ -36,32 +36,34 @@ class EditableCell extends React.Component { } render() { const { value, editable } = this.state; - return (
- { - editable ? -
- - -
- : -
- {value || ' '} - -
- } -
); + return ( +
+ { + editable ? +
+ + +
+ : +
+ {value || ' '} + +
+ } +
+ ); } } @@ -142,10 +144,12 @@ class EditableTable extends React.Component { render() { const { dataSource } = this.state; const columns = this.columns; - return (
- - - ); + return ( +
+ +
+ + ); } } @@ -189,7 +193,7 @@ ReactDOM.render(, mountNode); .editable-cell-icon:hover, .editable-cell-icon-check:hover { - color:#2db7f5; + color: #108ee9; } .editable-add-btn { diff --git a/components/table/demo/edit-row.md b/components/table/demo/edit-row.md index 684d9ccf37..0662590920 100644 --- a/components/table/demo/edit-row.md +++ b/components/table/demo/edit-row.md @@ -47,21 +47,23 @@ class EditableCell extends React.Component { } render() { const { value, editable } = this.state; - return (
- { - editable ? -
- this.handleChange(e)} - /> -
- : -
- {value.toString() || ' '} -
- } -
); + return ( +
+ { + editable ? +
+ this.handleChange(e)} + /> +
+ : +
+ {value.toString() || ' '} +
+ } +
+ ); } } @@ -88,21 +90,23 @@ class EditableTable extends React.Component { dataIndex: 'operation', render: (text, record, index) => { const { editable } = this.state.data[index].name; - return (
- { - editable ? - - this.editDone(index, 'save')}>Save - this.editDone(index, 'cancel')}> - Cancel - - - : - - this.edit(index)}>Edit - - } -
); + return ( +
+ { + editable ? + + this.editDone(index, 'save')}>Save + this.editDone(index, 'cancel')}> + Cancel + + + : + + this.edit(index)}>Edit + + } +
+ ); }, }]; this.state = { diff --git a/docs/spec/font.md b/docs/spec/font.md index bb7974998f..e9db16dfff 100644 --- a/docs/spec/font.md +++ b/docs/spec/font.md @@ -88,7 +88,7 @@ font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Micros

我是链接文字 - #2db7f5 + #108ee9 12px

@@ -151,7 +151,7 @@ font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Micros

I am example text - #2db7f5 + #108ee9 12px

diff --git a/package.json b/package.json index 9db16ba752..24f9a136b6 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "rimraf": "^2.5.4", "stylelint": "^7.8.0", "stylelint-config-standard": "^16.0.0", - "typescript": "^2.1.6", + "typescript": "~2.1.6", "typescript-babel-jest": "^0.1.5", "values.js": "^1.0.3", "xhr2": "^0.1.3" diff --git a/site/theme/template/Content/Article.jsx b/site/theme/template/Content/Article.jsx index 1d305d113d..0bcf9f2f2c 100644 --- a/site/theme/template/Content/Article.jsx +++ b/site/theme/template/Content/Article.jsx @@ -69,7 +69,7 @@ export default class Article extends React.Component { {title[locale] || title} { !subtitle || locale === 'en-US' ? null : - {subtitle} + {subtitle} } } filename={filename} /> @@ -81,7 +81,7 @@ export default class Article extends React.Component { } { (!content.toc || content.toc.length <= 1 || meta.toc === false) ? null : -
{props.utils.toReactComponent(content.toc)}
+
{props.utils.toReactComponent(content.toc)}
} { this.getArticle(props.utils.toReactComponent( diff --git a/site/theme/template/Content/ComponentDoc.jsx b/site/theme/template/Content/ComponentDoc.jsx index 35cf7f6a99..4a8f62460a 100644 --- a/site/theme/template/Content/ComponentDoc.jsx +++ b/site/theme/template/Content/ComponentDoc.jsx @@ -86,8 +86,7 @@ export default class ComponentDoc extends React.Component {

{title[locale] || title} { - !subtitle ? null : - {subtitle} + !subtitle ? null : {subtitle} } } filename={filename} />

@@ -114,8 +113,7 @@ export default class ComponentDoc extends React.Component { {leftChildren} { - isSingleCol ? null : -
{rightChildren} + isSingleCol ? null : {rightChildren} } {