feat: add basic Button Tabs

hamsterBiscuit · hamsterBiscuit · commit e61c1c776cf2 · 2019-04-25T22:09:43.000+08:00
diff --git a/.umirc.js b/.umirc.js
@@ -21,6 +21,7 @@ export default {
     ],
   ],
   publicPath: '/code-river-pc/',
+  theme:'./src/theme.js',
   history: 'hash',
   cssLoaderOptions: {},
   alias: {
diff --git a/src/pages/basic/index.tsx b/src/pages/basic/index.tsx
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Card } from 'antd';
+import { Card, Button, Tabs } from 'antd';
 import { connect } from 'dva';
 import * as styles from './static/style.less';
 
@@ -9,6 +9,8 @@ import Input from 'component/common/Input';
 import Popover from 'component/common/Popover';
 import Select from 'component/common/Select';
 
+const { TabPane } = Tabs
+
 @connect(({ displayModel }) => ({
   displayModel,
 }))
@@ -37,6 +39,19 @@ export default class Display extends Component<any> {
         <Card title=" input输入框">
           <Input />
         </Card>
+
+        <Card title="Button 按钮">
+          <Button type="primary" style={{marginRight: '8px'}}>确定</Button>
+          <Button>取消</Button>
+        </Card>
+
+        <Card title="Tabs 标签页">
+        <Tabs defaultActiveKey="1">
+          <TabPane tab="Tab 1" key="1">Content of Tab Pane 1</TabPane>
+          <TabPane tab="Tab 2" key="2">Content of Tab Pane 2</TabPane>
+          <TabPane tab="Tab 3" key="3">Content of Tab Pane 3</TabPane>
+        </Tabs>
+        </Card>
       </div>
     );
   }
diff --git a/src/pages/user/login/component/Button.jsx b/src/pages/user/login/component/Button.jsx
@@ -1,15 +0,0 @@
-import Button from '@material-ui/core/Button';
-import styles from '../style.less';
-
-function Index({ onClick }) {
-  return (
-    <Button
-      variant="contained"
-      className={styles.crButton}
-      onClick={onClick}
-    >
-      登录
-    </Button>
-)}
-
-export default Index
