Merge branch 'master' of https://github.com/vueComponent/ant-design

CHANGELOG.en-US.md

@@ -10,6 +10,13 @@
 
 ---
 
+## 1.3.8
+`2019-04-04`
+- 🐞 Fix `Table` unclickable problem under IE [#504](https://github.com/vueComponent/ant-design-vue/issues/504)
+- 🐞 Fix `Table` Header is not aligned under Firefox [#579](https://github.com/vueComponent/ant-design-vue/issues/579)
+- 🌟 Drawer `Drawer` add custom `handel` 
+- 🐞 Fix TypeScript type definitions.
+
 ## 1.3.7
 `2019-03-18`
 - 🐞 Fix `Select` `selectedKeys` type validation error [#597](https://github.com/vueComponent/ant-design-vue/issues/597)

CHANGELOG.zh-CN.md

@@ -10,6 +10,13 @@
 
 ---
 
+## 1.3.8
+`2019-04-04`
+- 🐞 修复 `Table` 在 IE 下不可点击问题 [#504](https://github.com/vueComponent/ant-design-vue/issues/504)
+- 🐞 修复 `Table` 在 Firefox 下 Header 没对齐问题 [#579](https://github.com/vueComponent/ant-design-vue/issues/579)
+- 🌟 抽屉 `Drawer` 添加自定义 `handel` 功能
+- 🐞 修复 TypeScript 类型定义。
+
 ## 1.3.7
 `2019-03-18`
 - 🐞 修复 `Select` `selectedKeys` 类型校验错误 [#597](https://github.com/vueComponent/ant-design-vue/issues/597)

components/drawer/index.en-US.md

@@ -16,6 +16,7 @@
 | height | placement is `top` or `bottom`, height of the Drawer dialog. | string\|number | - |
 | zIndex | The `z-index` of the Drawer. | Number | 1000 |
 | placement | The placement of the Drawer. | 'top'  \| 'right' \| 'bottom' \| 'left' | 'right' |
+| handle | After setting, the drawer is directly mounted on the DOM, and you can control the drawer to open or close through this `handle`. | VNode \| slot | - |
 
 
 ## Methods

components/drawer/index.jsx

@@ -24,6 +24,7 @@ const Drawer = {
     placement: PropTypes.oneOf(['top', 'right', 'bottom', 'left']).def('right'),
     level: PropTypes.any.def(null),
     wrapClassName: PropTypes.string, // not use class like react, vue will add class to root dom
+    handle: PropTypes.any,
   },
   mixins: [BaseMixin],
   data() {
@@ -181,10 +182,11 @@ const Drawer = {
     } else {
       offsetStyle.height = typeof height === 'number' ? `${height}px` : height;
     }
+    const handler = getComponentFromProp(this, 'handle') || false;
     const vcDrawerProps = {
       props: {
-        handler: false,
         ...rest,
+        handler,
         ...offsetStyle,
         open: visible,
         showMask: props.mask,

components/drawer/index.zh-CN.md

@@ -15,7 +15,8 @@
 | width | 宽度 | string \| number | 256 |
 | height | 高度, 在 `placement` 为 `top` 或 `bottom` 时使用 | string \| number | 256 |
 | zIndex | 设置 Drawer 的 `z-index` | Number | 1000 |
-| placement | 抽屉的方向 | 'top'  \| 'right' \| 'bottom' \| 'left' | 'right'
+| placement | 抽屉的方向 | 'top'  \| 'right' \| 'bottom' \| 'left' | 'right'|
+| handle | 设置后抽屉直接挂载到DOM上，你可以通过该handle控制抽屉打开关闭 | VNode \| slot | - |
 
 ## 方法
 

components/vc-drawer/src/Drawer.js

@@ -408,8 +408,8 @@ const Drawer = {
             <i class="drawer-handle-icon" />
           </div>
         );
-        const { handler: handlerSlot } = this.$slots;
-        const handlerSlotVnode = handlerSlot || handlerDefalut;
+        const { handler: handlerSlot } = this;
+        const handlerSlotVnode = (handlerSlot && handlerSlot[0]) || handlerDefalut;
         const { click: handleIconClick } = getEvents(handlerSlotVnode);
         handlerChildren = cloneElement(handlerSlotVnode, {
           on: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ant-design-vue",
-  "version": "1.3.7",
+  "version": "1.3.8",
   "title": "Ant Design Vue",
   "description": "An enterprise-class UI design language and Vue-based implementation",
   "keywords": [

site/components/layout.vue

@@ -268,6 +268,7 @@ export default {
               }
               <a-col xxl={20} xl={19} lg={19} md={18} sm={24} xs={24}>
                 <section class='main-container main-container-component'>
+                  <CarbonAds isMobile={isMobile}/>
                   {!isMobile ? <div class='toc-affix' style='width: 150px;'>
                     {this.getSubMenu(isCN)}
                   </div> : null}