github/Sword
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🎉 1.0.0-RC2

Browse Source
This commit is contained in:
smallchill 2019-01-18 22:41:40 +08:00
parent d5d7509baf
commit db544b3d75
5 changed files with 62 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/Account/Center/Applications.js
View File

@ -16,17 +16,17 @@ class Center extends PureComponent {
const itemMenu = ( const itemMenu = (
<Menu> <Menu>
<Menu.Item> <Menu.Item>
<a target="_blank" rel="noopener noreferrer" href="http://www.alipay.com/"> <a target="_blank" rel="noopener noreferrer" href="https://www.alipay.com/">
1st menu item 1st menu item
</a> </a>
</Menu.Item> </Menu.Item>
<Menu.Item> <Menu.Item>
<a target="_blank" rel="noopener noreferrer" href="http://www.taobao.com/"> <a target="_blank" rel="noopener noreferrer" href="https://www.taobao.com/">
2nd menu item 2nd menu item
</a> </a>
</Menu.Item> </Menu.Item>
<Menu.Item> <Menu.Item>
<a target="_blank" rel="noopener noreferrer" href="http://www.tmall.com/"> <a target="_blank" rel="noopener noreferrer" href="https://www.tmall.com/">
3d menu item 3d menu item
</a> </a>
</Menu.Item> </Menu.Item>

50
src/pages/Dashboard/Analysis.js
View File

@ -144,30 +144,32 @@ class Analysis extends Component {
selectDate={this.selectDate} selectDate={this.selectDate}
/> />
</Suspense> </Suspense>
<Row gutter={24}> <div className={styles.twoColLayout}>
<Col xl={12} lg={24} md={24} sm={24} xs={24}> <Row gutter={24}>
<Suspense fallback={null}> <Col xl={12} lg={24} md={24} sm={24} xs={24}>
<TopSearch <Suspense fallback={null}>
loading={loading} <TopSearch
visitData2={visitData2} loading={loading}
selectDate={this.selectDate} visitData2={visitData2}
searchData={searchData} selectDate={this.selectDate}
dropdownGroup={dropdownGroup} searchData={searchData}
/> dropdownGroup={dropdownGroup}
</Suspense> />
</Col> </Suspense>
<Col xl={12} lg={24} md={24} sm={24} xs={24}> </Col>
<Suspense fallback={null}> <Col xl={12} lg={24} md={24} sm={24} xs={24}>
<ProportionSales <Suspense fallback={null}>
dropdownGroup={dropdownGroup} <ProportionSales
salesType={salesType} dropdownGroup={dropdownGroup}
loading={loading} salesType={salesType}
salesPieData={salesPieData} loading={loading}
handleChangeSalesType={this.handleChangeSalesType} salesPieData={salesPieData}
/> handleChangeSalesType={this.handleChangeSalesType}
</Suspense> />
</Col> </Suspense>
</Row> </Col>
</Row>
</div>
<Suspense fallback={null}> <Suspense fallback={null}>
<OfflineData <OfflineData
activeKey={activeKey} activeKey={activeKey}

19
src/pages/Dashboard/Analysis.less
View File

@ -134,6 +134,25 @@
} }
} }
.twoColLayout {
.salesCard {
height: calc(100% - 24px);
}
div[class^='ant-col']:last-child {
right: 0\9;
height: 100%\9;
position: absolute\9;
}
:global {
.ant-row {
display: flex;
display: block\9;
flex-flow: row wrap;
position: relative\9;
}
}
}
.trendText { .trendText {
margin-left: 8px; margin-left: 8px;
color: @heading-color; color: @heading-color;

31
src/pages/Dashboard/ProportionSales.js
View File

@ -38,24 +38,19 @@ const ProportionSales = memo(
} }
style={{ marginTop: 24 }} style={{ marginTop: 24 }}
> >
<div <h4 style={{ marginTop: 10, marginBottom: 32 }}>
style={{ <FormattedMessage id="app.analysis.sales" defaultMessage="Sales" />
minHeight: 380, </h4>
}} <Pie
> hasLegend
<h4 style={{ marginTop: 8, marginBottom: 32 }}> subTitle={<FormattedMessage id="app.analysis.sales" defaultMessage="Sales" />}
<FormattedMessage id="app.analysis.sales" defaultMessage="Sales" /> total={() => <Yuan>{salesPieData.reduce((pre, now) => now.y + pre, 0)}</Yuan>}
</h4> data={salesPieData}
<Pie valueFormat={value => <Yuan>{value}</Yuan>}
hasLegend height={270}
subTitle={<FormattedMessage id="app.analysis.sales" defaultMessage="Sales" />} lineWidth={4}
total={() => <Yuan>{salesPieData.reduce((pre, now) => now.y + pre, 0)}</Yuan>} style={{ padding: '8px 0' }}
data={salesPieData} />
valueFormat={value => <Yuan>{value}</Yuan>}
height={248}
lineWidth={4}
/>
</div>
</Card> </Card>
) )
); );

2
src/pages/Dashboard/Workplace.js
View File

@ -177,7 +177,7 @@ class Workplace extends PureComponent {
<span> <span>
<a className={styles.username}>SpringBlade 企业版系列 </a> <a className={styles.username}>SpringBlade 企业版系列 </a>
<span className={styles.event}> <span className={styles.event}>
已通过长时间生产环境的考验，现将其拆分出基础模块进行开源，当前版本为：2.0.0-RC1。 已通过长时间生产环境的考验，现将其拆分出基础模块进行开源，当前版本为：2.0.0-RC2。
</span> </span>
</span> </span>
} }