{
- title &&
);
- const salesExtra = (
diff --git a/src/routes/User/Login.js b/src/routes/User/Login.js
index 4db2e4a7..38665130 100644
--- a/src/routes/User/Login.js
+++ b/src/routes/User/Login.js
@@ -5,7 +5,7 @@ import { Form, Input, Tabs, Button, Icon, Checkbox, Row, Col, Alert } from 'antd
import styles from './Login.less';
const FormItem = Form.Item;
-const TabPane = Tabs.TabPane;
+const { TabPane } = Tabs;
@connect(state => ({
login: state.login,
diff --git a/src/routes/User/Register.js b/src/routes/User/Register.js
index 4bc444fc..58d60f1b 100644
--- a/src/routes/User/Register.js
+++ b/src/routes/User/Register.js
@@ -5,7 +5,7 @@ import { Form, Input, Button, Select, Row, Col, Popover, Progress } from 'antd';
import styles from './Register.less';
const FormItem = Form.Item;
-const Option = Select.Option;
+const { Option } = Select;
const InputGroup = Input.Group;
const passwordStatusMap = {
@@ -55,7 +55,7 @@ export default class Register extends Component {
}
getPasswordStatus = () => {
- const form = this.props.form;
+ const { form } = this.props;
const value = form.getFieldValue('password');
if (value && value.length > 9) {
return 'ok';
@@ -81,12 +81,12 @@ export default class Register extends Component {
}
handleConfirmBlur = (e) => {
- const value = e.target.value;
+ const { value } = e.target;
this.setState({ confirmDirty: this.state.confirmDirty || !!value });
}
checkConfirm = (rule, value, callback) => {
- const form = this.props.form;
+ const { form } = this.props;
if (value && value !== form.getFieldValue('password')) {
callback('两次输入的密码不匹配!');
} else {
@@ -113,7 +113,7 @@ export default class Register extends Component {
if (value.length < 6) {
callback('error');
} else {
- const form = this.props.form;
+ const { form } = this.props;
if (value && this.state.confirmDirty) {
form.validateFields(['confirm'], { force: true });
}
@@ -123,7 +123,7 @@ export default class Register extends Component {
}
renderPasswordProgress = () => {
- const form = this.props.form;
+ const { form } = this.props;
const value = form.getFieldValue('password');
const passwordStatus = this.getPasswordStatus();
return value && value.length ?
- {title}
-
+ title && (
+
+ {title}
+
+ )
}
{children}
diff --git a/src/components/StandardTable/index.js b/src/components/StandardTable/index.js
index 4d6be6e8..ef855758 100644
--- a/src/components/StandardTable/index.js
+++ b/src/components/StandardTable/index.js
@@ -6,16 +6,13 @@ import styles from './index.less';
class StandardTable extends PureComponent {
state = {
selectedRowKeys: [],
- selectedRows: [],
totalCallNo: 0,
- loading: false,
};
componentWillReceiveProps(nextProps) {
// clean state
if (nextProps.selectedRows.length === 0) {
this.setState({
- selectedRows: [],
selectedRowKeys: [],
totalCallNo: 0,
});
@@ -31,7 +28,7 @@ class StandardTable extends PureComponent {
this.props.onSelectRow(selectedRows);
}
- this.setState({ selectedRowKeys, selectedRows, totalCallNo });
+ this.setState({ selectedRowKeys, totalCallNo });
}
handleTableChange = (pagination, filters, sorter) => {
diff --git a/src/components/TagCloud/index.js b/src/components/TagCloud/index.js
index 72693b95..88a8d7bd 100644
--- a/src/components/TagCloud/index.js
+++ b/src/components/TagCloud/index.js
@@ -19,8 +19,7 @@ class TagCloud extends PureComponent {
}
initTagCloud = () => {
- const Util = G2.Util;
- const Shape = G2.Shape;
+ const { Util, Shape } = G2;
function getTextAttrs(cfg) {
const textAttrs = Util.mix(true, {}, {
@@ -131,4 +130,3 @@ class TagCloud extends PureComponent {
}
export default TagCloud;
-
diff --git a/src/components/TagSelect/index.js b/src/components/TagSelect/index.js
index e0969eba..74cf5ccf 100644
--- a/src/components/TagSelect/index.js
+++ b/src/components/TagSelect/index.js
@@ -4,7 +4,7 @@ import { Tag, Icon } from 'antd';
import styles from './index.less';
-const CheckableTag = Tag.CheckableTag;
+const { CheckableTag } = Tag;
const TagSelectOption = ({ children, checked, onChange, value }) => (
{
const { onChange } = this.props;
let checkedTags = [];
- let expand = this.state.expand;
+ let expanded = this.state.expand;
if (checked) {
const tags = this.getAllTags();
checkedTags = tags.list;
- expand = tags.expand;
+ expanded = tags.expand;
}
this.setState({
checkedAll: checked,
checkedTags,
- expand,
+ expand: expanded,
});
if (onChange) {
@@ -60,7 +60,7 @@ class TagSelect extends PureComponent {
}
getAllTags() {
- let expand = this.state.expand;
+ let { expand } = this.state;
const { children } = this.props;
let checkedTags = children.filter(child => child.props.displayName === 'TagSelectOption').map(child => child.props.value);
@@ -138,20 +138,24 @@ class TagSelect extends PureComponent {
}))
}
{
- expandNode &&
- { expand ? '收起' : '展开'}
);
diff --git a/src/e2e/login.e2e.js b/src/e2e/login.e2e.js
index 8d565988..5e8e10a0 100644
--- a/src/e2e/login.e2e.js
+++ b/src/e2e/login.e2e.js
@@ -11,7 +11,7 @@ describe('Login', () => {
await page.type('#userName', 'mockuser')
.type('#password', 'wrong_password')
.click('button[type="submit"]')
- .wait('.ant-alert-error') // should display error
+ .wait('.ant-alert-error') // should display error
.end();
});
@@ -19,7 +19,7 @@ describe('Login', () => {
const text = await page.type('#userName', 'admin')
.type('#password', '888888')
.click('button[type="submit"]')
- .wait('.ant-layout-sider h1') // should display error
+ .wait('.ant-layout-sider h1') // should display error
.evaluate(() => document.body.innerHTML)
.end();
expect(text).toContain('
- {
- expandNode.props.children.map(child => React.cloneElement(child, {
- key: `tag-select-${child.props.value}`,
- checked: checkedTags.indexOf(child.props.value) > -1,
- onChange: this.handleTagChange,
- }))
- }
-
+ expandNode && (
+
+ {
+ expandNode.props.children.map(child => React.cloneElement(child, {
+ key: `tag-select-${child.props.value}`,
+ checked: checkedTags.indexOf(child.props.value) > -1,
+ onChange: this.handleTagChange,
+ }))
+ }
+
+ )
}
Ant Design Pro
'); diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js index 103c73bb..7a20b762 100644 --- a/src/layouts/BasicLayout.js +++ b/src/layouts/BasicLayout.js @@ -28,9 +28,6 @@ class BasicLayout extends React.PureComponent { openKeys: this.getDefaultCollapsedSubMenus(props), }; } - state = { - mode: 'inline', - }; getChildContext() { const { routes, params } = this.props; return { routes, params }; @@ -225,10 +222,10 @@ class BasicLayout extends React.PureComponent { placeholder="站内搜索" dataSource={['搜索提示一', '搜索提示二', '搜索提示三']} onSearch={(value) => { - console.log('input', value); // eslint-disable-line + console.log('input', value); // eslint-disable-line }} onPressEnter={(value) => { - console.log('enter', value); // eslint-disable-line + console.log('enter', value); // eslint-disable-line }} />
-
- 12.3%
- 11%
- }
+ footer={
+
+ 12.3%
+ 11%
+
+ }
contentHeight={46}
>
);
}
- }
+}
diff --git a/src/routes/Forms/BasicForm.js b/src/routes/Forms/BasicForm.js
index 34c44fcc..482f976d 100644
--- a/src/routes/Forms/BasicForm.js
+++ b/src/routes/Forms/BasicForm.js
@@ -4,7 +4,7 @@ import { Form, Input, DatePicker, Select, Button, Card } from 'antd';
import PageHeaderLayout from '../../layouts/PageHeaderLayout';
const FormItem = Form.Item;
-const Option = Select.Option;
+const { Option } = Select;
const { RangePicker } = DatePicker;
@connect(state => ({
diff --git a/src/routes/Forms/StepForm/Step1.js b/src/routes/Forms/StepForm/Step1.js
index 7ae811b0..5e800307 100644
--- a/src/routes/Forms/StepForm/Step1.js
+++ b/src/routes/Forms/StepForm/Step1.js
@@ -3,7 +3,7 @@ import { Form, Input, Button, Select, Divider } from 'antd';
import { routerRedux } from 'dva/router';
import styles from './style.less';
-const Option = Select.Option;
+const { Option } = Select;
export default ({ formItemLayout, form, dispatch }) => {
const { getFieldDecorator, validateFields } = form;
diff --git a/src/routes/Forms/StepForm/index.js b/src/routes/Forms/StepForm/index.js
index 85a0a20c..bca88bb0 100644
--- a/src/routes/Forms/StepForm/index.js
+++ b/src/routes/Forms/StepForm/index.js
@@ -5,7 +5,7 @@ import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
import Step1 from './Step1';
import styles from '../style.less';
-const Step = Steps.Step;
+const { Step } = Steps;
@Form.create()
class StepForm extends PureComponent {
diff --git a/src/routes/List/BasicList.js b/src/routes/List/BasicList.js
index 5dd0369c..c6f89a3a 100644
--- a/src/routes/List/BasicList.js
+++ b/src/routes/List/BasicList.js
@@ -9,7 +9,7 @@ import styles from './BasicList.less';
const RadioButton = Radio.Button;
const RadioGroup = Radio.Group;
-const Search = Input.Search;
+const { Search } = Input;
@connect(state => ({
list: state.list,
diff --git a/src/routes/List/CardList.js b/src/routes/List/CardList.js
index 9b7cda8b..b4a3681e 100644
--- a/src/routes/List/CardList.js
+++ b/src/routes/List/CardList.js
@@ -26,7 +26,8 @@ export default class CardList extends PureComponent {
const content = (
- this.selectDate('today')}>今日
- this.selectDate('week')}>本周
- this.selectDate('month')}>本月
- this.selectDate('year')}>全年
+ const salesExtra = (
+
);
+ );
const columns = [
{
@@ -233,10 +235,12 @@ export default class Analysis extends Component {
title="线上购物转化率"
action={
+
-
+ this.selectDate('today')}>今日
+ this.selectDate('week')}>本周
+ this.selectDate('month')}>本月
+ this.selectDate('year')}>全年
+
+ 段落示意：蚂蚁金服务设计平台-design.alipay.com，用最小的工作量，无缝接入蚂蚁金服生态， - 提供跨越设计与开发的体验解决方案。
+ 提供跨越设计与开发的体验解决方案。 +
快速开始
diff --git a/src/routes/List/CoverCardList.js b/src/routes/List/CoverCardList.js
index 0fef6b31..06d3212b 100644
--- a/src/routes/List/CoverCardList.js
+++ b/src/routes/List/CoverCardList.js
@@ -12,7 +12,7 @@ import SearchInput from '../../components/SearchInput';
import styles from './CoverCardList.less';
-const Option = Select.Option;
+const { Option } = Select;
const FormItem = Form.Item;
const TagOption = TagSelect.Option;
const TagExpand = TagSelect.Expand;
diff --git a/src/routes/List/FilterCardList.js b/src/routes/List/FilterCardList.js
index 0b93c1e6..e7c6489b 100644
--- a/src/routes/List/FilterCardList.js
+++ b/src/routes/List/FilterCardList.js
@@ -11,7 +11,7 @@ import SearchInput from '../../components/SearchInput';
import styles from './FilterCardList.less';
-const Option = Select.Option;
+const { Option } = Select;
const FormItem = Form.Item;
const TagOption = TagSelect.Option;
const TagExpand = TagSelect.Expand;
diff --git a/src/routes/List/SearchList.js b/src/routes/List/SearchList.js
index d0974e3a..0b051bfe 100644
--- a/src/routes/List/SearchList.js
+++ b/src/routes/List/SearchList.js
@@ -10,7 +10,7 @@ import TagSelect from '../../components/TagSelect';
import SearchInput from '../../components/SearchInput';
import styles from './SearchList.less';
-const Option = Select.Option;
+const { Option } = Select;
const FormItem = Form.Item;
const TagOption = TagSelect.Option;
const TagExpand = TagSelect.Expand;
diff --git a/src/routes/List/TableList.js b/src/routes/List/TableList.js
index 424e6e9d..042e65b6 100644
--- a/src/routes/List/TableList.js
+++ b/src/routes/List/TableList.js
@@ -7,7 +7,7 @@ import PageHeaderLayout from '../../layouts/PageHeaderLayout';
import styles from './TableList.less';
const FormItem = Form.Item;
-const Option = Select.Option;
+const { Option } = Select;
const getValue = obj => Object.keys(obj).map(key => obj[key]).join(',');
@connect(state => ({
@@ -203,39 +203,43 @@ export default class TableList extends PureComponent {
{
- this.state.expandForm &&
{
- selectedRows.length > 0 &&
-
-
-
-
-
+ selectedRows.length > 0 && (
+
+
+
+
+
+
+ )
}