Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support show tooltip when menu collapsed #2917

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/menu/const.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export interface TdMenuInterface {
theme?: Ref<string>;
isHead: boolean;
vMenu?: VMenu;
collapsed?: Ref<boolean>;
select: (val: MenuValue) => void;
open?: (val: MenuValue, type?: TdOpenType) => boolean | void;
}
Expand Down
19 changes: 17 additions & 2 deletions src/menu/menu-item.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { defineComponent, computed, inject, onMounted, ref, toRefs } from 'vue';
import { defineComponent, computed, inject, onMounted, ref, toRefs, getCurrentInstance } from 'vue';
import props from './menu-item-props';
import { TdMenuInterface, TdSubMenuInterface } from './const';
import { renderContent, renderTNodeJSX } from '../utils/render-tnode';
import { emitEvent } from '../utils/event';
import useRipple from '../hooks/useRipple';
import { usePrefixClass } from '../hooks/useConfig';
import Tooltip from '../tooltip';

export default defineComponent({
name: 'TMenuItem',
Expand All @@ -18,6 +19,7 @@ export default defineComponent({
useRipple(itemRef);
const submenu = inject<TdSubMenuInterface>('TdSubmenu', null);
const active = computed(() => menu.activeValue.value === props.value);
const collapsed = computed(() => menu.collapsed?.value);
const classes = computed(() => [
`${classPrefix.value}-menu__item`,
{
Expand All @@ -37,6 +39,7 @@ export default defineComponent({
classPrefix,
menu,
active,
collapsed,
classes,
itemRef,
href,
Expand Down Expand Up @@ -67,7 +70,7 @@ export default defineComponent({
},
},
render() {
return (
const liContent = (
<li ref="itemRef" class={this.classes} onClick={this.handleClick}>
{renderTNodeJSX(this, 'icon')}
{this.href ? (
Expand All @@ -79,5 +82,17 @@ export default defineComponent({
)}
</li>
);

const instance = getCurrentInstance();
const node = instance.parent;
// 菜单收起,且只有本身为一级菜单才需要显示 tooltip
if (this.collapsed && /tmenu/i.test(node?.type.name)) {
return (
<Tooltip content={() => renderContent(this, 'default', 'content')} placement="right">
{liContent}
</Tooltip>
);
}
return liContent;
},
});
2 changes: 2 additions & 0 deletions src/menu/menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export default defineComponent({
const mode = ref(props.expandType);
const theme = computed(() => props.theme);
const isMutex = computed(() => props.expandMutex);
const collapsed = computed(() => props.collapsed);
const menuClass = computed(() => [
`${classPrefix.value}-default-menu`,
`${classPrefix.value}-menu--${props.theme}`,
Expand Down Expand Up @@ -68,6 +69,7 @@ export default defineComponent({
theme,
isHead: false,
vMenu,
collapsed,
select: (value: MenuValue) => {
setActiveValue(value);
},
Expand Down
8 changes: 0 additions & 8 deletions src/tree-select/__tests__/__snapshots__/index.test.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,7 @@ exports[`TreeSelect > :props > :defaultValue 1`] = `
<span
class="t-tag--text"
>

<!---->

</span>
<svg
class="t-icon t-icon-close t-tag__icon-close"
Expand Down Expand Up @@ -585,9 +583,7 @@ exports[`TreeSelect > :props > :multiple 1`] = `
<span
class="t-tag--text"
>

<!---->

</span>
<svg
class="t-icon t-icon-close t-tag__icon-close"
Expand Down Expand Up @@ -1020,9 +1016,7 @@ exports[`TreeSelect > <slot> > <collapsedItems> 1`] = `
<span
class="t-tag--text"
>

<!---->

</span>
<svg
class="t-icon t-icon-close t-tag__icon-close"
Expand Down Expand Up @@ -1354,9 +1348,7 @@ exports[`TreeSelect > function > :collapsedItems 1`] = `
<span
class="t-tag--text"
>

<!---->

</span>
<svg
class="t-icon t-icon-close t-tag__icon-close"
Expand Down
Loading