Merge branch 'feat-3.10.3'

# Conflicts:
#	components/locale-provider/__tests__/__snapshots__/index.test.js.snap

Author: tangjinzhou

.eslintignore

@@ -2,3 +2,4 @@ node_modules/
 **/*.spec.*
 **/style/
 *.html
+/components/test/*

CHANGELOG.en-US.md

@@ -2,6 +2,40 @@
 
 ---
 
+## 1.2.0
+`2018-12-16`
+### Synchronize with antd 3.10.x
+
+- 🔥🔥🔥 replaced font icons with svg icons which bring benefits below:：
+  - Complete offline usage of icon, no dependency of alipay cdn font icon file and no more empty square during downloading than no need to deploy icon font files locally either.
+  - Much more display accuracy in lower-level screens.
+  - Support multiple colors for icon.
+  - No need to change built-in icons with overriding styles by providing more props in component.
+  - 🌟 Add the `theme` attribute to set the theme style of the icon.
+  - 🌟 Added `component` attribute, you can externally pass a component to customize the control rendering result. 
+  - 🌟 The `twoToneColor` property is added to control the theme color of the two-color icon.
+  - 🌟 Added static methods `Icon.getTowToneColor()` and `Icon.setTwoToneColor(...)` to globally get and set the theme color of all two-color icons.
+  - 🌟 The new static method `Icon.createFromIconfontCN({...})` is added to make it easier to use icons hosted on [`iconfont.cn`](http://iconfont.cn/).
+- 🔥 Added a new component `Skeleton`.
+- 🔥 Menu will automatically close up to fit width in `horizontal` mode.
+- 🔥 The `placement` of the drawer supports `top` and `bottom` to accommodate more scenes.
+- 🌟 The following components add a `suffixIcon` prop, which is used to set the icon behind the input box. For details, please refer to the documentation.
+  - Cascader
+  - DatePicker
+  - Select
+  - TreeSelect
+  - TimePicker
+- 🌟 Added Modal.open for optional icon dialog.
+- 🌟 Modal.info adds the configuration of `getContainer`.
+- 🌟 Improve RangePicker footer UI by merging them.
+- 🌟 The Anchor component adds `onClick` property.
+- 🌟 The Tab component adds the `renderTabBar` property.
+- 🌟 The Input component adds the `select` method.
+- 🌟 Steps adds the `initial` attribute.
+- 🌟 Upload adds `openFileDialogOnClick` prop to allow setting whether to open the upload dialog when the component is clicked.
+- 🌟 InputNumber adds `decimalSeparator` prop to allow setting a custom decimal.
+- 🐞 Fix a lot of hidden bugs that have not yet been issued, and then not list them one by one.
+
 ## 1.1.10
 
 `2018-12-7`

CHANGELOG.zh-CN.md

@@ -2,6 +2,40 @@
 
 ---
 
+## 1.2.0
+`2018-12-16`
+### 与antd 3.10.x同步
+
+- 🔥🔥🔥 使用了 svg 图标替换了原先的 font 图标，从而带来了以下优势：
+  可以离线化使用，不需要从支付宝 cdn 下载字体文件，图标不会因为网络问题呈现方块，也无需字体文件本地部署。
+  在低端设备上 svg 有更好的清晰度。
+  支持多色图标。
+  对于内建图标的更换可以提供更多 API，而不需要进行样式覆盖。
+  - 🌟 新增 `theme` 属性，可以设置图标的主题风格。
+  - 🌟 新增 `component` 属性，可以外部传入一个组件来自定义控制渲染结果。
+  - 🌟 新增 `twoToneColor` 属性，可以控制双色图标的主题色。
+  - 🌟 新增静态方法 `Icon.getTowToneColor()` 和 `Icon.setTwoToneColor(...)`，可以全局性的获取和设置所有双色图标的主题色。
+  - 🌟 新增静态方法 `Icon.createFromIconfontCN({...})`，可以更加方便地使用 [`iconfont.cn`](http://iconfont.cn/) 上托管的图标。
+- 🔥 增加了一个新组件`Skeleton`
+- 🔥 Menu 在 `horizontal` 模式下会自动收起来适应宽度。
+- 🔥 Drawer 的 `placement` 支持 `top` 和 `bottom`，可以适应更多场景。
+- 🌟 以下组件均新增了 `suffixIcon` 属性，用于设置输入框后面的图标，具体用法可以参考文档。
+  - Cascader
+  - DatePicker
+  - Select
+  - TreeSelect
+  - TimePicker
+- 🌟 新增 Modal.open 方法，用于可自定义图标的快捷对话框。
+- 🌟 Modal.info 增加 `getContainer` 的配置。
+- 🌟 合并优化了 RangePicker 的日历页脚 UI。
+- 🌟 Anchor 组件增加 `click` 事件。
+- 🌟 Tab 组件增加 `renderTabBar` 属性。
+- 🌟 Input 组件增加 `select` 方法。
+- 🌟 Steps 增加 `initial` 属性。
+- 🌟 Upload 组件新增 `openFileDialogOnClick` 属性，用于设置点击组件时是否打开上传对话框。
+- 🌟 InputNumber 组件新增 `decimalSeparator` 属性，用于设置自定义的小数点。
+- 🐞 修复众多隐蔽暂未提issue的bug，再此不在一一列出
+
 ## 1.1.10
 
 `2018-12-7`

components/_util/FormDecoratorDirective.js

@@ -1,7 +1,11 @@
+export function antDecorator (Vue) {
+  return Vue.directive('decorator', {
+  })
+}
+
 export default {
   // just for tag
   install: (Vue, options) => {
-    Vue.directive('decorator', {
-    })
+    antDecorator(Vue)
   },
 }

components/_util/antDirective.js

@@ -0,0 +1,9 @@
+import { antInput } from './antInputDirective'
+import { antDecorator } from './FormDecoratorDirective'
+
+export default {
+  install: (Vue, options) => {
+    antInput(Vue)
+    antDecorator(Vue)
+  },
+}

components/_util/antInputDirective.js

@@ -49,26 +49,30 @@ if (isIE9) {
   })
 }
 
-export default {
-  install: (Vue, options) => {
-    Vue.directive('ant-input', {
-      inserted (el, binding, vnode, oldVnode) {
-        if (vnode.tag === 'textarea' || isTextInputType(el.type)) {
-          if (!binding.modifiers || !binding.modifiers.lazy) {
-            el.addEventListener('compositionstart', onCompositionStart)
-            el.addEventListener('compositionend', onCompositionEnd)
-            // Safari < 10.2 & UIWebView doesn't fire compositionend when
-            // switching focus before confirming composition choice
-            // this also fixes the issue where some browsers e.g. iOS Chrome
-            // fires "change" instead of "input" on autocomplete.
-            el.addEventListener('change', onCompositionEnd)
-            /* istanbul ignore if */
-            if (isIE9) {
-              el.vmodel = true
-            }
+export function antInput (Vue) {
+  return Vue.directive('ant-input', {
+    inserted (el, binding, vnode, oldVnode) {
+      if (vnode.tag === 'textarea' || isTextInputType(el.type)) {
+        if (!binding.modifiers || !binding.modifiers.lazy) {
+          el.addEventListener('compositionstart', onCompositionStart)
+          el.addEventListener('compositionend', onCompositionEnd)
+          // Safari < 10.2 & UIWebView doesn't fire compositionend when
+          // switching focus before confirming composition choice
+          // this also fixes the issue where some browsers e.g. iOS Chrome
+          // fires "change" instead of "input" on autocomplete.
+          el.addEventListener('change', onCompositionEnd)
+          /* istanbul ignore if */
+          if (isIE9) {
+            el.vmodel = true
           }
         }
-      },
-    })
+      }
+    },
+  })
+}
+
+export default {
+  install: (Vue, options) => {
+    antInput(Vue)
   },
 }

