diff --git a/build/config.js b/build/config.js
index 68fd72401..622e99787 100644
--- a/build/config.js
+++ b/build/config.js
@@ -1,5 +1,5 @@
 module.exports = {
   dev: {
-    componentName: 'tag', // dev components
+    componentName: 'tooltip', // dev components
   },
 };
diff --git a/components/tooltip/Tooltip.jsx b/components/tooltip/Tooltip.jsx
index dcf427622..fe94edd65 100644
--- a/components/tooltip/Tooltip.jsx
+++ b/components/tooltip/Tooltip.jsx
@@ -78,9 +78,12 @@ export default {
     // mouse events don't trigger at disabled button in Chrome
     // https://github.com/react-component/tooltip/issues/18
     getDisabledCompatibleChildren(ele) {
-      const isAntBtn = ele.componentOptions && ele.componentOptions.Ctor.options.__ANT_BUTTON;
+      const options = (ele.componentOptions && ele.componentOptions.Ctor.options) || {};
+
       if (
-        (isAntBtn &&
+        ((options.__ANT_BUTTON === true ||
+          options.__ANT_SWITCH === true ||
+          options.__ANT_CHECKBOX === true) &&
           (ele.componentOptions.propsData.disabled ||
             ele.componentOptions.propsData.disabled === '')) ||
         (ele.tag === 'button' &&
@@ -125,8 +128,16 @@ export default {
     },
 
     isNoTitle() {
-      const { $slots, title } = this;
-      return !$slots.title && !title;
+      const title = getComponentFromProp(this, 'title');
+      return !title && title !== 0;
+    },
+
+    getOverlay() {
+      const title = getComponentFromProp(this, 'title');
+      if (title === 0) {
+        return title;
+      }
+      return title || '';
     },
 
     // 动态设置动画点
@@ -189,6 +200,7 @@ export default {
         prefixCls,
         getTooltipContainer: getPopupContainer || getContextPopupContainer,
         builtinPlacements: this.getPlacements(),
+        overlay: this.getOverlay(),
         visible: sVisible,
       },
       ref: 'tooltip',
@@ -200,7 +212,6 @@ export default {
     };
     return (
       <VcTooltip {...tooltipProps}>
-        <template slot="overlay">{getComponentFromProp(this, 'title')}</template>
         {sVisible ? cloneElement(child, { class: childCls }) : child}
       </VcTooltip>
     );
diff --git a/components/tooltip/__tests__/tooltip.test.js b/components/tooltip/__tests__/tooltip.test.js
index 1bf44042a..0775b24e4 100644
--- a/components/tooltip/__tests__/tooltip.test.js
+++ b/components/tooltip/__tests__/tooltip.test.js
@@ -1,8 +1,10 @@
 import { asyncExpect } from '@/tests/utils';
 import { mount } from '@vue/test-utils';
 import Tooltip from '..';
+import mountTest from '../../../tests/shared/mountTest';
 
 describe('Tooltip', () => {
+  mountTest(Tooltip);
   it('check `onVisibleChange` arguments', async () => {
     const onVisibleChange = jest.fn();
     const wrapper = mount(
diff --git a/components/tooltip/demo/index.vue b/components/tooltip/demo/index.vue
index c4c0a8639..c4a0c53f5 100644
--- a/components/tooltip/demo/index.vue
+++ b/components/tooltip/demo/index.vue
@@ -37,15 +37,12 @@ export default {
     return (
       <div>
         <md cn={md.cn} us={md.us} />
-        <br />
-        <Basic />
-        <br />
-        <Placement />
-        <br />
-        <ArrowPointAtCenter />
-        <br />
-        <AutoAdjustOverflow />
-        <br />
+        <demo-sort cols="2">
+          <Basic />
+          <Placement />
+          <ArrowPointAtCenter />
+          <AutoAdjustOverflow />
+        </demo-sort>
         <api>
           <template slot="cn">
             <CN />
diff --git a/components/tooltip/demo/placement.md b/components/tooltip/demo/placement.md
index 2c09d4d0a..61e976fd2 100644
--- a/components/tooltip/demo/placement.md
+++ b/components/tooltip/demo/placement.md
@@ -5,7 +5,7 @@
 
 <us>
 #### Placement
-The ToolTip has 12 placements choice.
+There are 12 placement options available.
 </us>
 
 ```tpl
diff --git a/site/components/demoSort.jsx b/site/components/demoSort.jsx
index af20ab57f..802930c90 100644
--- a/site/components/demoSort.jsx
+++ b/site/components/demoSort.jsx
@@ -11,7 +11,7 @@ export default {
   props: {
     cols: {
       type: [Number, String],
-      default: 1,
+      default: 2,
     },
   },
   inject: {