Merge branch 'master' of http://221.226.25.34:3000/liang.cheng/org-chart-frant

src/components/topBar/index.jsx

@@ -79,8 +79,8 @@ export class TopBar extends React.Component {
 
   render() {
     return (
-      <div className={style.topbarWrapper} style={{ display: 'flex' }}>
+      <div className={style.topbarWrapper}>
-        <Row style={{ flex: 1 }}>
+        <Row>
           <Col span={5}>
             数据日期：
             <DatePicker
@@ -149,7 +149,7 @@ export class TopBar extends React.Component {
             </Select>
           </Col>
 
-          <Col span={5} style={{ marginTop: 10 }}>
+          <Col span={3}>
             <Checkbox
               style={{ marginTop: '5px' }}
               onChange={(e) =>
@@ -161,8 +161,7 @@ export class TopBar extends React.Component {
               显示虚拟组织
             </Checkbox>
           </Col>
-        </Row>
+          <Col span={3}>
-        <div style={{ display: 'flex', maxWidth: '20%' }}>
             <Button
               type="primary"
               style={{ marginRight: '10px' }}
@@ -175,7 +174,8 @@ export class TopBar extends React.Component {
             <Dropdown overlay={this.menu}>
               <Button>导出</Button>
             </Dropdown>
-        </div>
+          </Col>
+        </Row>
       </div>
     );
   }