Revert "demo中的icon迁移"

This reverts commit e7b11ec.

site/docs/demoPage/layoutToolbar.js

@@ -18,11 +18,11 @@ ReactDOM.render(
           <span className="nav-text">nav 1</span>
         </Menu.Item>
         <Menu.Item key="2">
-          <window.IconVideoCamera {...DEMOIconProps}  />
+          <Icon type="video-camera"/>
           <span className="nav-text">nav 2</span>
         </Menu.Item>
         <Menu.Item key="3">
-          <window.IconDownloadLine {...DEMOIconProps}/>
+          <Icon type="download-line"/>
           <span className="nav-text">nav 3</span>
         </Menu.Item>
         <Menu.Item key="4">
@@ -42,7 +42,7 @@ ReactDOM.render(
           <span className="nav-text">nav 7</span>
         </Menu.Item>
         <Menu.Item key="8">
-          <window.IconSetting {...DEMOIconProps}/>
+          <Icon type="Settingx"/>
           <span className="nav-text">nav 8</span>
         </Menu.Item>
       </Menu>

site/docs/zh-CN/footerToolbar.md

@@ -65,11 +65,11 @@ render() {
           <span className="nav-text">nav 1</span>
         </Menu.Item>
         <Menu.Item key="2">
-          <IconVideoCamera className="img-icon-14"/>
+          <Icon type="video-camera"/>
           <span className="nav-text">nav 2</span>
         </Menu.Item>
         <Menu.Item key="3">
-          <IconDownloadLine className="img-icon-14"/>
+          <Icon type="download-line"/>
           <span className="nav-text">nav 3</span>
         </Menu.Item>
         <Menu.Item key="4">
@@ -89,7 +89,7 @@ render() {
           <span className="nav-text">nav 7</span>
         </Menu.Item>
         <Menu.Item key="8">
-          <IconSetting className="img-icon-14"  />
+          <Icon type="Settingx"/>
           <span className="nav-text">nav 8</span>
         </Menu.Item>
       </Menu>

site/docs/zh-CN/form.md

@@ -63,7 +63,7 @@ class HorizontalLoginForm extends React.Component {
           {getFieldDecorator('userName1', {
             rules: [{ required: true, message: 'Please input your username!' }],
           })(
-            <Input prefix={<IconUserLine style={{ color: 'rgba(0,0,0,.25)' }} />} placeholder="Username" />
+            <Input prefix={<Icon type="user-line" style={{ color: 'rgba(0,0,0,.25)' }} />} placeholder="Username" />
           )}
         </FormItem>
         <FormItem
@@ -73,7 +73,7 @@ class HorizontalLoginForm extends React.Component {
           {getFieldDecorator('password1', {
             rules: [{ required: true, message: 'Please input your Password!' }],
           })(
-            <Input prefix={<IconLockLine style={{ color: 'rgba(0,0,0,.25)' }} />} type="password" placeholder="Password" />
+            <Input prefix={<Icon type="lock-line" style={{ color: 'rgba(0,0,0,.25)' }} />} type="password" placeholder="Password" />
           )}
         </FormItem>
         <FormItem>
@@ -121,14 +121,14 @@ class NormalLoginForm extends React.Component {
           {getFieldDecorator('userName2', {
             rules: [{ required: true, message: 'Please input your username!' }],
           })(
-            <Input prefix={<IconUserLine style={{ color: 'rgba(0,0,0,.25)' }} />} placeholder="Username" />
+            <Input prefix={<Icon type="user-line" style={{ color: 'rgba(0,0,0,.25)' }} />} placeholder="Username" />
           )}
         </FormItem>
         <FormItem>
           {getFieldDecorator('password2', {
             rules: [{ required: true, message: 'Please input your Password!' }],
           })(
-            <Input prefix={<IconLockLine  style={{ color: 'rgba(0,0,0,.25)' }} />} type="password" placeholder="Password" />
+            <Input prefix={<Icon type="lock-line" style={{ color: 'rgba(0,0,0,.25)' }} />} type="password" placeholder="Password" />
           )}
         </FormItem>
         <FormItem>
@@ -739,7 +739,7 @@ class DynamicFieldSet extends React.Component {
         {formItems}
         <FormItem {...formItemLayoutWithOutLabel}>
           <Button type="dashed" onClick={this.add} style={{ width: '60%' }}>
-            <IconUploadPlus className="img-icon-12" type="upload-plus" /> Add field
+            <Icon type="upload-plus" /> Add field
           </Button>
         </FormItem>
         <FormItem {...formItemLayoutWithOutLabel}>
@@ -1315,8 +1315,8 @@ render(){
         >
           <Input
             placeholder="Enter your username"
-            prefix={<IconDateLine style={{ color: 'rgba(0,0,0,.25)' }} />}
-            suffix={<IconCloseCircleFill style={{ color: 'rgba(0,0,0,.25)' }} />}
+            prefix={<Icon type="date-line" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            suffix={<Icon type="close-circle-fill" style={{ color: 'rgba(0,0,0,.25)' }} />}
           />
         </FormItem>
       </Form>
@@ -1695,7 +1695,7 @@ class UnwrappedDemo extends React.Component {
           })(
             <Upload name="logo" action="/upload.do" listType="picture">
               <Button>
-                <IconUploadLine type="upload-line" /> Click to upload
+                <Icon type="upload-line" /> Click to upload
               </Button>
             </Upload>
           )}
@@ -1712,7 +1712,7 @@ class UnwrappedDemo extends React.Component {
             })(
               <Upload.Dragger name="files" action="/upload.do">
                 <p className="fishd-upload-drag-icon">
-                  <IconUploadCloud type="upload-cloud" />
+                  <Icon type="upload-cloud" />
                 </p>
                 <p className="fishd-upload-text">Click or drag file to this area to upload</p>
                 <p className="fishd-upload-hint">Support for a single or bulk upload.</p>

site/docs/zh-CN/icon.md

@@ -137,7 +137,7 @@ render(){
 由于图标字体本质上还是文字，可以使用 `style` 和 `className` 设置图标的大小和颜色。
 
 ```html
-<Icon type="time-line" style={{ fontSize: 16, color: '#08c' }} />
+<Icon type="question" style={{ fontSize: 16, color: '#08c' }} />
 ```
 
 | 参数 | 说明 | 类型 | 默认值 |

site/docs/zh-CN/input.md

@@ -72,7 +72,7 @@ render(){
           <Input addonBefore={selectBefore} addonAfter={selectAfter} defaultValue="mysite" />
         </div>
         <div style={{ marginBottom: 16 }}>
-          <Input addonAfter={<IconStopLine type="stop-line" />} defaultValue="mysite" />
+          <Input addonAfter={<Icon type="stop-line" />} defaultValue="mysite" />
         </div>
     </div>
   )
@@ -338,11 +338,11 @@ render(){
 
   render() {
     const { userName } = this.state;
-    const suffix = userName ? <IconCloseCircleFill  style={{ color: 'rgba(0,0,0,.25)' }} onClick={this.emitEmpty} /> : null;
+    const suffix = userName ? <Icon type="close-circle-fill" onClick={this.emitEmpty} /> : null;
     return (
       <Input
         placeholder="Enter your username"
-        prefix={<IconDateLine  style={{ color: 'rgba(0,0,0,.25)' }} />}
+        prefix={<Icon type="date-line" style={{ color: 'rgba(0,0,0,.25)' }} />}
         suffix={suffix}
         value={userName}
         onChange={this.onChangeUserName}

site/docs/zh-CN/layout.md

@@ -149,7 +149,7 @@ class Demo extends React.Component {
           onCollapse={this.onCollapse}
         >
           <div className="logo">
-            <Icon type="logo" className="img-icon-14 fishdicon" />
+            <IconLogo className="img-icon-14 fishdicon" />
             {
               !this.state.collapsed ? <span className="logo-text">Fish Design</span> : null
             }
@@ -266,7 +266,7 @@ class Demo extends React.Component {
           collapsed={this.state.collapsed}
         >
           <div className="logo">
-            <Icon type="logo" className="img-icon-14 fishdicon" />
+            <IconLogo className="img-icon-14 fishdicon" />
             {
               !this.state.collapsed ? <span className="logo-text">Fish Design</span> : null
             }
@@ -388,7 +388,7 @@ render(){
         onCollapse={(collapsed, type) => { console.log(collapsed, type); }}
       >
         <div className="logo">
-          <Icon type="logo" className="img-icon-14 fishdicon" />
+          <IconLogo className="img-icon-14 fishdicon" />
           <span className="logo-text">Fish Design</span>
         </div>
         <Menu theme="dark" mode="inline" defaultSelectedKeys={['2']}>

site/docs/zh-CN/notification.md

@@ -127,7 +127,7 @@ openNotification = () => {
   notification.open({
     message: 'Notification Title',
     description: 'This is the content of the notification. This is the content of the notification. This is the content of the notification.',
-    icon: <IconRicheditorExpressio  style={{ color: '#108ee9' }} />,
+    icon: <Icon type="richeditor-expressio" style={{ color: '#108ee9' }} />,
   });
 };
 

site/docs/zh-CN/switch.md

@@ -57,7 +57,7 @@
         <br />
         <Switch checkedChildren="1" unCheckedChildren="0" />
         <br />
-        <Switch checkedChildren={<IconCheck type="check" />} unCheckedChildren={<IconCross type="cross" />} defaultChecked />
+        <Switch checkedChildren={<Icon type="check" />} unCheckedChildren={<Icon type="cross" />} defaultChecked />
       </div>
     );
   }

site/docs/zh-CN/tag.md

@@ -120,7 +120,7 @@
             onClick={this.showInput}
             style={{ background: '#fff', border: '1px dashed #e1e3e6' }}
           >
-            <IconUploadPlus type="upload-plus" /> New Tag
+            <Icon type="upload-plus" /> New Tag
           </Tag>
         )}
       </div>

site/docs/zh-CN/timeline.md

@@ -133,7 +133,7 @@
       <Timeline>
         <Timeline.Item>Create a services site 2015-09-01</Timeline.Item>
         <Timeline.Item>Solve initial network problems 2015-09-01</Timeline.Item>
-        <Timeline.Item dot={<IconDeleteLine type="delete-line" style={{ fontSize: '16px' }} />} color="red">Technical testing 2015-09-01</Timeline.Item>
+        <Timeline.Item dot={<Icon type="delete-line" style={{ fontSize: '16px' }} />} color="red">Technical testing 2015-09-01</Timeline.Item>
         <Timeline.Item>Network problems being solved 2015-09-01</Timeline.Item>
       </Timeline>
     );
@@ -151,10 +151,10 @@ render(){
     <Timeline mode="alternate">
         <Timeline.Item>Create a services site 2015-09-01</Timeline.Item>
         <Timeline.Item color="green">Solve initial network problems 2015-09-01</Timeline.Item>
-        <Timeline.Item dot={<IconDeleteLine  style={{ fontSize: '16px' }} />}>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo.</Timeline.Item>
+        <Timeline.Item dot={<Icon type="delete-line" style={{ fontSize: '16px' }} />}>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo.</Timeline.Item>
         <Timeline.Item color="red">Network problems being solved 2015-09-01</Timeline.Item>
         <Timeline.Item>Create a services site 2015-09-01</Timeline.Item>
-        <Timeline.Item dot={<IconDeleteLine  style={{ fontSize: '16px' }} />}>Technical testing 2015-09-01</Timeline.Item>
+        <Timeline.Item dot={<Icon type="delete-line" style={{ fontSize: '16px' }} />}>Technical testing 2015-09-01</Timeline.Item>
       </Timeline>
   )
 }
@@ -171,7 +171,7 @@ render(){
       <Timeline mode="right">
         <Timeline.Item>Create a services site 2015-09-01</Timeline.Item>
         <Timeline.Item>Solve initial network problems 2015-09-01</Timeline.Item>
-        <Timeline.Item dot={<IconDeleteLine type="delete-line" style={{ fontSize: '16px' }} />} color="red">Technical testing 2015-09-01</Timeline.Item>
+        <Timeline.Item dot={<Icon type="delete-line" style={{ fontSize: '16px' }} />} color="red">Technical testing 2015-09-01</Timeline.Item>
         <Timeline.Item>Network problems being solved 2015-09-01</Timeline.Item>
       </Timeline>
   )

site/docs/zh-CN/tree.md

@@ -213,7 +213,7 @@
   render() {
     const TreeNode = Tree.TreeNode;
     const { searchValue, expandedKeys, autoExpandParent } = this.state;
-    const suffix = searchValue ? <IconCloseCircleFill type="close-circle-fill" onClick={this.emitEmpty} /> : <Icon type="search-line" />;
+    const suffix = searchValue ? <Icon type="close-circle-fill" onClick={this.emitEmpty} /> : <Icon type="search-line" />;
     let notFound = true;
     const loop = data => data.map((item) => {
       const index = item.title.indexOf(searchValue);

site/docs/zh-CN/upload.md

@@ -49,7 +49,7 @@ render() {
   return (
     <Upload {...props}>
       <Button type="primary" style={{display: 'inline-flex',alignItems: 'center'}}>
-        <IconUploadLine type="upload-line" style={{fontSize:'20px'}} /> 上传
+        <Icon type="upload-line" style={{fontSize:'20px'}} /> 上传
       </Button>
     </Upload>
   );
@@ -275,7 +275,7 @@ render() {
     }
     const uploadButton = (
       <div>
-        { this.state.loading ?  <Spin /> : <IconUploadPlus type="upload-plus"/> }
+        { this.state.loading ?  <Spin /> : <Icon type="upload-plus"/> }
         <div className="fishd-upload-text">上传图片</div>
       </div>
     );