Merge branch 'feature/orgChart'

src/components/topBar/index.jsx

@@ -79,9 +79,9 @@ export class TopBar extends React.Component {
 
   render() {
     return (
-      <div className={style.topbarWrapper}>
-        <Row>
-          <Col span={4}>
+      <div className={style.topbarWrapper} style={{ display: 'flex' }}>
+        <Row style={{ flex: 1 }}>
+          <Col span={5}>
             数据日期：
             <DatePicker
               placeholder="请选择日期"
@@ -103,7 +103,7 @@ export class TopBar extends React.Component {
             />
           </Col>
 
-          <Col span={4}>
+          <Col span={5}>
             维度：
             <Select
               defaultValue="0"
@@ -117,7 +117,7 @@ export class TopBar extends React.Component {
             </Select>
           </Col>
 
-          <Col span={4}>
+          <Col span={5}>
             根节点：
             <Select
               showSearch
@@ -135,7 +135,7 @@ export class TopBar extends React.Component {
             </Select>
           </Col>
 
-          <Col span={4}>
+          <Col span={5}>
             显示层级：
             <Select
               defaultValue="3"
@@ -149,7 +149,7 @@ export class TopBar extends React.Component {
             </Select>
           </Col>
 
-          <Col span={4}>
+          <Col span={5} style={{ marginTop: 10 }}>
             <Checkbox
               style={{ marginTop: '5px' }}
               onChange={(e) =>
@@ -161,21 +161,21 @@ export class TopBar extends React.Component {
               显示虚拟组织
             </Checkbox>
           </Col>
-          <Col span={4}>
-            <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>
     );
   }