From 8e533e6b8ed00db78eabd3599f81890be502243a Mon Sep 17 00:00:00 2001
From: wangxueliang <wangxueliang@yidian-inc.com>
Date: Thu, 29 Nov 2018 16:41:11 +0800
Subject: [PATCH 1/9] fix: vc-slider Range

---
 components/vc-slider/demo/handle.jsx                 | 9 ++++-----
 components/vc-slider/src/Range.jsx                   | 4 ++--
 components/vc-slider/src/createSliderWithTooltip.jsx | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/components/vc-slider/demo/handle.jsx b/components/vc-slider/demo/handle.jsx
index c3bcb9e0a..a0d4abadd 100644
--- a/components/vc-slider/demo/handle.jsx
+++ b/components/vc-slider/demo/handle.jsx
@@ -19,17 +19,15 @@ export default {
   },
   render () {
     const handle = (h, props) => {
-      const { value, dragging, index, refStr, style, ...restProps } = props
+      const { value, dragging, index, ref, style, ...restProps } = props
       const handleProps = {
         props: {
           ...restProps,
           value,
         },
-        attrs: {
-          refStr,
-        },
         key: index,
         style,
+        ref,
       }
       return (
         <Tooltip
@@ -45,7 +43,7 @@ export default {
       )
     }
 
-    const handleRange = (h, { value, dragging, index, disabled, style, ...restProps }) => {
+    const handleRange = (h, { value, ref, dragging, index, disabled, style, ...restProps }) => {
       const tipFormatter = value => `${value}%`
       const tipProps = {}
 
@@ -85,6 +83,7 @@ export default {
         style: {
           ...handleStyleWithIndex,
         },
+        ref,
       }
 
       return (
diff --git a/components/vc-slider/src/Range.jsx b/components/vc-slider/src/Range.jsx
index 170bfe447..ad4468683 100644
--- a/components/vc-slider/src/Range.jsx
+++ b/components/vc-slider/src/Range.jsx
@@ -118,7 +118,7 @@ const Range = {
       this.onChange({ bounds: nextBounds })
     },
     onEnd () {
-      this.setState({ sHandle: null }, this.onBlur)
+      this.setState({ sHandle: null }, this.blur)
       this.removeDocumentEvents()
       this.$emit('afterChange', this.bounds)
     },
@@ -210,7 +210,7 @@ const Range = {
         nextHandle = nextBounds.indexOf(value)
       }
       this.onChange({
-        handle: nextHandle,
+        sHandle: nextHandle,
         bounds: nextBounds,
       })
       if (isFromKeyboardEvent) {
diff --git a/components/vc-slider/src/createSliderWithTooltip.jsx b/components/vc-slider/src/createSliderWithTooltip.jsx
index 06dd657ae..779f1fb06 100644
--- a/components/vc-slider/src/createSliderWithTooltip.jsx
+++ b/components/vc-slider/src/createSliderWithTooltip.jsx
@@ -6,7 +6,7 @@ import Handle from './Handle'
 
 export default function createSliderWithTooltip (Component) {
   return {
-    mixins: [BaseMixin],
+    mixins: [BaseMixin, Component],
     props: {
       ...Component.props,
       tipFormatter: PropTypes.func.def((value) => { return value }),

From 1d340a91547a5c2a379b5157b7ca6e887eac5306 Mon Sep 17 00:00:00 2001
From: wangxueliang <wangxueliang@yidian-inc.com>
Date: Thu, 29 Nov 2018 16:58:40 +0800
Subject: [PATCH 2/9] docs: add vc-slick base version

---
 components/vc-slick/src/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/vc-slick/src/index.js b/components/vc-slick/src/index.js
index 712f4192f..3db344945 100644
--- a/components/vc-slick/src/index.js
+++ b/components/vc-slick/src/index.js
@@ -1,3 +1,4 @@
+// base react-slick 0.23.2
 import Slider from './slider'
 
 export default Slider

From 752c82df211cc1fd5c407839558aae96b0d6e625 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Thu, 29 Nov 2018 22:20:17 +0800
Subject: [PATCH 3/9] feat: update cascader

---
 .../__snapshots__/index.test.js.snap          | 33 ++++++-----
 components/cascader/demo/index.vue            |  3 +
 components/cascader/demo/suffix.md            | 58 ++++++++++++++++++
 components/cascader/index.en-US.md            |  1 +
 components/cascader/index.jsx                 | 59 ++++++++++++++-----
 components/cascader/index.zh-CN.md            |  1 +
 components/icon/index.js                      |  3 +-
 7 files changed, 126 insertions(+), 32 deletions(-)
 create mode 100644 components/cascader/demo/suffix.md

diff --git a/components/cascader/__tests__/__snapshots__/index.test.js.snap b/components/cascader/__tests__/__snapshots__/index.test.js.snap
index cd6fe345c..291597ae7 100644
--- a/components/cascader/__tests__/__snapshots__/index.test.js.snap
+++ b/components/cascader/__tests__/__snapshots__/index.test.js.snap
@@ -5,11 +5,11 @@ exports[`Cascader can be selected 1`] = `
   <div class="ant-cascader-menus  ant-cascader-menus-placement-bottomLeft" style="left: -999px; top: -995px;">
     <div class="ant-cascader-menus-content">
       <ul class="ant-cascader-menu">
-        <li title="Zhejiang" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Zhejiang<span class="ant-cascader-menu-item-expand-icon">&gt;</span></li>
-        <li title="Jiangsu" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Jiangsu<span class="ant-cascader-menu-item-expand-icon">&gt;</span></li>
+        <li title="Zhejiang" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Zhejiang<span class="ant-cascader-menu-item-expand-icon"><i class="anticon anticon-right"><svg viewBox="64 64 896 896" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 0 0 302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 0 0 0-50.4z"></path></svg></i></span></li>
+        <li title="Jiangsu" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Jiangsu<span class="ant-cascader-menu-item-expand-icon"><i class="anticon anticon-right"><svg viewBox="64 64 896 896" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 0 0 302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 0 0 0-50.4z"></path></svg></i></span></li>
       </ul>
       <ul class="ant-cascader-menu">
-        <li title="Hangzhou" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Hangzhou<span class="ant-cascader-menu-item-expand-icon">&gt;</span></li>
+        <li title="Hangzhou" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Hangzhou<span class="ant-cascader-menu-item-expand-icon"><i class="anticon anticon-right"><svg viewBox="64 64 896 896" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 0 0 302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 0 0 0-50.4z"></path></svg></i></span></li>
       </ul>
     </div>
   </div>
@@ -21,11 +21,11 @@ exports[`Cascader can be selected 2`] = `
   <div class="ant-cascader-menus  ant-cascader-menus-placement-bottomLeft" style="left: -999px; top: -995px;">
     <div class="ant-cascader-menus-content">
       <ul class="ant-cascader-menu">
-        <li title="Zhejiang" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Zhejiang<span class="ant-cascader-menu-item-expand-icon">&gt;</span></li>
-        <li title="Jiangsu" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Jiangsu<span class="ant-cascader-menu-item-expand-icon">&gt;</span></li>
+        <li title="Zhejiang" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Zhejiang<span class="ant-cascader-menu-item-expand-icon"><i class="anticon anticon-right"><svg viewBox="64 64 896 896" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 0 0 302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 0 0 0-50.4z"></path></svg></i></span></li>
+        <li title="Jiangsu" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Jiangsu<span class="ant-cascader-menu-item-expand-icon"><i class="anticon anticon-right"><svg viewBox="64 64 896 896" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 0 0 302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 0 0 0-50.4z"></path></svg></i></span></li>
       </ul>
       <ul class="ant-cascader-menu">
-        <li title="Hangzhou" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Hangzhou<span class="ant-cascader-menu-item-expand-icon">&gt;</span></li>
+        <li title="Hangzhou" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Hangzhou<span class="ant-cascader-menu-item-expand-icon"><i class="anticon anticon-right"><svg viewBox="64 64 896 896" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 0 0 302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 0 0 0-50.4z"></path></svg></i></span></li>
       </ul>
       <ul class="ant-cascader-menu">
         <li title="West Lake" class="ant-cascader-menu-item">West Lake</li>
@@ -40,11 +40,11 @@ exports[`Cascader can be selected 3`] = `
   <div class="ant-cascader-menus  ant-cascader-menus-placement-bottomLeft" style="display: none;">
     <div class="ant-cascader-menus-content">
       <ul class="ant-cascader-menu">
-        <li title="Zhejiang" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Zhejiang<span class="ant-cascader-menu-item-expand-icon">&gt;</span></li>
-        <li title="Jiangsu" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Jiangsu<span class="ant-cascader-menu-item-expand-icon">&gt;</span></li>
+        <li title="Zhejiang" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Zhejiang<span class="ant-cascader-menu-item-expand-icon"><i class="anticon anticon-right"><svg viewBox="64 64 896 896" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 0 0 302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 0 0 0-50.4z"></path></svg></i></span></li>
+        <li title="Jiangsu" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Jiangsu<span class="ant-cascader-menu-item-expand-icon"><i class="anticon anticon-right"><svg viewBox="64 64 896 896" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 0 0 302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 0 0 0-50.4z"></path></svg></i></span></li>
       </ul>
       <ul class="ant-cascader-menu">
-        <li title="Hangzhou" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Hangzhou<span class="ant-cascader-menu-item-expand-icon">&gt;</span></li>
+        <li title="Hangzhou" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Hangzhou<span class="ant-cascader-menu-item-expand-icon"><i class="anticon anticon-right"><svg viewBox="64 64 896 896" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 0 0 302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 0 0 0-50.4z"></path></svg></i></span></li>
       </ul>
       <ul class="ant-cascader-menu">
         <li title="West Lake" class="ant-cascader-menu-item ant-cascader-menu-item-active">West Lake</li>
@@ -67,8 +67,8 @@ exports[`Cascader popup correctly when panel is open 1`] = `
   <div class="ant-cascader-menus  ant-cascader-menus-placement-bottomLeft" style="left: -999px; top: -995px;">
     <div class="ant-cascader-menus-content">
       <ul class="ant-cascader-menu">
-        <li title="Zhejiang" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Zhejiang<span class="ant-cascader-menu-item-expand-icon">&gt;</span></li>
-        <li title="Jiangsu" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Jiangsu<span class="ant-cascader-menu-item-expand-icon">&gt;</span></li>
+        <li title="Zhejiang" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Zhejiang<span class="ant-cascader-menu-item-expand-icon"><i class="anticon anticon-right"><svg viewBox="64 64 896 896" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 0 0 302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 0 0 0-50.4z"></path></svg></i></span></li>
+        <li title="Jiangsu" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Jiangsu<span class="ant-cascader-menu-item-expand-icon"><i class="anticon anticon-right"><svg viewBox="64 64 896 896" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 0 0 302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 0 0 0-50.4z"></path></svg></i></span></li>
       </ul>
     </div>
   </div>
@@ -80,11 +80,11 @@ exports[`Cascader popup correctly with defaultValue 1`] = `
   <div class="ant-cascader-menus  ant-cascader-menus-placement-bottomLeft" style="left: -999px; top: -995px;">
     <div class="ant-cascader-menus-content">
       <ul class="ant-cascader-menu">
-        <li title="Zhejiang" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Zhejiang<span class="ant-cascader-menu-item-expand-icon">&gt;</span></li>
-        <li title="Jiangsu" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Jiangsu<span class="ant-cascader-menu-item-expand-icon">&gt;</span></li>
+        <li title="Zhejiang" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Zhejiang<span class="ant-cascader-menu-item-expand-icon"><i class="anticon anticon-right"><svg viewBox="64 64 896 896" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 0 0 302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 0 0 0-50.4z"></path></svg></i></span></li>
+        <li title="Jiangsu" class="ant-cascader-menu-item ant-cascader-menu-item-expand">Jiangsu<span class="ant-cascader-menu-item-expand-icon"><i class="anticon anticon-right"><svg viewBox="64 64 896 896" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 0 0 302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 0 0 0-50.4z"></path></svg></i></span></li>
       </ul>
       <ul class="ant-cascader-menu">
-        <li title="Hangzhou" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Hangzhou<span class="ant-cascader-menu-item-expand-icon">&gt;</span></li>
+        <li title="Hangzhou" class="ant-cascader-menu-item ant-cascader-menu-item-expand ant-cascader-menu-item-active">Hangzhou<span class="ant-cascader-menu-item-expand-icon"><i class="anticon anticon-right"><svg viewBox="64 64 896 896" data-icon="right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 0 0 302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 0 0 0-50.4z"></path></svg></i></span></li>
       </ul>
       <ul class="ant-cascader-menu">
         <li title="West Lake" class="ant-cascader-menu-item">West Lake</li>
@@ -95,8 +95,9 @@ exports[`Cascader popup correctly with defaultValue 1`] = `
 `;
 
 exports[`Cascader support controlled mode 1`] = `
-<span tabindex="0" class="ant-cascader-picker"><input value="" type="text" readonly="true" class="ant-input ant-cascader-input  ant-cascader-input "><span class="ant-cascader-picker-label">Zhejiang / Hangzhou / West Lake</span><i class="anticon anticon-cross-circle">
-  <!----></i><i class="anticon anticon-down"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class="">
+<span tabindex="0" class="ant-cascader-picker"><input value="" type="text" readonly="true" class="ant-input ant-cascader-input  ant-cascader-input "><span class="ant-cascader-picker-label">Zhejiang / Hangzhou / West Lake</span><i class="ant-cascader-picker-clear anticon anticon-close-circle"><svg viewBox="64 64 896 896" data-icon="close-circle" width="1em" height="1em" fill="currentColor" aria-hidden="true" class="">
+    <path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm165.4 618.2l-66-.3L512 563.4l-99.3 118.4-66.1.3c-4.4 0-8-3.5-8-8 0-1.9.7-3.7 1.9-5.2l130.1-155L340.5 359a8.32 8.32 0 0 1-1.9-5.2c0-4.4 3.6-8 8-8l66.1.3L512 464.6l99.3-118.4 66-.3c4.4 0 8 3.5 8 8 0 1.9-.7 3.7-1.9 5.2L553.5 514l130 155c1.2 1.5 1.9 3.3 1.9 5.2 0 4.4-3.6 8-8 8z"></path>
+  </svg></i><i class="ant-cascader-picker-arrow anticon anticon-down"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" class="">
     <path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path>
   </svg></i></span>
 `;
diff --git a/components/cascader/demo/index.vue b/components/cascader/demo/index.vue
index 33c6e0a5d..593914de8 100644
--- a/components/cascader/demo/index.vue
+++ b/components/cascader/demo/index.vue
@@ -10,6 +10,7 @@ import Lazy from './lazy'
 import Search from './search'
 import Size from './size'
 import FieldsName from './fields-name'
+import Suffix from './suffix'
 
 import CN from '../index.zh-CN.md'
 import US from '../index.en-US.md'
@@ -33,6 +34,7 @@ const md = {
 export default {
   category: 'Components',
   type: 'Data Entry',
+  zhType: '数据录入',
   title: 'Cascader',
   subtitle: '级联选择',
   render () {
@@ -50,6 +52,7 @@ export default {
         <Search/>
         <Size/>
         <FieldsName />
+        <Suffix />
         <api>
           <CN slot='cn' />
           <US/>
diff --git a/components/cascader/demo/suffix.md b/components/cascader/demo/suffix.md
new file mode 100644
index 000000000..db823bb17
--- /dev/null
+++ b/components/cascader/demo/suffix.md
@@ -0,0 +1,58 @@
+
+<cn>
+#### 后缀图标
+省市区级联。
+</cn>
+
+<us>
+#### Suffix
+Cascade selection box for selecting province/city/district.
+</us>
+
+```html
+<template>
+  <div>
+    <a-cascader style="margin-top: 1rem" :options="options" @change="onChange" placeholder="Please select">
+      <a-icon type="smile" slot="suffixIcon" class="test"/>
+    </a-cascader>
+    <a-cascader suffixIcon="ab" style="margin-top: 1rem" :options="options" @change="onChange" placeholder="Please select" />
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      options: [{
+        value: 'zhejiang',
+        label: 'Zhejiang',
+        children: [{
+          value: 'hangzhou',
+          label: 'Hangzhou',
+          children: [{
+            value: 'xihu',
+            label: 'West Lake',
+          }],
+        }],
+      }, {
+        value: 'jiangsu',
+        label: 'Jiangsu',
+        children: [{
+          value: 'nanjing',
+          label: 'Nanjing',
+          children: [{
+            value: 'zhonghuamen',
+            label: 'Zhong Hua Men',
+          }],
+        }],
+      }]
+    }
+  },
+  methods: {
+    onChange(value) {
+      console.log(value);
+    }
+  }
+}
+</script>
+```
+
diff --git a/components/cascader/index.en-US.md b/components/cascader/index.en-US.md
index a8376f6d0..386438080 100644
--- a/components/cascader/index.en-US.md
+++ b/components/cascader/index.en-US.md
@@ -26,6 +26,7 @@
 | popupVisible | set visible of cascader popup | boolean | - |
 | showSearch | Whether show search input in single mode. | boolean\|object | false |
 | size | input size, one of `large` `default` `small` | string | `default` |
+| suffixIcon | The custom suffix icon | string \| VNode \| slot | - |
 | value(v-model) | selected value | string\[] | - |
 
 Fields in `showSearch`:
diff --git a/components/cascader/index.jsx b/components/cascader/index.jsx
index 691a31913..2cc36d73b 100644
--- a/components/cascader/index.jsx
+++ b/components/cascader/index.jsx
@@ -7,8 +7,9 @@ import omit from 'omit.js'
 import KeyCode from '../_util/KeyCode'
 import Input from '../input'
 import Icon from '../icon'
-import { hasProp, filterEmpty, getOptionProps, getStyle, getClass, getAttrs } from '../_util/props-util'
+import { hasProp, filterEmpty, getOptionProps, getStyle, getClass, getAttrs, getComponentFromProp, isValidElement } from '../_util/props-util'
 import BaseMixin from '../_util/BaseMixin'
+import { cloneElement } from '../_util/vnode'
 
 const CascaderOptionType = PropTypes.shape({
   value: PropTypes.string,
@@ -74,6 +75,7 @@ const CascaderProps = {
   popupVisible: PropTypes.bool,
   fieldNames: FieldNamesType,
   autoFocus: PropTypes.bool,
+  suffixIcon: PropTypes.any,
 }
 
 function defaultFilterOption (inputValue, path, names) {
@@ -88,7 +90,7 @@ function defaultSortFilteredOption (a, b, inputValue, names) {
   return a.findIndex(callback) - b.findIndex(callback)
 }
 
-function getFilledFieldNames (fieldNames = {}) {
+function getFilledFieldNames ({ fieldNames = {}}) {
   const names = {
     children: fieldNames.children || 'children',
     label: fieldNames.label || 'label',
@@ -110,13 +112,13 @@ const Cascader = {
   },
   data () {
     this.cachedOptions = []
-    const { value, defaultValue, popupVisible, showSearch, options, changeOnSelect, flattenTree, fieldNames } = this
+    const { value, defaultValue, popupVisible, showSearch, options, flattenTree } = this
     return {
       sValue: value || defaultValue || [],
       inputValue: '',
       inputFocused: false,
       sPopupVisible: popupVisible,
-      flattenOptions: showSearch ? flattenTree(options, changeOnSelect, fieldNames) : undefined,
+      flattenOptions: showSearch ? flattenTree(options, this.$props) : undefined,
     }
   },
   mounted () {
@@ -135,7 +137,7 @@ const Cascader = {
     },
     options (val) {
       if (this.showSearch) {
-        this.setState({ flattenOptions: this.flattenTree(this.options, this.changeOnSelect, this.fieldNames) })
+        this.setState({ flattenOptions: this.flattenTree(this.options, this.$props) })
       }
     },
   },
@@ -218,8 +220,8 @@ const Cascader = {
     },
 
     getLabel () {
-      const { options, $scopedSlots, fieldNames } = this
-      const names = getFilledFieldNames(fieldNames)
+      const { options, $scopedSlots } = this
+      const names = getFilledFieldNames(this.$props)
       const displayRender = this.displayRender || $scopedSlots.displayRender || defaultDisplayRender
       const value = this.sValue
       const unwrappedValue = Array.isArray(value[0]) ? value[0] : value
@@ -242,18 +244,18 @@ const Cascader = {
       }
     },
 
-    flattenTree (options, changeOnSelect, fieldNames, ancestor = []) {
-      const names = getFilledFieldNames(fieldNames)
+    flattenTree (options, props, ancestor = []) {
+      const names = getFilledFieldNames(props)
       let flattenOptions = []
       const childrenName = names.children
       options.forEach((option) => {
         const path = ancestor.concat(option)
-        if (changeOnSelect || !option[childrenName] || !option[childrenName].length) {
+        if (props.changeOnSelect || !option[childrenName] || !option[childrenName].length) {
           flattenOptions.push(path)
         }
         if (option[childrenName]) {
           flattenOptions = flattenOptions.concat(
-            this.flattenTree(option[childrenName], changeOnSelect, fieldNames, path)
+            this.flattenTree(option[childrenName], props, path)
           )
         }
       })
@@ -261,8 +263,8 @@ const Cascader = {
     },
 
     generateFilteredOptions (prefixCls) {
-      const { showSearch, notFoundContent, $scopedSlots, fieldNames } = this
-      const names = getFilledFieldNames(fieldNames)
+      const { showSearch, notFoundContent, $scopedSlots } = this
+      const names = getFilledFieldNames(this.$props)
       const {
         filter = defaultFilterOption,
         // render = this.defaultRenderFilteredOption,
@@ -308,6 +310,7 @@ const Cascader = {
     const { $slots, sPopupVisible, inputValue, $listeners } = this
     const { sValue: value, inputFocused } = this.$data
     const props = getOptionProps(this)
+    const suffixIcon = getComponentFromProp(this, 'suffixIcon')
     const {
       prefixCls, inputPrefixCls, placeholder, size, disabled,
       allowClear, showSearch = false, ...otherProps } = props
@@ -318,7 +321,8 @@ const Cascader = {
     })
     const clearIcon = (allowClear && !disabled && value.length > 0) || inputValue ? (
       <Icon
-        type='cross-circle'
+        type='close-circle'
+        theme='filled'
         class={`${prefixCls}-picker-clear`}
         onClick={this.clearSelection}
         key='clear-icon'
@@ -403,6 +407,19 @@ const Cascader = {
       attrs: getAttrs(this),
     }
     const children = filterEmpty($slots.default)
+    const inputIcon = suffixIcon && (
+      isValidElement(suffixIcon[0])
+        ? cloneElement(
+          suffixIcon[0],
+          {
+            class: {
+              [`${prefixCls}-picker-arrow`]: true,
+            },
+          },
+        ) : <span class={`${prefixCls}-picker-arrow`}>{suffixIcon}</span>) || (
+      <Icon type='down' class={arrowCls} />
+    )
+
     const input = children.length ? children : (
       <span
         class={pickerCls}
@@ -417,7 +434,17 @@ const Cascader = {
           {this.getLabel()}
         </span> : null}
         {clearIcon}
-        <Icon type='down' key='down-icon' class={arrowCls} />
+        {inputIcon}
+      </span>
+    )
+
+    const expandIcon = (
+      <Icon type='right' />
+    )
+
+    const loadingIcon = (
+      <span class={`${prefixCls}-menu-item-loading-icon`}>
+        <Icon type='redo' spin />
       </span>
     )
     const cascaderProps = {
@@ -427,6 +454,8 @@ const Cascader = {
         value: value,
         popupVisible: sPopupVisible,
         dropdownMenuColumnStyle: dropdownMenuColumnStyle,
+        expandIcon,
+        loadingIcon,
       },
       on: {
         ...$listeners,
diff --git a/components/cascader/index.zh-CN.md b/components/cascader/index.zh-CN.md
index aad91e236..1a0d58d17 100644
--- a/components/cascader/index.zh-CN.md
+++ b/components/cascader/index.zh-CN.md
@@ -26,6 +26,7 @@
 | popupVisible | 控制浮层显隐 | boolean | - |
 | showSearch | 在选择框中显示搜索框 | boolean | false |
 | size | 输入框大小，可选 `large` `default` `small` | string | `default` |
+| suffixIcon | 自定义的选择框后缀图标 | string \| VNode \| slot | - |
 | value(v-model) | 指定选中项 | string\[] | - |
 
 `showSearch` 为对象时，其中的字段：
diff --git a/components/icon/index.js b/components/icon/index.js
index 24b9b6c9a..c90dafd41 100644
--- a/components/icon/index.js
+++ b/components/icon/index.js
@@ -11,7 +11,7 @@ import {
 } from './utils'
 import warning from '../_util/warning'
 import { getTwoToneColor, setTwoToneColor } from './twoTonePrimaryColor'
-import { filterEmpty } from '../_util/props-util'
+import { filterEmpty, getClass } from '../_util/props-util'
 
 // Initial setting
 VueIcon.add(...Object.keys(allIcons).map((key) => allIcons[key]))
@@ -51,6 +51,7 @@ const Icon = {
     )
 
     const classString = classNames({
+      ...getClass(context),
       [`anticon`]: true,
       [`anticon-${type}`]: !!type,
     })

From e8743ec48d13fc83af2d5cd0d457289aaabe81b8 Mon Sep 17 00:00:00 2001
From: wangxueliang <wangxueliang@yidian-inc.com>
Date: Fri, 30 Nov 2018 09:30:43 +0800
Subject: [PATCH 4/9] fix: update vc-slider

---
 components/vc-slider/demo/handle.jsx          | 107 +++++++++---------
 components/vc-slider/src/Range.jsx            |   8 +-
 components/vc-slider/src/Slider.jsx           |   8 +-
 .../vc-slider/src/common/createSlider.jsx     |  39 ++++---
 4 files changed, 90 insertions(+), 72 deletions(-)

diff --git a/components/vc-slider/demo/handle.jsx b/components/vc-slider/demo/handle.jsx
index a0d4abadd..060bdf9ae 100644
--- a/components/vc-slider/demo/handle.jsx
+++ b/components/vc-slider/demo/handle.jsx
@@ -3,7 +3,10 @@ import Tooltip from '../../vc-tooltip'
 import '../assets/index.less'
 import '../../vc-tooltip/assets/bootstrap.less'
 
-const { Handle, Range } = Slider
+const { Handle } = Slider
+
+const { createSliderWithTooltip } = Slider
+const Range = createSliderWithTooltip(Slider.Range)
 
 export default {
   data () {
@@ -18,7 +21,7 @@ export default {
     },
   },
   render () {
-    const handle = (h, props) => {
+    const handle = (props) => {
       const { value, dragging, index, ref, style, ...restProps } = props
       const handleProps = {
         props: {
@@ -43,60 +46,60 @@ export default {
       )
     }
 
-    const handleRange = (h, { value, ref, dragging, index, disabled, style, ...restProps }) => {
-      const tipFormatter = value => `${value}%`
-      const tipProps = {}
+    // const handleRange = (h, { value, ref, dragging, index, disabled, style, ...restProps }) => {
+    //   const tipFormatter = value => `${value}%`
+    //   const tipProps = {}
 
-      const {
-        prefixCls = 'rc-slider-tooltip',
-        overlay = tipFormatter(value),
-        placement = 'top',
-        visible = visible || false,
-        ...restTooltipProps } = tipProps
+    //   const {
+    //     prefixCls = 'rc-slider-tooltip',
+    //     overlay = tipFormatter(value),
+    //     placement = 'top',
+    //     visible = visible || false,
+    //     ...restTooltipProps } = tipProps
 
-      let handleStyleWithIndex
-      if (Array.isArray(style)) {
-        handleStyleWithIndex = style[index] || style[0]
-      } else {
-        handleStyleWithIndex = style
-      }
+    //   let handleStyleWithIndex
+    //   if (Array.isArray(style)) {
+    //     handleStyleWithIndex = style[index] || style[0]
+    //   } else {
+    //     handleStyleWithIndex = style
+    //   }
 
-      const tooltipProps = {
-        props: {
-          prefixCls,
-          overlay,
-          placement,
-          visible: (!disabled && (this.visibles[index] || dragging)) || visible,
-          ...restTooltipProps,
-        },
-        key: index,
-      }
-      const handleProps = {
-        props: {
-          value,
-          ...restProps,
-        },
-        on: {
-          mouseenter: () => this.handleTooltipVisibleChange(index, true),
-          mouseleave: () => this.handleTooltipVisibleChange(index, false),
-        },
-        style: {
-          ...handleStyleWithIndex,
-        },
-        ref,
-      }
+    //   const tooltipProps = {
+    //     props: {
+    //       prefixCls,
+    //       overlay,
+    //       placement,
+    //       visible: (!disabled && (this.visibles[index] || dragging)) || visible,
+    //       ...restTooltipProps,
+    //     },
+    //     key: index,
+    //   }
+    //   const handleProps = {
+    //     props: {
+    //       value,
+    //       ...restProps,
+    //     },
+    //     on: {
+    //       mouseenter: () => this.handleTooltipVisibleChange(index, true),
+    //       mouseleave: () => this.handleTooltipVisibleChange(index, false),
+    //     },
+    //     style: {
+    //       ...handleStyleWithIndex,
+    //     },
+    //     ref,
+    //   }
 
-      return (
-        <Tooltip
-          {...tooltipProps}
-        >
+    //   return (
+    //     <Tooltip
+    //       {...tooltipProps}
+    //     >
 
-          <Handle
-            {...handleProps}
-          />
-        </Tooltip>
-      )
-    }
+    //       <Handle
+    //         {...handleProps}
+    //       />
+    //     </Tooltip>
+    //   )
+    // }
     const wrapperStyle = 'width: 400px; margin: 50px'
 
     return (
@@ -107,7 +110,7 @@ export default {
         </div>
         <div style={wrapperStyle}>
           <p>Range with custom handle</p>
-          <Range min={0} max={20} defaultValue={[3, 10]} handle={handleRange} />
+          <Range min={0} max={20} defaultValue={[3, 10]} tipFormatter={value => `${value}%`} />
         </div>
       </div>
     )
diff --git a/components/vc-slider/src/Range.jsx b/components/vc-slider/src/Range.jsx
index ad4468683..342049a3d 100644
--- a/components/vc-slider/src/Range.jsx
+++ b/components/vc-slider/src/Range.jsx
@@ -334,17 +334,17 @@ const Range = {
         disabled,
         min,
         max,
-        handle: handleGenerator,
+        handle,
+        defaultHandle,
         trackStyle,
         handleStyle,
         tabIndex,
-        $createElement,
       } = this
-
+      const handleGenerator = handle || defaultHandle
       const offsets = bounds.map(v => this.calcOffset(v))
 
       const handleClassName = `${prefixCls}-handle`
-      const handles = bounds.map((v, i) => handleGenerator($createElement, {
+      const handles = bounds.map((v, i) => handleGenerator({
         className: classNames({
           [handleClassName]: true,
           [`${handleClassName}-${i + 1}`]: true,
diff --git a/components/vc-slider/src/Slider.jsx b/components/vc-slider/src/Slider.jsx
index 56b467867..36c4004eb 100644
--- a/components/vc-slider/src/Slider.jsx
+++ b/components/vc-slider/src/Slider.jsx
@@ -165,11 +165,13 @@ const Slider = {
         tabIndex,
         min,
         max,
-        handle: handleGenerator,
+        handle,
+        defaultHandle,
       } = this
+      const handleGenerator = handle || defaultHandle
       const { sValue, dragging } = this
       const offset = this.calcOffset(sValue)
-      const handle = handleGenerator(this.$createElement, {
+      const handles = handleGenerator({
         className: `${prefixCls}-handle`,
         prefixCls,
         vertical,
@@ -190,7 +192,7 @@ const Slider = {
       const _trackStyle = trackStyle[0] || trackStyle
       return {
         tracks: this.getTrack({ prefixCls, vertical, included, offset, minimumTrackStyle, _trackStyle }),
-        handles: handle,
+        handles,
       }
     },
   },
diff --git a/components/vc-slider/src/common/createSlider.jsx b/components/vc-slider/src/common/createSlider.jsx
index 3cff35115..c21c32e8d 100644
--- a/components/vc-slider/src/common/createSlider.jsx
+++ b/components/vc-slider/src/common/createSlider.jsx
@@ -45,19 +45,19 @@ export default function createSlider (Component) {
       max: 100,
       step: 1,
       marks: {},
-      handle (h, { index, ref, className, style, ...restProps }) {
-        delete restProps.dragging
-        const handleProps = {
-          props: {
-            ...restProps,
-          },
-          class: className,
-          style,
-          key: index,
-          ref,
-        }
-        return <Handle {...handleProps} />
-      },
+      // handle ({ index, ref, className, style, ...restProps }) {
+      //   delete restProps.dragging
+      //   const handleProps = {
+      //     props: {
+      //       ...restProps,
+      //     },
+      //     class: className,
+      //     style,
+      //     key: index,
+      //     ref,
+      //   }
+      //   return <Handle {...handleProps} />
+      // },
       included: true,
       disabled: false,
       dots: false,
@@ -106,6 +106,19 @@ export default function createSlider (Component) {
       },
     },
     methods: {
+      defaultHandle ({ index, ref, className, style, ...restProps }) {
+        delete restProps.dragging
+        const handleProps = {
+          props: {
+            ...restProps,
+          },
+          class: className,
+          style,
+          key: index,
+          ref,
+        }
+        return <Handle {...handleProps} />
+      },
       onMouseDown (e) {
         if (e.button !== 0) { return }
         const isVertical = this.vertical

From 3d41b55ba35a22513831e555e9249c4eadb58d41 Mon Sep 17 00:00:00 2001
From: wangxueliang <wangxueliang@yidian-inc.com>
Date: Fri, 30 Nov 2018 10:50:26 +0800
Subject: [PATCH 5/9] feat: update steps

---
 components/steps/index.en-US.md |  1 +
 components/steps/index.jsx      | 13 +++++++++----
 components/steps/index.zh-CN.md |  1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/components/steps/index.en-US.md b/components/steps/index.en-US.md
index b0dd6e2ee..437547847 100644
--- a/components/steps/index.en-US.md
+++ b/components/steps/index.en-US.md
@@ -10,6 +10,7 @@ The whole of the step bar.
 | progressDot | Steps with progress dot style, customize the progress dot by setting a scoped slot. labelPlacement will be `vertical` | Boolean or slot="progressDot" slot-scope="{index, status, title, description, prefixCls})" | false |
 | size | to specify the size of the step bar, `default` and `small` are currently supported | string | `default` |
 | status | to specify the status of current step, can be set to one of the following values: `wait` `process` `finish` `error` | string | `process` |
+| initial | set the initial step, counting from 0 | number | 0 |
 
 ### Steps.Step
 
diff --git a/components/steps/index.jsx b/components/steps/index.jsx
index ca75aecc7..7c2c67db1 100644
--- a/components/steps/index.jsx
+++ b/components/steps/index.jsx
@@ -2,12 +2,15 @@
 import PropTypes from '../_util/vue-types'
 import { initDefaultProps, getOptionProps, getComponentFromProp } from '../_util/props-util'
 import VcSteps from '../vc-steps'
+import Icon from '../icon'
 
 const getStepsProps = (defaultProps = {}) => {
   const props = {
     prefixCls: PropTypes.string,
     iconPrefix: PropTypes.string,
     current: PropTypes.number,
+    initial: PropTypes.number,
+    labelPlacement: PropTypes.oneOf(['horizontal', 'vertical']),
     status: PropTypes.oneOf(['wait', 'process', 'finish', 'error']),
     size: PropTypes.oneOf(['default', 'small']),
     direction: PropTypes.oneOf(['horizontal', 'vertical']),
@@ -29,13 +32,15 @@ const Steps = {
   Step: { ...VcSteps.Step, name: 'AStep' },
   render () {
     const props = getOptionProps(this)
+    const { prefixCls } = props
+    const icons = {
+      finish: <Icon type='check' className={`${prefixCls}-finish-icon`} />,
+      error: <Icon type='close' className={`${prefixCls}-error-icon`} />,
+    }
     const stepsProps = {
       props: {
         ...props,
-        icons: props.icons || {
-          error: getComponentFromProp(this, 'icons.error'),
-          finish: getComponentFromProp(this, 'icons.finish'),
-        },
+        icons,
       },
       on: this.$listeners,
       scopedSlots: this.$scopedSlots,
diff --git a/components/steps/index.zh-CN.md b/components/steps/index.zh-CN.md
index d189fa32a..543ec6017 100644
--- a/components/steps/index.zh-CN.md
+++ b/components/steps/index.zh-CN.md
@@ -11,6 +11,7 @@
 | progressDot | 点状步骤条，可以设置为一个 作用域插槽,labelPlacement 将强制为`vertical` | Boolean or slot="progressDot" slot-scope="{index, status, title, description, prefixCls})" | false |
 | size | 指定大小，目前支持普通（`default`）和迷你（`small`） | string | default |
 | status | 指定当前步骤的状态，可选 `wait` `process` `finish` `error` | string | process |
+| initial | 起始序号，从 0 开始记数 | number | 0 |
 
 ### Steps.Step
 

From 918cde803f816535c6933bedee40d797ce3f721b Mon Sep 17 00:00:00 2001
From: wangxueliang <wangxueliang@yidian-inc.com>
Date: Fri, 30 Nov 2018 11:56:41 +0800
Subject: [PATCH 6/9] feat: update spin

---
 components/spin/Spin.jsx                 | 106 +++++++++++++----------
 components/spin/demo/custom-indicator.md |   2 +-
 components/steps/index.jsx               |   2 +-
 3 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/components/spin/Spin.jsx b/components/spin/Spin.jsx
index 7da91b8a0..b538cb7b3 100644
--- a/components/spin/Spin.jsx
+++ b/components/spin/Spin.jsx
@@ -20,6 +20,10 @@ export const SpinProps = () => ({
 // Render indicator
 let defaultIndicator
 
+function shouldDelay (spinning, delay) {
+  return !!spinning && !!delay && !isNaN(Number(delay))
+}
+
 export function setDefaultIndicator (content) {
   defaultIndicator = typeof content.indicator === 'function' ? content.indicator : (h) => {
     return <content.indicator />
@@ -36,14 +40,63 @@ export default {
     wrapperClassName: '',
   }),
   data () {
-    const { spinning } = this
+    const { spinning, delay } = this
     return {
-      stateSpinning: spinning,
+      sSpinning: spinning && !shouldDelay(spinning, delay),
       debounceTimeout: null,
       delayTimeout: null,
     }
   },
+  mounted () {
+    this.$nextTick(() => {
+      const { spinning, delay } = this
+      if (shouldDelay(spinning, delay)) {
+        this.delayTimeout = window.setTimeout(this.delayUpdateSpinning, delay)
+      }
+    })
+  },
+  updated () {
+    this.$nextTick(() => {
+      const { delay, spinning, sSpinning } = this
+      if (sSpinning === spinning) {
+        return
+      }
+
+      if (this.debounceTimeout) {
+        clearTimeout(this.debounceTimeout)
+      }
+      if (sSpinning && !spinning) {
+        this.debounceTimeout = window.setTimeout(() => this.setState({ sSpinning: spinning }), 200)
+        if (this.delayTimeout) {
+          clearTimeout(this.delayTimeout)
+        }
+      } else {
+        if (shouldDelay(spinning, delay)) {
+          if (this.delayTimeout) {
+            clearTimeout(this.delayTimeout)
+          }
+          this.delayTimeout = window.setTimeout(this.delayUpdateSpinning, delay)
+        } else {
+          this.setState({ sSpinning: spinning })
+        }
+      }
+    })
+  },
+  beforeDestroy () {
+    if (this.debounceTimeout) {
+      clearTimeout(this.debounceTimeout)
+    }
+    if (this.delayTimeout) {
+      clearTimeout(this.delayTimeout)
+    }
+  },
   methods: {
+    delayUpdateSpinning () {
+      const { spinning, sSpinning } = this
+      if (sSpinning !== spinning) {
+        this.setState({ sSpinning: spinning })
+      }
+    },
     getChildren () {
       if (this.$slots && this.$slots.default) {
         return filterEmpty(this.$slots.default)
@@ -77,55 +130,14 @@ export default {
       )
     },
   },
-  mounted () {
-    this.$nextTick(() => {
-      const { spinning, delay } = this
-      if (spinning && delay && !isNaN(Number(delay))) {
-        this.setState({ stateSpinning: false })
-        this.delayTimeout = window.setTimeout(() => this.setState({ stateSpinning: spinning }), delay)
-      }
-    })
-  },
-  beforeDestroy () {
-    if (this.debounceTimeout) {
-      clearTimeout(this.debounceTimeout)
-    }
-    if (this.delayTimeout) {
-      clearTimeout(this.delayTimeout)
-    }
-  },
-  watch: {
-    spinning () {
-      const { delay, spinning } = this
-
-      if (this.debounceTimeout) {
-        clearTimeout(this.debounceTimeout)
-      }
-      if (!spinning) {
-        this.debounceTimeout = window.setTimeout(() => this.setState({ stateSpinning: spinning }), 200)
-        if (this.delayTimeout) {
-          clearTimeout(this.delayTimeout)
-        }
-      } else {
-        if (spinning && delay && !isNaN(Number(delay))) {
-          if (this.delayTimeout) {
-            clearTimeout(this.delayTimeout)
-          }
-          this.delayTimeout = window.setTimeout(() => this.setState({ stateSpinning: spinning }), delay)
-        } else {
-          this.setState({ stateSpinning: spinning })
-        }
-      }
-    },
-  },
   render (h) {
     const { size, prefixCls, tip, wrapperClassName, ...restProps } = this.$props
-    const { stateSpinning } = this
+    const { sSpinning } = this
     const spinClassName = {
       [prefixCls]: true,
       [`${prefixCls}-sm`]: size === 'small',
       [`${prefixCls}-lg`]: size === 'large',
-      [`${prefixCls}-spinning`]: stateSpinning,
+      [`${prefixCls}-spinning`]: sSpinning,
       [`${prefixCls}-show-text`]: !!tip,
     }
 
@@ -143,7 +155,7 @@ export default {
       }
       const containerClassName = {
         [`${prefixCls}-container`]: true,
-        [`${prefixCls}-blur`]: stateSpinning,
+        [`${prefixCls}-blur`]: sSpinning,
       }
 
       return (
@@ -152,7 +164,7 @@ export default {
           tag='div'
           class={animateClassName}
         >
-          {stateSpinning && <div key='loading'>{spinElement}</div>}
+          {sSpinning && <div key='loading'>{spinElement}</div>}
           <div class={containerClassName} key='container'>
             {children}
           </div>
diff --git a/components/spin/demo/custom-indicator.md b/components/spin/demo/custom-indicator.md
index fb500cda4..ce2f4f2d2 100644
--- a/components/spin/demo/custom-indicator.md
+++ b/components/spin/demo/custom-indicator.md
@@ -21,7 +21,7 @@ Use custom loading indicator.
   export default {
     data () {
       return {
-        indicator: <i class="anticon anticon-loading anticon-spin ant-spin-dot" style="font-size: 24px;"></i>
+        indicator: <a-icon type="loading" style="font-size: 24px" spin />
       }
     },
   }
diff --git a/components/steps/index.jsx b/components/steps/index.jsx
index 7c2c67db1..644108c3a 100644
--- a/components/steps/index.jsx
+++ b/components/steps/index.jsx
@@ -1,6 +1,6 @@
 
 import PropTypes from '../_util/vue-types'
-import { initDefaultProps, getOptionProps, getComponentFromProp } from '../_util/props-util'
+import { initDefaultProps, getOptionProps } from '../_util/props-util'
 import VcSteps from '../vc-steps'
 import Icon from '../icon'
 

From ac7cf55bcfdacd5a37b7bf276db453c6dbde5180 Mon Sep 17 00:00:00 2001
From: wangxueliang <wangxueliang@yidian-inc.com>
Date: Fri, 30 Nov 2018 13:18:59 +0800
Subject: [PATCH 7/9] feat: update switch

---
 components/switch/demo/text.md | 2 +-
 components/switch/index.jsx    | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/components/switch/demo/text.md b/components/switch/demo/text.md
index 1c7996d9f..cb580b58a 100644
--- a/components/switch/demo/text.md
+++ b/components/switch/demo/text.md
@@ -17,7 +17,7 @@ With text and icon.
     <br>
     <a-switch defaultChecked >
       <a-icon type="check" slot="checkedChildren"/>
-      <a-icon type="cross" slot="unCheckedChildren"/>
+      <a-icon type="close" slot="unCheckedChildren"/>
     </a-switch>
   </div>
 </template>
diff --git a/components/switch/index.jsx b/components/switch/index.jsx
index b9a86131f..2f9066605 100644
--- a/components/switch/index.jsx
+++ b/components/switch/index.jsx
@@ -3,6 +3,7 @@ import PropTypes from '../_util/vue-types'
 import { getOptionProps, getComponentFromProp } from '../_util/props-util'
 import VcSwitch from '../vc-switch'
 import Wave from '../_util/wave'
+import Icon from '../icon'
 
 const Switch = {
   name: 'ASwitch',
@@ -38,10 +39,17 @@ const Switch = {
       [`${prefixCls}-small`]: size === 'small',
       [`${prefixCls}-loading`]: loading,
     }
+    const loadingIcon = loading ? (
+      <Icon
+        type='loading'
+        class={`${prefixCls}-loading-icon`}
+      />
+    ) : null
     const switchProps = {
       props: {
         ...restProps,
         prefixCls,
+        loadingIcon,
       },
       on: this.$listeners,
       class: classes,

From 6b5c0a404bb742e008a509d47c705c237522248c Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Fri, 30 Nov 2018 19:58:45 +0800
Subject: [PATCH 8/9] fix: update spin steps

---
 components/spin/Spin.jsx   | 5 +++--
 components/steps/index.jsx | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/components/spin/Spin.jsx b/components/spin/Spin.jsx
index b538cb7b3..11f042ce0 100644
--- a/components/spin/Spin.jsx
+++ b/components/spin/Spin.jsx
@@ -41,10 +41,11 @@ export default {
   }),
   data () {
     const { spinning, delay } = this
+    this.debounceTimeout = null
+    this.delayTimeout = null
     return {
       sSpinning: spinning && !shouldDelay(spinning, delay),
-      debounceTimeout: null,
-      delayTimeout: null,
+
     }
   },
   mounted () {
diff --git a/components/steps/index.jsx b/components/steps/index.jsx
index 644108c3a..54fc7f9a8 100644
--- a/components/steps/index.jsx
+++ b/components/steps/index.jsx
@@ -34,13 +34,13 @@ const Steps = {
     const props = getOptionProps(this)
     const { prefixCls } = props
     const icons = {
-      finish: <Icon type='check' className={`${prefixCls}-finish-icon`} />,
-      error: <Icon type='close' className={`${prefixCls}-error-icon`} />,
+      finish: <Icon type='check' class={`${prefixCls}-finish-icon`} />,
+      error: <Icon type='close' class={`${prefixCls}-error-icon`} />,
     }
     const stepsProps = {
       props: {
-        ...props,
         icons,
+        ...props,
       },
       on: this.$listeners,
       scopedSlots: this.$scopedSlots,

From 380331df80a878e33eefe9141fb06c3632562bec Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Fri, 30 Nov 2018 22:58:46 +0800
Subject: [PATCH 9/9] feat: update checkbox divider dropdown

---
 components/checkbox/Checkbox.jsx            |  5 ++++-
 components/checkbox/Group.jsx               |  3 ++-
 components/checkbox/__tests__/group.test.js | 17 +++++++++++++++++
 components/checkbox/demo/index.vue          |  1 +
 components/checkbox/index.en-US.md          |  2 +-
 components/checkbox/index.zh-CN.md          |  3 +--
 components/divider/demo/index.vue           |  1 +
 components/dropdown/demo/index.vue          |  1 +
 8 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/components/checkbox/Checkbox.jsx b/components/checkbox/Checkbox.jsx
index 763d3c32b..29d4c39ff 100644
--- a/components/checkbox/Checkbox.jsx
+++ b/components/checkbox/Checkbox.jsx
@@ -55,7 +55,10 @@ export default {
     } = props
     const checkboxProps = { props: { ...restProps, prefixCls }, on: restListeners, attrs: getAttrs(this) }
     if (checkboxGroup) {
-      checkboxProps.on.change = () => checkboxGroup.toggleOption({ label: children, value: props.value })
+      checkboxProps.on.change = (...args) => {
+        this.$emit('change', ...args)
+        checkboxGroup.toggleOption({ label: children, value: props.value })
+      }
       checkboxProps.props.checked = checkboxGroup.sValue.indexOf(props.value) !== -1
       checkboxProps.props.disabled = props.disabled || checkboxGroup.disabled
     } else {
diff --git a/components/checkbox/Group.jsx b/components/checkbox/Group.jsx
index 2ddc14655..4e2e8c989 100644
--- a/components/checkbox/Group.jsx
+++ b/components/checkbox/Group.jsx
@@ -1,6 +1,7 @@
 
 import Checkbox from './Checkbox'
 import hasProp from '../_util/props-util'
+function noop () {}
 export default {
   name: 'ACheckboxGroup',
   props: {
@@ -82,7 +83,7 @@ export default {
           disabled={'disabled' in option ? option.disabled : props.disabled}
           value={option.value}
           checked={state.sValue.indexOf(option.value) !== -1}
-          onChange={() => this.toggleOption(option)}
+          onChange={option.onChange || noop}
           class={`${groupPrefixCls}-item`}
         >
           {option.label}
diff --git a/components/checkbox/__tests__/group.test.js b/components/checkbox/__tests__/group.test.js
index 1fd53a51f..d4db61bde 100644
--- a/components/checkbox/__tests__/group.test.js
+++ b/components/checkbox/__tests__/group.test.js
@@ -103,4 +103,21 @@ describe('CheckboxGroup', () => {
       expect(wrapper.vm.sValue).toEqual(['Apple'])
     })
   })
+
+  // https://github.com/ant-design/ant-design/issues/12642
+  it('should trigger onChange in sub Checkbox', () => {
+    const onChange = jest.fn()
+    const wrapper = mount({
+      render () {
+        return (
+          <Checkbox.Group>
+            <Checkbox value='my' onChange={onChange} />
+          </Checkbox.Group>
+        )
+      },
+    })
+    wrapper.findAll('.ant-checkbox-input').at(0).trigger('change')
+    expect(onChange).toBeCalled()
+    expect(onChange.mock.calls[0][0].target.value).toEqual('my')
+  })
 })
diff --git a/components/checkbox/demo/index.vue b/components/checkbox/demo/index.vue
index ca86cf930..8fd01a22f 100644
--- a/components/checkbox/demo/index.vue
+++ b/components/checkbox/demo/index.vue
@@ -29,6 +29,7 @@
     category: 'Components',
     subtitle: '多选框',
     type: 'Data Entry',
+    zhType: '数据录入',
     title: 'Checkbox',
     render () {
       return (
diff --git a/components/checkbox/index.en-US.md b/components/checkbox/index.en-US.md
index 592ea8f00..5471f0b9a 100644
--- a/components/checkbox/index.en-US.md
+++ b/components/checkbox/index.en-US.md
@@ -23,7 +23,7 @@
 | -------- | ----------- | ---- | ------- |
 | defaultValue | Default selected value | string\[] | \[] |
 | disabled | Disable all checkboxes | boolean | false |
-| options | Specifies options | string\[] \| Array&lt;{ label: string value: string disabled?: boolean }> | \[] |
+| options | Specifies options | string\[] \| Array&lt;{ label: string value: string disabled?: boolean, onChange?: function }> | \[] |
 | value | Used for setting the currently selected value. | string\[] | \[] |
 
 #### events
diff --git a/components/checkbox/index.zh-CN.md b/components/checkbox/index.zh-CN.md
index aba61cbe2..ff59f2d50 100644
--- a/components/checkbox/index.zh-CN.md
+++ b/components/checkbox/index.zh-CN.md
@@ -25,9 +25,8 @@
 | --- | --- | --- | --- |
 | defaultValue | 默认选中的选项 | string\[] | \[] |
 | disabled | 整组失效 | boolean | false |
-| options | 指定可选项 | string\[] \| Array&lt;{ label: string value: string disabled?: boolean }> | \[] |
+| options | 指定可选项 | string\[] \| Array&lt;{ label: string value: string disabled?: boolean, onChange?: function }> | \[] |
 | value | 指定选中的选项 | string\[] | \[] |
-| onChange | 变化时回调函数 | Function(checkedValue) | - |
 
 #### 事件
 | 事件名称 | 说明 | 回调参数 |
diff --git a/components/divider/demo/index.vue b/components/divider/demo/index.vue
index 7a0d89995..a4078213b 100644
--- a/components/divider/demo/index.vue
+++ b/components/divider/demo/index.vue
@@ -23,6 +23,7 @@ const md = {
 export default {
   category: 'Components',
   type: 'Other',
+  zhType: '其他',
   title: 'Divider',
   subtitle: '分割线',
   render () {
diff --git a/components/dropdown/demo/index.vue b/components/dropdown/demo/index.vue
index 6b581f941..7a7c62e45 100644
--- a/components/dropdown/demo/index.vue
+++ b/components/dropdown/demo/index.vue
@@ -27,6 +27,7 @@ export default {
   category: 'Components',
   subtitle: '下拉菜单',
   type: 'Navigation',
+  zhType: '导航',
   title: 'Dropdown',
   render () {
     return (