Skip to content

Commit 8f5684c

Browse files
authored
fix(editor-md): tooltip关闭innerHTML渲染后直接渲染问题 (DevCloudFE#1746)
1 parent dda7611 commit 8f5684c

File tree

3 files changed

+31
-8
lines changed

3 files changed

+31
-8
lines changed

packages/devui-vue/devui/editor-md/src/components/toolbar-item.tsx

+24-6
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,20 @@ export default defineComponent({
4141
return () => (
4242
<>
4343
{config.type === 'button' && (
44-
<Tooltip position={['top', 'bottom']} content={getTooltipContent(config.name, config.shortKey)} hide-after={1000}>
45-
<span
46-
class="md-toolbar-item"
47-
onClick={onToolbarItemClick}
48-
innerHTML={config.id === 'fullscreen' ? (showFullscreen.value ? config.exitIcon : config.icon) : config.icon}></span>
44+
<Tooltip position={['top', 'bottom']} hide-after={1000}>
45+
{{
46+
default: () => (
47+
<span
48+
class="md-toolbar-item"
49+
onClick={onToolbarItemClick}
50+
innerHTML={config.id === 'fullscreen' ? (showFullscreen.value ? config.exitIcon : config.icon) : config.icon}>
51+
</span>
52+
),
53+
content: () => (
54+
<span class='md-toolbar-tip-content' innerHTML={getTooltipContent(config.name, config.shortKey)}>
55+
</span>
56+
)
57+
}}
4958
</Tooltip>
5059
)}
5160
{config.type === 'dropDown' && (
@@ -54,7 +63,16 @@ export default defineComponent({
5463
default: () => (
5564
<span>
5665
<Tooltip position={showFullscreen.value ? ['right'] : ['top']} content={getTooltipContent(config.name)} hide-after={1000}>
57-
<span class="md-toolbar-item" onClick={() => config.handler?.()} innerHTML={config.icon}></span>
66+
{{
67+
default: () => (
68+
<span class="md-toolbar-item" onClick={() => config.handler?.()} innerHTML={config.icon}>
69+
</span>
70+
),
71+
content: () => (
72+
<span class='md-toolbar-tip-content' innerHTML={getTooltipContent(config.name)}>
73+
</span>
74+
)
75+
}}
5876
</Tooltip>
5977
</span>
6078
),

packages/devui-vue/devui/editor-md/src/components/toolbar.scss

+5
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
}
4141
}
4242

43+
.md-toolbar-tip-content {
44+
display: inline-block;
45+
padding: 4px 16px;
46+
}
47+
4348
.dropdown-font-size {
4449
padding: 0;
4550
margin: 0;

packages/devui-vue/docs/components/editor-md/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ export default defineComponent({
259259
$\\sqrt{3x-1}+(1+x)^2$ // DEMO无法进行import,使用时请放开代码中注释
260260
`);
261261
262-
mdPlugins = [{
262+
const mdPlugins = [{
263263
// plugin: mk
264264
}];
265265
@@ -303,7 +303,7 @@ Alice -> "Bob()" : Hello
303303
Long --> "Bob()" : ok
304304
@enduml`);
305305
306-
mdPlugins = [{
306+
const mdPlugins = [{
307307
// plugin: PlantUml,
308308
// opts: {server: 'https://www/plantuml.com/plantuml'} // 自定义server可参考plantuml官方文档进行搭建
309309
}];

0 commit comments

Comments
 (0)