Skip to content

Commit

Permalink
fix(menu): fix the jitter problem of menu folding animation,fix #732
Browse files Browse the repository at this point in the history
  • Loading branch information
anncwb committed Jun 17, 2021
1 parent 0d07084 commit 4c89ea7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
1 change: 1 addition & 0 deletions CHANGELOG.zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
- **FlowChart** 修复拖放菜单丢失
- 修复后台模式下,Iframe 路由错误
- **PageWrapper** 修复 footer 与全局页脚同时开启时的高度计算问题
- **Menu** 修复菜单折叠动画抖动问题

## 2.4.2(2021-06-10)

Expand Down
3 changes: 1 addition & 2 deletions src/components/SimpleMenu/src/components/SubMenuItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 2 additions & 4 deletions src/views/demo/feat/ws/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,10 @@
<script lang="ts">
import { defineComponent, reactive, watchEffect, computed, toRefs } from 'vue';
import { Tag, Input } from 'ant-design-vue';
import { PageWrapper } from '/@/components/Page';
import { useWebSocket } from '@vueuse/core';
import { formatToDateTime } from '/@/utils/dateUtil';
export default defineComponent({
components: {
PageWrapper,
Expand All @@ -76,7 +74,7 @@
});
const { status, data, send, close, open } = useWebSocket(state.server, {
autoReconnect: true,
autoReconnect: false,
heartbeat: true,
});
Expand Down

0 comments on commit 4c89ea7

Please sign in to comment.