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

vueComponent · May 14, 2019 · d478653 · d478653
2 parents faa4c1c + ec0ff99
commit d478653
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 1 deletion.
diff --git a/components/_util/ContainerRender.jsx b/components/_util/ContainerRender.jsx
@@ -36,6 +36,7 @@ export default {
         this._component && this._component.$destroy();
         this.container.parentNode.removeChild(this.container);
         this.container = null;
+        this._component = null;
       }
     },
 

diff --git a/components/avatar/Avatar.jsx b/components/avatar/Avatar.jsx
@@ -30,6 +30,12 @@ export default {
       scale: 1,
     };
   },
+  watch: {
+    src() {
+      this.isImgExist = true;
+      this.scale = 1;
+    },
+  },
   mounted() {
     this.prevChildren = this.$slots.default;
     this.prevState = { ...this.$data };

diff --git a/components/dropdown/demo/dropdown-button.md b/components/dropdown/demo/dropdown-button.md
@@ -11,7 +11,7 @@ A button is on the left, and a related functional menu is on the right.
 ```html
 <template>
 <div>
-  <a-dropdown-button @click="handleMenuClick">
+  <a-dropdown-button @click="handleButtonClick">
     Dropdown
     <a-menu slot="overlay" @click="handleMenuClick">
       <a-menu-item key="1"><a-icon type="user" />1st menu item</a-menu-item>

diff --git a/components/tooltip/abstractTooltipProps.js b/components/tooltip/abstractTooltipProps.js
@@ -28,5 +28,6 @@ export default () => ({
   getPopupContainer: PropTypes.func,
   arrowPointAtCenter: PropTypes.bool.def(false),
   autoAdjustOverflow: PropTypes.oneOfType([PropTypes.bool, PropTypes.object]).def(true),
+  destroyTooltipOnHide: PropTypes.bool.def(false),
   align: PropTypes.object.def({}),
 });
diff --git a/components/tooltip/index.en-US.md b/components/tooltip/index.en-US.md
@@ -21,6 +21,7 @@ The following APIs are shared by Tooltip, Popconfirm, Popover.
 | placement | The position of the tooltip relative to the target, which can be one of `top` `left` `right` `bottom` `topLeft` `topRight` `bottomLeft` `bottomRight` `leftTop` `leftBottom` `rightTop` `rightBottom` | string | `top` |
 | trigger | Tooltip trigger mode | `hover` \| `focus` \| `click` \| `contextmenu` | `hover` |
 | visible(v-model) | Whether the floating tooltip card is visible or not | boolean | `false` |
+| destroyTooltipOnHide | Whether to destroy tooltip on hide | boolean | false |
 | align | this value will be merged into placement's config, please refer to the settings [dom-align](https://github.com/yiminghe/dom-align) | Object | - |
 
 ### events

diff --git a/components/tooltip/index.zh-CN.md b/components/tooltip/index.zh-CN.md
@@ -21,6 +21,7 @@
 | placement | 气泡框位置，可选 `top` `left` `right` `bottom` `topLeft` `topRight` `bottomLeft` `bottomRight` `leftTop` `leftBottom` `rightTop` `rightBottom` | string | top |
 | trigger | 触发行为，可选 `hover/focus/click/contextmenu` | string | hover |
 | visible(v-model) | 用于手动控制浮层显隐 | boolean | false |
+| destroyTooltipOnHide | 隐藏后是否销毁tooltip | boolean | false |
 | align | 该值将合并到 placement 的配置中，设置参考 [dom-align](https://github.com/yiminghe/dom-align) | Object | 无 |
 
 ### 事件