From bc59e6ea5d10fcabc2e1f0fdd33868a3ccbe8840 Mon Sep 17 00:00:00 2001 From: neverland Date: Mon, 7 Sep 2020 20:53:26 +0800 Subject: [PATCH 1/2] fix(Calendar): readonly not work in multiple mode (#7127) --- src/calendar/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calendar/index.js b/src/calendar/index.js index 360bbae7d..4eca1687b 100644 --- a/src/calendar/index.js +++ b/src/calendar/index.js @@ -301,6 +301,10 @@ export default createComponent({ }, onClickDay(item) { + if (this.readonly) { + return; + } + const { date } = item; const { type, currentDate } = this; @@ -358,10 +362,6 @@ export default createComponent({ }, select(date, complete) { - if (this.readonly) { - return; - } - const emit = (date) => { this.currentDate = date; this.$emit('select', copyDates(this.currentDate)); From 432c32a3c6aad8307469a4e8f1e8d80e05373c7e Mon Sep 17 00:00:00 2001 From: neverland Date: Mon, 7 Sep 2020 20:57:42 +0800 Subject: [PATCH 2/2] fix(List): scoped style not applied to first child (#7128) --- src/list/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/list/index.js b/src/list/index.js index 82f1148c1..4a6aef7a5 100644 --- a/src/list/index.js +++ b/src/list/index.js @@ -121,7 +121,7 @@ export default createComponent({ genLoading() { if (this.innerLoading && !this.finished) { return ( -
+
{this.slots('loading') || ( {this.loadingText || t('loading')} )} @@ -156,7 +156,9 @@ export default createComponent({ }, render() { - const Placeholder =
; + const Placeholder = ( +
+ ); return (