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
ce13d974
Commit
ce13d974
authored
Nov 26, 2016
by
baiyaaaaa
Committed by
cinwell.li
Nov 26, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix datepicker year select mode bug (#1385)
parent
75d248e1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
17 deletions
+8
-17
packages/date-picker/src/basic/year-table.vue
packages/date-picker/src/basic/year-table.vue
+2
-4
packages/date-picker/src/panel/date.vue
packages/date-picker/src/panel/date.vue
+2
-2
packages/date-picker/src/picker.vue
packages/date-picker/src/picker.vue
+4
-11
No files found.
packages/date-picker/src/basic/year-table.vue
View file @
ce13d974
...
@@ -50,9 +50,7 @@
...
@@ -50,9 +50,7 @@
props
:
{
props
:
{
disabledDate
:
{},
disabledDate
:
{},
date
:
{},
date
:
{},
year
:
{
year
:
{}
type
:
Number
}
},
},
computed
:
{
computed
:
{
...
@@ -86,7 +84,7 @@
...
@@ -86,7 +84,7 @@
const
target
=
event
.
target
;
const
target
=
event
.
target
;
if
(
target
.
tagName
===
'
A
'
)
{
if
(
target
.
tagName
===
'
A
'
)
{
if
(
hasClass
(
target
.
parentNode
,
'
disabled
'
))
return
;
if
(
hasClass
(
target
.
parentNode
,
'
disabled
'
))
return
;
const
year
=
parseInt
(
target
.
textContent
||
target
.
innerText
,
10
)
;
const
year
=
target
.
textContent
||
target
.
innerText
;
this
.
$emit
(
'
pick
'
,
year
);
this
.
$emit
(
'
pick
'
,
year
);
}
}
}
}
...
...
packages/date-picker/src/panel/date.vue
View file @
ce13d974
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
@
click=
"handleShortcutClick(shortcut)"
>
{{
shortcut
.
text
}}
</button>
@
click=
"handleShortcutClick(shortcut)"
>
{{
shortcut
.
text
}}
</button>
</div>
</div>
<div
class=
"el-picker-panel__body"
>
<div
class=
"el-picker-panel__body"
>
<div
class=
"el-date-picker__time-header"
v-if=
"showTime"
>
<div
class=
"el-date-picker__time-header"
v-if=
"showTime"
>
<span
class=
"el-date-picker__editor-wrap"
>
<span
class=
"el-date-picker__editor-wrap"
>
<input
<input
:placehoder=
"t('el.datepicker.selectDate')"
:placehoder=
"t('el.datepicker.selectDate')"
...
@@ -310,7 +310,7 @@
...
@@ -310,7 +310,7 @@
this
.
date
.
setFullYear
(
year
);
this
.
date
.
setFullYear
(
year
);
if
(
this
.
selectionMode
===
'
year
'
)
{
if
(
this
.
selectionMode
===
'
year
'
)
{
this
.
$emit
(
'
pick
'
,
year
);
this
.
$emit
(
'
pick
'
,
new
Date
(
year
)
);
}
else
{
}
else
{
this
.
currentView
=
'
month
'
;
this
.
currentView
=
'
month
'
;
}
}
...
...
packages/date-picker/src/picker.vue
View file @
ce13d974
...
@@ -58,7 +58,8 @@ const DEFAULT_FORMATS = {
...
@@ -58,7 +58,8 @@ const DEFAULT_FORMATS = {
time
:
'
HH:mm:ss
'
,
time
:
'
HH:mm:ss
'
,
timerange
:
'
HH:mm:ss
'
,
timerange
:
'
HH:mm:ss
'
,
daterange
:
'
yyyy-MM-dd
'
,
daterange
:
'
yyyy-MM-dd
'
,
datetimerange
:
'
yyyy-MM-dd HH:mm:ss
'
datetimerange
:
'
yyyy-MM-dd HH:mm:ss
'
,
year
:
'
yyyy
'
};
};
const
HAVE_TRIGGER_TYPES
=
[
const
HAVE_TRIGGER_TYPES
=
[
'
date
'
,
'
date
'
,
...
@@ -163,16 +164,8 @@ const TYPE_VALUE_RESOLVER_MAP = {
...
@@ -163,16 +164,8 @@ const TYPE_VALUE_RESOLVER_MAP = {
parser
:
DATE_PARSER
parser
:
DATE_PARSER
},
},
year
:
{
year
:
{
formatter
(
value
)
{
formatter
:
DATE_FORMATTER
,
if
(
!
value
)
return
''
;
parser
:
DATE_PARSER
return
''
+
value
;
},
parser
(
text
)
{
const
year
=
Number
(
text
);
if
(
!
isNaN
(
year
))
return
year
;
return
null
;
}
},
},
number
:
{
number
:
{
formatter
(
value
)
{
formatter
(
value
)
{
...
...
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