From 4c89ea7474f4315870df1790f99f3e431f343b90 Mon Sep 17 00:00:00 2001 From: Vben Date: Fri, 18 Jun 2021 00:36:00 +0800 Subject: [PATCH] fix(menu): fix the jitter problem of menu folding animation,fix #732 --- .vscode/settings.json | 2 +- CHANGELOG.zh_CN.md | 1 + src/components/SimpleMenu/src/components/SubMenuItem.vue | 3 +-- src/views/demo/feat/ws/index.vue | 6 ++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index a1b2021e199..704663b1f05 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -118,5 +118,5 @@ "i18n-ally.enabledParsers": ["ts"], "i18n-ally.sourceLanguage": "en", "i18n-ally.enabledFrameworks": ["vue", "react"], - "cSpell.words": ["vben", "windi", "browserslist", "esnext", "antv", "tinymce", "qrcode"] + "cSpell.words": ["vben", "windi", "browserslist", "esnext", "antv", "tinymce", "qrcode", "sider"] } diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index 5583081941a..264ff9bb450 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -27,6 +27,7 @@ - **FlowChart** 修复拖放菜单丢失 - 修复后台模式下,Iframe 路由错误 - **PageWrapper** 修复 footer 与全局页脚同时开启时的高度计算问题 +- **Menu** 修复菜单折叠动画抖动问题 ## 2.4.2(2021-06-10) diff --git a/src/components/SimpleMenu/src/components/SubMenuItem.vue b/src/components/SimpleMenu/src/components/SubMenuItem.vue index 0c5dd9a15fa..25aff2adcc0 100644 --- a/src/components/SimpleMenu/src/components/SubMenuItem.vue +++ b/src/components/SimpleMenu/src/components/SubMenuItem.vue @@ -273,8 +273,7 @@ state.opened = data; return; } - - if (isObject(data)) { + if (isObject(data) && rootProps.accordion) { const { opend, parent, uidList } = data as Recordable; if (parent === instance?.parent) { state.opened = opend; diff --git a/src/views/demo/feat/ws/index.vue b/src/views/demo/feat/ws/index.vue index 2a4e17f358a..31deafd3959 100644 --- a/src/views/demo/feat/ws/index.vue +++ b/src/views/demo/feat/ws/index.vue @@ -55,12 +55,10 @@