From c6227ba583fc8174bbe373e8b88fee0d0ee3ddd3 Mon Sep 17 00:00:00 2001
From: zuiidea <zuiiidea@gmail.com>
Date: Wed, 22 Mar 2017 10:49:16 +0800
Subject: [PATCH] add Helmet

---
 package.json                            |  2 ++
 src/_index.html                         |  6 ------
 src/components/DataTable/DataTable.js   |  6 ------
 src/components/Editer/Editer.js         |  0
 src/components/Editer/Editer.less       |  0
 src/index.html                          |  8 +-------
 src/routes/UIElement/dataTable/index.js |  4 ++--
 src/routes/app.js                       | 20 ++++++++++++++++----
 src/utils/config.js                     |  3 ++-
 9 files changed, 23 insertions(+), 26 deletions(-)
 create mode 100644 src/components/Editer/Editer.js
 create mode 100644 src/components/Editer/Editer.less

diff --git a/package.json b/package.json
index 59d6c1c..633b113 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,8 @@
     "react": "^15.4.1",
     "react-countup": "1.3.0",
     "react-dom": "^15.4.1",
+    "react-draft-wysiwyg": "^1.8.1",
+    "react-helmet": "^5.0.0",
     "recharts": "^0.19.0"
   },
   "devDependencies": {
diff --git a/src/_index.html b/src/_index.html
index 92370ca..e84c9f8 100644
--- a/src/_index.html
+++ b/src/_index.html
@@ -5,9 +5,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title>Ant Design Admin</title>
   <link rel="stylesheet" href="index.css" />
-  <link rel="icon" href="https://t.alipayobjects.com/images/T1QUBfXo4fXXXXXXXX.png" type="image/x-icon">
   <!--[if lte IE 10]>
       <script
         src="https://as.alipayobjects.com/g/component/??console-polyfill/0.2.2/index.js,media-match/2.0.2/media.match.min.js"></script>
@@ -15,12 +13,8 @@
 </head>
 
 <body>
-
   <div id="root"></div>
-
   <script src="index.js"></script>
-  <script src="//at.alicdn.com/t/font_c4y7asse3q1cq5mi.js"></script>
-
 </body>
 
 </html>
diff --git a/src/components/DataTable/DataTable.js b/src/components/DataTable/DataTable.js
index 8723384..f484e07 100644
--- a/src/components/DataTable/DataTable.js
+++ b/src/components/DataTable/DataTable.js
@@ -37,11 +37,6 @@ class DataTable extends React.Component {
       this.props = nextProps
       this.fetch()
     }
-
-    // if (!lodash.isEqual(nextProps.fetch, this.props.fetch)) {
-    //   this.props = nextProps
-    //   this.fetch()
-    // }
   }
 
   handleTableChange = (pagination, filters, sorter) => {
@@ -64,7 +59,6 @@ class DataTable extends React.Component {
     const { fetch: { url, data, dataKey } } = this.props
     const { fetchData } = this.state
     this.setState({ loading: true })
-    console.log(data)
     request(url, {
       result: 10,
       data: {
diff --git a/src/components/Editer/Editer.js b/src/components/Editer/Editer.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/components/Editer/Editer.less b/src/components/Editer/Editer.less
new file mode 100644
index 0000000..e69de29
diff --git a/src/index.html b/src/index.html
index 373672f..01cf2f8 100644
--- a/src/index.html
+++ b/src/index.html
@@ -5,9 +5,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title>Ant Design Admin</title>
   <link rel="stylesheet" href="/index.css" />
-  <link rel="icon" href="https://t.alipayobjects.com/images/T1QUBfXo4fXXXXXXXX.png" type="image/x-icon">
   <!--[if lte IE 10]>
       <script
         src="https://as.alipayobjects.com/g/component/??console-polyfill/0.2.2/index.js,media-match/2.0.2/media.match.min.js"></script>
@@ -15,12 +13,8 @@
 </head>
 
 <body>
-
   <div id="root"></div>
-
-  <script src="/index.js"></script>
-  <script src="//at.alicdn.com/t/font_c4y7asse3q1cq5mi.js"></script>
-
+  <script src="./index.js"></script>
 </body>
 
 </html>
diff --git a/src/routes/UIElement/dataTable/index.js b/src/routes/UIElement/dataTable/index.js
index ae80837..d4eb9b1 100644
--- a/src/routes/UIElement/dataTable/index.js
+++ b/src/routes/UIElement/dataTable/index.js
@@ -64,7 +64,7 @@ class DataTablePage extends React.Component {
       <Row gutter={32}>
         <Col lg={12} md={24}>
           <Card title="默认">
-            <DataTable />
+            <DataTable pagination={false} />
           </Card>
         </Col>
         <Col lg={12} md={24}>
@@ -82,7 +82,7 @@ class DataTablePage extends React.Component {
           </Card>
         </Col>
         <Col lg={12} md={24}>
-          <Card title="条件变化">
+          <Card title="参数变化">
             <Select placeholder="Please select gender" allowClear onChange={this.handleSelectChange} style={{ width: 200, marginBottom: 16 }}>
               <Select.Option value="male">Male</Select.Option>
               <Select.Option value="female">Female</Select.Option>
diff --git a/src/routes/app.js b/src/routes/app.js
index 6103abc..6b075df 100644
--- a/src/routes/app.js
+++ b/src/routes/app.js
@@ -3,7 +3,8 @@ import { connect } from 'dva'
 import Login from './login'
 import { Layout } from '../components'
 import { Spin } from 'antd'
-import { classnames } from '../utils'
+import { classnames, config } from '../utils'
+import { Helmet } from 'react-helmet'
 import '../components/skin.less'
 
 const { Header, Bread, Footer, Sider, styles } = Layout
@@ -55,7 +56,13 @@ function App ({ children, location, dispatch, app, loading }) {
   }
 
   return (
-    <div>{login
+    <div>
+      <Helmet>
+        <title>ANTD ADMIN</title>
+        <link rel="icon" href={config.logoSrc} type="image/x-icon" />
+        {config.iconFontUrl ? <script src={config.iconFontUrl}></script> : ''}
+      </Helmet>
+      {login
         ? <div className={classnames(styles.layout, { [styles.fold]: isNavbar ? false : siderFold }, { [styles.withnavbar]: isNavbar })}>
           {!isNavbar ? <aside className={classnames(styles.sider, { [styles.light]: !darkTheme })}>
             <Sider {...siderProps} />
@@ -70,8 +77,13 @@ function App ({ children, location, dispatch, app, loading }) {
             </div>
             <Footer />
           </div>
-        </div>
-        : <div className={styles.spin}><Spin tip="加载用户信息..." spinning={loading} size="large"><Login {...loginProps} /></Spin></div>}</div>
+        </div> :
+        <div className={styles.spin}>
+          <Spin tip="加载用户信息..." spinning={loading} size="large">
+            <Login {...loginProps} />
+          </Spin>
+        </div>}
+    </div>
   )
 }
 
diff --git a/src/utils/config.js b/src/utils/config.js
index 15a26f2..3a0ea61 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -2,7 +2,8 @@ module.exports = {
   name: 'Ant Design Admin',
   prefix: 'antdAdmin',
   footerText: 'Ant Design Admin 版权所有 © 2016 由 zuiidea 支持',
-  logoSrc: 'https://t.alipayobjects.com/images/rmsweb/T1B9hfXcdvXXXXXXXX.svg',
+  logoSrc: 'https://t.alipayobjects.com/images/T1QUBfXo4fXXXXXXXX.png',
   logoText: 'Antd Admin',
   needLogin: true,
+  iconFontUrl: '//at.alicdn.com/t/font_c4y7asse3q1cq5mi.js',
 }