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
3902bcc3
Commit
3902bcc3
authored
May 04, 2017
by
wacky6
Committed by
杨奕
May 13, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DatePicker: fix, add test for unwanted 'input' event emission
Fixes issue:
https://github.com/ElemeFE/element/issues/4624
parent
4f03d279
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
134 additions
and
1 deletion
+134
-1
packages/date-picker/src/picker.vue
packages/date-picker/src/picker.vue
+18
-1
test/unit/specs/date-picker.spec.js
test/unit/specs/date-picker.spec.js
+116
-0
No files found.
packages/date-picker/src/picker.vue
View file @
3902bcc3
...
@@ -182,6 +182,20 @@ const PLACEMENT_MAP = {
...
@@ -182,6 +182,20 @@ const PLACEMENT_MAP = {
right
:
'
bottom-end
'
right
:
'
bottom-end
'
};
};
// only considers date-picker's value: Date or [Date, Date]
const
valueEquals
=
function
(
a
,
b
)
{
const
aIsArray
=
a
instanceof
Array
;
const
bIsArray
=
b
instanceof
Array
;
if
(
aIsArray
&&
bIsArray
)
{
return
new
Date
(
a
[
0
]).
getTime
()
===
new
Date
(
b
[
0
]).
getTime
()
&&
new
Date
(
a
[
1
]).
getTime
()
===
new
Date
(
b
[
1
]).
getTime
();
}
if
(
!
aIsArray
&&
!
bIsArray
)
{
return
new
Date
(
a
).
getTime
()
===
new
Date
(
b
).
getTime
();
}
return
false
;
};
export
default
{
export
default
{
mixins
:
[
Emitter
,
NewPopper
],
mixins
:
[
Emitter
,
NewPopper
],
...
@@ -470,7 +484,10 @@ export default {
...
@@ -470,7 +484,10 @@ export default {
this
.
picker
.
$on
(
'
dodestroy
'
,
this
.
doDestroy
);
this
.
picker
.
$on
(
'
dodestroy
'
,
this
.
doDestroy
);
this
.
picker
.
$on
(
'
pick
'
,
(
date
=
''
,
visible
=
false
)
=>
{
this
.
picker
.
$on
(
'
pick
'
,
(
date
=
''
,
visible
=
false
)
=>
{
this
.
$emit
(
'
input
'
,
date
);
// do not emit if values are same
if
(
!
valueEquals
(
this
.
value
,
date
))
{
this
.
$emit
(
'
input
'
,
date
);
}
this
.
pickerVisible
=
this
.
picker
.
visible
=
visible
;
this
.
pickerVisible
=
this
.
picker
.
visible
=
visible
;
this
.
picker
.
resetView
&&
this
.
picker
.
resetView
();
this
.
picker
.
resetView
&&
this
.
picker
.
resetView
();
});
});
...
...
test/unit/specs/date-picker.spec.js
View file @
3902bcc3
...
@@ -202,6 +202,122 @@ describe('DatePicker', () => {
...
@@ -202,6 +202,122 @@ describe('DatePicker', () => {
},
DELAY
);
},
DELAY
);
});
});
describe
(
'
input event
'
,
()
=>
{
// mimic standard <select>'s behavior
// emit input if and only if value changes
afterEach
(()
=>
{
destroyVM
(
vm
);
});
it
(
'
works for type=date
'
,
done
=>
{
let
emitted
=
false
;
vm
=
createVue
({
template
:
`
<el-date-picker
ref="compo"
v-model="value"
type="date"
@input="handleInput" />`
,
methods
:
{
handleInput
(
val
)
{
emitted
=
true
;
}
},
data
()
{
return
{
value
:
''
};
}
},
true
);
const
input
=
vm
.
$el
.
querySelector
(
'
input
'
);
input
.
blur
();
input
.
focus
();
setTimeout
(
_
=>
{
const
picker
=
vm
.
$refs
.
compo
.
picker
;
picker
.
$el
.
querySelector
(
'
td.available
'
).
click
();
setTimeout
(
_
=>
{
expect
(
emitted
).
to
.
true
;
emitted
=
false
;
setTimeout
(
_
=>
{
input
.
blur
();
input
.
focus
();
picker
.
$el
.
querySelector
(
'
td.available
'
).
click
();
setTimeout
(
_
=>
{
expect
(
emitted
).
to
.
false
;
done
();
},
DELAY
);
},
DELAY
);
},
DELAY
);
},
DELAY
);
});
it
(
'
works for type=daterange
'
,
done
=>
{
let
emitted
=
false
;
vm
=
createVue
({
template
:
`
<el-date-picker
ref="compo"
v-model="value"
type="daterange"
@input="handleInput" />`
,
methods
:
{
handleInput
(
val
)
{
emitted
=
true
;
}
},
data
()
{
return
{
value
:
''
};
}
},
true
);
const
input
=
vm
.
$el
.
querySelector
(
'
input
'
);
input
.
blur
();
input
.
focus
();
setTimeout
(
_
=>
{
const
picker
=
vm
.
$refs
.
compo
.
picker
;
picker
.
$el
.
querySelector
(
'
td.available
'
).
click
();
setTimeout
(
_
=>
{
picker
.
$el
.
querySelector
(
'
td.available + td.available
'
).
click
();
setTimeout
(
_
=>
{
expect
(
emitted
).
to
.
true
;
emitted
=
false
;
setTimeout
(
_
=>
{
input
.
blur
();
input
.
focus
();
const
picker
=
vm
.
$refs
.
compo
.
picker
;
picker
.
$el
.
querySelector
(
'
td.available
'
).
click
();
setTimeout
(
_
=>
{
picker
.
$el
.
querySelector
(
'
td.available + td.available
'
).
click
();
setTimeout
(
_
=>
{
expect
(
emitted
).
to
.
false
;
done
();
});
},
DELAY
);
},
DELAY
);
});
},
DELAY
);
},
DELAY
);
});
});
it
(
'
default value
'
,
done
=>
{
it
(
'
default value
'
,
done
=>
{
const
toDateStr
=
date
=>
{
const
toDateStr
=
date
=>
{
let
d
=
new
Date
(
date
);
let
d
=
new
Date
(
date
);
...
...
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