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
66139664
Commit
66139664
authored
Sep 21, 2016
by
qingwei.li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DatePicker: add align attribute
parent
e75f83c8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
6 deletions
+18
-6
CHANGELOG.md
CHANGELOG.md
+2
-0
examples/docs/date-picker.md
examples/docs/date-picker.md
+2
-0
packages/autocomplete/src/autocomplete.vue
packages/autocomplete/src/autocomplete.vue
+2
-3
packages/date-picker/src/css/picker.css
packages/date-picker/src/css/picker.css
+2
-2
packages/date-picker/src/picker.vue
packages/date-picker/src/picker.vue
+10
-1
No files found.
CHANGELOG.md
View file @
66139664
...
...
@@ -12,6 +12,8 @@
-
修复 TimePicker 图标样式被默认图标样式覆盖
-
修复 在 mounted 钩子函数中改变 Select 绑定值不生效的问题
-
修复 在多个依次出现的 Dialog 或 Message Box 全部关闭后页面有几率不可滚动的问题
-
新增 时间、日期选择器增加 align 属性,可设置对齐方式
-
新增 TableColumn 的 align 属性
#### 非兼容性更新
-
Select 组件样式的
`display`
属性默认值修改为
`block`
...
...
examples/docs/date-picker.md
View file @
66139664
...
...
@@ -205,6 +205,7 @@
<el-date-picker
v-model=
"value7"
type=
"daterange"
align=
"right"
placeholder=
"选择日期范围"
:picker-options=
"pickerOptions2"
style=
"width: 220px"
>
...
...
@@ -257,6 +258,7 @@
| type | 显示类型 | string | year/month/date/datetime/week | date |
| format | 时间日期格式化 | string | 年
`yyyy`
,月
`MM`
,日
`dd`
,
<br>
小时
`HH`
,分
`mm`
,秒
`ss`
| yyyy-MM-dd |
| shortcuts | 快捷选项列表,配置信息
<br>
查看下表 | object
[]
| — | — |
| align | 对齐方式 | left, center, right | left |
### Shortcuts
| 参数 | 说明 | 类型 | 可选值 | 默认值 |
...
...
packages/autocomplete/src/autocomplete.vue
View file @
66139664
...
...
@@ -42,9 +42,7 @@
</template>
<
script
>
import
ElInput
from
'
packages/input/index.js
'
;
import
Vue
from
'
vue
'
;
import
VueClickoutside
from
'
main/utils/clickoutside
'
;
Vue
.
use
(
VueClickoutside
);
import
Clickoutside
from
'
main/utils/clickoutside
'
;
export
default
{
name
:
'
ElAutocomplete
'
,
...
...
@@ -52,6 +50,7 @@
components
:
{
ElInput
},
directives
:
{
Clickoutside
},
props
:
{
placeholder
:
String
,
disabled
:
Boolean
,
...
...
packages/date-picker/src/css/picker.css
View file @
66139664
...
...
@@ -47,8 +47,8 @@
cursor
:
pointer
;
position
:
absolute
;
display
:
inline-block
;
width
:
20
px
;
right
:
0
;
width
:
13
px
;
right
:
10px
;
top
:
0
;
bottom
:
0
;
color
:
var
(
--datepicker-trigger-color
);
...
...
packages/date-picker/src/picker.vue
View file @
66139664
...
...
@@ -177,6 +177,11 @@ const TYPE_VALUE_RESOLVER_MAP = {
}
}
};
const
PLACEMENT_MAP
=
{
left
:
'
bottom-start
'
,
center
:
'
bottom-center
'
,
right
:
'
bottom-end
'
};
export
default
{
mixins
:
[
emitter
],
...
...
@@ -185,6 +190,10 @@ export default {
format
:
String
,
readonly
:
Boolean
,
placeholder
:
String
,
align
:
{
type
:
String
,
default
:
'
left
'
},
value
:
{},
haveTrigger
:
{},
pickerOptions
:
{}
...
...
@@ -465,7 +474,7 @@ export default {
this
.
popper
=
new
Popper
(
this
.
$refs
.
reference
,
this
.
picker
.
$el
,
{
gpuAcceleration
:
false
,
placement
:
'
bottom-start
'
,
placement
:
PLACEMENT_MAP
[
this
.
align
]
||
PLACEMENT_MAP
.
left
,
boundariesPadding
:
0
,
forceAbsolute
:
true
});
...
...
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