Merge branch 'master' into feat-1.3.0

Author: tangjinzhou

CHANGELOG.en-US.md

@@ -2,6 +2,18 @@
 
 ---
 
+## 1.2.4
+`2018-12-29`
+
+- 🐞 Fix `Select` component does not trigger `popupScroll` event[#350](https://github.com/vueComponent/ant-design-vue/issues/350)
+- 🐞 Fixing the custom `Icon` component does not support `class` `style` issues.[#351](https://github.com/vueComponent/ant-design-vue/issues/351)
+- 🌟 `Tree` `TreeSelect` supports `key` of `number` type. [#343](https://github.com/vueComponent/ant-design-vue/issues/343)
+- 🌟 `Tree` components `selectedKeys`, `expandedKeys` support the `.sync` modifier.[6373ce](https://github.com/vueComponent/ant-design-vue/commit/6373ce8e92a979abb1f5dc94fa9697ee64b08dc2)
+- `TreeSelect`
+  - 🌟 `treeExpandedKeys` supports the `.sync` modifier.[983318](https://github.com/vueComponent/ant-design-vue/commit/983318b985ad727c008232c75a8598d52d0f924b)
+  - 🐞 Fix page scrolling issue when the first `focus`.[139356](https://github.com/vueComponent/ant-design-vue/commit/1393563c9b7f8cb7d7ddc0409aa5422c53fca60b)
+- 🐞 Remove the expansion animation when the `Menu` component is initialized.[#338](https://github.com/vueComponent/ant-design-vue/issues/338)
+
 ## 1.2.3
 `2018-12-25`
 

CHANGELOG.zh-CN.md

@@ -2,6 +2,18 @@
 
 ---
 
+## 1.2.4
+`2018-12-29`
+
+- 🐞 修复`Select`组件没有触发`popupScroll`事件问题[#350](https://github.com/vueComponent/ant-design-vue/issues/350)
+- 🐞 修复自定义`Icon`组件不支持`class` `style`问题。[#351](https://github.com/vueComponent/ant-design-vue/issues/351)
+- 🌟 `Tree` `TreeSelect` 支持`number`类型的`key`。[#343](https://github.com/vueComponent/ant-design-vue/issues/343)
+- 🌟 `Tree`组件`selectedKeys`、`expandedKeys`支持`.sync`修饰符。[6373ce](https://github.com/vueComponent/ant-design-vue/commit/6373ce8e92a979abb1f5dc94fa9697ee64b08dc2)
+- `TreeSelect`
+  - 🌟 `treeExpandedKeys`支持`.sync`修饰符。[983318](https://github.com/vueComponent/ant-design-vue/commit/983318b985ad727c008232c75a8598d52d0f924b)
+  - 🐞 修复第一次`focus`时触发页面滚动问题。[139356](https://github.com/vueComponent/ant-design-vue/commit/1393563c9b7f8cb7d7ddc0409aa5422c53fca60b)
+- 🐞 移除`Menu`组件初始化时的展开动画。[#338](https://github.com/vueComponent/ant-design-vue/issues/338)
+
 ## 1.2.3
 `2018-12-25`
 

components/date-picker/index.en-US.md

@@ -108,8 +108,8 @@ The following APIs are shared by DatePicker, MonthPicker, RangePicker, WeekPicke
 
 | Property | Description | Type | Default |
 | -------- | ----------- | ---- | ------- |
-| defaultValue | to set default date | \[[moment](http://momentjs.com/), [moment](http://momentjs.com/)] | - |
-| defaultPickerValue | to set default picker date | [moment](http://momentjs.com/) | - |
+| defaultValue | to set default date | [moment](http://momentjs.com/)\[] | - |
+| defaultPickerValue | to set default picker date | [moment](http://momentjs.com/)\[] | - |
 | disabledTime | to specify the time that cannot be selected | function(dates: [moment, moment], partial: `'start'|'end'`) | - |
 | format | to set the date format | string | "YYYY-MM-DD HH:mm:ss" |
 | ranges | preseted ranges for quick selection | { \[range: string]: [moment](http://momentjs.com/)\[] } \| { \[range: string]: () => [moment](http://momentjs.com/)\[] } | - |

components/date-picker/index.zh-CN.md

@@ -111,7 +111,7 @@ moment.locale('zh-cn');
 | 参数 | 说明 | 类型 | 默认值 |
 | --- | --- | --- | --- |
 | defaultValue | 默认日期 | [moment](http://momentjs.com/)\[] | 无 |
-| defaultPickerValue | 默认面板日期 | [moment](http://momentjs.com/) | 无 |
+| defaultPickerValue | 默认面板日期 | [moment](http://momentjs.com/)\[] | 无 |
 | disabledTime | 不可选择的时间 | function(dates: [moment, moment], partial: `'start'|'end'`) | 无 |
 | format | 展示的日期格式 | string | "YYYY-MM-DD HH:mm:ss" |
 | ranges       | 预设时间范围快捷选择 | { \[range: string]: [moment](http://momentjs.com/)\[] } \| { \[range: string]: () => [moment](http://momentjs.com/)\[] } | 无 |

components/drawer/index.en-US.md

@@ -2,7 +2,6 @@
 
 | Property | Description | Type | Default |
 | -------- | ----------- | ---- | ------- |
-| Props | Description | Type | Default |
 | --- | --- | --- | --- |
 | closable | Whether a close (x) button is visible on top right of the Drawer dialog or not. | boolean | true |
 | destroyOnClose | Whether to unmount child components on closing drawer or not. | boolean | false |

components/icon/IconFont.jsx

@@ -26,8 +26,9 @@ export default function create (options) {
   const Iconfont = {
     functional: true,
     name: 'AIconfont',
+    props: Icon.props,
     render (h, context) {
-      const { props, slots, listeners } = context
+      const { props, slots, listeners, data } = context
       const { type, ...restProps } = props
       const slotsMap = slots()
       const children = slotsMap.default
@@ -40,9 +41,7 @@ export default function create (options) {
         content = children
       }
       return (
-        <Icon
-          {...{ props: restProps, on: listeners }}
-        >
+        <Icon {...{ ...data, props: restProps, on: listeners }}>
           {content}
         </Icon>
 

components/vc-menu/Menu.jsx

@@ -165,6 +165,7 @@ const Menu = {
       },
       class: `${props.prefixCls}-root`,
       on: {
+        ...this.$listeners,
         click: this.onClick,
         openChange: this.onOpenChange,
         deselect: this.onDeselect,

package.json

@@ -1,6 +1,6 @@
 {
     "name": "ant-design-vue",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "title": "Ant Design Vue",
     "description": "An enterprise-class UI design language and Vue-based implementation",
     "keywords": [
@@ -16,6 +16,7 @@
         "frontend"
     ],
     "main": "dist/antd.min.js",
+    "typings": "types/index.d.ts",
     "files": [
         "dist",
         "lib",
@@ -183,4 +184,4 @@
         "vue-ref": "^1.0.3",
         "warning": "^3.0.0"
     }
-}
+}

types/affix.d.ts

@@ -0,0 +1,27 @@
+// Project: https://github.com/vueComponent/ant-design-vue
+// Definitions by: akki-jat <https://github.com/akki-jat>
+// Definitions: https://github.com/vueComponent/ant-design-vue/types
+
+import { AntdComponent } from './component';
+
+export declare class Affix extends AntdComponent {
+  /**
+   * Pixels to offset from top when calculating position of scroll
+   * @default 0
+   * @type number
+   */
+  offsetTop: number;
+
+  /**
+   * Pixels to offset from bottom when calculating position of scroll
+   * @type number
+   */
+  offsetBottom: number;
+
+  /**
+   * specifies the scrollable area dom node
+   * @default () => window
+   * @type Function
+   */
+  target: () => HTMLElement;
+}

types/alert.d.ts

@@ -0,0 +1,64 @@
+// Project: https://github.com/vueComponent/ant-design-vue
+// Definitions by: akki-jat <https://github.com/akki-jat>
+// Definitions: https://github.com/vueComponent/ant-design-vue/types
+
+import { AntdComponent } from './component';
+
+export declare class Alert extends AntdComponent {
+  /**
+   * Called when close animation is finished
+   * @type Function
+   */
+  afterClose: () => void;
+
+  /**
+   * Whether to show as banner
+   * @default false
+   * @type boolean
+   */
+  banner: boolean;
+
+  /**
+   * Whether Alert can be closed
+   * @type boolean
+   */
+  closable: boolean;
+
+  /**
+   * Close text to show
+   * @type any (string | slot)
+   */
+  closeText: any;
+
+  /**
+   * additional content of Alert
+   * @type any (string | slot)
+   */
+  description: any;
+
+  /**
+   * Custom icon, effective when showIcon is true
+   * @type any (VNode | slot)
+   */
+  icon: any;
+
+  /**
+   * Content of Alert
+   * @type any (string | slot)
+   */
+  message: any;
+
+  /**
+   * Whether to show icon
+   * @default false, in banner mode default is true
+   * @type boolean
+   */
+  showIcon: boolean;
+
+  /**
+   * Type of Alert styles, options: success, info, warning, error
+   * @default info, in banner mode default is warning
+   * @type string
+   */
+  type: "success" | "info" | "warning" | "error";
+}