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' }}>
-        <Row style={{ flex: 1 }}>
+      <div className={style.topbarWrapper}>
+        <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,21 +161,21 @@ export class TopBar extends React.Component {
               显示虚拟组织
             </Checkbox>
           </Col>
+          <Col span={3}>
+            <Button
+              type="primary"
+              style={{ marginRight: '10px' }}
+              onClick={() => {
+                this.props.onSearch(this.state.requestData);
+              }}
+            >
+              查询
+            </Button>
+            <Dropdown overlay={this.menu}>
+              <Button>导出</Button>
+            </Dropdown>
+          </Col>
         </Row>
-        <div style={{ display: 'flex', maxWidth: '20%' }}>
-          <Button
-            type="primary"
-            style={{ marginRight: '10px' }}
-            onClick={() => {
-              this.props.onSearch(this.state.requestData);
-            }}
-          >
-            查询
-          </Button>
-          <Dropdown overlay={this.menu}>
-            <Button>导出</Button>
-          </Dropdown>
-        </div>
       </div>
     );
   }