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.

Sign up for GitHub

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

fix(head-menu): 菜单折叠 #2029

Merged
merged 2 commits into from
Nov 19, 2022
Merged

fix(head-menu): 菜单折叠 #2029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6170fb4
fix(head-menu): 菜单折叠
dianjie Nov 18, 2022
e89505b
feat: update snap
PengYYYYY Nov 19, 2022
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
2 changes: 1 addition & 1 deletion src/_common
Open in desktop
Submodule _common updated 1 files
+6 −2 style/web/components/menu/_index-v2.less
92 changes: 55 additions & 37 deletions src/menu/__tests__/__snapshots__/head-menu.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@ exports[`HeadMenu > props > :active 1`] = `
class="t-head-menu__inner"
>
<!---->
<ul
class="t-menu"
style="flex: 1;"
<div
class="t-menu__container"
>


</ul>
<ul
class="t-menu"
>


</ul>
</div>
<!---->
</div>
<!---->
Expand All @@ -30,13 +33,16 @@ exports[`HeadMenu > props > :height 1`] = `
class="t-head-menu__inner"
>
<!---->
<ul
class="t-menu"
style="flex: 1;"
<div
class="t-menu__container"
>


</ul>
<ul
class="t-menu"
>


</ul>
</div>
<!---->
</div>
<!---->
Expand All @@ -51,13 +57,16 @@ exports[`HeadMenu > props > :theme 1`] = `
class="t-head-menu__inner"
>
<!---->
<ul
class="t-menu"
style="flex: 1;"
<div
class="t-menu__container"
>


</ul>
<ul
class="t-menu"
>


</ul>
</div>
<!---->
</div>
<!---->
Expand All @@ -72,14 +81,17 @@ exports[`HeadMenu > slot > <default> 1`] = `
class="t-head-menu__inner"
>
<!---->
<ul
class="t-menu"
style="flex: 1;"
<div
class="t-menu__container"
>

<div />

</ul>
<ul
class="t-menu"
>

<div />

</ul>
</div>
<!---->
</div>
<!---->
Expand All @@ -100,13 +112,16 @@ exports[`HeadMenu > slot > <logo> 1`] = `
<div />

</div>
<ul
class="t-menu"
style="flex: 1;"
<div
class="t-menu__container"
>


</ul>
<ul
class="t-menu"
>


</ul>
</div>
<!---->
</div>
<!---->
Expand All @@ -121,13 +136,16 @@ exports[`HeadMenu > slot > <operations> 1`] = `
class="t-head-menu__inner"
>
<!---->
<ul
class="t-menu"
style="flex: 1;"
<div
class="t-menu__container"
>


</ul>
<ul
class="t-menu"
>


</ul>
</div>
<div
class="t-menu__operations"
>
Expand Down
13 changes: 8 additions & 5 deletions src/menu/head-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ export default defineComponent({
);
};

const menuContainerRef = ref<HTMLDivElement>();
const menuRef = ref<HTMLUListElement>();
const innerRef = ref<HTMLDivElement>();
const logoRef = ref<HTMLDivElement>();
Expand All @@ -132,8 +133,8 @@ export default defineComponent({
Number.parseInt(String(getComputedCss(el, cssProperty)), 10);

const calcMenuWidth = () => {
const menuPaddingLeft = getComputedCssValue(menuRef.value, 'paddingLeft');
const menuPaddingRight = getComputedCssValue(menuRef.value, 'paddingRight');
const menuPaddingLeft = getComputedCssValue(menuContainerRef.value, 'paddingLeft');
const menuPaddingRight = getComputedCssValue(menuContainerRef.value, 'paddingRight');
let totalWidth = innerRef.value.clientWidth;
if (logoRef.value) {
const logoMarginLeft = getComputedCssValue(logoRef.value, 'marginLeft');
Expand Down Expand Up @@ -200,9 +201,11 @@ export default defineComponent({
{logo}
</div>
)}
<ul class={`${classPrefix.value}-menu`} style={{ flex: 1 }} ref={menuRef}>
{content}
</ul>
<div class={`${classPrefix.value}-menu__container`} ref={menuContainerRef}>
<ul class={`${classPrefix.value}-menu`} ref={menuRef}>
{content}
</ul>
</div>
{operations && (
<div class={`${classPrefix.value}-menu__operations`} ref={operationRef}>
{operations}
Expand Down
Loading