Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
najiu-admin-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
najiu-frontend
najiu-admin-template
Commits
4c89ea74
Commit
4c89ea74
authored
Jun 18, 2021
by
Vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(menu): fix the jitter problem of menu folding animation,fix #732
parent
0d070840
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
7 deletions
+5
-7
settings.json
.vscode/settings.json
+1
-1
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+1
-0
SubMenuItem.vue
src/components/SimpleMenu/src/components/SubMenuItem.vue
+1
-2
index.vue
src/views/demo/feat/ws/index.vue
+2
-4
No files found.
.vscode/settings.json
View file @
4c89ea74
...
...
@@ -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"
]
}
CHANGELOG.zh_CN.md
View file @
4c89ea74
...
...
@@ -27,6 +27,7 @@
-
**FlowChart**
修复拖放菜单丢失
-
修复后台模式下,Iframe 路由错误
-
**PageWrapper**
修复 footer 与全局页脚同时开启时的高度计算问题
-
**Menu**
修复菜单折叠动画抖动问题
## 2.4.2(2021-06-10)
...
...
src/components/SimpleMenu/src/components/SubMenuItem.vue
View file @
4c89ea74
...
...
@@ -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;
...
...
src/views/demo/feat/ws/index.vue
View file @
4c89ea74
...
...
@@ -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
,
...
...
@@ -76,7 +74,7 @@
});
const
{
status
,
data
,
send
,
close
,
open
}
=
useWebSocket
(
state
.
server
,
{
autoReconnect
:
tru
e
,
autoReconnect
:
fals
e
,
heartbeat
:
true
,
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment