Commit a2368883 authored by ι™ˆεΈ…'s avatar ι™ˆεΈ…

use drawer repalce rc-drawer

parent 8b2b78e6
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
"function-parentheses-newline-inside": null, "function-parentheses-newline-inside": null,
"function-max-empty-lines": null, "function-max-empty-lines": null,
"function-whitespace-after": null, "function-whitespace-after": null,
"no-missing-end-of-source-newline": null,
"number-leading-zero": null, "number-leading-zero": null,
"number-no-trailing-zeros": null, "number-no-trailing-zeros": null,
"rule-empty-line-before": null, "rule-empty-line-before": null,
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
"prettier": "prettier --write ./src/**/**/**/*" "prettier": "prettier --write ./src/**/**/**/*"
}, },
"dependencies": { "dependencies": {
"@antv/data-set": "^0.8.0", "@antv/data-set": "^0.9.0",
"@babel/polyfill": "^7.0.0-beta.36", "@babel/polyfill": "^7.0.0-beta.36",
"antd": "^3.8.0", "antd": "^3.8.0",
"bizcharts": "^3.1.10", "bizcharts": "^3.1.10",
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
"path-to-regexp": "^2.1.0", "path-to-regexp": "^2.1.0",
"prop-types": "^15.5.10", "prop-types": "^15.5.10",
"qs": "^6.5.0", "qs": "^6.5.0",
"rc-drawer": "^1.2.0",
"react": "^16.4.1", "react": "^16.4.1",
"react-container-query": "^0.11.0", "react-container-query": "^0.11.0",
"react-document-title": "^2.0.3", "react-document-title": "^2.0.3",
...@@ -56,7 +55,7 @@ ...@@ -56,7 +55,7 @@
"babel-plugin-transform-decorators-legacy": "^1.3.4", "babel-plugin-transform-decorators-legacy": "^1.3.4",
"cross-env": "^5.1.1", "cross-env": "^5.1.1",
"cross-port-killer": "^1.0.1", "cross-port-killer": "^1.0.1",
"enzyme": "^3.1.0", "enzyme": "^3.4.1",
"eslint": "^5.0.0", "eslint": "^5.0.0",
"eslint-config-airbnb": "^17.0.0", "eslint-config-airbnb": "^17.0.0",
"eslint-config-prettier": "^2.9.0", "eslint-config-prettier": "^2.9.0",
...@@ -70,15 +69,15 @@ ...@@ -70,15 +69,15 @@
"husky": "^0.14.3", "husky": "^0.14.3",
"lint-staged": "^7.2.0", "lint-staged": "^7.2.0",
"mockjs": "^1.0.1-beta3", "mockjs": "^1.0.1-beta3",
"prettier": "1.14.0", "prettier": "1.14.2",
"pro-download": "^1.0.1", "pro-download": "^1.0.1",
"react-loadable": "^5.4.0", "react-loadable": "^5.5.0",
"redbox-react": "^1.5.0", "redbox-react": "^1.5.0",
"regenerator-runtime": "^0.12.0", "regenerator-runtime": "^0.12.0",
"roadhog": "^2.4.2", "roadhog": "^2.4.2",
"roadhog-api-doc": "^1.1.2", "roadhog-api-doc": "^1.1.2",
"stylelint": "^9.2.1", "stylelint": "^9.2.1",
"stylelint-config-prettier": "^3.0.4", "stylelint-config-prettier": "^4.0.0",
"stylelint-config-standard": "^18.0.0" "stylelint-config-standard": "^18.0.0"
}, },
"optionalDependencies": { "optionalDependencies": {
......
import 'rc-drawer/assets/index.css';
import React from 'react'; import React from 'react';
import DrawerMenu from 'rc-drawer'; import { Drawer } from 'antd';
import SiderMenu from './SiderMenu'; import SiderMenu from './SiderMenu';
const SiderMenuWrapper = props => { const SiderMenuWrapper = props => {
const { isMobile, collapsed } = props; const { isMobile, collapsed } = props;
return isMobile ? ( return isMobile ? (
<DrawerMenu <Drawer
getContainer={null} visible={!collapsed}
level={null} placement="left"
handleChild={<i className="drawer-handle-icon" />} style={{
onHandleClick={() => { padding: 0,
props.onCollapse(!collapsed);
}} }}
open={!collapsed} onClose={() => {
onMaskClick={() => {
props.onCollapse(true); props.onCollapse(true);
}} }}
> >
<SiderMenu {...props} collapsed={isMobile ? false : collapsed} /> <SiderMenu {...props} collapsed={isMobile ? false : collapsed} />
</DrawerMenu> </Drawer>
) : ( ) : (
<SiderMenu {...props} /> <SiderMenu {...props} />
); );
......
...@@ -295,7 +295,7 @@ export default class TableList extends PureComponent { ...@@ -295,7 +295,7 @@ export default class TableList extends PureComponent {
</Col> </Col>
</Row> </Row>
<div style={{ overflow: 'hidden' }}> <div style={{ overflow: 'hidden' }}>
<span style={{ float: 'right', marginBottom: 24 }}> <div style={{ float: 'right', marginBottom: 24 }}>
<Button type="primary" htmlType="submit"> <Button type="primary" htmlType="submit">
ζŸ₯θ―’ ζŸ₯θ―’
</Button> </Button>
...@@ -305,7 +305,7 @@ export default class TableList extends PureComponent { ...@@ -305,7 +305,7 @@ export default class TableList extends PureComponent {
<a style={{ marginLeft: 8 }} onClick={this.toggleForm}> <a style={{ marginLeft: 8 }} onClick={this.toggleForm}>
ζ”Άθ΅· <Icon type="up" /> ζ”Άθ΅· <Icon type="up" />
</a> </a>
</span> </div>
</div> </div>
</Form> </Form>
); );
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
} }
} }
.submitButtons { .submitButtons {
display: block;
white-space: nowrap; white-space: nowrap;
margin-bottom: 24px; margin-bottom: 24px;
} }
......
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