Skip to content

Commit 3d72aa6

Browse files
committed
fixed: datetime-picker position bug, change attibute type`s default value
1 parent 9a5c39c commit 3d72aa6

File tree

5 files changed

+30
-22
lines changed

5 files changed

+30
-22
lines changed

docs/components/datetime-picker.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ ___点击 picker 默认值规则:___
4242

4343
|属性名 |类型 |默认值 |值域 |说明 |
4444
|:-: |:-: |:-: | |:-: |
45-
|type |String |date |date/daterange/datetime/datetimerange
45+
|type |String |datetime |date/daterange/datetime/datetimerange
4646
range|选择器类型 |
4747
|value |String、Number |- |- |输入框当前值 |
4848
|start |String、Number |- |- |最小值,可以使用日期的字符串(String)、时间戳(Number) |

uni_modules/uni-datetime-picker/changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.0.2(2021-05-08)
2+
- 修复 在 admin 中获取弹出层定位错误的bug
3+
## 2.0.1(2021-05-08)
4+
- 修复 type 属性向下兼容,默认值从 date 变更为 datetime
15
## 2.0.0(2021-04-30)
26
- 支持日历形式的日期+时间的范围选择
37
> 注意:此版本不向后兼容,不再支持单独时间选择(type=time)及相关的 hide-second 属性(时间选可使用内置组件 picker)

uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
props: {
165165
type: {
166166
type: String,
167-
default: 'date'
167+
default: 'datetime'
168168
},
169169
value: {
170170
type: [String, Number, Array],
@@ -357,22 +357,24 @@
357357
if (systemInfo.windowWidth <= 500) {
358358
this.$refs.mobile.open()
359359
return
360+
}
361+
this.popover = {
362+
top: '10px'
360363
}
361-
let left
362-
const leftWindowInfo = uni.getLeftWindowStyle()
363-
const dateEditor = uni.createSelectorQuery().in(this).select(".uni-date-editor--x")
364-
dateEditor.boundingClientRect(rect => {
365-
// console.log(22222222, rect);
366-
if (leftWindowInfo.errMsg) {
367-
left = rect.left + 'px'
368-
} else {
369-
left = '15px'
370-
}
371-
this.popover = {
372-
top: rect.top + rect.height + 15 + 'px',
373-
left: left,
374-
}
375-
}).exec()
364+
// const dateEditor = uni.createSelectorQuery().in(this).select(".uni-date-editor--x")
365+
// dateEditor.boundingClientRect(rect => {
366+
// console.log(22222222, rect);
367+
// if (leftWindowInfo.errMsg) {
368+
// left = rect.left + 'px'
369+
// } else {
370+
// left = '15px'
371+
// }
372+
// this.popover = {
373+
// // top: rect.top + rect.height + 15 + 'px',
374+
// top: '40px',
375+
// left: 0,
376+
// }
377+
// }).exec()
376378
setTimeout(() => {
377379
this.popup = !this.popup
378380
// this.visible = true
@@ -648,7 +650,8 @@
648650
text-align: center;
649651
}
650652
651-
.uni-date-picker__container {
653+
.uni-date-picker__container {
654+
position: relative;
652655
/* position: fixed;
653656
left: 0;
654657
right: 0;
@@ -675,7 +678,7 @@
675678
top: 0;
676679
left: 0;
677680
z-index: 999;
678-
width: 375px;
681+
/* width: 375px; */
679682
border: 1px solid #F1F1F1;
680683
border-radius: 4px;
681684
}

uni_modules/uni-datetime-picker/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"id": "uni-datetime-picker",
33
"displayName": "uni-datetime-picker 日期选择器",
4-
"version": "2.0.0",
4+
"version": "2.0.2",
55
"description": "uni-datetime-picker 日期时间选择器,支持日历,支持范围选择",
66
"keywords": [
7+
"uni-datetime-picker",
78
"uni-ui",
89
"uniui",
910
"日期时间选择器",
@@ -79,4 +80,4 @@
7980
}
8081
}
8182
}
82-
}
83+
}

uni_modules/uni-datetime-picker/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ___点击 picker 默认值规则:___
4040

4141
|属性名 |类型 |默认值 |值域 |说明 |
4242
|:-: |:-: |:-: | |:-: |
43-
|type |String |date |date/daterange/datetime/datetimerange
43+
|type |String |datetime |date/daterange/datetime/datetimerange
4444
range|选择器类型 |
4545
|value |String、Number |- |- |输入框当前值 |
4646
|start |String、Number |- |- |最小值,可以使用日期的字符串(String)、时间戳(Number) |

0 commit comments

Comments
 (0)