Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Element
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
林焕东
Element
Commits
64f15483
Commit
64f15483
authored
Nov 12, 2017
by
Leopoldthecoder
Committed by
杨奕
Nov 12, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Chore: replace includes with indexOf
parent
1833db26
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
packages/cascader/src/menu.vue
packages/cascader/src/menu.vue
+2
-2
packages/dropdown/src/dropdown.vue
packages/dropdown/src/dropdown.vue
+4
-4
packages/tree/src/tree.vue
packages/tree/src/tree.vue
+3
-3
No files found.
packages/cascader/src/menu.vue
View file @
64f15483
...
...
@@ -186,7 +186,7 @@
// keydown up/down/left/right/enter
events
.
on
.
keydown
=
(
ev
)
=>
{
const
keyCode
=
ev
.
keyCode
;
if
(
!
[
37
,
38
,
39
,
40
,
13
,
9
,
27
].
in
cludes
(
keyCode
)
)
{
if
(
!
[
37
,
38
,
39
,
40
,
13
,
9
,
27
].
in
dexOf
(
keyCode
)
>
-
1
)
{
return
;
}
const
currentEle
=
ev
.
target
;
...
...
@@ -194,7 +194,7 @@
const
menuItemList
=
parentEle
.
querySelectorAll
(
"
[tabindex='-1']
"
);
const
currentIndex
=
Array
.
prototype
.
indexOf
.
call
(
menuItemList
,
currentEle
);
// 当前索引
let
nextIndex
,
nextMenu
;
if
([
38
,
40
].
in
cludes
(
keyCode
)
)
{
if
([
38
,
40
].
in
dexOf
(
keyCode
)
>
-
1
)
{
if
(
keyCode
===
38
)
{
// up键
nextIndex
=
currentIndex
!==
0
?
(
currentIndex
-
1
)
:
currentIndex
;
}
else
if
(
keyCode
===
40
)
{
// down
...
...
packages/dropdown/src/dropdown.vue
View file @
64f15483
...
...
@@ -132,7 +132,7 @@
},
handleTriggerKeyDown
(
ev
)
{
const
keyCode
=
ev
.
keyCode
;
if
([
38
,
40
].
in
cludes
(
keyCode
)
)
{
// up/down
if
([
38
,
40
].
in
dexOf
(
keyCode
)
>
-
1
)
{
// up/down
this
.
removeTabindex
();
this
.
resetTabindex
(
this
.
menuItems
[
0
]);
this
.
menuItems
[
0
].
focus
();
...
...
@@ -140,7 +140,7 @@
ev
.
stopPropagation
();
}
else
if
(
keyCode
===
13
)
{
// space enter选中
this
.
handleClick
();
}
else
if
([
9
,
27
].
in
cludes
(
keyCode
)
)
{
// tab || esc
}
else
if
([
9
,
27
].
in
dexOf
(
keyCode
)
>
-
1
)
{
// tab || esc
this
.
hide
();
}
return
;
...
...
@@ -151,7 +151,7 @@
const
currentIndex
=
this
.
menuItemsArray
.
indexOf
(
target
);
const
max
=
this
.
menuItemsArray
.
length
-
1
;
let
nextIndex
;
if
([
38
,
40
].
in
cludes
(
keyCode
)
)
{
// up/down
if
([
38
,
40
].
in
dexOf
(
keyCode
)
>
-
1
)
{
// up/down
if
(
keyCode
===
38
)
{
// up
nextIndex
=
currentIndex
!==
0
?
currentIndex
-
1
:
0
;
}
else
{
// down
...
...
@@ -168,7 +168,7 @@
if
(
!
this
.
hideOnClick
)
{
// click关闭
this
.
visible
=
false
;
}
}
else
if
([
9
,
27
].
in
cludes
(
keyCode
)
)
{
// tab // esc
}
else
if
([
9
,
27
].
in
dexOf
(
keyCode
)
>
-
1
)
{
// tab // esc
this
.
hide
();
this
.
triggerElm
.
focus
();
}
...
...
packages/tree/src/tree.vue
View file @
64f15483
...
...
@@ -202,7 +202,7 @@
this
.
treeItems
=
this
.
$el
.
querySelectorAll
(
'
.is-focusable[role=treeitem]
'
);
const
currentIndex
=
this
.
treeItemArray
.
indexOf
(
currentItem
);
let
nextIndex
;
if
([
38
,
40
].
in
cludes
(
keyCode
)
)
{
// up、down
if
([
38
,
40
].
in
dexOf
(
keyCode
)
>
-
1
)
{
// up、down
if
(
keyCode
===
38
)
{
// up
nextIndex
=
currentIndex
!==
0
?
currentIndex
-
1
:
0
;
}
else
{
...
...
@@ -211,10 +211,10 @@
this
.
treeItemArray
[
nextIndex
].
focus
();
// 选中
}
const
hasInput
=
currentItem
.
querySelector
(
'
[type="checkbox"]
'
);
if
([
37
,
39
].
in
cludes
(
keyCode
)
)
{
// left、right 展开
if
([
37
,
39
].
in
dexOf
(
keyCode
)
>
-
1
)
{
// left、right 展开
currentItem
.
click
();
// 选中
}
if
([
13
,
32
].
in
cludes
(
keyCode
)
)
{
// space enter选中checkbox
if
([
13
,
32
].
in
dexOf
(
keyCode
)
>
-
1
)
{
// space enter选中checkbox
if
(
hasInput
)
{
hasInput
.
click
();
}
...
...
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