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
01f6b9da
Commit
01f6b9da
authored
Aug 23, 2016
by
qingwei.li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix DatePicker style
parent
951c3de1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
18 deletions
+15
-18
examples/docs/input.md
examples/docs/input.md
+1
-1
packages/date-picker/src/css/date-picker.css
packages/date-picker/src/css/date-picker.css
+1
-1
packages/date-picker/src/css/date-range-picker.css
packages/date-picker/src/css/date-range-picker.css
+1
-1
packages/date-picker/src/panel/date-range.vue
packages/date-picker/src/panel/date-range.vue
+12
-15
No files found.
examples/docs/input.md
View file @
01f6b9da
...
...
@@ -70,7 +70,7 @@
## 禁用状态
<div
class=
"demo-box demo-input"
>
<div
class=
"demo-box demo-input"
>
<el-input
:disabled="true"
placeholder="请输入内容"
...
...
packages/date-picker/src/css/date-picker.css
View file @
01f6b9da
...
...
@@ -35,7 +35,7 @@
@e
time-header
{
position
:
relative
;
border-bottom
:
1px
solid
var
(
--datepicker-inner-border-color
);
font-size
:
0
;
font-size
:
12px
;
padding
:
8px
5px
5px
5px
;
display
:
flex
;
}
...
...
packages/date-picker/src/css/date-range-picker.css
View file @
01f6b9da
...
...
@@ -89,7 +89,7 @@
@e
time-header
{
position
:
relative
;
border-bottom
:
1px
solid
var
(
--datepicker-inner-border-color
);
font-size
:
0
;
font-size
:
12px
;
padding
:
8px
5px
5px
5px
;
display
:
flex
;
...
...
packages/date-picker/src/panel/date-range.vue
View file @
01f6b9da
...
...
@@ -115,9 +115,9 @@
</div>
</div>
<div
class=
"el-picker-panel__footer"
v-if=
"showTime"
>
<a
<
!--
<
a
class=
"el-picker-panel__link-btn"
@
click=
"changeToToday"
>
{{
$t
(
'
datepicker.today
'
)
}}
</a>
@
click=
"changeToToday"
>
{{
$t
(
'
datepicker.today
'
)
}}
</a>
-->
<button
type=
"button"
class=
"el-picker-panel__btn"
...
...
@@ -400,18 +400,15 @@
this
.
rightTimePickerVisible
=
false
;
},
handleLeftTimePick
(
value
)
{
if
(
!
this
.
minDate
)
{
this
.
minDate
=
new
Date
();
}
this
.
minDate
.
setHours
(
value
.
getHours
());
this
.
minDate
.
setMinutes
(
value
.
getMinutes
());
this
.
minDate
.
setSeconds
(
value
.
getSeconds
());
handleLeftTimePick
(
value
,
visible
,
first
)
{
this
.
minDate
=
value
||
this
.
minDate
||
new
Date
();
this
.
minDate
=
new
Date
(
this
.
minDate
);
if
(
!
first
)
{
this
.
leftTimePickerVisible
=
visible
;
}
},
handleRightTimePick
(
value
)
{
handleRightTimePick
(
value
,
visible
,
first
)
{
if
(
!
this
.
maxDate
)
{
const
now
=
new
Date
();
if
(
now
>=
this
.
minDate
)
{
...
...
@@ -420,11 +417,11 @@
}
if
(
this
.
maxDate
)
{
this
.
maxDate
.
setHours
(
value
.
getHours
());
this
.
maxDate
.
setMinutes
(
value
.
getMinutes
());
this
.
maxDate
.
setSeconds
(
value
.
getSeconds
());
this
.
maxDate
=
value
;
}
this
.
maxDate
=
new
Date
(
this
.
maxDate
);
if
(
!
first
)
{
this
.
rightTimePickerVisible
=
visible
;
}
},
...
...
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