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
fce92e8b
Commit
fce92e8b
authored
Nov 07, 2016
by
cinwell.li
Committed by
FuryBean
Nov 07, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DatePicker: fix reset value, fixed #878 (#880)
add test
parent
b5e97d85
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
37 additions
and
0 deletions
+37
-0
CHANGELOG.md
CHANGELOG.md
+1
-0
packages/date-picker/src/panel/date.vue
packages/date-picker/src/panel/date.vue
+4
-0
packages/date-picker/src/picker.vue
packages/date-picker/src/picker.vue
+3
-0
test/unit/specs/date-picker.spec.js
test/unit/specs/date-picker.spec.js
+29
-0
No files found.
CHANGELOG.md
View file @
fce92e8b
...
...
@@ -17,6 +17,7 @@
-
TableColumn 的 showTooltipWhenOverflow 更名为 showOverflowTooltip(两个属性均可用)
-
TableColumn 新增属性 render-header
-
Pagination 新增属性 pageCount
-
DatePicker 修复重置 value 后默认选中日期没有重置, #878
#### 非兼容性更新
...
...
packages/date-picker/src/panel/date.vue
View file @
fce92e8b
...
...
@@ -181,6 +181,10 @@
}
,
methods
:
{
handleClear
()
{
this
.
date
=
new
Date
();
}
,
resetDate
()
{
this
.
date
=
new
Date
(
this
.
date
);
}
,
...
...
packages/date-picker/src/picker.vue
View file @
fce92e8b
...
...
@@ -221,6 +221,9 @@ export default {
val
?
this
.
showPicker
()
:
this
.
hidePicker
();
},
value
(
val
)
{
if
(
!
val
&&
this
.
picker
&&
typeof
this
.
picker
.
handleClear
===
'
function
'
)
{
this
.
picker
.
handleClear
();
}
this
.
dispatch
(
'
form-item
'
,
'
el.form.change
'
);
}
},
...
...
test/unit/specs/date-picker.spec.js
View file @
fce92e8b
...
...
@@ -66,6 +66,35 @@ describe('DatePicker', () => {
},
DELAY
);
});
it
(
'
reset
'
,
done
=>
{
vm
=
createVue
({
template
:
`
<el-date-picker ref="compo" v-model="value"></el-date-picker>
`
,
data
()
{
return
{
value
:
''
};
}
},
true
);
const
input
=
vm
.
$el
.
querySelector
(
'
input
'
);
input
.
blur
();
input
.
focus
();
setTimeout
(
_
=>
{
const
$el
=
vm
.
$refs
.
compo
.
picker
.
$el
;
$el
.
querySelector
(
'
.el-date-picker__next-btn.el-icon-arrow-right
'
).
click
();
setTimeout
(
_
=>
{
$el
.
querySelector
(
'
td.available
'
).
click
();
vm
.
$nextTick
(
_
=>
{
vm
.
value
=
''
;
setTimeout
(
_
=>
{
expect
(
vm
.
$refs
.
compo
.
picker
.
date
.
getDate
()).
to
.
equal
(
new
Date
().
getDate
());
done
();
},
DELAY
);
});
},
DELAY
);
},
DELAY
);
});
describe
(
'
keydown
'
,
()
=>
{
let
input
;
let
keyDown
=
function
(
el
,
keyCode
)
{
...
...
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