components/_util/antRefDirective.js

@@ -1,4 +1,22 @@
-const EVENT_NAME_MAP = {
+const START_EVENT_NAME_MAP = {
+  transitionstart: {
+    transition: 'transitionstart',
+    WebkitTransition: 'webkitTransitionStart',
+    MozTransition: 'mozTransitionStart',
+    OTransition: 'oTransitionStart',
+    msTransition: 'MSTransitionStart',
+  },
+
+  animationstart: {
+    animation: 'animationstart',
+    WebkitAnimation: 'webkitAnimationStart',
+    MozAnimation: 'mozAnimationStart',
+    OAnimation: 'oAnimationStart',
+    msAnimation: 'MSAnimationStart',
+  },
+}
+
+const END_EVENT_NAME_MAP = {
   transitionend: {
     transition: 'transitionend',
     WebkitTransition: 'webkitTransitionEnd',
@@ -16,31 +34,39 @@ const EVENT_NAME_MAP = {
   },
 }
 
+const startEvents = []
 const endEvents = []
 
 function detectEvents () {
   const testEl = document.createElement('div')
   const style = testEl.style
 
   if (!('AnimationEvent' in window)) {
-    delete EVENT_NAME_MAP.animationend.animation
+    delete START_EVENT_NAME_MAP.animationstart.animation
+    delete END_EVENT_NAME_MAP.animationend.animation
   }
 
   if (!('TransitionEvent' in window)) {
-    delete EVENT_NAME_MAP.transitionend.transition
+    delete START_EVENT_NAME_MAP.transitionstart.transition
+    delete END_EVENT_NAME_MAP.transitionend.transition
   }
 
-  for (const baseEventName in EVENT_NAME_MAP) {
-    if (EVENT_NAME_MAP.hasOwnProperty(baseEventName)) {
-      const baseEvents = EVENT_NAME_MAP[baseEventName]
-      for (const styleName in baseEvents) {
-        if (styleName in style) {
-          endEvents.push(baseEvents[styleName])
-          break
+  function process (EVENT_NAME_MAP, events) {
+    for (const baseEventName in EVENT_NAME_MAP) {
+      if (EVENT_NAME_MAP.hasOwnProperty(baseEventName)) {
+        const baseEvents = EVENT_NAME_MAP[baseEventName]
+        for (const styleName in baseEvents) {
+          if (styleName in style) {
+            events.push(baseEvents[styleName])
+            break
+          }
         }
       }
     }
   }
+
+  process(START_EVENT_NAME_MAP, startEvents)
+  process(END_EVENT_NAME_MAP, endEvents)
 }
 
 if (typeof window !== 'undefined' && typeof document !== 'undefined') {
@@ -56,6 +82,31 @@ function removeEventListener (node, eventName, eventListener) {
 }
 
 const TransitionEvents = {
+  // Start events
+  startEvents,
+
+  addStartEventListener (node, eventListener) {
+    if (startEvents.length === 0) {
+      window.setTimeout(eventListener, 0)
+      return
+    }
+    startEvents.forEach((startEvent) => {
+      addEventListener(node, startEvent, eventListener)
+    })
+  },
+
+  removeStartEventListener (node, eventListener) {
+    if (startEvents.length === 0) {
+      return
+    }
+    startEvents.forEach((startEvent) => {
+      removeEventListener(node, startEvent, eventListener)
+    })
+  },
+
+  // End events
+  endEvents,
+
   addEndEventListener (node, eventListener) {
     if (endEvents.length === 0) {
       window.setTimeout(eventListener, 0)
@@ -66,8 +117,6 @@ const TransitionEvents = {
     })
   },
 
-  endEvents,
-
   removeEndEventListener (node, eventListener) {
     if (endEvents.length === 0) {
       return
@@ -79,4 +128,3 @@ const TransitionEvents = {
 }
 
 export default TransitionEvents
-

components/_util/css-animation/Event.js

@@ -1,3 +1,5 @@
+// https://github.com/yiminghe/css-animation 1.5.0
+
 import Event from './Event'
 import classes from 'component-classes'
 import { requestAnimationTimeout, cancelAnimationTimeout } from '../requestAnimationTimeout'

components/_util/css-animation/index.js

@@ -95,19 +95,22 @@ const getOptionProps = (instance) => {
   return filterProps($props, $options.propsData)
 }
 
-const getComponentFromProp = (instance, prop) => {
+const getComponentFromProp = (instance, prop, options = instance, execute = true) => {
   if (instance.$createElement) {
     const h = instance.$createElement
     const temp = instance[prop]
     if (temp !== undefined) {
-      return typeof temp === 'function' ? temp(h) : temp
+      return typeof temp === 'function' && execute ? temp(h, options) : temp
     }
-    return instance.$slots[prop]
+    return instance.$slots[prop] ||
+     (instance.$scopedSlots[prop] && execute && instance.$scopedSlots[prop](options)) ||
+     (instance.$scopedSlots[prop] && instance.$scopedSlots[prop]) ||
+     undefined
   } else {
     const h = instance.context.$createElement
     const temp = getPropsData(instance)[prop]
     if (temp !== undefined) {
-      return typeof temp === 'function' ? temp(h) : temp
+      return typeof temp === 'function' && execute ? temp(h, options) : temp
     }
     const slotsProp = []
     const componentOptions = instance.componentOptions || {};
@@ -231,7 +234,7 @@ const initDefaultProps = (propTypes, defaultProps) => {
 export function mergeProps () {
   const args = [].slice.call(arguments, 0)
   const props = {}
-  args.forEach((p, i) => {
+  args.forEach((p = {}, i) => {
     for (const [k, v] of Object.entries(p)) {
       props[k] = props[k] || {}
       if (isPlainObject(v)) {