diff --git a/.eslintrc.json b/.eslintrc.json index f676ea14d32370a28081f721d59b5a1d1333b84b..caf7efe8d62f7cb2d46f2cf32a9679c59966e5d4 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -20,7 +20,6 @@ "comma-dangle": 0, "func-names": 0, "prefer-const": 0, - "prefer-template": 0, "arrow-body-style": 0, "react/sort-comp": 0, "react/no-multi-comp": 0, diff --git a/components/affix/index.jsx b/components/affix/index.jsx index c8a1f4185547361ed06948d3ce0a58cb3f70aeda..0c8eb35f65896ee63bbb98a8a455e32e9294ed10 100644 --- a/components/affix/index.jsx +++ b/components/affix/index.jsx @@ -4,8 +4,8 @@ import rcUtil from 'rc-util'; import classNames from 'classnames'; function getScroll(w, top) { - let ret = w['page' + (top ? 'Y' : 'X') + 'Offset']; - let method = 'scroll' + (top ? 'Top' : 'Left'); + let ret = w[`page${top ? 'Y' : 'X'}Offset`]; + let method = `scroll${top ? 'Top' : 'Left'}`; if (typeof ret !== 'number') { let d = w.document; // ie6,7,8 standard mode diff --git a/components/alert/index.jsx b/components/alert/index.jsx index 91c0f8ad231f946f9309ef1d0bdc9c407884af3a..566718731e4a6f7db37a139f7c34e95bd9d01f06 100644 --- a/components/alert/index.jsx +++ b/components/alert/index.jsx @@ -21,10 +21,10 @@ export default React.createClass({ handleClose(e) { e.preventDefault(); let dom = ReactDOM.findDOMNode(this); - dom.style.height = dom.offsetHeight + 'px'; + dom.style.height = `${dom.offsetHeight}px`; // Magic code // 重复一次后才能正确设置 height - dom.style.height = dom.offsetHeight + 'px'; + dom.style.height = `${dom.offsetHeight}px`; this.setState({ closing: false @@ -67,10 +67,10 @@ export default React.createClass({ let alertCls = classNames({ [prefixCls]: true, - [prefixCls + '-' + type]: true, - [prefixCls + '-close']: !this.state.closing, - [prefixCls + '-with-description']: !!description, - [prefixCls + '-no-icon']: !showIcon, + [`${prefixCls}-${type}`]: true, + [`${prefixCls}-close`]: !this.state.closing, + [`${prefixCls}-with-description`]: !!description, + [`${prefixCls}-no-icon`]: !showIcon, }); // closeable when closeText is assigned @@ -85,9 +85,9 @@ export default React.createClass({ onEnd={this.animationEnd}>
{showIcon ? : null} - {message} - {description} - {closable ? + {message} + {description} + {closable ? {closeText || } : null}
diff --git a/components/badge/ScrollNumber.jsx b/components/badge/ScrollNumber.jsx index 070efb16d9fdafc96f86b1c3fbe507f1411f9405..9b91e788a3c9e6bf6fa60c05d3987ceb458be1f0 100644 --- a/components/badge/ScrollNumber.jsx +++ b/components/badge/ScrollNumber.jsx @@ -76,7 +76,7 @@ class AntScrollNumber extends React.Component { className: `${this.props.prefixCls}-only`, style: { transition: removeTransition && 'none', - transform: 'translate3d(0, ' + (-position * height) + 'px, 0)', + transform: `translate3d(0, ${-position * height}px, 0)`, height, }, key: i, diff --git a/components/badge/index.jsx b/components/badge/index.jsx index c21399709e431597ba64c94a9086e6e0252b4690..cd518742884f24b57bbc4c5889eb31be254aa0ee 100644 --- a/components/badge/index.jsx +++ b/components/badge/index.jsx @@ -33,7 +33,7 @@ class AntBadge extends React.Component { {children} { hidden ? null : diff --git a/components/breadcrumb/index.jsx b/components/breadcrumb/index.jsx index ab13e1e724b1d364d764a153005c79884b29c437..f9e0f8bd23de27d9bc52a28d49aa1da47e29640e 100644 --- a/components/breadcrumb/index.jsx +++ b/components/breadcrumb/index.jsx @@ -17,14 +17,14 @@ const BreadcrumbItem = React.createClass({ }, render() { const { prefixCls, separator, children } = this.props; - let link = {children}; + let link = {children}; if (typeof this.props.href === 'undefined') { - link = {children}; + link = {children}; } return ( {link} - {separator} + {separator} ); } @@ -62,7 +62,7 @@ const Breadcrumb = React.createClass({ let link; let path = route.path.replace(/^\//, ''); Object.keys(params).forEach(key => { - path = path.replace(':' + key, params[key]); + path = path.replace(`:${key}`, params[key]); }); if (path) { paths.push(path); @@ -71,7 +71,7 @@ const Breadcrumb = React.createClass({ if (i === routes.length - 1) { link = {name}; } else { - link = {name}; + link = {name}; } return {link}; }); diff --git a/components/button/button.jsx b/components/button/button.jsx index 43b33c2d799e0617feabd8f1189a65d1294de52c..b9e7ec61104c614ab5da61c6565075702a9182bf 100644 --- a/components/button/button.jsx +++ b/components/button/button.jsx @@ -46,7 +46,7 @@ export default class Button extends React.Component { [prefix + type]: type, [prefix + shape]: shape, [prefix + sizeCls]: sizeCls, - [prefix + 'loading']: ('loading' in props && props.loading !== false), + [`${prefix}loading`]: ('loading' in props && props.loading !== false), [className]: className }); diff --git a/components/calendar/index.jsx b/components/calendar/index.jsx index e1dd790b14fcd64f021eed82de24c88918104bd0..cd6266b06f93357de3da630783afa8eb444c8f16 100644 --- a/components/calendar/index.jsx +++ b/components/calendar/index.jsx @@ -8,8 +8,8 @@ import Header from './Header'; function noop() { return null; } function zerofixed(v) { - if (v < 10) return '0' + v; - return v + ''; + if (v < 10) return `0${v}`; + return `${v}`; } class Calendar extends Component { @@ -80,7 +80,7 @@ class Calendar extends Component { let cls = className || ''; if (fullscreen) { - cls += (' ' + prefixCls + '-fullscreen'); + cls += (` ${prefixCls}-fullscreen`); } return ( diff --git a/components/carousel/index.jsx b/components/carousel/index.jsx index c534745eab0a539930a10d0de8bd23ce5605063d..a994d46d9007911b839a113f10a5c54489461022 100644 --- a/components/carousel/index.jsx +++ b/components/carousel/index.jsx @@ -34,7 +34,7 @@ const AntCarousel = React.createClass({ let className = 'ant-carousel'; if (props.vertical) { - className = className + ' ant-carousel-vertical'; + className = `${className} ant-carousel-vertical`; } return ( diff --git a/components/checkbox/demo/basic.md b/components/checkbox/demo/basic.md index eea91c1169c84e00a9ab67dea56ca39fbb96dbc2..b642019a4bd9bcc731e5513a5e11fca316e90938 100644 --- a/components/checkbox/demo/basic.md +++ b/components/checkbox/demo/basic.md @@ -10,7 +10,7 @@ import { Checkbox } from 'antd'; function onChange(e) { - console.log('checked = ' + e.target.checked); + console.log(`checked = ${e.target.checked}`); } ReactDOM.render(