Commit 4c89ea7474f4315870df1790f99f3e431f343b90
1 parent
0d070840
fix(menu): fix the jitter problem of menu folding animation,fix #732
Showing
4 changed files
with
5 additions
and
7 deletions
.vscode/settings.json
@@ -118,5 +118,5 @@ | @@ -118,5 +118,5 @@ | ||
118 | "i18n-ally.enabledParsers": ["ts"], | 118 | "i18n-ally.enabledParsers": ["ts"], |
119 | "i18n-ally.sourceLanguage": "en", | 119 | "i18n-ally.sourceLanguage": "en", |
120 | "i18n-ally.enabledFrameworks": ["vue", "react"], | 120 | "i18n-ally.enabledFrameworks": ["vue", "react"], |
121 | - "cSpell.words": ["vben", "windi", "browserslist", "esnext", "antv", "tinymce", "qrcode"] | 121 | + "cSpell.words": ["vben", "windi", "browserslist", "esnext", "antv", "tinymce", "qrcode", "sider"] |
122 | } | 122 | } |
CHANGELOG.zh_CN.md
@@ -27,6 +27,7 @@ | @@ -27,6 +27,7 @@ | ||
27 | - **FlowChart** 修复拖放菜单丢失 | 27 | - **FlowChart** 修复拖放菜单丢失 |
28 | - 修复后台模式下,Iframe 路由错误 | 28 | - 修复后台模式下,Iframe 路由错误 |
29 | - **PageWrapper** 修复 footer 与全局页脚同时开启时的高度计算问题 | 29 | - **PageWrapper** 修复 footer 与全局页脚同时开启时的高度计算问题 |
30 | +- **Menu** 修复菜单折叠动画抖动问题 | ||
30 | 31 | ||
31 | ## 2.4.2(2021-06-10) | 32 | ## 2.4.2(2021-06-10) |
32 | 33 |
src/components/SimpleMenu/src/components/SubMenuItem.vue
@@ -273,8 +273,7 @@ | @@ -273,8 +273,7 @@ | ||
273 | state.opened = data; | 273 | state.opened = data; |
274 | return; | 274 | return; |
275 | } | 275 | } |
276 | - | ||
277 | - if (isObject(data)) { | 276 | + if (isObject(data) && rootProps.accordion) { |
278 | const { opend, parent, uidList } = data as Recordable; | 277 | const { opend, parent, uidList } = data as Recordable; |
279 | if (parent === instance?.parent) { | 278 | if (parent === instance?.parent) { |
280 | state.opened = opend; | 279 | state.opened = opend; |
src/views/demo/feat/ws/index.vue
@@ -55,12 +55,10 @@ | @@ -55,12 +55,10 @@ | ||
55 | <script lang="ts"> | 55 | <script lang="ts"> |
56 | import { defineComponent, reactive, watchEffect, computed, toRefs } from 'vue'; | 56 | import { defineComponent, reactive, watchEffect, computed, toRefs } from 'vue'; |
57 | import { Tag, Input } from 'ant-design-vue'; | 57 | import { Tag, Input } from 'ant-design-vue'; |
58 | - | ||
59 | import { PageWrapper } from '/@/components/Page'; | 58 | import { PageWrapper } from '/@/components/Page'; |
60 | - | ||
61 | import { useWebSocket } from '@vueuse/core'; | 59 | import { useWebSocket } from '@vueuse/core'; |
62 | - | ||
63 | import { formatToDateTime } from '/@/utils/dateUtil'; | 60 | import { formatToDateTime } from '/@/utils/dateUtil'; |
61 | + | ||
64 | export default defineComponent({ | 62 | export default defineComponent({ |
65 | components: { | 63 | components: { |
66 | PageWrapper, | 64 | PageWrapper, |
@@ -76,7 +74,7 @@ | @@ -76,7 +74,7 @@ | ||
76 | }); | 74 | }); |
77 | 75 | ||
78 | const { status, data, send, close, open } = useWebSocket(state.server, { | 76 | const { status, data, send, close, open } = useWebSocket(state.server, { |
79 | - autoReconnect: true, | 77 | + autoReconnect: false, |
80 | heartbeat: true, | 78 | heartbeat: true, |
81 | }); | 79 | }); |
82 | 80 |