From d295fda926d3118c2177c260f29d9c69baf7807f Mon Sep 17 00:00:00 2001 From: rex-zsd Date: Sat, 21 Mar 2020 11:53:30 +0800 Subject: [PATCH] build: compile 1.1.0 --- dist/button/index.js | 5 +- dist/button/index.wxml | 14 +- dist/calendar/calendar.wxml | 57 +++++ dist/calendar/components/header/index.d.ts | 1 + dist/calendar/components/header/index.js | 16 ++ dist/calendar/components/header/index.json | 3 + dist/calendar/components/header/index.wxml | 16 ++ dist/calendar/components/header/index.wxss | 1 + dist/calendar/components/month/index.d.ts | 1 + dist/calendar/components/month/index.js | 148 ++++++++++++ dist/calendar/components/month/index.json | 3 + dist/calendar/components/month/index.wxml | 39 +++ dist/calendar/components/month/index.wxs | 67 ++++++ dist/calendar/components/month/index.wxss | 1 + dist/calendar/index.d.ts | 1 + dist/calendar/index.js | 250 +++++++++++++++++++ dist/calendar/index.json | 9 + dist/calendar/index.wxml | 29 +++ dist/calendar/index.wxs | 33 +++ dist/calendar/index.wxss | 1 + dist/calendar/utils.d.ts | 10 + dist/calendar/utils.js | 78 ++++++ dist/calendar/utils.wxs | 25 ++ dist/field/index.js | 5 +- dist/field/index.wxml | 11 +- dist/field/index.wxs | 21 ++ dist/field/index.wxss | 2 +- dist/grid-item/index.js | 1 + dist/grid-item/index.wxml | 8 +- dist/grid/index.wxml | 2 +- dist/mixins/button.js | 5 +- dist/popup/index.js | 3 +- dist/popup/index.wxml | 2 +- dist/sidebar-item/index.wxml | 3 +- dist/steps/index.js | 8 +- dist/steps/index.wxml | 2 + dist/uploader/index.js | 201 ++++++---------- dist/uploader/index.wxml | 7 +- dist/uploader/index.wxss | 2 +- dist/uploader/shared.d.ts | 28 +++ dist/uploader/shared.js | 30 +++ dist/uploader/utils.d.ts | 15 +- dist/uploader/utils.js | 42 ++++ lib/button/index.js | 5 +- lib/button/index.wxml | 14 +- lib/calendar/calendar.wxml | 57 +++++ lib/calendar/components/header/index.js | 18 ++ lib/calendar/components/header/index.json | 3 + lib/calendar/components/header/index.wxml | 16 ++ lib/calendar/components/header/index.wxss | 1 + lib/calendar/components/month/index.js | 152 ++++++++++++ lib/calendar/components/month/index.json | 3 + lib/calendar/components/month/index.wxml | 39 +++ lib/calendar/components/month/index.wxs | 67 ++++++ lib/calendar/components/month/index.wxss | 1 + lib/calendar/index.js | 267 +++++++++++++++++++++ lib/calendar/index.json | 9 + lib/calendar/index.wxml | 29 +++ lib/calendar/index.wxs | 33 +++ lib/calendar/index.wxss | 1 + lib/calendar/utils.js | 89 +++++++ lib/calendar/utils.wxs | 25 ++ lib/field/index.js | 5 +- lib/field/index.wxml | 11 +- lib/field/index.wxs | 21 ++ lib/field/index.wxss | 2 +- lib/grid-item/index.js | 1 + lib/grid-item/index.wxml | 8 +- lib/grid/index.wxml | 2 +- lib/mixins/button.js | 5 +- lib/popup/index.js | 3 +- lib/popup/index.wxml | 2 +- lib/sidebar-item/index.wxml | 3 +- lib/steps/index.js | 8 +- lib/steps/index.wxml | 2 + lib/uploader/index.js | 199 ++++++--------- lib/uploader/index.wxml | 7 +- lib/uploader/index.wxss | 2 +- lib/uploader/shared.js | 32 +++ lib/uploader/utils.js | 47 ++++ 80 files changed, 2077 insertions(+), 318 deletions(-) create mode 100644 dist/calendar/calendar.wxml create mode 100644 dist/calendar/components/header/index.d.ts create mode 100644 dist/calendar/components/header/index.js create mode 100644 dist/calendar/components/header/index.json create mode 100644 dist/calendar/components/header/index.wxml create mode 100644 dist/calendar/components/header/index.wxss create mode 100644 dist/calendar/components/month/index.d.ts create mode 100644 dist/calendar/components/month/index.js create mode 100644 dist/calendar/components/month/index.json create mode 100644 dist/calendar/components/month/index.wxml create mode 100644 dist/calendar/components/month/index.wxs create mode 100644 dist/calendar/components/month/index.wxss create mode 100644 dist/calendar/index.d.ts create mode 100644 dist/calendar/index.js create mode 100644 dist/calendar/index.json create mode 100644 dist/calendar/index.wxml create mode 100644 dist/calendar/index.wxs create mode 100644 dist/calendar/index.wxss create mode 100644 dist/calendar/utils.d.ts create mode 100644 dist/calendar/utils.js create mode 100644 dist/calendar/utils.wxs create mode 100644 dist/field/index.wxs create mode 100644 dist/uploader/shared.d.ts create mode 100644 dist/uploader/shared.js create mode 100644 lib/calendar/calendar.wxml create mode 100644 lib/calendar/components/header/index.js create mode 100644 lib/calendar/components/header/index.json create mode 100644 lib/calendar/components/header/index.wxml create mode 100644 lib/calendar/components/header/index.wxss create mode 100644 lib/calendar/components/month/index.js create mode 100644 lib/calendar/components/month/index.json create mode 100644 lib/calendar/components/month/index.wxml create mode 100644 lib/calendar/components/month/index.wxs create mode 100644 lib/calendar/components/month/index.wxss create mode 100644 lib/calendar/index.js create mode 100644 lib/calendar/index.json create mode 100644 lib/calendar/index.wxml create mode 100644 lib/calendar/index.wxs create mode 100644 lib/calendar/index.wxss create mode 100644 lib/calendar/utils.js create mode 100644 lib/calendar/utils.wxs create mode 100644 lib/field/index.wxs create mode 100644 lib/uploader/shared.js diff --git a/dist/button/index.js b/dist/button/index.js index 22a811ba..599aa98c 100644 --- a/dist/button/index.js +++ b/dist/button/index.js @@ -60,9 +60,10 @@ VantComponent({ }, methods: { onClick() { - if (!this.data.disabled && !this.data.loading) { + if (!this.data.loading) { this.$emit('click'); } - } + }, + noop() { } } }); diff --git a/dist/button/index.wxml b/dist/button/index.wxml index 3239354f..09bef324 100644 --- a/dist/button/index.wxml +++ b/dist/button/index.wxml @@ -15,13 +15,13 @@ show-message-card="{{ showMessageCard }}" app-parameter="{{ appParameter }}" aria-label="{{ ariaLabel }}" - bindtap="onClick" - bindgetuserinfo="bindGetUserInfo" - bindcontact="bindContact" - bindgetphonenumber="bindGetPhoneNumber" - binderror="bindError" - bindlaunchapp="bindLaunchApp" - bindopensetting="bindOpenSetting" + bindtap="{{ !disabled ? 'onClick' : 'noop' }}" + bindgetuserinfo="{{ !disabled ? 'bindGetUserInfo' : 'noop' }}" + bindcontact="{{ !disabled ? 'bindContact' : 'noop' }}" + bindgetphonenumber="{{ !disabled ? 'bindGetPhoneNumber' : 'noop' }}" + binderror="{{ !disabled ? 'bindError' : 'noop' }}" + bindlaunchapp="{{ !disabled ? 'bindLaunchApp' : 'noop' }}" + bindopensetting="{{ !disabled ? 'bindOpenSetting' : 'noop' }}" > + + diff --git a/dist/calendar/components/header/index.d.ts b/dist/calendar/components/header/index.d.ts new file mode 100644 index 00000000..cb0ff5c3 --- /dev/null +++ b/dist/calendar/components/header/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/dist/calendar/components/header/index.js b/dist/calendar/components/header/index.js new file mode 100644 index 00000000..74d4327a --- /dev/null +++ b/dist/calendar/components/header/index.js @@ -0,0 +1,16 @@ +import { VantComponent } from '../../../common/component'; +VantComponent({ + props: { + title: { + type: String, + value: '日期选择' + }, + subtitle: String, + showTitle: Boolean, + showSubtitle: Boolean + }, + data: { + weekdays: ['日', '一', '二', '三', '四', '五', '六'] + }, + methods: {} +}); diff --git a/dist/calendar/components/header/index.json b/dist/calendar/components/header/index.json new file mode 100644 index 00000000..467ce294 --- /dev/null +++ b/dist/calendar/components/header/index.json @@ -0,0 +1,3 @@ +{ + "component": true +} diff --git a/dist/calendar/components/header/index.wxml b/dist/calendar/components/header/index.wxml new file mode 100644 index 00000000..eb8e4b47 --- /dev/null +++ b/dist/calendar/components/header/index.wxml @@ -0,0 +1,16 @@ + + + + {{ title }} + + + + {{ subtitle }} + + + + + {{ item }} + + + diff --git a/dist/calendar/components/header/index.wxss b/dist/calendar/components/header/index.wxss new file mode 100644 index 00000000..4075e48f --- /dev/null +++ b/dist/calendar/components/header/index.wxss @@ -0,0 +1 @@ +@import '../../../common/index.wxss';.van-calendar__header{-webkit-flex-shrink:0;flex-shrink:0;box-shadow:0 2px 10px rgba(125,126,128,.16);box-shadow:var(--calendar-header-box-shadow,0 2px 10px rgba(125,126,128,.16))}.van-calendar__header-subtitle,.van-calendar__header-title{text-align:center;height:44px;height:var(--calendar-header-title-height,44px);font-weight:500;font-weight:var(--font-weight-bold,500);line-height:44px;line-height:var(--calendar-header-title-height,44px)}.van-calendar__header-title+.van-calendar__header-title,.van-calendar__header-title:empty{display:none}.van-calendar__header-title:empty+.van-calendar__header-title{display:block!important}.van-calendar__weekdays{display:-webkit-flex;display:flex}.van-calendar__weekday{-webkit-flex:1;flex:1;text-align:center;font-size:12px;font-size:var(--calendar-weekdays-font-size,12px);line-height:30px;line-height:var(--calendar-weekdays-height,30px)} \ No newline at end of file diff --git a/dist/calendar/components/month/index.d.ts b/dist/calendar/components/month/index.d.ts new file mode 100644 index 00000000..cb0ff5c3 --- /dev/null +++ b/dist/calendar/components/month/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/dist/calendar/components/month/index.js b/dist/calendar/components/month/index.js new file mode 100644 index 00000000..0c88643a --- /dev/null +++ b/dist/calendar/components/month/index.js @@ -0,0 +1,148 @@ +import { VantComponent } from '../../../common/component'; +import { getMonthEndDay, compareDay, getPrevDay, getNextDay } from '../../utils'; +VantComponent({ + props: { + date: { + type: null, + observer: 'setDays' + }, + type: { + type: String, + observer: 'setDays' + }, + color: String, + minDate: { + type: null, + observer: 'setDays' + }, + maxDate: { + type: null, + observer: 'setDays' + }, + showMark: Boolean, + rowHeight: [Number, String], + formatter: { + type: null, + observer: 'setDays' + }, + currentDate: { + type: [null, Array], + observer: 'setDays' + }, + allowSameDay: Boolean, + showSubtitle: Boolean, + showMonthTitle: Boolean + }, + data: { + visible: true, + days: [] + }, + methods: { + onClick(event) { + const { index } = event.currentTarget.dataset; + const item = this.data.days[index]; + if (item.type !== 'disabled') { + this.$emit('click', item); + } + }, + setDays() { + const days = []; + const startDate = new Date(this.data.date); + const year = startDate.getFullYear(); + const month = startDate.getMonth(); + const totalDay = getMonthEndDay(startDate.getFullYear(), startDate.getMonth() + 1); + for (let day = 1; day <= totalDay; day++) { + const date = new Date(year, month, day); + const type = this.getDayType(date); + let config = { + date, + type, + text: day, + bottomInfo: this.getBottomInfo(type) + }; + if (this.data.formatter) { + config = this.data.formatter(config); + } + days.push(config); + } + this.setData({ days }); + }, + getMultipleDayType(day) { + const { currentDate } = this.data; + if (!Array.isArray(currentDate)) { + return ''; + } + const isSelected = date => currentDate.some(item => compareDay(item, date) === 0); + if (isSelected(day)) { + const prevDay = getPrevDay(day); + const nextDay = getNextDay(day); + const prevSelected = isSelected(prevDay); + const nextSelected = isSelected(nextDay); + if (prevSelected && nextSelected) { + return 'multiple-middle'; + } + if (prevSelected) { + return 'end'; + } + return nextSelected ? 'start' : 'multiple-selected'; + } + return ''; + }, + getRangeDayType(day) { + const { currentDate, allowSameDay } = this.data; + if (!Array.isArray(currentDate)) { + return; + } + const [startDay, endDay] = currentDate; + if (!startDay) { + return; + } + const compareToStart = compareDay(day, startDay); + if (!endDay) { + return compareToStart === 0 ? 'start' : ''; + } + const compareToEnd = compareDay(day, endDay); + if (compareToStart === 0 && compareToEnd === 0 && allowSameDay) { + return 'start-end'; + } + if (compareToStart === 0) { + return 'start'; + } + if (compareToEnd === 0) { + return 'end'; + } + if (compareToStart > 0 && compareToEnd < 0) { + return 'middle'; + } + }, + getDayType(day) { + const { type, minDate, maxDate, currentDate } = this.data; + if (compareDay(day, minDate) < 0 || compareDay(day, maxDate) > 0) { + return 'disabled'; + } + if (type === 'single') { + return compareDay(day, currentDate) === 0 ? 'selected' : ''; + } + if (type === 'multiple') { + return this.getMultipleDayType(day); + } + /* istanbul ignore else */ + if (type === 'range') { + return this.getRangeDayType(day); + } + }, + getBottomInfo(type) { + if (this.data.type === 'range') { + if (type === 'start') { + return '开始'; + } + if (type === 'end') { + return '结束'; + } + if (type === 'start-end') { + return '开始/结束'; + } + } + } + } +}); diff --git a/dist/calendar/components/month/index.json b/dist/calendar/components/month/index.json new file mode 100644 index 00000000..467ce294 --- /dev/null +++ b/dist/calendar/components/month/index.json @@ -0,0 +1,3 @@ +{ + "component": true +} diff --git a/dist/calendar/components/month/index.wxml b/dist/calendar/components/month/index.wxml new file mode 100644 index 00000000..55bab83f --- /dev/null +++ b/dist/calendar/components/month/index.wxml @@ -0,0 +1,39 @@ + + + + + + {{ computed.formatMonthTitle(date) }} + + + + + {{ computed.getMark(date) }} + + + + + {{ item.topInfo }} + {{ item.text }} + + {{ item.bottomInfo }} + + + + + {{ item.topInfo }} + {{ item.text }} + + {{ item.bottomInfo }} + + + + + diff --git a/dist/calendar/components/month/index.wxs b/dist/calendar/components/month/index.wxs new file mode 100644 index 00000000..a0570798 --- /dev/null +++ b/dist/calendar/components/month/index.wxs @@ -0,0 +1,67 @@ +/* eslint-disable */ +var utils = require('../../utils.wxs'); + +function getMark(date) { + return getDate(date).getMonth() + 1; +} + +var ROW_HEIGHT = 64; + +function getDayStyle(type, index, date, rowHeight, color) { + var style = []; + var offset = getDate(date).getDay(); + + if (index === 0) { + style.push(['margin-left', (100 * offset) / 7 + '%']); + } + + if (rowHeight !== ROW_HEIGHT) { + style.push(['height', rowHeight + 'px']); + } + + if (color) { + if ( + type === 'start' || + type === 'end' || + type === 'multiple-selected' || + type === 'multiple-middle' + ) { + style.push(['background', color]); + } else if (type === 'middle') { + style.push(['color', color]); + } + } + + return style + .map(function(item) { + return item.join(':'); + }) + .join(';'); +} + +function formatMonthTitle(date) { + date = getDate(date); + return date.getFullYear() + '年' + (date.getMonth() + 1) + '月'; +} + +function getMonthStyle(visible, date, rowHeight) { + if (!visible) { + date = getDate(date); + + var totalDay = utils.getMonthEndDay( + date.getFullYear(), + date.getMonth() + 1 + ); + var offset = getDate(date).getDay(); + var padding = Math.ceil((totalDay + offset) / 7) * rowHeight; + + return 'padding-bottom:' + padding + 'px'; + } +} + +module.exports = { + getMark: getMark, + getDayStyle: getDayStyle, + formatMonthTitle: formatMonthTitle, + getMonthStyle: getMonthStyle +}; diff --git a/dist/calendar/components/month/index.wxss b/dist/calendar/components/month/index.wxss new file mode 100644 index 00000000..17c12f4e --- /dev/null +++ b/dist/calendar/components/month/index.wxss @@ -0,0 +1 @@ +@import '../../../common/index.wxss';.van-calendar{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;height:100%;background-color:#fff;background-color:var(--calendar-background-color,#fff)}.van-calendar__month-title{text-align:center;height:44px;height:var(--calendar-header-title-height,44px);font-weight:500;font-weight:var(--font-weight-bold,500);font-size:14px;font-size:var(--calendar-month-title-font-size,14px);line-height:44px;line-height:var(--calendar-header-title-height,44px)}.van-calendar__days{position:relative;display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap;-webkit-user-select:none;user-select:none}.van-calendar__month-mark{position:absolute;top:50%;left:50%;z-index:0;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);pointer-events:none;color:rgba(242,243,245,.8);color:var(--calendar-month-mark-color,rgba(242,243,245,.8));font-size:160px;font-size:var(--calendar-month-mark-font-size,160px)}.van-calendar__day,.van-calendar__selected-day{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;text-align:center}.van-calendar__day{position:relative;width:14.285%;height:64px;height:var(--calendar-day-height,64px);font-size:16px;font-size:var(--calendar-day-font-size,16px)}.van-calendar__day--end,.van-calendar__day--multiple-middle,.van-calendar__day--multiple-selected,.van-calendar__day--start,.van-calendar__day--start-end{color:#fff;color:var(--calendar-range-edge-color,#fff);background-color:#ee0a24;background-color:var(--calendar-range-edge-background-color,#ee0a24)}.van-calendar__day--start{border-radius:4px 0 0 4px;border-radius:var(--border-radius-md,4px) 0 0 var(--border-radius-md,4px)}.van-calendar__day--end{border-radius:0 4px 4px 0;border-radius:0 var(--border-radius-md,4px) var(--border-radius-md,4px) 0}.van-calendar__day--multiple-selected,.van-calendar__day--start-end{border-radius:4px;border-radius:var(--border-radius-md,4px)}.van-calendar__day--middle{color:#ee0a24;color:var(--calendar-range-middle-color,#ee0a24)}.van-calendar__day--middle:after{position:absolute;top:0;right:0;bottom:0;left:0;background-color:currentColor;content:"";opacity:.1;opacity:var(--calendar-range-middle-background-opacity,.1)}.van-calendar__day--disabled{cursor:default;color:#c8c9cc;color:var(--calendar-day-disabled-color,#c8c9cc)}.van-calendar__bottom-info,.van-calendar__top-info{position:absolute;right:0;left:0;font-size:10px;font-size:var(--calendar-info-font-size,10px);line-height:14px;line-height:var(--calendar-info-line-height,14px)}@media (max-width:350px){.van-calendar__bottom-info,.van-calendar__top-info{font-size:9px}}.van-calendar__top-info{top:6px}.van-calendar__bottom-info{bottom:6px}.van-calendar__selected-day{width:54px;width:var(--calendar-selected-day-size,54px);height:54px;height:var(--calendar-selected-day-size,54px);color:#fff;color:var(--calendar-selected-day-color,#fff);background-color:#ee0a24;background-color:var(--calendar-selected-day-background-color,#ee0a24);border-radius:4px;border-radius:var(--border-radius-md,4px)} \ No newline at end of file diff --git a/dist/calendar/index.d.ts b/dist/calendar/index.d.ts new file mode 100644 index 00000000..cb0ff5c3 --- /dev/null +++ b/dist/calendar/index.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/dist/calendar/index.js b/dist/calendar/index.js new file mode 100644 index 00000000..e9a4614e --- /dev/null +++ b/dist/calendar/index.js @@ -0,0 +1,250 @@ +import { VantComponent } from '../common/component'; +import { ROW_HEIGHT, getNextDay, compareDay, copyDates, calcDateNum, formatMonthTitle, compareMonth, getMonths } from './utils'; +import Toast from '../toast/toast'; +VantComponent({ + props: { + title: { + type: String, + value: '日期选择' + }, + color: String, + show: { + type: Boolean, + observer(val) { + if (val) { + this.initRect(); + this.scrollIntoView(); + } + } + }, + formatter: null, + confirmText: { + type: String, + value: '确定' + }, + rangePrompt: String, + defaultDate: { + type: [Number, Array], + observer(val) { + this.setData({ currentDate: val }); + this.scrollIntoView(); + } + }, + allowSameDay: Boolean, + confirmDisabledText: String, + type: { + type: String, + value: 'single', + observer: 'reset' + }, + minDate: { + type: null, + value: Date.now() + }, + maxDate: { + type: null, + value: new Date(new Date().getFullYear(), new Date().getMonth() + 6, new Date().getDate()).getTime() + }, + position: { + type: String, + value: 'bottom' + }, + rowHeight: { + type: [Number, String], + value: ROW_HEIGHT + }, + round: { + type: Boolean, + value: true + }, + poppable: { + type: Boolean, + value: true + }, + showMark: { + type: Boolean, + value: true + }, + showTitle: { + type: Boolean, + value: true + }, + showConfirm: { + type: Boolean, + value: true + }, + showSubtitle: { + type: Boolean, + value: true + }, + safeAreaInsetBottom: { + type: Boolean, + value: true + }, + closeOnClickOverlay: { + type: Boolean, + value: true + }, + maxRange: { + type: [Number, String], + value: null + } + }, + data: { + subtitle: '', + currentDate: null, + scrollIntoView: '' + }, + created() { + this.setData({ + currentDate: this.getInitialDate() + }); + }, + mounted() { + if (this.data.show || !this.data.poppable) { + this.initRect(); + this.scrollIntoView(); + } + }, + methods: { + reset() { + this.setData({ currentDate: this.getInitialDate() }); + this.scrollIntoView(); + }, + initRect() { + if (this.contentObserver != null) { + this.contentObserver.disconnect(); + } + const contentObserver = this.createIntersectionObserver({ + thresholds: [0, 0.1, 0.9, 1], + observeAll: true + }); + this.contentObserver = contentObserver; + contentObserver.relativeTo('.van-calendar__body'); + contentObserver.observe('.month', res => { + if (res.boundingClientRect.top <= res.relativeRect.top) { + // @ts-ignore + this.setData({ subtitle: formatMonthTitle(res.dataset.date) }); + } + }); + }, + getInitialDate() { + const { type, defaultDate, minDate } = this.data; + if (type === 'range') { + const [startDay, endDay] = defaultDate || []; + return [ + startDay || minDate, + endDay || getNextDay(new Date(minDate)).getTime() + ]; + } + if (type === 'multiple') { + return [defaultDate || minDate]; + } + return defaultDate || minDate; + }, + scrollIntoView() { + setTimeout(() => { + const { currentDate, type, show, poppable, minDate, maxDate } = this.data; + const targetDate = type === 'single' ? currentDate : currentDate[0]; + const displayed = show || !poppable; + if (!targetDate || !displayed) { + return; + } + const months = getMonths(minDate, maxDate); + months.some((month, index) => { + if (compareMonth(month, targetDate) === 0) { + this.setData({ scrollIntoView: `month${index}` }); + return true; + } + return false; + }); + }, 100); + }, + onOpen() { + this.$emit('open'); + }, + onOpened() { + this.$emit('opened'); + }, + onClose() { + this.$emit('close'); + }, + onClosed() { + this.$emit('closed'); + }, + onClickDay(event) { + const { date } = event.detail; + const { type, currentDate, allowSameDay } = this.data; + if (type === 'range') { + const [startDay, endDay] = currentDate; + if (startDay && !endDay) { + const compareToStart = compareDay(date, startDay); + if (compareToStart === 1) { + this.select([startDay, date], true); + } + else if (compareToStart === -1) { + this.select([date, null]); + } + else if (allowSameDay) { + this.select([date, date]); + } + } + else { + this.select([date, null]); + } + } + else if (type === 'multiple') { + let selectedIndex; + const selected = currentDate.some((dateItem, index) => { + const equal = compareDay(dateItem, date) === 0; + if (equal) { + selectedIndex = index; + } + return equal; + }); + if (selected) { + currentDate.splice(selectedIndex, 1); + this.setData({ currentDate }); + } + else { + this.select([...currentDate, date]); + } + } + else { + this.select(date, true); + } + }, + select(date, complete) { + const getTime = (date) => (date instanceof Date ? date.getTime() : date); + this.setData({ + currentDate: Array.isArray(date) ? date.map(getTime) : getTime(date) + }); + this.$emit('select', copyDates(date)); + if (complete && this.data.type === 'range') { + const valid = this.checkRange(); + if (!valid) { + return; + } + } + if (complete && !this.data.showConfirm) { + this.onConfirm(); + } + }, + checkRange() { + const { maxRange, currentDate, rangePrompt } = this.data; + if (maxRange && calcDateNum(currentDate) > maxRange) { + Toast(rangePrompt || `选择天数不能超过 ${maxRange} 天`); + return false; + } + return true; + }, + onConfirm() { + if (this.data.type === 'range' && !this.checkRange()) { + return; + } + wx.nextTick(() => { + this.$emit('confirm', copyDates(this.data.currentDate)); + }); + } + } +}); diff --git a/dist/calendar/index.json b/dist/calendar/index.json new file mode 100644 index 00000000..61dec086 --- /dev/null +++ b/dist/calendar/index.json @@ -0,0 +1,9 @@ +{ + "component": true, + "usingComponents": { + "header": "./components/header/index", + "month": "./components/month/index", + "van-button": "../button/index", + "van-popup": "../popup/index" + } +} diff --git a/dist/calendar/index.wxml b/dist/calendar/index.wxml new file mode 100644 index 00000000..1a4f59c7 --- /dev/null +++ b/dist/calendar/index.wxml @@ -0,0 +1,29 @@ + + + + + +