diff --git a/examples/docs/zh-CN/tooltip.md b/examples/docs/zh-CN/tooltip.md index 8176b775f..1bc6a84a9 100644 --- a/examples/docs/zh-CN/tooltip.md +++ b/examples/docs/zh-CN/tooltip.md @@ -116,8 +116,10 @@ Tooltip 组件提供了两个不同的主题:`dark`和`light`。 :::demo 用具名 slot 分发`content`,替代`tooltip`中的`content`属性。 ```html -
多行信息
第二行信息
- Top center + + Top center + +
张明明
``` ::: diff --git a/examples/versions.json b/examples/versions.json index c3b964221..d8b581200 100644 --- a/examples/versions.json +++ b/examples/versions.json @@ -1 +1 @@ -{"1.4.13":"1.4","2.0.11":"2.0","2.1.0":"2.1","2.2.2":"2.2","2.3.9":"2.3","2.4.11":"2.4","2.5.4":"2.5","2.6.3":"2.6","2.7.2":"2.7","2.8.2":"2.8","2.9.2":"2.9","2.10.1":"2.10","2.11.1":"2.11","2.12.0":"2.12","0.0.8":"2.13"} +{"1.4.13":"1.4","2.0.11":"2.0","2.1.0":"2.1","2.2.2":"2.2","2.3.9":"2.3","2.4.11":"2.4","2.5.4":"2.5","2.6.3":"2.6","2.7.2":"2.7","2.8.2":"2.8","2.9.2":"2.9","2.10.1":"2.10","2.11.1":"2.11","2.12.0":"2.12","0.0.8":"2.13"} \ No newline at end of file diff --git a/packages/tooltip/index.js b/packages/tooltip/index.js index 298b3aa55..3ae9fed0e 100644 --- a/packages/tooltip/index.js +++ b/packages/tooltip/index.js @@ -1,4 +1,4 @@ -import Tooltip from './src/main' +import Tooltip from './src/main.vue' /* istanbul ignore next */ Tooltip.install = function (app) { diff --git a/packages/tooltip/src/main-test.vue b/packages/tooltip/src/main-test.vue new file mode 100644 index 000000000..1284cfe66 --- /dev/null +++ b/packages/tooltip/src/main-test.vue @@ -0,0 +1,256 @@ + + \ No newline at end of file diff --git a/packages/tooltip/src/main.js b/packages/tooltip/src/main.js index 2c8b00f21..7614c8ede 100644 --- a/packages/tooltip/src/main.js +++ b/packages/tooltip/src/main.js @@ -244,9 +244,9 @@ export default { let element = null for (let index = 0; index < slots.length; index++) { console.log(slots[index], 'slots[index]'); - // if (slots[index] && slots[index].tag) { + if (slots[index] && slots[index].type) { element = slots[index] - // } + } } return element } diff --git a/packages/tooltip/src/main.vue b/packages/tooltip/src/main.vue index e48a1c08c..35d67dcef 100644 --- a/packages/tooltip/src/main.vue +++ b/packages/tooltip/src/main.vue @@ -1,30 +1,35 @@