From 7c2ec98824a939ddd45569dedc19ef967a379818 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Mon, 23 Oct 2017 16:38:53 +0800
Subject: [PATCH] update styles

---
 src/layouts/BasicLayout.less   |  2 +-
 src/routes/List/TableList.js   | 94 +++++++++++++++-------------------
 src/routes/List/TableList.less | 22 ++++----
 3 files changed, 51 insertions(+), 67 deletions(-)

diff --git a/src/layouts/BasicLayout.less b/src/layouts/BasicLayout.less
index 5aa45bc3..91ad7d99 100644
--- a/src/layouts/BasicLayout.less
+++ b/src/layouts/BasicLayout.less
@@ -11,7 +11,7 @@
   height: 64px;
   position: relative;
   line-height: 64px;
-  padding-left: 32px;
+  padding-left: 24px;
   transition: all .3s;
   background: #002140;
   overflow: hidden;
diff --git a/src/routes/List/TableList.js b/src/routes/List/TableList.js
index 844d0beb..0ca42b24 100644
--- a/src/routes/List/TableList.js
+++ b/src/routes/List/TableList.js
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 import { connect } from 'dva';
-import { Card, Row, Col, Form, Input, Select, Icon, Button, Dropdown, Menu, InputNumber, DatePicker, Modal, message } from 'antd';
+import { Card, Form, Input, Select, Icon, Button, Dropdown, Menu, InputNumber, DatePicker, Modal, message } from 'antd';
 import StandardTable from '../../components/StandardTable';
 import PageHeaderLayout from '../../layouts/PageHeaderLayout';
 
@@ -156,11 +156,6 @@ export default class TableList extends PureComponent {
     const { rule: { loading: ruleLoading, data }, form: { getFieldDecorator } } = this.props;
     const { selectedRows, modalVisible, addInputValue } = this.state;
 
-    const formItemLayout = {
-      labelCol: { xs: 5, sm: 8, lg: 6, xl: 6 },
-      wrapperCol: { xs: 18, sm: 16, lg: 17, xl: 17 },
-    };
-
     const menu = (
       <Menu onClick={this.handleMenuClick} selectedKeys={[]}>
         <Menu.Item key="remove">删除</Menu.Item>
@@ -173,56 +168,47 @@ export default class TableList extends PureComponent {
         <Card bordered={false}>
           <div className={styles.tableList}>
             <div className={styles.tableListForm}>
-              <Form onSubmit={this.handleSearch}>
-                <Row>
-                  <Col md={8} sm={12} xs={24}>
-                    <FormItem {...formItemLayout} label="规则编号">
-                      {getFieldDecorator('no')(
-                        <Input placeholder="请输入" />
-                      )}
-                    </FormItem>
-                  </Col>
-                  <Col md={8} sm={12} xs={24}>
-                    <FormItem {...formItemLayout} label="状态">
-                      {getFieldDecorator('status')(
-                        <Select placeholder="请选择" style={{ width: '100%' }}>
-                          <Option value="0">关闭</Option>
-                          <Option value="1">运行中</Option>
-                        </Select>
-                      )}
-                    </FormItem>
-                  </Col>
-                  <Col md={8} sm={12} xs={24} style={{ marginBottom: 24 }}>
-                    <div className={styles.formButton}>
-                      <Button type="primary" htmlType="submit">查询</Button>
-                      <Button style={{ marginLeft: 8 }} onClick={this.handleFormReset}>重置</Button>
-                      <a style={{ marginLeft: 8, fontSize: 12 }} onClick={this.toggleForm}>
-                        {this.state.expandForm ? '收起' : '展开'} <Icon type={this.state.expandForm ? 'up' : 'down'} />
-                      </a>
-                    </div>
-                  </Col>
-                </Row>
+              <Form onSubmit={this.handleSearch} layout="inline">
+                <div style={{ marginBottom: 16 }}>
+                  <FormItem label="规则编号">
+                    {getFieldDecorator('no')(
+                      <Input placeholder="请输入" style={{ width: 272 }} />
+                    )}
+                  </FormItem>
+                  <FormItem label="使用状态">
+                    {getFieldDecorator('status')(
+                      <Select placeholder="请选择" style={{ width: 272 }}>
+                        <Option value="0">关闭</Option>
+                        <Option value="1">运行中</Option>
+                      </Select>
+                    )}
+                  </FormItem>
+                  <span className={styles.formButton}>
+                    <Button type="primary" htmlType="submit">查询</Button>
+                    <Button style={{ marginLeft: 8 }} onClick={this.handleFormReset}>重置</Button>
+                    <a style={{ marginLeft: 8 }} onClick={this.toggleForm}>
+                      {this.state.expandForm ? '收起' : '展开'} <Icon type={this.state.expandForm ? 'up' : 'down'} />
+                    </a>
+                  </span>
+                </div>
                 {
                   this.state.expandForm && (
-                    <Row>
-                      <Col md={8} sm={12} xs={24}>
-                        <FormItem {...formItemLayout} label="更新时间">
-                          {getFieldDecorator('updatedAt')(
-                            <DatePicker style={{ width: '100%' }} />
-                          )}
-                        </FormItem>
-                      </Col>
-                      <Col md={8} sm={12} xs={24}>
-                        <FormItem {...formItemLayout} label="调用次数">
-                          {getFieldDecorator('callNo')(
-                            <InputNumber
-                              prefix={<Icon type="right" />}
-                              placeholder="请输入"
-                            />
-                          )}
-                        </FormItem>
-                      </Col>
-                    </Row>
+                    <div style={{ marginBottom: 16 }}>
+                      <FormItem label="更新时间">
+                        {getFieldDecorator('updatedAt')(
+                          <DatePicker style={{ width: 272 }} />
+                        )}
+                      </FormItem>
+                      <FormItem label="调用次数">
+                        {getFieldDecorator('callNo')(
+                          <InputNumber
+                            prefix={<Icon type="right" />}
+                            placeholder="请输入"
+                            style={{ width: 272 }}
+                          />
+                        )}
+                      </FormItem>
+                    </div>
                   )
                 }
               </Form>
diff --git a/src/routes/List/TableList.less b/src/routes/List/TableList.less
index 21e1d93c..904668d1 100644
--- a/src/routes/List/TableList.less
+++ b/src/routes/List/TableList.less
@@ -3,11 +3,6 @@
 
 .tableList {
   padding-bottom: 8px;
-  :global {
-    .ant-form-item {
-      margin-bottom: 24px;
-    }
-  }
   .tableListOperator {
     margin-bottom: 16px;
     button {
@@ -16,20 +11,23 @@
   }
 }
 
+.tableListForm :global(.ant-form-item) {
+  margin-right: 48px;
+  margin-bottom: 8px;
+}
+
 .formButton {
-  margin-left: 40px;
-  position: relative;
-  top: 2px;
+  white-space: nowrap;
 }
 
 @media screen and (max-width: @screen-lg) {
-  .formButton {
-    margin-left: 20px;
+  .tableListForm :global(.ant-form-item) {
+    margin-right: 24px;
   }
 }
 
 @media screen and (max-width: @screen-md) {
-  .formButton {
-    margin-left: 0;
+  .tableListForm :global(.ant-form-item) {
+    margin-right: 8px;
   }
 }
-- 
GitLab