blackteay/vant-weapp
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant-weapp.git synced 2025-04-05 19:41:45 +08:00
Code Issues Projects Releases Wiki Activity

fix(calendar): confirmDisabledText增加默认值和文档同步 (#3394)

Browse Source 
* fix(calendar): confirmDisabledText增加默认值和文档同步

* fix(datetime-picker): 默认值为string 解析时间错误
This commit is contained in:
如风 2020-07-17 11:51:50 +08:00 committed by GitHub
parent 97c2a458b0
commit c304655dc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/calendar/index.js vendored
View File

@ -41,7 +41,10 @@ VantComponent({
},
},
allowSameDay: Boolean,
confirmDisabledText: String,
confirmDisabledText: {
type: String,
value: '确定',
},
type: {
type: String,
value: 'single',

4
dist/datetime-picker/index.js vendored
View File

@ -203,8 +203,8 @@ VantComponent({
return `${hour}:${minute}`;
}
// date type
value = Math.max(value, data.minDate);
value = Math.min(value, data.maxDate);
value = Math.max(new Date(value).getTime(), data.minDate);
value = Math.min(new Date(value).getTime(), data.maxDate);
return value;
},
getBoundary(type, innerValue) {