blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into next

Browse Source
This commit is contained in:
chenjiahan 2020-09-07 21:01:41 +08:00
commit ef38d75fa4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calendar/index.js
View File

@ -308,6 +308,10 @@ export default createComponent({
},
onClickDay(item) {
if (this.readonly) {
return;
}
const { date } = item;
const { type, currentDate } = this;
@ -365,10 +369,6 @@ export default createComponent({
},
select(date, complete) {
if (this.readonly) {
return;
}
const emit = (date) => {
this.currentDate = date;
this.$emit('select', copyDates(this.currentDate));

2
src/list/index.js
View File

@ -118,7 +118,7 @@ export default createComponent({
const renderLoading = () => {
if (loading.value && !props.finished) {
return (
<div class={bem('loading')} key="loading">
<div class={bem('loading')}>
{slots.loading ? (
slots.loading()
) : (