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
8a8c28fc
Commit
8a8c28fc
authored
Oct 13, 2016
by
qingwei.li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DatePicker: fix tab key
parent
2f41d86d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
22 deletions
+6
-22
packages/date-picker/src/picker.vue
packages/date-picker/src/picker.vue
+6
-6
packages/date-picker/src/util/index.js
packages/date-picker/src/util/index.js
+0
-16
No files found.
packages/date-picker/src/picker.vue
View file @
8a8c28fc
...
...
@@ -32,7 +32,7 @@
<
script
>
import
Vue
from
'
vue
'
;
import
Clickoutside
from
'
element-ui/src/utils/clickoutside
'
;
import
{
merge
,
formatDate
,
parseDate
,
getWeekNumber
}
from
'
./util
'
;
import
{
formatDate
,
parseDate
,
getWeekNumber
}
from
'
./util
'
;
import
Popper
from
'
element-ui/src/utils/vue-popper
'
;
import
emitter
from
'
element-ui/src/mixins/emitter
'
;
...
...
@@ -312,7 +312,6 @@ export default {
},
handleBlur
()
{
this
.
pickerVisible
=
false
;
this
.
$emit
(
'
blur
'
,
this
);
this
.
dispatch
(
'
form-item
'
,
'
el.form.blur
'
);
},
...
...
@@ -323,7 +322,10 @@ export default {
let
selectionEnd
=
event
.
target
.
selectionEnd
;
let
length
=
event
.
target
.
value
.
length
;
if
(
keyCode
===
27
)
{
// tab
if
(
keyCode
===
9
)
{
this
.
pickerVisible
=
false
;
}
else
if
(
keyCode
===
27
)
{
this
.
pickerVisible
=
this
.
picker
.
visible
=
false
;
// left
}
else
if
(
keyCode
===
37
)
{
...
...
@@ -414,9 +416,7 @@ export default {
showPicker
()
{
if
(
!
this
.
picker
)
{
this
.
panel
.
defaultValue
=
this
.
value
;
this
.
picker
=
new
Vue
(
merge
({
el
:
document
.
createElement
(
'
div
'
)
},
this
.
panel
));
this
.
picker
=
new
Vue
(
this
.
panel
).
$mount
(
document
.
createElement
(
'
div
'
));
this
.
popperElm
=
this
.
picker
.
$el
;
this
.
picker
.
width
=
this
.
$refs
.
reference
.
getBoundingClientRect
().
width
;
this
.
picker
.
showTime
=
this
.
type
===
'
datetime
'
||
this
.
type
===
'
datetimerange
'
;
...
...
packages/date-picker/src/util/index.js
View file @
8a8c28fc
...
...
@@ -8,22 +8,6 @@ const newArray = function(start, end) {
return
result
;
};
export
const
merge
=
function
(
target
)
{
for
(
var
i
=
1
,
j
=
arguments
.
length
;
i
<
j
;
i
++
)
{
var
source
=
arguments
[
i
];
for
(
var
prop
in
source
)
{
if
(
source
.
hasOwnProperty
(
prop
))
{
var
value
=
source
[
prop
];
if
(
value
!==
undefined
)
{
target
[
prop
]
=
value
;
}
}
}
}
return
target
;
};
export
const
toDate
=
function
(
date
)
{
date
=
new
Date
(
date
);
if
(
isNaN
(
date
.
getTime
()))
return
null
;
...
...
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