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
b24a9ce7
Commit
b24a9ce7
authored
Mar 15, 2018
by
Harlan
Committed by
杨奕
Mar 15, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
TimeSelect: fix resetField not working when user inputs an invalid value (#10176)
parent
c48a69c9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
1 deletion
+17
-1
packages/date-picker/src/picker.vue
packages/date-picker/src/picker.vue
+6
-0
packages/date-picker/src/picker/time-select.js
packages/date-picker/src/picker/time-select.js
+9
-1
packages/form/src/form-item.vue
packages/form/src/form-item.vue
+2
-0
No files found.
packages/date-picker/src/picker.vue
View file @
b24a9ce7
...
...
@@ -502,6 +502,8 @@ export default {
gpuAcceleration
:
false
};
this
.
placement
=
PLACEMENT_MAP
[
this
.
align
]
||
PLACEMENT_MAP
.
left
;
this
.
$on
(
'
fieldReset
'
,
this
.
handleFieldReset
);
},
methods
:
{
...
...
@@ -634,6 +636,10 @@ export default {
this
.
pickerVisible
=
false
;
},
handleFieldReset
(
initialValue
)
{
this
.
userInput
=
initialValue
;
},
handleFocus
()
{
const
type
=
this
.
type
;
...
...
packages/date-picker/src/picker/time-select.js
View file @
b24a9ce7
...
...
@@ -6,8 +6,16 @@ export default {
name
:
'
ElTimeSelect
'
,
componentName
:
'
ElTimeSelect
'
,
props
:
{
type
:
{
type
:
String
,
default
:
'
time-select
'
}
},
beforeCreate
()
{
this
.
type
=
'
time-select
'
;
this
.
panel
=
Panel
;
}
};
packages/form/src/form-item.vue
View file @
b24a9ce7
...
...
@@ -227,6 +227,8 @@
这里需要强行触发一次,刷新 validateDisabled 的值,
确保 Select 下一次值改变时能正确触发校验 */
this
.
broadcast
(
'
ElSelect
'
,
'
fieldReset
'
);
this
.
broadcast
(
'
ElTimeSelect
'
,
'
fieldReset
'
,
this
.
initialValue
);
},
getRules
()
{
let
formRules
=
this
.
form
.
rules
;
...
...
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