Commit 3c18317c authored by 陈帅's avatar 陈帅 Committed by ddcat1115

div to fragment (#883)

* div to fragment

* Remove extra divs

* fix indent
parent 6db2e484
...@@ -60,7 +60,9 @@ export default class Radar extends Component { ...@@ -60,7 +60,9 @@ export default class Radar extends Component {
const { legendData } = this.state; const { legendData } = this.state;
legendData[i] = newItem; legendData[i] = newItem;
const filteredLegendData = legendData.filter(l => l.checked).map(l => l.name); const filteredLegendData = legendData
.filter(l => l.checked)
.map(l => l.name);
if (this.chart) { if (this.chart) {
this.chart.filter('name', val => filteredLegendData.indexOf(val) > -1); this.chart.filter('name', val => filteredLegendData.indexOf(val) > -1);
...@@ -109,71 +111,76 @@ export default class Radar extends Component { ...@@ -109,71 +111,76 @@ export default class Radar extends Component {
return ( return (
<div className={styles.radar} style={{ height }}> <div className={styles.radar} style={{ height }}>
<div> {title && <h4>{title}</h4>}
{title && <h4>{title}</h4>} <Chart
<Chart scale={scale}
scale={scale} height={chartHeight}
height={chartHeight} forceFit={forceFit}
forceFit={forceFit} data={data}
data={data} padding={padding}
padding={padding} animate={animate}
animate={animate} onGetG2Instance={this.getG2Instance}
onGetG2Instance={this.getG2Instance} >
> <Tooltip />
<Tooltip /> <Coord type="polar" />
<Coord type="polar" /> <Axis
<Axis name="label"
name="label" line={null}
line={null} tickLine={null}
tickLine={null} grid={{
grid={{ lineStyle: {
lineStyle: { lineDash: null,
lineDash: null, },
}, hideFirstLine: false,
hideFirstLine: false, }}
}} />
/> <Axis
<Axis name="value"
name="value" grid={{
grid={{ type: 'polygon',
type: 'polygon', lineStyle: {
lineStyle: { lineDash: null,
lineDash: null, },
}, }}
}} />
/> <Geom
<Geom type="line" position="label*value" color={['name', colors]} size={1} /> type="line"
<Geom position="label*value"
type="point" color={['name', colors]}
position="label*value" size={1}
color={['name', colors]} />
shape="circle" <Geom
size={3} type="point"
/> position="label*value"
</Chart> color={['name', colors]}
{hasLegend && ( shape="circle"
<Row className={styles.legend}> size={3}
{legendData.map((item, i) => ( />
<Col </Chart>
span={24 / legendData.length} {hasLegend && (
key={item.name} <Row className={styles.legend}>
onClick={() => this.handleLegendClick(item, i)} {legendData.map((item, i) => (
> <Col
<div className={styles.legendItem}> span={24 / legendData.length}
<p> key={item.name}
<span onClick={() => this.handleLegendClick(item, i)}
className={styles.dot} >
style={{ backgroundColor: !item.checked ? '#aaa' : item.color }} <div className={styles.legendItem}>
/> <p>
<span>{item.name}</span> <span
</p> className={styles.dot}
<h6>{item.value}</h6> style={{
</div> backgroundColor: !item.checked ? '#aaa' : item.color,
</Col> }}
))} />
</Row> <span>{item.name}</span>
)} </p>
</div> <h6>{item.value}</h6>
</div>
</Col>
))}
</Row>
)}
</div> </div>
); );
} }
......
import React, { PureComponent } from 'react'; import React, { PureComponent, Fragment } from 'react';
import { Table, Alert } from 'antd'; import { Table, Alert } from 'antd';
import styles from './index.less'; import styles from './index.less';
...@@ -84,7 +84,7 @@ class StandardTable extends PureComponent { ...@@ -84,7 +84,7 @@ class StandardTable extends PureComponent {
<div className={styles.tableAlert}> <div className={styles.tableAlert}>
<Alert <Alert
message={( message={(
<div> <Fragment>
已选择 <a style={{ fontWeight: 600 }}>{selectedRowKeys.length}</a> 项&nbsp;&nbsp; 已选择 <a style={{ fontWeight: 600 }}>{selectedRowKeys.length}</a> 项&nbsp;&nbsp;
{ {
needTotalList.map(item => ( needTotalList.map(item => (
...@@ -97,7 +97,7 @@ class StandardTable extends PureComponent { ...@@ -97,7 +97,7 @@ class StandardTable extends PureComponent {
) )
} }
<a onClick={this.cleanSelectedKeys} style={{ marginLeft: 24 }}>清空</a> <a onClick={this.cleanSelectedKeys} style={{ marginLeft: 24 }}>清空</a>
</div> </Fragment>
)} )}
type="info" type="info"
showIcon showIcon
......
import React from 'react'; import React, { Fragment } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Layout, Icon, message } from 'antd'; import { Layout, Icon, message } from 'antd';
import DocumentTitle from 'react-document-title'; import DocumentTitle from 'react-document-title';
...@@ -222,9 +222,9 @@ class BasicLayout extends React.PureComponent { ...@@ -222,9 +222,9 @@ class BasicLayout extends React.PureComponent {
blankTarget: true, blankTarget: true,
}]} }]}
copyright={ copyright={
<div> <Fragment>
Copyright <Icon type="copyright" /> 2018 蚂蚁金服体验技术部出品 Copyright <Icon type="copyright" /> 2018 蚂蚁金服体验技术部出品
</div> </Fragment>
} }
/> />
</Footer> </Footer>
......
import React from 'react'; import React, { Fragment } from 'react';
import { Link, Redirect, Switch, Route } from 'dva/router'; import { Link, Redirect, Switch, Route } from 'dva/router';
import DocumentTitle from 'react-document-title'; import DocumentTitle from 'react-document-title';
import { Icon } from 'antd'; import { Icon } from 'antd';
...@@ -21,7 +21,7 @@ const links = [{ ...@@ -21,7 +21,7 @@ const links = [{
href: '', href: '',
}]; }];
const copyright = <div>Copyright <Icon type="copyright" /> 2018 蚂蚁金服体验技术部出品</div>; const copyright = <Fragment>Copyright <Icon type="copyright" /> 2018 蚂蚁金服体验技术部出品</Fragment>;
class UserLayout extends React.PureComponent { class UserLayout extends React.PureComponent {
getPageTitle() { getPageTitle() {
......
import React, { Component } from 'react'; import React, { Component, Fragment } from 'react';
import { connect } from 'dva'; import { connect } from 'dva';
import { import {
Row, Row,
...@@ -241,7 +241,7 @@ export default class Analysis extends Component { ...@@ -241,7 +241,7 @@ export default class Analysis extends Component {
}; };
return ( return (
<div> <Fragment>
<Row gutter={24}> <Row gutter={24}>
<Col {...topColResponsiveProps}> <Col {...topColResponsiveProps}>
<ChartCard <ChartCard
...@@ -482,7 +482,7 @@ export default class Analysis extends Component { ...@@ -482,7 +482,7 @@ export default class Analysis extends Component {
))} ))}
</Tabs> </Tabs>
</Card> </Card>
</div> </Fragment>
); );
} }
} }
import React, { PureComponent } from 'react'; import React, { PureComponent, Fragment } from 'react';
import { connect } from 'dva'; import { connect } from 'dva';
import { Row, Col, Card, Tooltip } from 'antd'; import { Row, Col, Card, Tooltip } from 'antd';
import numeral from 'numeral'; import numeral from 'numeral';
...@@ -35,7 +35,7 @@ export default class Monitor extends PureComponent { ...@@ -35,7 +35,7 @@ export default class Monitor extends PureComponent {
const { tags } = monitor; const { tags } = monitor;
return ( return (
<div> <Fragment>
<Row gutter={24}> <Row gutter={24}>
<Col xl={18} lg={24} md={24} sm={24} xs={24} style={{ marginBottom: 24 }}> <Col xl={18} lg={24} md={24} sm={24} xs={24} style={{ marginBottom: 24 }}>
<Card title="活动实时交易情况" bordered={false}> <Card title="活动实时交易情况" bordered={false}>
...@@ -164,7 +164,7 @@ export default class Monitor extends PureComponent { ...@@ -164,7 +164,7 @@ export default class Monitor extends PureComponent {
</Card> </Card>
</Col> </Col>
</Row> </Row>
</div> </Fragment>
); );
} }
} }
import React from 'react'; import React, { Fragment } from 'react';
import { connect } from 'dva'; import { connect } from 'dva';
import { Form, Input, Button, Select, Divider } from 'antd'; import { Form, Input, Button, Select, Divider } from 'antd';
import { routerRedux } from 'dva/router'; import { routerRedux } from 'dva/router';
...@@ -32,7 +32,7 @@ class Step1 extends React.PureComponent { ...@@ -32,7 +32,7 @@ class Step1 extends React.PureComponent {
}); });
}; };
return ( return (
<div> <Fragment>
<Form layout="horizontal" className={styles.stepForm} hideRequiredMark> <Form layout="horizontal" className={styles.stepForm} hideRequiredMark>
<Form.Item <Form.Item
{...formItemLayout} {...formItemLayout}
...@@ -112,7 +112,7 @@ class Step1 extends React.PureComponent { ...@@ -112,7 +112,7 @@ class Step1 extends React.PureComponent {
<h4>转账到银行卡</h4> <h4>转账到银行卡</h4>
<p>如果需要这里可以放一些关于产品的常见问题说明如果需要这里可以放一些关于产品的常见问题说明如果需要这里可以放一些关于产品的常见问题说明</p> <p>如果需要这里可以放一些关于产品的常见问题说明如果需要这里可以放一些关于产品的常见问题说明如果需要这里可以放一些关于产品的常见问题说明</p>
</div> </div>
</div> </Fragment>
); );
} }
} }
......
import React from 'react'; import React, { Fragment } from 'react';
import { connect } from 'dva'; import { connect } from 'dva';
import { Button, Row, Col } from 'antd'; import { Button, Row, Col } from 'antd';
import { routerRedux } from 'dva/router'; import { routerRedux } from 'dva/router';
...@@ -32,14 +32,14 @@ class Step3 extends React.PureComponent { ...@@ -32,14 +32,14 @@ class Step3 extends React.PureComponent {
</div> </div>
); );
const actions = ( const actions = (
<div> <Fragment>
<Button type="primary" onClick={onFinish}> <Button type="primary" onClick={onFinish}>
再转一笔 再转一笔
</Button> </Button>
<Button> <Button>
查看账单 查看账单
</Button> </Button>
</div> </Fragment>
); );
return ( return (
<Result <Result
......
import React, { PureComponent } from 'react'; import React, { PureComponent, Fragment } from 'react';
import { Route, Redirect, Switch } from 'dva/router'; import { Route, Redirect, Switch } from 'dva/router';
import { Card, Steps } from 'antd'; import { Card, Steps } from 'antd';
import PageHeaderLayout from '../../../layouts/PageHeaderLayout'; import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
...@@ -25,7 +25,7 @@ export default class StepForm extends PureComponent { ...@@ -25,7 +25,7 @@ export default class StepForm extends PureComponent {
return ( return (
<PageHeaderLayout title="分步表单" content="将一个冗长或用户不熟悉的表单任务分成多个步骤,指导用户完成。"> <PageHeaderLayout title="分步表单" content="将一个冗长或用户不熟悉的表单任务分成多个步骤,指导用户完成。">
<Card bordered={false}> <Card bordered={false}>
<div> <Fragment>
<Steps current={this.getCurrentStep()} className={styles.steps}> <Steps current={this.getCurrentStep()} className={styles.steps}>
<Step title="填写转账信息" /> <Step title="填写转账信息" />
<Step title="确认转账信息" /> <Step title="确认转账信息" />
...@@ -45,7 +45,7 @@ export default class StepForm extends PureComponent { ...@@ -45,7 +45,7 @@ export default class StepForm extends PureComponent {
<Redirect exact from="/form/step-form" to="/form/step-form/info" /> <Redirect exact from="/form/step-form" to="/form/step-form/info" />
<Route render={NotFound} /> <Route render={NotFound} />
</Switch> </Switch>
</div> </Fragment>
</Card> </Card>
</PageHeaderLayout> </PageHeaderLayout>
); );
......
import React, { PureComponent } from 'react'; import React, { PureComponent, Fragment } from 'react';
import { Table, Button, Input, message, Popconfirm, Divider } from 'antd'; import { Table, Button, Input, message, Popconfirm, Divider } from 'antd';
import styles from './style.less'; import styles from './style.less';
...@@ -203,7 +203,7 @@ export default class TableForm extends PureComponent { ...@@ -203,7 +203,7 @@ export default class TableForm extends PureComponent {
}]; }];
return ( return (
<div> <Fragment>
<Table <Table
loading={this.state.loading} loading={this.state.loading}
columns={columns} columns={columns}
...@@ -221,7 +221,7 @@ export default class TableForm extends PureComponent { ...@@ -221,7 +221,7 @@ export default class TableForm extends PureComponent {
> >
新增成员 新增成员
</Button> </Button>
</div> </Fragment>
); );
} }
} }
import React, { Component } from 'react'; import React, { Component, Fragment } from 'react';
import moment from 'moment'; import moment from 'moment';
import { connect } from 'dva'; import { connect } from 'dva';
import { Form, Card, Select, List, Tag, Icon, Avatar, Row, Col, Button } from 'antd'; import { Form, Card, Select, List, Tag, Icon, Avatar, Row, Col, Button } from 'antd';
...@@ -99,7 +99,7 @@ export default class SearchList extends Component { ...@@ -99,7 +99,7 @@ export default class SearchList extends Component {
) : null; ) : null;
return ( return (
<div> <Fragment>
<Card bordered={false}> <Card bordered={false}>
<Form layout="inline"> <Form layout="inline">
<StandardFormRow title="所属类目" block style={{ paddingBottom: 11 }}> <StandardFormRow title="所属类目" block style={{ paddingBottom: 11 }}>
...@@ -230,7 +230,7 @@ export default class SearchList extends Component { ...@@ -230,7 +230,7 @@ export default class SearchList extends Component {
)} )}
/> />
</Card> </Card>
</div> </Fragment>
); );
} }
} }
import React, { Component } from 'react'; import React, { Component, Fragment } from 'react';
import Debounce from 'lodash-decorators/debounce'; import Debounce from 'lodash-decorators/debounce';
import Bind from 'lodash-decorators/bind'; import Bind from 'lodash-decorators/bind';
import { connect } from 'dva'; import { connect } from 'dva';
...@@ -23,7 +23,7 @@ const menu = ( ...@@ -23,7 +23,7 @@ const menu = (
); );
const action = ( const action = (
<div> <Fragment>
<ButtonGroup> <ButtonGroup>
<Button>操作</Button> <Button>操作</Button>
<Button>操作</Button> <Button>操作</Button>
...@@ -32,7 +32,7 @@ const action = ( ...@@ -32,7 +32,7 @@ const action = (
</Dropdown> </Dropdown>
</ButtonGroup> </ButtonGroup>
<Button type="primary">主操作</Button> <Button type="primary">主操作</Button>
</div> </Fragment>
); );
const extra = ( const extra = (
...@@ -69,20 +69,20 @@ const tabList = [{ ...@@ -69,20 +69,20 @@ const tabList = [{
const desc1 = ( const desc1 = (
<div className={classNames(styles.textSecondary, styles.stepDescription)}> <div className={classNames(styles.textSecondary, styles.stepDescription)}>
<div> <Fragment>
曲丽丽 曲丽丽
<Icon type="dingding-o" style={{ marginLeft: 8 }} /> <Icon type="dingding-o" style={{ marginLeft: 8 }} />
</div> </Fragment>
<div>2016-12-12 12:32</div> <div>2016-12-12 12:32</div>
</div> </div>
); );
const desc2 = ( const desc2 = (
<div className={styles.stepDescription}> <div className={styles.stepDescription}>
<div> <Fragment>
周毛毛 周毛毛
<Icon type="dingding-o" style={{ color: '#00A0E9', marginLeft: 8 }} /> <Icon type="dingding-o" style={{ color: '#00A0E9', marginLeft: 8 }} />
</div> </Fragment>
<div><a href="">催一下</a></div> <div><a href="">催一下</a></div>
</div> </div>
); );
......
import React from 'react'; import React, { Fragment } from 'react';
import { Button, Icon, Card } from 'antd'; import { Button, Icon, Card } from 'antd';
import Result from '../../components/Result'; import Result from '../../components/Result';
import PageHeaderLayout from '../../layouts/PageHeaderLayout'; import PageHeaderLayout from '../../layouts/PageHeaderLayout';
const extra = ( const extra = (
<div> <Fragment>
<div style={{ fontSize: 16, color: 'rgba(0, 0, 0, 0.85)', fontWeight: '500', marginBottom: 16 }}> <div style={{ fontSize: 16, color: 'rgba(0, 0, 0, 0.85)', fontWeight: '500', marginBottom: 16 }}>
您提交的内容有如下错误 您提交的内容有如下错误
</div> </div>
...@@ -16,7 +16,7 @@ const extra = ( ...@@ -16,7 +16,7 @@ const extra = (
<Icon style={{ color: '#f5222d', marginRight: 8 }} type="close-circle-o" />您的账户还不具备申请资格 <Icon style={{ color: '#f5222d', marginRight: 8 }} type="close-circle-o" />您的账户还不具备申请资格
<a style={{ marginLeft: 16 }}>立即升级 <Icon type="right" /></a> <a style={{ marginLeft: 16 }}>立即升级 <Icon type="right" /></a>
</div> </div>
</div> </Fragment>
); );
const actions = <Button type="primary">返回修改</Button>; const actions = <Button type="primary">返回修改</Button>;
......
import React from 'react'; import React, { Fragment } from 'react';
import { Button, Row, Col, Icon, Steps, Card } from 'antd'; import { Button, Row, Col, Icon, Steps, Card } from 'antd';
import Result from '../../components/Result'; import Result from '../../components/Result';
import PageHeaderLayout from '../../layouts/PageHeaderLayout'; import PageHeaderLayout from '../../layouts/PageHeaderLayout';
...@@ -24,7 +24,7 @@ const desc2 = ( ...@@ -24,7 +24,7 @@ const desc2 = (
); );
const extra = ( const extra = (
<div> <Fragment>
<div style={{ fontSize: 16, color: 'rgba(0, 0, 0, 0.85)', fontWeight: '500', marginBottom: 20 }}> <div style={{ fontSize: 16, color: 'rgba(0, 0, 0, 0.85)', fontWeight: '500', marginBottom: 20 }}>
项目名称 项目名称
</div> </div>
...@@ -48,15 +48,15 @@ const extra = ( ...@@ -48,15 +48,15 @@ const extra = (
<Step title={<span style={{ fontSize: 14 }}>财务复核</span>} /> <Step title={<span style={{ fontSize: 14 }}>财务复核</span>} />
<Step title={<span style={{ fontSize: 14 }}>完成</span>} /> <Step title={<span style={{ fontSize: 14 }}>完成</span>} />
</Steps> </Steps>
</div> </Fragment>
); );
const actions = ( const actions = (
<div> <Fragment>
<Button type="primary">返回列表</Button> <Button type="primary">返回列表</Button>
<Button>查看项目</Button> <Button>查看项目</Button>
<Button> </Button> <Button> </Button>
</div> </Fragment>
); );
export default () => ( export default () => (
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment