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
69dd5399
Commit
69dd5399
authored
Jul 25, 2018
by
Jiewei Qian
Committed by
Jikkai Xiao
Jul 25, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
date-picker: fix #11152 (#12114)
parent
5c9eb375
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
4 deletions
+22
-4
packages/date-picker/src/basic/date-table.vue
packages/date-picker/src/basic/date-table.vue
+0
-4
test/unit/specs/date-picker.spec.js
test/unit/specs/date-picker.spec.js
+22
-0
No files found.
packages/date-picker/src/basic/date-table.vue
View file @
69dd5399
...
@@ -235,10 +235,6 @@
...
@@ -235,10 +235,6 @@
if
(
newVal
&&
!
oldVal
)
{
if
(
newVal
&&
!
oldVal
)
{
this
.
rangeState
.
selecting
=
false
;
this
.
rangeState
.
selecting
=
false
;
this
.
markRange
(
newVal
);
this
.
markRange
(
newVal
);
this
.
$emit
(
'
pick
'
,
{
minDate
:
this
.
minDate
,
maxDate
:
this
.
maxDate
});
}
}
}
}
},
},
...
...
test/unit/specs/date-picker.spec.js
View file @
69dd5399
...
@@ -1923,6 +1923,17 @@ describe('DatePicker', () => {
...
@@ -1923,6 +1923,17 @@ describe('DatePicker', () => {
const
leftCell
=
pickers
[
0
].
querySelector
(
'
td.available
'
);
const
leftCell
=
pickers
[
0
].
querySelector
(
'
td.available
'
);
const
rightCell
=
pickers
[
1
].
querySelector
(
'
td.available
'
);
const
rightCell
=
pickers
[
1
].
querySelector
(
'
td.available
'
);
const
{
minDate
,
maxDate
}
=
vm
.
picker
;
expect
(
minDate
.
getHours
()).
to
.
be
.
equal
(
10
);
expect
(
minDate
.
getMinutes
()).
to
.
be
.
equal
(
10
);
expect
(
minDate
.
getSeconds
()).
to
.
be
.
equal
(
0
);
expect
(
maxDate
.
getHours
()).
to
.
be
.
equal
(
10
);
expect
(
maxDate
.
getMinutes
()).
to
.
be
.
equal
(
10
);
expect
(
maxDate
.
getSeconds
()).
to
.
be
.
equal
(
0
);
triggerEvent
(
leftCell
,
'
mousemove
'
,
true
);
triggerEvent
(
leftCell
,
'
mousemove
'
,
true
);
setTimeout
(
_
=>
{
setTimeout
(
_
=>
{
triggerEvent
(
leftCell
,
'
click
'
,
true
);
triggerEvent
(
leftCell
,
'
click
'
,
true
);
...
@@ -2024,6 +2035,17 @@ describe('DatePicker', () => {
...
@@ -2024,6 +2035,17 @@ describe('DatePicker', () => {
const
leftCell
=
pickers
[
0
].
querySelector
(
'
td.available
'
);
const
leftCell
=
pickers
[
0
].
querySelector
(
'
td.available
'
);
const
rightCell
=
pickers
[
1
].
querySelector
(
'
td.available
'
);
const
rightCell
=
pickers
[
1
].
querySelector
(
'
td.available
'
);
const
{
minDate
,
maxDate
}
=
vm
.
picker
;
expect
(
minDate
.
getHours
()).
to
.
be
.
equal
(
10
);
expect
(
minDate
.
getMinutes
()).
to
.
be
.
equal
(
10
);
expect
(
minDate
.
getSeconds
()).
to
.
be
.
equal
(
0
);
expect
(
maxDate
.
getHours
()).
to
.
be
.
equal
(
10
);
expect
(
maxDate
.
getMinutes
()).
to
.
be
.
equal
(
10
);
expect
(
maxDate
.
getSeconds
()).
to
.
be
.
equal
(
0
);
triggerEvent
(
leftCell
,
'
mousemove
'
,
true
);
triggerEvent
(
leftCell
,
'
mousemove
'
,
true
);
setTimeout
(
_
=>
{
setTimeout
(
_
=>
{
triggerEvent
(
leftCell
,
'
click
'
,
true
);
triggerEvent
(
leftCell
,
'
click
'
,
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