build: compile 1.1.0

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() { }
     }
 });

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' }}"
 >
   <block wx:if="{{ loading }}">
     <van-loading

dist/calendar/calendar.wxml

@@ -0,0 +1,57 @@
+<wxs src="./index.wxs" module="computed"></wxs>
+
+<template name="calendar">
+  <view class="van-calendar">
+    <header
+      title="{{ title }}"
+      showTitle="{{ showTitle }}"
+      subtitle="{{ subtitle }}"
+      showSubtitle="{{ showSubtitle }}"
+    >
+      <slot name="title" slot="title"></slot>
+    </header>
+
+    <scroll-view class="van-calendar__body" scroll-y scroll-into-view="{{ scrollIntoView }}">
+      <month
+        wx:for="{{ computed.getMonths(minDate, maxDate) }}"
+        wx:key="index"
+        id="month{{ index }}"
+        class="month"
+        data-date="{{ item }}"
+        date="{{ item }}"
+        type="{{ type }}"
+        color="{{ color }}"
+        minDate="{{ minDate }}"
+        maxDate="{{ maxDate }}"
+        showMark="{{ showMark }}"
+        formatter="{{ formatter }}"
+        rowHeight="{{ rowHeight }}"
+        currentDate="{{ currentDate }}"
+        showSubtitle="{{ showSubtitle }}"
+        allowSameDay="{{ allowSameDay }}"
+        showMonthTitle="{{ index !== 0 || !showSubtitle }}"
+        bind:click="onClickDay"
+      />
+    </scroll-view>
+
+    <view class="van-calendar__footer {{ safeAreaInsetBottom ? 'van-calendar__footer--safe-area-inset-bottom' : '' }}">
+      <slot name="footer"></slot>
+    </view>
+
+    <view class="van-calendar__footer {{ safeAreaInsetBottom ? 'van-calendar__footer--safe-area-inset-bottom' : '' }}">
+      <van-button
+        wx:if="{{ showConfirm }}"
+        round
+        block
+        type="danger"
+        color="{{ color }}"
+        custom-class="van-calendar__confirm"
+        disabled="{{ computed.getButtonDisabled(type, currentDate) }}"
+        nativeType="text"
+        bind:click="onConfirm"
+      >
+        {{ computed.getButtonDisabled(type, currentDate) ? confirmDisabledText : confirmText }}
+      </van-button>
+    </view>
+  </view>
+</template>

dist/calendar/components/header/index.d.ts

@@ -0,0 +1 @@
+export {};

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: {}
+});

dist/calendar/components/header/index.json

@@ -0,0 +1,3 @@
+{
+  "component": true
+}

dist/calendar/components/header/index.wxml

@@ -0,0 +1,16 @@
+<view class="van-calendar__header">
+  <block wx:if="{{ showTitle }}">
+    <view class="van-calendar__header-title"><slot name="title"></slot></view>
+    <view class="van-calendar__header-title">{{ title }}</view>
+  </block>
+
+  <view wx:if="{{ showSubtitle }}" class="van-calendar__header-subtitle">
+    {{ subtitle }}
+  </view>
+
+  <view class="van-calendar__weekdays">
+    <view wx:for="{{ weekdays }}" wx:key="index" class="van-calendar__weekday">
+      {{ item }}
+    </view>
+  </view>
+</view>

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)}

dist/calendar/components/month/index.d.ts

@@ -0,0 +1 @@
+export {};

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 '开始/结束';
+                }
+            }
+        }
+    }
+});

dist/calendar/components/month/index.json

@@ -0,0 +1,3 @@
+{
+  "component": true
+}

dist/calendar/components/month/index.wxml

@@ -0,0 +1,39 @@
+<wxs src="./index.wxs" module="computed"></wxs>
+<wxs src="../../../wxs/utils.wxs" module="utils" />
+
+<view class="van-calendar__month" style="{{ computed.getMonthStyle(visible, date, rowHeight) }}">
+  <view wx:if="{{ showMonthTitle }}" class="van-calendar__month-title">
+    {{ computed.formatMonthTitle(date) }}
+  </view>
+
+  <view wx:if="{{ visible }}" class="van-calendar__days">
+    <view wx:if="{{ showMark }}" class="van-calendar__month-mark">
+      {{ computed.getMark(date) }}
+    </view>
+
+    <view
+      wx:for="{{ days }}"
+      wx:key="index"
+      style="{{ computed.getDayStyle(item.type, index, date, rowHeight, color) }}"
+      class="{{ utils.bem('calendar__day', [item.type]) }} {{ item.className }}"
+      data-index="{{ index }}"
+      bindtap="onClick"
+    >
+      <view wx:if="{{ item.type === 'selected' }}" class="van-calendar__selected-day" style="background: {{ color }}">
+        <view wx:if="{{ item.topInfo }}" class="van-calendar__top-info">{{ item.topInfo }}</view>
+        {{ item.text }}
+        <view wx:if="{{ item.bottomInfo }}" class="van-calendar__bottom-info">
+          {{ item.bottomInfo }}
+        </view>
+      </view>
+
+      <view wx:else>
+        <view wx:if="{{ item.topInfo }}" class="van-calendar__top-info">{{ item.topInfo }}</view>
+        {{ item.text }}
+        <view wx:if="{{ item.bottomInfo }}" class="van-calendar__bottom-info">
+          {{ item.bottomInfo }}
+        </view>
+      </view>
+    </view>
+  </view>
+</view>

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
+};

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)}

dist/calendar/index.d.ts

@@ -0,0 +1 @@
+export {};

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));
+            });
+        }
+    }
+});

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"
+  }
+}

dist/calendar/index.wxml

@@ -0,0 +1,29 @@
+<wxs src="./index.wxs" module="computed" />
+
+<import src="./calendar.wxml" />
+
+<van-popup
+  wx:if="{{ poppable }}"
+  custom-class="van-calendar__popup--{{ position }}"
+  close-icon-class="van-calendar__close-icon"
+  show="{{ show }}"
+  round="{{ round }}"
+  position="{{ position }}"
+  closeable="{{ showTitle || showSubtitle }}"
+  close-on-click-overlay="{{ closeOnClickOverlay }}"
+  bind:enter="onOpen"
+  bind:close="onClose"
+  bind:after-enter="onOpened"
+  bind:after-leave="onClosed"
+>
+  <template
+    is="calendar"
+    data="{{ title, subtitle, showTitle, showSubtitle, minDate, maxDate, type, color, showMark, formatter, rowHeight, currentDate, safeAreaInsetBottom, showConfirm, confirmDisabledText, confirmText, scrollIntoView, allowSameDay }}"
+  />
+</van-popup>
+
+<template
+  wx:else
+  is="calendar"
+  data="{{ title, subtitle, showTitle, showSubtitle, minDate, maxDate, type, color, showMark, formatter, rowHeight, currentDate, safeAreaInsetBottom, showConfirm, confirmDisabledText, confirmText, scrollIntoView, allowSameDay }}"
+/>

dist/calendar/index.wxs

@@ -0,0 +1,33 @@
+/* eslint-disable */
+var utils = require('./utils.wxs');
+
+function getMonths(minDate, maxDate) {
+  var months = [];
+  var cursor = getDate(minDate);
+
+  cursor.setDate(1);
+
+  do {
+    months.push(cursor.getTime());
+    cursor.setMonth(cursor.getMonth() + 1);
+  } while (utils.compareMonth(cursor, getDate(maxDate)) !== 1);
+
+  return months;
+}
+
+function getButtonDisabled(type, currentDate) {
+  if (type === 'range') {
+    return !currentDate[0] || !currentDate[1];
+  }
+
+  if (type === 'multiple') {
+    return !currentDate.length;
+  }
+
+  return !currentDate;
+}
+
+module.exports = {
+  getMonths: getMonths,
+  getButtonDisabled: getButtonDisabled
+};

dist/calendar/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%;height:var(--calendar-height,100%);background-color:#fff;background-color:var(--calendar-background-color,#fff)}.van-calendar__close-icon{top:11px}.van-calendar__popup--bottom,.van-calendar__popup--top{height:80%;height:var(--calendar-popup-height,80%)}.van-calendar__popup--left,.van-calendar__popup--right{height:100%}.van-calendar__body{-webkit-flex:1;flex:1;overflow:auto;-webkit-overflow-scrolling:touch}.van-calendar__footer{-webkit-flex-shrink:0;flex-shrink:0;padding:0 16px;padding:0 var(--padding-md,16px)}.van-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.van-calendar__footer+.van-calendar__footer,.van-calendar__footer:empty{display:none}.van-calendar__footer:empty+.van-calendar__footer{display:block!important}.van-calendar__confirm{height:36px!important;height:var(--calendar-confirm-button-height,36px)!important;margin:7px 0!important;margin:var(--calendar-confirm-button-margin,7px 0)!important;line-height:34px!important;line-height:var(--calendar-confirm-button-line-height,34px)!important}

dist/calendar/utils.d.ts

@@ -0,0 +1,10 @@
+export declare const ROW_HEIGHT = 64;
+export declare function formatMonthTitle(date: Date): string;
+export declare function compareMonth(date1: Date | number, date2: Date | number): 1 | 0 | -1;
+export declare function compareDay(day1: Date | number, day2: Date | number): 1 | 0 | -1;
+export declare function getPrevDay(date: Date): Date;
+export declare function getNextDay(date: Date): Date;
+export declare function calcDateNum(date: [Date, Date]): number;
+export declare function copyDates(dates: Date | Date[]): Date | Date[];
+export declare function getMonthEndDay(year: number, month: number): number;
+export declare function getMonths(minDate: number, maxDate: number): any[];

dist/calendar/utils.js

@@ -0,0 +1,78 @@
+export const ROW_HEIGHT = 64;
+export function formatMonthTitle(date) {
+    if (!(date instanceof Date)) {
+        date = new Date(date);
+    }
+    return `${date.getFullYear()}年${date.getMonth() + 1}月`;
+}
+export function compareMonth(date1, date2) {
+    if (!(date1 instanceof Date)) {
+        date1 = new Date(date1);
+    }
+    if (!(date2 instanceof Date)) {
+        date2 = new Date(date2);
+    }
+    const year1 = date1.getFullYear();
+    const year2 = date2.getFullYear();
+    const month1 = date1.getMonth();
+    const month2 = date2.getMonth();
+    if (year1 === year2) {
+        return month1 === month2 ? 0 : month1 > month2 ? 1 : -1;
+    }
+    return year1 > year2 ? 1 : -1;
+}
+export function compareDay(day1, day2) {
+    if (!(day1 instanceof Date)) {
+        day1 = new Date(day1);
+    }
+    if (!(day2 instanceof Date)) {
+        day2 = new Date(day2);
+    }
+    const compareMonthResult = compareMonth(day1, day2);
+    if (compareMonthResult === 0) {
+        const date1 = day1.getDate();
+        const date2 = day2.getDate();
+        return date1 === date2 ? 0 : date1 > date2 ? 1 : -1;
+    }
+    return compareMonthResult;
+}
+function getDayByOffset(date, offset) {
+    date = new Date(date);
+    date.setDate(date.getDate() + offset);
+    return date;
+}
+export function getPrevDay(date) {
+    return getDayByOffset(date, -1);
+}
+export function getNextDay(date) {
+    return getDayByOffset(date, 1);
+}
+export function calcDateNum(date) {
+    const day1 = new Date(date[0]).getTime();
+    const day2 = new Date(date[1]).getTime();
+    return (day2 - day1) / (1000 * 60 * 60 * 24) + 1;
+}
+export function copyDates(dates) {
+    if (Array.isArray(dates)) {
+        return dates.map(date => {
+            if (date === null) {
+                return date;
+            }
+            return new Date(date);
+        });
+    }
+    return new Date(dates);
+}
+export function getMonthEndDay(year, month) {
+    return 32 - new Date(year, month - 1, 32).getDate();
+}
+export function getMonths(minDate, maxDate) {
+    const months = [];
+    const cursor = new Date(minDate);
+    cursor.setDate(1);
+    do {
+        months.push(cursor.getTime());
+        cursor.setMonth(cursor.getMonth() + 1);
+    } while (compareMonth(cursor, maxDate) !== 1);
+    return months;
+}

dist/calendar/utils.wxs

@@ -0,0 +1,25 @@
+/* eslint-disable */
+function getMonthEndDay(year, month) {
+  return 32 -  getDate(year, month - 1, 32).getDate();
+}
+
+function compareMonth(date1, date2) {
+  date1 = getDate(date1);
+  date2 = getDate(date2);
+
+  var year1 = date1.getFullYear();
+  var year2 = date2.getFullYear();
+  var month1 = date1.getMonth();
+  var month2 = date2.getMonth();
+
+  if (year1 === year2) {
+    return month1 === month2 ? 0 : month1 > month2 ? 1 : -1;
+  }
+
+  return year1 > year2 ? 1 : -1;
+}
+
+module.exports = {
+  getMonthEndDay: getMonthEndDay,
+  compareMonth: compareMonth
+};

dist/field/index.js

@@ -1,5 +1,4 @@
 import { VantComponent } from '../common/component';
-import { getSystemInfoSync } from '../common/utils';
 VantComponent({
     field: true,
     classes: ['input-class', 'right-icon-class'],
@@ -15,7 +14,7 @@ VantComponent({
         leftIcon: String,
         rightIcon: String,
         disabled: Boolean,
-        autosize: Boolean,
+        autosize: [Boolean, Object],
         readonly: Boolean,
         required: Boolean,
         password: Boolean,
@@ -30,6 +29,7 @@ VantComponent({
         holdKeyboard: Boolean,
         errorMessage: String,
         arrowDirection: String,
+        showWordLimit: Boolean,
         placeholderStyle: String,
         errorMessageAlign: String,
         selectionEnd: {
@@ -71,7 +71,6 @@ VantComponent({
     },
     data: {
         focused: false,
-        system: getSystemInfoSync().system.split(' ').shift().toLowerCase()
     },
     methods: {
         onInput(event) {

dist/field/index.wxml

@@ -1,4 +1,5 @@
 <wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="computed" />
 
 <van-cell
   size="{{ size }}"
@@ -16,7 +17,7 @@
 >
   <slot name="left-icon" slot="icon" />
   <slot name="label" slot="title" />
-  <view class="{{ utils.bem('field__body', [type, system]) }}">
+  <view class="{{ utils.bem('field__body', [type]) }}">
     <textarea
       wx:if="{{ type === 'textarea' }}"
       class="input-class {{ utils.bem('field__input', [inputAlign, type, { disabled, error }]) }}"
@@ -28,7 +29,8 @@
       placeholder="{{ placeholder }}"
       placeholder-style="{{ placeholderStyle }}"
       placeholder-class="{{ utils.bem('field__placeholder', { error }) }}"
-      auto-height="{{ autosize }}"
+      auto-height="{{ !!autosize }}"
+      style="{{ computed.inputStyle(autosize) }}"
       cursor-spacing="{{ cursorSpacing }}"
       adjust-position="{{ adjustPosition }}"
       show-confirm-bar="{{ showConfirmBar }}"
@@ -67,7 +69,6 @@
     />
     <van-icon
       wx:if="{{ clearable && focused && value && !readonly }}"
-      size="16px"
       name="clear"
       class="van-field__clear-root van-field__icon-root"
       catch:touchstart="onClear"
@@ -75,7 +76,6 @@
     <view class="van-field__icon-container" bind:tap="onClickIcon">
       <van-icon
         wx:if="{{ rightIcon || icon }}"
-        size="16px"
         name="{{ rightIcon || icon }}"
         class="van-field__icon-root {{ iconClass }}"
         custom-class="right-icon-class"
@@ -87,6 +87,9 @@
       <slot name="button" />
     </view>
   </view>
+  <view wx:if="{{ showWordLimit && maxlength }}" class="van-field__word-limit">
+    <view class="{{ utils.bem('field__word-num', { full: value.length >= maxlength }) }}">{{ value.length }}</view>/{{ maxlength }}
+  </view>
   <view wx:if="{{ errorMessage }}" class="van-field__error-message {{ utils.bem('field__error', [errorMessageAlign, { disabled, error }]) }}">
     {{ errorMessage }}
   </view>

dist/field/index.wxs

@@ -0,0 +1,21 @@
+/* eslint-disable */
+var utils = require('../wxs/utils.wxs');
+
+function inputStyle(autosize) {
+  if (autosize.constructor === 'Object') {
+    var style = '';
+    if (autosize.minHeight) {
+      style += 'min-height:' + utils.addUnit(autosize.minHeight);
+    }
+    if (autosize.maxHeight) {
+      style += 'min-height:' + utils.addUnit(autosize.maxHeight);
+    }
+    return style;
+  }
+
+  return '';
+}
+
+module.exports = {
+  inputStyle: inputStyle
+};

dist/field/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{line-height:1.2em;min-height:24px;min-height:var(--cell-line-height,24px)}.van-field__body--textarea.van-field__body--ios{margin-top:-4.5px}.van-field__input{position:relative;display:block;box-sizing:border-box;width:100%;margin:0;padding:0;line-height:inherit;text-align:left;background-color:initial;border:0;resize:none;color:#323233;color:var(--field-input-text-color,#323233);height:24px;height:var(--cell-line-height,24px);min-height:24px;min-height:var(--cell-line-height,24px)}.van-field__input--textarea{height:18px;height:var(--field-text-area-min-height,18px);min-height:18px;min-height:var(--field-text-area-min-height,18px)}.van-field__input--error{color:#ee0a24;color:var(--field-input-error-text-color,#ee0a24)}.van-field__input--disabled{background-color:initial;opacity:1;color:#969799;color:var(--field-input-disabled-text-color,#969799)}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__placeholder{position:absolute;top:0;right:0;left:0;pointer-events:none;color:#969799;color:var(--field-placeholder-text-color,#969799)}.van-field__placeholder--error{color:#ee0a24;color:var(--field-error-message-color,#ee0a24)}.van-field__icon-root{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;min-height:24px;min-height:var(--cell-line-height,24px)}.van-field__clear-root,.van-field__icon-container{line-height:inherit;vertical-align:middle;padding:0 8px;padding:0 var(--padding-xs,8px);margin-right:-8px;margin-right:-var(--padding-xs,8px)}.van-field__button,.van-field__clear-root,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear-root{color:#c8c9cc;color:var(--field-clear-icon-color,#c8c9cc)}.van-field__icon-container{color:#969799;color:var(--field-icon-container-color,#969799)}.van-field__icon-container:empty{display:none}.van-field__button{padding-left:8px;padding-left:var(--padding-xs,8px)}.van-field__button:empty{display:none}.van-field__error-message{text-align:left;font-size:12px;font-size:var(--field-error-message-text-font-size,12px);color:#ee0a24;color:var(--field-error-message-color,#ee0a24)}.van-field__error-message--center{text-align:center}.van-field__error-message--right{text-align:right}
+@import '../common/index.wxss';.van-field{--cell-icon-size:16px;--cell-icon-size:var(--field-icon-size,16px)}.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{line-height:1.2em}.van-field__body--textarea,.van-field__input{min-height:24px;min-height:var(--cell-line-height,24px)}.van-field__input{position:relative;display:block;box-sizing:border-box;width:100%;margin:0;padding:0;line-height:inherit;text-align:left;background-color:initial;border:0;resize:none;color:#323233;color:var(--field-input-text-color,#323233);height:24px;height:var(--cell-line-height,24px)}.van-field__input--textarea{height:18px;height:var(--field-text-area-min-height,18px);min-height:18px;min-height:var(--field-text-area-min-height,18px)}.van-field__input--error{color:#ee0a24;color:var(--field-input-error-text-color,#ee0a24)}.van-field__input--disabled{background-color:initial;opacity:1;color:#969799;color:var(--field-input-disabled-text-color,#969799)}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__placeholder{position:absolute;top:0;right:0;left:0;pointer-events:none;color:#969799;color:var(--field-placeholder-text-color,#969799)}.van-field__placeholder--error{color:#ee0a24;color:var(--field-error-message-color,#ee0a24)}.van-field__icon-root{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;min-height:24px;min-height:var(--cell-line-height,24px)}.van-field__clear-root,.van-field__icon-container{line-height:inherit;vertical-align:middle;padding:0 8px;padding:0 var(--padding-xs,8px);margin-right:-8px;margin-right:-var(--padding-xs,8px)}.van-field__button,.van-field__clear-root,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear-root{font-size:16px;font-size:var(--field-clear-icon-size,16px);color:#c8c9cc;color:var(--field-clear-icon-color,#c8c9cc)}.van-field__icon-container{font-size:16px;font-size:var(--field-icon-size,16px);color:#969799;color:var(--field-icon-container-color,#969799)}.van-field__icon-container:empty{display:none}.van-field__button{padding-left:8px;padding-left:var(--padding-xs,8px)}.van-field__button:empty{display:none}.van-field__error-message{text-align:left;font-size:12px;font-size:var(--field-error-message-text-font-size,12px);color:#ee0a24;color:var(--field-error-message-color,#ee0a24)}.van-field__error-message--center{text-align:center}.van-field__error-message--right{text-align:right}.van-field__word-limit{text-align:right;margin-top:4px;margin-top:var(--padding-base,4px);color:#646566;color:var(--field-word-limit-color,#646566);font-size:12px;font-size:var(--field-word-limit-font-size,12px);line-height:16px;line-height:var(--field-word-limit-line-height,16px)}.van-field__word-num{display:inline}.van-field__word-num--full{color:#ee0a24;color:var(--field-word-num-full-color,#ee0a24)}

dist/grid-item/index.js

@@ -7,6 +7,7 @@ VantComponent({
         type: 'ancestor',
         current: 'grid-item',
     },
+    classes: ['content-class', 'icon-class', 'text-class'],
     mixins: [link],
     props: {
         icon: String,

dist/grid-item/index.wxml

@@ -1,19 +1,19 @@
 <wxs src="../wxs/utils.wxs" module="utils" />
 
-<view class="{{ utils.bem('grid-item', { square }) }}" style="{{ viewStyle }}" bindtap="onClick">
+<view class="custom-class {{ utils.bem('grid-item', { square }) }}" style="{{ viewStyle }}" bindtap="onClick">
   <view
-    class="{{ utils.bem('grid-item__content', { center, square, clickable, surround: border && gutter }) }} {{ border ? 'van-hairline--surround' : '' }}"
+    class="content-class {{ utils.bem('grid-item__content', { center, square, clickable, surround: border && gutter }) }} {{ border ? 'van-hairline--surround' : '' }}"
     style="{{ contentStyle }}"
   >
     <block wx:if="{{ useSlot }}">
       <slot />
     </block>
     <block wx:else>
-      <view class="van-grid-item__icon">
+      <view class="van-grid-item__icon icon-class">
         <van-icon wx:if="{{ icon }}" name="{{ icon }}" dot="{{ dot }}" info="{{ info }}" />
         <slot wx:else name="icon"></slot>
       </view>
-      <view class="van-grid-item__text">
+      <view class="van-grid-item__text text-class">
         <text wx:if="{{ text }}">{{ text }}</text>
         <slot wx:else name="text"></slot>
       </view>

dist/grid/index.wxml

@@ -1,3 +1,3 @@
-<view class="van-grid {{ border && !gutter ? 'van-hairline--top' : '' }}" style="{{ viewStyle }}">
+<view class="van-grid custom-class {{ border && !gutter ? 'van-hairline--top' : '' }}" style="{{ viewStyle }}">
   <slot />
 </view>

dist/mixins/button.js

@@ -2,10 +2,7 @@ export const button = Behavior({
     externalClasses: ['hover-class'],
     properties: {
         id: String,
-        lang: {
-            type: String,
-            value: 'en'
-        },
+        lang: String,
         businessId: Number,
         sessionFrom: String,
         sendMessageTitle: String,

dist/popup/index.js

@@ -7,7 +7,8 @@ VantComponent({
         'enter-to-class',
         'leave-class',
         'leave-active-class',
-        'leave-to-class'
+        'leave-to-class',
+        'close-icon-class'
     ],
     mixins: [transition(false)],
     props: {

dist/popup/index.wxml

@@ -18,7 +18,7 @@
   <van-icon
     wx:if="{{ closeable }}"
     name="{{ closeIcon }}"
-    class="van-popup__close-icon van-popup__close-icon--{{ closeIconPosition }}"
+    class="close-icon-class van-popup__close-icon van-popup__close-icon--{{ closeIconPosition }}"
     bind:tap="onClickCloseIcon"
   />
 </view>

dist/sidebar-item/index.wxml

@@ -13,6 +13,7 @@
       info="{{ info }}"
       custom-style="right: 4px"
     />
-    {{ title }}
+    <view wx:if="{{ title }}">{{ title }}</view>
+    <slot wx:else name="title" />
   </view>
 </view>

dist/steps/index.js

@@ -23,5 +23,11 @@ VantComponent({
             value: 'checked'
         },
         inactiveIcon: String
-    }
+    },
+    methods: {
+        onClick(event) {
+            const { index } = event.currentTarget.dataset;
+            this.$emit('click-step', index);
+        }
+    },
 });

dist/steps/index.wxml

@@ -5,6 +5,8 @@
     <view
       wx:for="{{ steps }}"
       wx:key="index"
+      bindtap="onClick"
+      data-index="{{ index }}"
       class="{{ utils.bem('step', [direction, status(index, active)]) }} van-hairline"
       style="{{ status(index, active) === 'inactive' ? 'color: ' + inactiveColor: '' }}"
     >

dist/uploader/index.js

@@ -1,76 +1,47 @@
 import { VantComponent } from '../common/component';
-import { isImageFile, isVideo } from './utils';
+import { isImageFile, isVideo, chooseFile, isPromise } from './utils';
+import { chooseImageProps, chooseVideoProps } from './shared';
 VantComponent({
-    props: {
-        disabled: Boolean,
-        multiple: Boolean,
-        uploadText: String,
-        useBeforeRead: Boolean,
-        previewSize: {
+    props: Object.assign(Object.assign({ disabled: Boolean, multiple: Boolean, uploadText: String, useBeforeRead: Boolean, afterRead: null, beforeRead: null, previewSize: {
             type: null,
             value: 90
-        },
-        name: {
+        }, name: {
             type: [Number, String],
             value: ''
-        },
-        accept: {
+        }, accept: {
             type: String,
             value: 'image'
-        },
-        sizeType: {
-            type: Array,
-            value: ['original', 'compressed']
-        },
-        capture: {
-            type: Array,
-            value: ['album', 'camera']
-        },
-        fileList: {
+        }, fileList: {
             type: Array,
             value: [],
             observer: 'formatFileList'
-        },
-        maxSize: {
+        }, maxSize: {
             type: Number,
             value: Number.MAX_VALUE
-        },
-        maxCount: {
+        }, maxCount: {
             type: Number,
             value: 100
-        },
-        deletable: {
+        }, deletable: {
             type: Boolean,
             value: true
-        },
-        previewImage: {
+        }, showUpload: {
             type: Boolean,
             value: true
-        },
-        previewFullImage: {
+        }, previewImage: {
             type: Boolean,
             value: true
-        },
-        imageFit: {
+        }, previewFullImage: {
+            type: Boolean,
+            value: true
+        }, imageFit: {
             type: String,
             value: 'scaleToFill'
-        },
-        camera: {
+        }, uploadIcon: {
             type: String,
-            value: 'back'
-        },
-        compressed: {
-            type: Boolean,
-            value: true
-        },
-        maxDuration: {
-            type: Number,
-            value: 60
-        }
-    },
+            value: 'photograph'
+        } }, chooseImageProps), chooseVideoProps),
     data: {
         lists: [],
-        computedPreviewSize: '',
         isInCount: true
     },
     methods: {
@@ -79,49 +50,18 @@ VantComponent({
             const lists = fileList.map(item => (Object.assign(Object.assign({}, item), { isImage: typeof item.isImage === 'undefined' ? isImageFile(item) : item.isImage })));
             this.setData({ lists, isInCount: lists.length < maxCount });
         },
+        getDetail(index) {
+            return {
+                name: this.data.name,
+                index: index == null ? this.data.fileList.length : index
+            };
+        },
         startUpload() {
-            if (this.data.disabled)
+            const { maxCount, multiple, accept, lists, disabled } = this.data;
+            if (disabled)
                 return;
-            const { name = '', capture, maxCount, multiple, maxSize, accept, sizeType, lists, camera, compressed, maxDuration, useBeforeRead = false // 是否定义了 beforeRead
-             } = this.data;
-            let chooseFile = null;
-            const newMaxCount = maxCount - lists.length;
-            // 设置为只选择图片的时候使用 chooseImage 来实现
-            if (accept === 'image') {
-                chooseFile = new Promise((resolve, reject) => {
-                    wx.chooseImage({
-                        count: multiple ? (newMaxCount > 9 ? 9 : newMaxCount) : 1,
-                        sourceType: capture,
-                        sizeType,
-                        success: resolve,
-                        fail: reject
-                    });
-                });
-            }
-            else if (accept === 'video') {
-                chooseFile = new Promise((resolve, reject) => {
-                    wx.chooseVideo({
-                        sourceType: capture,
-                        compressed,
-                        maxDuration,
-                        camera,
-                        success: resolve,
-                        fail: reject
-                    });
-                });
-            }
-            else {
-                chooseFile = new Promise((resolve, reject) => {
-                    wx.chooseMessageFile({
-                        count: multiple ? newMaxCount : 1,
-                        type: 'file',
-                        success: resolve,
-                        fail: reject
-                    });
-                });
-            }
-            chooseFile
-                .then((res) => {
+            chooseFile(Object.assign(Object.assign({}, this.data), { maxCount: maxCount - lists.length }))
+                .then(res => {
                 let file = null;
                 if (isVideo(res, accept)) {
                     file = Object.assign({ path: res.tempFilePath }, res);
@@ -129,54 +69,65 @@ VantComponent({
                 else {
                     file = multiple ? res.tempFiles : res.tempFiles[0];
                 }
-                // 检查文件大小
-                if (file instanceof Array) {
-                    const sizeEnable = file.every(item => item.size <= maxSize);
-                    if (!sizeEnable) {
-                        this.$emit('oversize', { name });
-                        return;
-                    }
-                }
-                else if (file.size > maxSize) {
-                    this.$emit('oversize', { name });
-                    return;
-                }
-                // 触发上传之前的钩子函数
-                if (useBeforeRead) {
-                    this.$emit('before-read', {
-                        file,
-                        name,
-                        callback: (result) => {
-                            if (result) {
-                                // 开始上传
-                                this.$emit('after-read', { file, name });
-                            }
-                        }
-                    });
-                }
-                else {
-                    this.$emit('after-read', { file, name });
-                }
+                this.onBeforeRead(file);
             })
                 .catch(error => {
                 this.$emit('error', error);
             });
         },
+        onBeforeRead(file) {
+            const { beforeRead, useBeforeRead } = this.data;
+            let res = true;
+            if (typeof beforeRead === 'function') {
+                res = beforeRead(file, this.getDetail());
+            }
+            if (useBeforeRead) {
+                res = new Promise((resolve, reject) => {
+                    this.$emit('before-read', Object.assign(Object.assign({ file }, this.getDetail()), { callback: (ok) => {
+                            ok ? resolve() : reject();
+                        } }));
+                });
+            }
+            if (!res) {
+                return;
+            }
+            if (isPromise(res)) {
+                res.then((data) => this.onAfterRead(data || file));
+            }
+            else {
+                this.onAfterRead(file);
+            }
+        },
+        onAfterRead(file) {
+            const { maxSize } = this.data;
+            const oversize = Array.isArray(file)
+                ? file.some(item => item.size > maxSize)
+                : file.size > maxSize;
+            if (oversize) {
+                this.$emit('oversize', Object.assign({ file }, this.getDetail()));
+                return;
+            }
+            if (typeof this.data.afterRead === 'function') {
+                this.data.afterRead(file, this.getDetail());
+            }
+            this.$emit('after-read', Object.assign({ file }, this.getDetail()));
+        },
         deleteItem(event) {
             const { index } = event.currentTarget.dataset;
-            this.$emit('delete', { index, name: this.data.name });
+            this.$emit('delete', Object.assign(Object.assign({}, this.getDetail(index)), { file: this.data.fileList[index] }));
         },
-        doPreviewImage(event) {
+        onPreviewImage(event) {
+            const { index } = event.currentTarget.dataset;
+            const { lists } = this.data;
+            const item = lists[index];
+            this.$emit('click-preview', Object.assign({ url: item.url || item.path }, this.getDetail(index)));
             if (!this.data.previewFullImage)
                 return;
-            const curUrl = event.currentTarget.dataset.url;
-            const images = this.data.lists
-                .filter(item => item.isImage)
-                .map(item => item.url || item.path);
-            this.$emit('click-preview', { url: curUrl, name: this.data.name });
             wx.previewImage({
-                urls: images,
-                current: curUrl,
+                urls: lists
+                    .filter(item => item.isImage)
+                    .map(item => item.url || item.path),
+                current: item.url || item.path,
                 fail() {
                     wx.showToast({ title: '预览图片失败', icon: 'none' });
                 }

dist/uploader/index.wxml

@@ -16,8 +16,8 @@
         alt="{{ item.name || ('图片' + index) }}"
         class="van-uploader__preview-image"
         style="width: {{ utils.addUnit(previewSize) }}; height: {{ utils.addUnit(previewSize) }};"
-        data-url="{{ item.url || item.path }}"
-        bind:tap="doPreviewImage"
+        data-index="{{ index }}"
+        bind:tap="onPreviewImage"
       />
       <view
         wx:else
@@ -44,11 +44,12 @@
 
       <!-- 默认上传样式 -->
       <view
+        wx:if="{{ showUpload }}"
         class="van-uploader__upload {{ disabled ? 'van-uploader__upload--disabled': ''}}"
         style="width: {{ utils.addUnit(previewSize) }}; height: {{ utils.addUnit(previewSize) }};"
         bind:tap="startUpload"
       >
-        <van-icon name="plus" class="van-uploader__upload-icon" />
+        <van-icon name="{{ uploadIcon }}" class="van-uploader__upload-icon" />
         <text wx:if="{{ uploadText }}" class="van-uploader__upload-text">{{ uploadText }}</text>
       </view>
     </block>

dist/uploader/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap}.van-uploader__slot:empty{display:none}.van-uploader__slot:not(:empty)+.van-uploader__upload{display:none!important}.van-uploader__upload{position:relative;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;width:80px;height:80px;margin:0 8px 8px 0;background-color:#fff;border:1px dashed #ebedf0;border-radius:4px}.van-uploader__upload-icon{display:inline-block;width:24px;height:24px;color:#969799;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__upload--disabled{opacity:.5;opacity:var(--uploader-disabled-opacity,.5)}.van-uploader__preview{position:relative;margin:0 8px 8px 0}.van-uploader__preview-image{display:block;width:80px;height:80px;border-radius:4px}.van-uploader__preview-delete{position:absolute;top:-8px;right:-8px;color:#969799;font-size:18px;background-color:#fff;border-radius:100%}.van-uploader__file{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;width:80px;height:80px;background-color:#f7f8fa;border-radius:4px}.van-uploader__file-icon{display:inline-block;width:20px;height:20px;color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 5px;color:#646566;font-size:12px;text-align:center}
+@import '../common/index.wxss';.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap}.van-uploader__slot:empty{display:none}.van-uploader__slot:not(:empty)+.van-uploader__upload{display:none!important}.van-uploader__upload{position:relative;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;width:80px;height:80px;margin:0 8px 8px 0;background-color:#f7f8fa;border-radius:8px}.van-uploader__upload:active{background-color:#f2f3f5}.van-uploader__upload-icon{color:#dcdee0;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__upload--disabled{opacity:.5;opacity:var(--uploader-disabled-opacity,.5)}.van-uploader__preview{position:relative;margin:0 8px 8px 0;cursor:pointer}.van-uploader__preview-image{display:block;width:80px;height:80px;overflow:hidden;border-radius:8px}.van-uploader__preview-delete{position:absolute;top:-8px;right:-8px;color:#969799;font-size:18px;background-color:#fff;border-radius:100%}.van-uploader__file{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;width:80px;height:80px;background-color:#f7f8fa;border-radius:8px}.van-uploader__file-icon{color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 4px;color:#646566;font-size:12px;text-align:center}

dist/uploader/shared.d.ts

@@ -0,0 +1,28 @@
+export declare const chooseImageProps: {
+    sizeType: {
+        type: ArrayConstructor;
+        value: string[];
+    };
+    capture: {
+        type: ArrayConstructor;
+        value: string[];
+    };
+};
+export declare const chooseVideoProps: {
+    capture: {
+        type: ArrayConstructor;
+        value: string[];
+    };
+    compressed: {
+        type: BooleanConstructor;
+        value: boolean;
+    };
+    maxDuration: {
+        type: NumberConstructor;
+        value: number;
+    };
+    camera: {
+        type: StringConstructor;
+        value: string;
+    };
+};

dist/uploader/shared.js

@@ -0,0 +1,30 @@
+// props for choose image
+export const chooseImageProps = {
+    sizeType: {
+        type: Array,
+        value: ['original', 'compressed']
+    },
+    capture: {
+        type: Array,
+        value: ['album', 'camera']
+    }
+};
+// props for choose video
+export const chooseVideoProps = {
+    capture: {
+        type: Array,
+        value: ['album', 'camera']
+    },
+    compressed: {
+        type: Boolean,
+        value: true
+    },
+    maxDuration: {
+        type: Number,
+        value: 60
+    },
+    camera: {
+        type: String,
+        value: 'back'
+    }
+};

dist/uploader/utils.d.ts

@@ -10,5 +10,18 @@ interface File {
 }
 export declare function isImageUrl(url: string): boolean;
 export declare function isImageFile(item: File): boolean;
-export declare function isVideo(res: any, accept: any): res is WechatMiniprogram.ChooseVideoSuccessCallbackResult;
+export declare function isVideo(res: any, accept: string): res is WechatMiniprogram.ChooseVideoSuccessCallbackResult;
+export declare function chooseFile({ accept, multiple, capture, compressed, maxDuration, sizeType, camera, maxCount }: {
+    accept: any;
+    multiple: any;
+    capture: any;
+    compressed: any;
+    maxDuration: any;
+    sizeType: any;
+    camera: any;
+    maxCount: any;
+}): Promise<WechatMiniprogram.ChooseImageSuccessCallbackResult | WechatMiniprogram.ChooseVideoSuccessCallbackResult | WechatMiniprogram.ChooseMessageFileSuccessCallbackResult>;
+export declare function isFunction(val: unknown): val is Function;
+export declare function isObject(val: any): val is Record<any, any>;
+export declare function isPromise<T = any>(val: unknown): val is Promise<T>;
 export {};

dist/uploader/utils.js

@@ -17,3 +17,45 @@ export function isImageFile(item) {
 export function isVideo(res, accept) {
     return accept === 'video';
 }
+export function chooseFile({ accept, multiple, capture, compressed, maxDuration, sizeType, camera, maxCount }) {
+    if (accept === 'image') {
+        return new Promise((resolve, reject) => {
+            wx.chooseImage({
+                count: multiple ? Math.min(maxCount, 9) : 1,
+                sourceType: capture,
+                sizeType,
+                success: resolve,
+                fail: reject
+            });
+        });
+    }
+    if (accept === 'video') {
+        return new Promise((resolve, reject) => {
+            wx.chooseVideo({
+                sourceType: capture,
+                compressed,
+                maxDuration,
+                camera,
+                success: resolve,
+                fail: reject
+            });
+        });
+    }
+    return new Promise((resolve, reject) => {
+        wx.chooseMessageFile({
+            count: multiple ? maxCount : 1,
+            type: 'file',
+            success: resolve,
+            fail: reject
+        });
+    });
+}
+export function isFunction(val) {
+    return typeof val === 'function';
+}
+export function isObject(val) {
+    return val !== null && typeof val === 'object';
+}
+export function isPromise(val) {
+    return isObject(val) && isFunction(val.then) && isFunction(val.catch);
+}

lib/button/index.js

@@ -62,9 +62,10 @@ component_1.VantComponent({
     },
     methods: {
         onClick: function () {
-            if (!this.data.disabled && !this.data.loading) {
+            if (!this.data.loading) {
                 this.$emit('click');
             }
-        }
+        },
+        noop: function () { }
     }
 });

lib/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' }}"
 >
   <block wx:if="{{ loading }}">
     <van-loading

lib/calendar/calendar.wxml

@@ -0,0 +1,57 @@
+<wxs src="./index.wxs" module="computed"></wxs>
+
+<template name="calendar">
+  <view class="van-calendar">
+    <header
+      title="{{ title }}"
+      showTitle="{{ showTitle }}"
+      subtitle="{{ subtitle }}"
+      showSubtitle="{{ showSubtitle }}"
+    >
+      <slot name="title" slot="title"></slot>
+    </header>
+
+    <scroll-view class="van-calendar__body" scroll-y scroll-into-view="{{ scrollIntoView }}">
+      <month
+        wx:for="{{ computed.getMonths(minDate, maxDate) }}"
+        wx:key="index"
+        id="month{{ index }}"
+        class="month"
+        data-date="{{ item }}"
+        date="{{ item }}"
+        type="{{ type }}"
+        color="{{ color }}"
+        minDate="{{ minDate }}"
+        maxDate="{{ maxDate }}"
+        showMark="{{ showMark }}"
+        formatter="{{ formatter }}"
+        rowHeight="{{ rowHeight }}"
+        currentDate="{{ currentDate }}"
+        showSubtitle="{{ showSubtitle }}"
+        allowSameDay="{{ allowSameDay }}"
+        showMonthTitle="{{ index !== 0 || !showSubtitle }}"
+        bind:click="onClickDay"
+      />
+    </scroll-view>
+
+    <view class="van-calendar__footer {{ safeAreaInsetBottom ? 'van-calendar__footer--safe-area-inset-bottom' : '' }}">
+      <slot name="footer"></slot>
+    </view>
+
+    <view class="van-calendar__footer {{ safeAreaInsetBottom ? 'van-calendar__footer--safe-area-inset-bottom' : '' }}">
+      <van-button
+        wx:if="{{ showConfirm }}"
+        round
+        block
+        type="danger"
+        color="{{ color }}"
+        custom-class="van-calendar__confirm"
+        disabled="{{ computed.getButtonDisabled(type, currentDate) }}"
+        nativeType="text"
+        bind:click="onConfirm"
+      >
+        {{ computed.getButtonDisabled(type, currentDate) ? confirmDisabledText : confirmText }}
+      </van-button>
+    </view>
+  </view>
+</template>

lib/calendar/components/header/index.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var component_1 = require("../../../common/component");
+component_1.VantComponent({
+    props: {
+        title: {
+            type: String,
+            value: '日期选择'
+        },
+        subtitle: String,
+        showTitle: Boolean,
+        showSubtitle: Boolean
+    },
+    data: {
+        weekdays: ['日', '一', '二', '三', '四', '五', '六']
+    },
+    methods: {}
+});

lib/calendar/components/header/index.json

@@ -0,0 +1,3 @@
+{
+  "component": true
+}

lib/calendar/components/header/index.wxml

@@ -0,0 +1,16 @@
+<view class="van-calendar__header">
+  <block wx:if="{{ showTitle }}">
+    <view class="van-calendar__header-title"><slot name="title"></slot></view>
+    <view class="van-calendar__header-title">{{ title }}</view>
+  </block>
+
+  <view wx:if="{{ showSubtitle }}" class="van-calendar__header-subtitle">
+    {{ subtitle }}
+  </view>
+
+  <view class="van-calendar__weekdays">
+    <view wx:for="{{ weekdays }}" wx:key="index" class="van-calendar__weekday">
+      {{ item }}
+    </view>
+  </view>
+</view>

lib/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)}

lib/calendar/components/month/index.js

@@ -0,0 +1,152 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var component_1 = require("../../../common/component");
+var utils_1 = require("../../utils");
+component_1.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: function (event) {
+            var index = event.currentTarget.dataset.index;
+            var item = this.data.days[index];
+            if (item.type !== 'disabled') {
+                this.$emit('click', item);
+            }
+        },
+        setDays: function () {
+            var days = [];
+            var startDate = new Date(this.data.date);
+            var year = startDate.getFullYear();
+            var month = startDate.getMonth();
+            var totalDay = utils_1.getMonthEndDay(startDate.getFullYear(), startDate.getMonth() + 1);
+            for (var day = 1; day <= totalDay; day++) {
+                var date = new Date(year, month, day);
+                var type = this.getDayType(date);
+                var config = {
+                    date: date,
+                    type: type,
+                    text: day,
+                    bottomInfo: this.getBottomInfo(type)
+                };
+                if (this.data.formatter) {
+                    config = this.data.formatter(config);
+                }
+                days.push(config);
+            }
+            this.setData({ days: days });
+        },
+        getMultipleDayType: function (day) {
+            var currentDate = this.data.currentDate;
+            if (!Array.isArray(currentDate)) {
+                return '';
+            }
+            var isSelected = function (date) {
+                return currentDate.some(function (item) { return utils_1.compareDay(item, date) === 0; });
+            };
+            if (isSelected(day)) {
+                var prevDay = utils_1.getPrevDay(day);
+                var nextDay = utils_1.getNextDay(day);
+                var prevSelected = isSelected(prevDay);
+                var nextSelected = isSelected(nextDay);
+                if (prevSelected && nextSelected) {
+                    return 'multiple-middle';
+                }
+                if (prevSelected) {
+                    return 'end';
+                }
+                return nextSelected ? 'start' : 'multiple-selected';
+            }
+            return '';
+        },
+        getRangeDayType: function (day) {
+            var _a = this.data, currentDate = _a.currentDate, allowSameDay = _a.allowSameDay;
+            if (!Array.isArray(currentDate)) {
+                return;
+            }
+            var startDay = currentDate[0], endDay = currentDate[1];
+            if (!startDay) {
+                return;
+            }
+            var compareToStart = utils_1.compareDay(day, startDay);
+            if (!endDay) {
+                return compareToStart === 0 ? 'start' : '';
+            }
+            var compareToEnd = utils_1.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: function (day) {
+            var _a = this.data, type = _a.type, minDate = _a.minDate, maxDate = _a.maxDate, currentDate = _a.currentDate;
+            if (utils_1.compareDay(day, minDate) < 0 || utils_1.compareDay(day, maxDate) > 0) {
+                return 'disabled';
+            }
+            if (type === 'single') {
+                return utils_1.compareDay(day, currentDate) === 0 ? 'selected' : '';
+            }
+            if (type === 'multiple') {
+                return this.getMultipleDayType(day);
+            }
+            /* istanbul ignore else */
+            if (type === 'range') {
+                return this.getRangeDayType(day);
+            }
+        },
+        getBottomInfo: function (type) {
+            if (this.data.type === 'range') {
+                if (type === 'start') {
+                    return '开始';
+                }
+                if (type === 'end') {
+                    return '结束';
+                }
+                if (type === 'start-end') {
+                    return '开始/结束';
+                }
+            }
+        }
+    }
+});

lib/calendar/components/month/index.json

@@ -0,0 +1,3 @@
+{
+  "component": true
+}

lib/calendar/components/month/index.wxml

@@ -0,0 +1,39 @@
+<wxs src="./index.wxs" module="computed"></wxs>
+<wxs src="../../../wxs/utils.wxs" module="utils" />
+
+<view class="van-calendar__month" style="{{ computed.getMonthStyle(visible, date, rowHeight) }}">
+  <view wx:if="{{ showMonthTitle }}" class="van-calendar__month-title">
+    {{ computed.formatMonthTitle(date) }}
+  </view>
+
+  <view wx:if="{{ visible }}" class="van-calendar__days">
+    <view wx:if="{{ showMark }}" class="van-calendar__month-mark">
+      {{ computed.getMark(date) }}
+    </view>
+
+    <view
+      wx:for="{{ days }}"
+      wx:key="index"
+      style="{{ computed.getDayStyle(item.type, index, date, rowHeight, color) }}"
+      class="{{ utils.bem('calendar__day', [item.type]) }} {{ item.className }}"
+      data-index="{{ index }}"
+      bindtap="onClick"
+    >
+      <view wx:if="{{ item.type === 'selected' }}" class="van-calendar__selected-day" style="background: {{ color }}">
+        <view wx:if="{{ item.topInfo }}" class="van-calendar__top-info">{{ item.topInfo }}</view>
+        {{ item.text }}
+        <view wx:if="{{ item.bottomInfo }}" class="van-calendar__bottom-info">
+          {{ item.bottomInfo }}
+        </view>
+      </view>
+
+      <view wx:else>
+        <view wx:if="{{ item.topInfo }}" class="van-calendar__top-info">{{ item.topInfo }}</view>
+        {{ item.text }}
+        <view wx:if="{{ item.bottomInfo }}" class="van-calendar__bottom-info">
+          {{ item.bottomInfo }}
+        </view>
+      </view>
+    </view>
+  </view>
+</view>

lib/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
+};

lib/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)}

lib/calendar/index.js

@@ -0,0 +1,267 @@
+"use strict";
+var __spreadArrays = (this && this.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var component_1 = require("../common/component");
+var utils_1 = require("./utils");
+var toast_1 = __importDefault(require("../toast/toast"));
+component_1.VantComponent({
+    props: {
+        title: {
+            type: String,
+            value: '日期选择'
+        },
+        color: String,
+        show: {
+            type: Boolean,
+            observer: function (val) {
+                if (val) {
+                    this.initRect();
+                    this.scrollIntoView();
+                }
+            }
+        },
+        formatter: null,
+        confirmText: {
+            type: String,
+            value: '确定'
+        },
+        rangePrompt: String,
+        defaultDate: {
+            type: [Number, Array],
+            observer: function (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: utils_1.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: function () {
+        this.setData({
+            currentDate: this.getInitialDate()
+        });
+    },
+    mounted: function () {
+        if (this.data.show || !this.data.poppable) {
+            this.initRect();
+            this.scrollIntoView();
+        }
+    },
+    methods: {
+        reset: function () {
+            this.setData({ currentDate: this.getInitialDate() });
+            this.scrollIntoView();
+        },
+        initRect: function () {
+            var _this = this;
+            if (this.contentObserver != null) {
+                this.contentObserver.disconnect();
+            }
+            var contentObserver = this.createIntersectionObserver({
+                thresholds: [0, 0.1, 0.9, 1],
+                observeAll: true
+            });
+            this.contentObserver = contentObserver;
+            contentObserver.relativeTo('.van-calendar__body');
+            contentObserver.observe('.month', function (res) {
+                if (res.boundingClientRect.top <= res.relativeRect.top) {
+                    // @ts-ignore
+                    _this.setData({ subtitle: utils_1.formatMonthTitle(res.dataset.date) });
+                }
+            });
+        },
+        getInitialDate: function () {
+            var _a = this.data, type = _a.type, defaultDate = _a.defaultDate, minDate = _a.minDate;
+            if (type === 'range') {
+                var _b = defaultDate || [], startDay = _b[0], endDay = _b[1];
+                return [
+                    startDay || minDate,
+                    endDay || utils_1.getNextDay(new Date(minDate)).getTime()
+                ];
+            }
+            if (type === 'multiple') {
+                return [defaultDate || minDate];
+            }
+            return defaultDate || minDate;
+        },
+        scrollIntoView: function () {
+            var _this = this;
+            setTimeout(function () {
+                var _a = _this.data, currentDate = _a.currentDate, type = _a.type, show = _a.show, poppable = _a.poppable, minDate = _a.minDate, maxDate = _a.maxDate;
+                var targetDate = type === 'single' ? currentDate : currentDate[0];
+                var displayed = show || !poppable;
+                if (!targetDate || !displayed) {
+                    return;
+                }
+                var months = utils_1.getMonths(minDate, maxDate);
+                months.some(function (month, index) {
+                    if (utils_1.compareMonth(month, targetDate) === 0) {
+                        _this.setData({ scrollIntoView: "month" + index });
+                        return true;
+                    }
+                    return false;
+                });
+            }, 100);
+        },
+        onOpen: function () {
+            this.$emit('open');
+        },
+        onOpened: function () {
+            this.$emit('opened');
+        },
+        onClose: function () {
+            this.$emit('close');
+        },
+        onClosed: function () {
+            this.$emit('closed');
+        },
+        onClickDay: function (event) {
+            var date = event.detail.date;
+            var _a = this.data, type = _a.type, currentDate = _a.currentDate, allowSameDay = _a.allowSameDay;
+            if (type === 'range') {
+                var startDay = currentDate[0], endDay = currentDate[1];
+                if (startDay && !endDay) {
+                    var compareToStart = utils_1.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') {
+                var selectedIndex_1;
+                var selected = currentDate.some(function (dateItem, index) {
+                    var equal = utils_1.compareDay(dateItem, date) === 0;
+                    if (equal) {
+                        selectedIndex_1 = index;
+                    }
+                    return equal;
+                });
+                if (selected) {
+                    currentDate.splice(selectedIndex_1, 1);
+                    this.setData({ currentDate: currentDate });
+                }
+                else {
+                    this.select(__spreadArrays(currentDate, [date]));
+                }
+            }
+            else {
+                this.select(date, true);
+            }
+        },
+        select: function (date, complete) {
+            var getTime = function (date) {
+                return (date instanceof Date ? date.getTime() : date);
+            };
+            this.setData({
+                currentDate: Array.isArray(date) ? date.map(getTime) : getTime(date)
+            });
+            this.$emit('select', utils_1.copyDates(date));
+            if (complete && this.data.type === 'range') {
+                var valid = this.checkRange();
+                if (!valid) {
+                    return;
+                }
+            }
+            if (complete && !this.data.showConfirm) {
+                this.onConfirm();
+            }
+        },
+        checkRange: function () {
+            var _a = this.data, maxRange = _a.maxRange, currentDate = _a.currentDate, rangePrompt = _a.rangePrompt;
+            if (maxRange && utils_1.calcDateNum(currentDate) > maxRange) {
+                toast_1.default(rangePrompt || "\u9009\u62E9\u5929\u6570\u4E0D\u80FD\u8D85\u8FC7 " + maxRange + " \u5929");
+                return false;
+            }
+            return true;
+        },
+        onConfirm: function () {
+            var _this = this;
+            if (this.data.type === 'range' && !this.checkRange()) {
+                return;
+            }
+            wx.nextTick(function () {
+                _this.$emit('confirm', utils_1.copyDates(_this.data.currentDate));
+            });
+        }
+    }
+});

lib/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"
+  }
+}

lib/calendar/index.wxml

@@ -0,0 +1,29 @@
+<wxs src="./index.wxs" module="computed" />
+
+<import src="./calendar.wxml" />
+
+<van-popup
+  wx:if="{{ poppable }}"
+  custom-class="van-calendar__popup--{{ position }}"
+  close-icon-class="van-calendar__close-icon"
+  show="{{ show }}"
+  round="{{ round }}"
+  position="{{ position }}"
+  closeable="{{ showTitle || showSubtitle }}"
+  close-on-click-overlay="{{ closeOnClickOverlay }}"
+  bind:enter="onOpen"
+  bind:close="onClose"
+  bind:after-enter="onOpened"
+  bind:after-leave="onClosed"
+>
+  <template
+    is="calendar"
+    data="{{ title, subtitle, showTitle, showSubtitle, minDate, maxDate, type, color, showMark, formatter, rowHeight, currentDate, safeAreaInsetBottom, showConfirm, confirmDisabledText, confirmText, scrollIntoView, allowSameDay }}"
+  />
+</van-popup>
+
+<template
+  wx:else
+  is="calendar"
+  data="{{ title, subtitle, showTitle, showSubtitle, minDate, maxDate, type, color, showMark, formatter, rowHeight, currentDate, safeAreaInsetBottom, showConfirm, confirmDisabledText, confirmText, scrollIntoView, allowSameDay }}"
+/>

lib/calendar/index.wxs

@@ -0,0 +1,33 @@
+/* eslint-disable */
+var utils = require('./utils.wxs');
+
+function getMonths(minDate, maxDate) {
+  var months = [];
+  var cursor = getDate(minDate);
+
+  cursor.setDate(1);
+
+  do {
+    months.push(cursor.getTime());
+    cursor.setMonth(cursor.getMonth() + 1);
+  } while (utils.compareMonth(cursor, getDate(maxDate)) !== 1);
+
+  return months;
+}
+
+function getButtonDisabled(type, currentDate) {
+  if (type === 'range') {
+    return !currentDate[0] || !currentDate[1];
+  }
+
+  if (type === 'multiple') {
+    return !currentDate.length;
+  }
+
+  return !currentDate;
+}
+
+module.exports = {
+  getMonths: getMonths,
+  getButtonDisabled: getButtonDisabled
+};

lib/calendar/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%;height:var(--calendar-height,100%);background-color:#fff;background-color:var(--calendar-background-color,#fff)}.van-calendar__close-icon{top:11px}.van-calendar__popup--bottom,.van-calendar__popup--top{height:80%;height:var(--calendar-popup-height,80%)}.van-calendar__popup--left,.van-calendar__popup--right{height:100%}.van-calendar__body{-webkit-flex:1;flex:1;overflow:auto;-webkit-overflow-scrolling:touch}.van-calendar__footer{-webkit-flex-shrink:0;flex-shrink:0;padding:0 16px;padding:0 var(--padding-md,16px)}.van-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.van-calendar__footer+.van-calendar__footer,.van-calendar__footer:empty{display:none}.van-calendar__footer:empty+.van-calendar__footer{display:block!important}.van-calendar__confirm{height:36px!important;height:var(--calendar-confirm-button-height,36px)!important;margin:7px 0!important;margin:var(--calendar-confirm-button-margin,7px 0)!important;line-height:34px!important;line-height:var(--calendar-confirm-button-line-height,34px)!important}

lib/calendar/utils.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ROW_HEIGHT = 64;
+function formatMonthTitle(date) {
+    if (!(date instanceof Date)) {
+        date = new Date(date);
+    }
+    return date.getFullYear() + "\u5E74" + (date.getMonth() + 1) + "\u6708";
+}
+exports.formatMonthTitle = formatMonthTitle;
+function compareMonth(date1, date2) {
+    if (!(date1 instanceof Date)) {
+        date1 = new Date(date1);
+    }
+    if (!(date2 instanceof Date)) {
+        date2 = new Date(date2);
+    }
+    var year1 = date1.getFullYear();
+    var year2 = date2.getFullYear();
+    var month1 = date1.getMonth();
+    var month2 = date2.getMonth();
+    if (year1 === year2) {
+        return month1 === month2 ? 0 : month1 > month2 ? 1 : -1;
+    }
+    return year1 > year2 ? 1 : -1;
+}
+exports.compareMonth = compareMonth;
+function compareDay(day1, day2) {
+    if (!(day1 instanceof Date)) {
+        day1 = new Date(day1);
+    }
+    if (!(day2 instanceof Date)) {
+        day2 = new Date(day2);
+    }
+    var compareMonthResult = compareMonth(day1, day2);
+    if (compareMonthResult === 0) {
+        var date1 = day1.getDate();
+        var date2 = day2.getDate();
+        return date1 === date2 ? 0 : date1 > date2 ? 1 : -1;
+    }
+    return compareMonthResult;
+}
+exports.compareDay = compareDay;
+function getDayByOffset(date, offset) {
+    date = new Date(date);
+    date.setDate(date.getDate() + offset);
+    return date;
+}
+function getPrevDay(date) {
+    return getDayByOffset(date, -1);
+}
+exports.getPrevDay = getPrevDay;
+function getNextDay(date) {
+    return getDayByOffset(date, 1);
+}
+exports.getNextDay = getNextDay;
+function calcDateNum(date) {
+    var day1 = new Date(date[0]).getTime();
+    var day2 = new Date(date[1]).getTime();
+    return (day2 - day1) / (1000 * 60 * 60 * 24) + 1;
+}
+exports.calcDateNum = calcDateNum;
+function copyDates(dates) {
+    if (Array.isArray(dates)) {
+        return dates.map(function (date) {
+            if (date === null) {
+                return date;
+            }
+            return new Date(date);
+        });
+    }
+    return new Date(dates);
+}
+exports.copyDates = copyDates;
+function getMonthEndDay(year, month) {
+    return 32 - new Date(year, month - 1, 32).getDate();
+}
+exports.getMonthEndDay = getMonthEndDay;
+function getMonths(minDate, maxDate) {
+    var months = [];
+    var cursor = new Date(minDate);
+    cursor.setDate(1);
+    do {
+        months.push(cursor.getTime());
+        cursor.setMonth(cursor.getMonth() + 1);
+    } while (compareMonth(cursor, maxDate) !== 1);
+    return months;
+}
+exports.getMonths = getMonths;

lib/calendar/utils.wxs

@@ -0,0 +1,25 @@
+/* eslint-disable */
+function getMonthEndDay(year, month) {
+  return 32 -  getDate(year, month - 1, 32).getDate();
+}
+
+function compareMonth(date1, date2) {
+  date1 = getDate(date1);
+  date2 = getDate(date2);
+
+  var year1 = date1.getFullYear();
+  var year2 = date2.getFullYear();
+  var month1 = date1.getMonth();
+  var month2 = date2.getMonth();
+
+  if (year1 === year2) {
+    return month1 === month2 ? 0 : month1 > month2 ? 1 : -1;
+  }
+
+  return year1 > year2 ? 1 : -1;
+}
+
+module.exports = {
+  getMonthEndDay: getMonthEndDay,
+  compareMonth: compareMonth
+};

lib/field/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var component_1 = require("../common/component");
-var utils_1 = require("../common/utils");
 component_1.VantComponent({
     field: true,
     classes: ['input-class', 'right-icon-class'],
@@ -17,7 +16,7 @@ component_1.VantComponent({
         leftIcon: String,
         rightIcon: String,
         disabled: Boolean,
-        autosize: Boolean,
+        autosize: [Boolean, Object],
         readonly: Boolean,
         required: Boolean,
         password: Boolean,
@@ -32,6 +31,7 @@ component_1.VantComponent({
         holdKeyboard: Boolean,
         errorMessage: String,
         arrowDirection: String,
+        showWordLimit: Boolean,
         placeholderStyle: String,
         errorMessageAlign: String,
         selectionEnd: {
@@ -73,7 +73,6 @@ component_1.VantComponent({
     },
     data: {
         focused: false,
-        system: utils_1.getSystemInfoSync().system.split(' ').shift().toLowerCase()
     },
     methods: {
         onInput: function (event) {

lib/field/index.wxml

@@ -1,4 +1,5 @@
 <wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="computed" />
 
 <van-cell
   size="{{ size }}"
@@ -16,7 +17,7 @@
 >
   <slot name="left-icon" slot="icon" />
   <slot name="label" slot="title" />
-  <view class="{{ utils.bem('field__body', [type, system]) }}">
+  <view class="{{ utils.bem('field__body', [type]) }}">
     <textarea
       wx:if="{{ type === 'textarea' }}"
       class="input-class {{ utils.bem('field__input', [inputAlign, type, { disabled, error }]) }}"
@@ -28,7 +29,8 @@
       placeholder="{{ placeholder }}"
       placeholder-style="{{ placeholderStyle }}"
       placeholder-class="{{ utils.bem('field__placeholder', { error }) }}"
-      auto-height="{{ autosize }}"
+      auto-height="{{ !!autosize }}"
+      style="{{ computed.inputStyle(autosize) }}"
       cursor-spacing="{{ cursorSpacing }}"
       adjust-position="{{ adjustPosition }}"
       show-confirm-bar="{{ showConfirmBar }}"
@@ -67,7 +69,6 @@
     />
     <van-icon
       wx:if="{{ clearable && focused && value && !readonly }}"
-      size="16px"
       name="clear"
       class="van-field__clear-root van-field__icon-root"
       catch:touchstart="onClear"
@@ -75,7 +76,6 @@
     <view class="van-field__icon-container" bind:tap="onClickIcon">
       <van-icon
         wx:if="{{ rightIcon || icon }}"
-        size="16px"
         name="{{ rightIcon || icon }}"
         class="van-field__icon-root {{ iconClass }}"
         custom-class="right-icon-class"
@@ -87,6 +87,9 @@
       <slot name="button" />
     </view>
   </view>
+  <view wx:if="{{ showWordLimit && maxlength }}" class="van-field__word-limit">
+    <view class="{{ utils.bem('field__word-num', { full: value.length >= maxlength }) }}">{{ value.length }}</view>/{{ maxlength }}
+  </view>
   <view wx:if="{{ errorMessage }}" class="van-field__error-message {{ utils.bem('field__error', [errorMessageAlign, { disabled, error }]) }}">
     {{ errorMessage }}
   </view>

lib/field/index.wxs

@@ -0,0 +1,21 @@
+/* eslint-disable */
+var utils = require('../wxs/utils.wxs');
+
+function inputStyle(autosize) {
+  if (autosize.constructor === 'Object') {
+    var style = '';
+    if (autosize.minHeight) {
+      style += 'min-height:' + utils.addUnit(autosize.minHeight);
+    }
+    if (autosize.maxHeight) {
+      style += 'min-height:' + utils.addUnit(autosize.maxHeight);
+    }
+    return style;
+  }
+
+  return '';
+}
+
+module.exports = {
+  inputStyle: inputStyle
+};

lib/field/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{line-height:1.2em;min-height:24px;min-height:var(--cell-line-height,24px)}.van-field__body--textarea.van-field__body--ios{margin-top:-4.5px}.van-field__input{position:relative;display:block;box-sizing:border-box;width:100%;margin:0;padding:0;line-height:inherit;text-align:left;background-color:initial;border:0;resize:none;color:#323233;color:var(--field-input-text-color,#323233);height:24px;height:var(--cell-line-height,24px);min-height:24px;min-height:var(--cell-line-height,24px)}.van-field__input--textarea{height:18px;height:var(--field-text-area-min-height,18px);min-height:18px;min-height:var(--field-text-area-min-height,18px)}.van-field__input--error{color:#ee0a24;color:var(--field-input-error-text-color,#ee0a24)}.van-field__input--disabled{background-color:initial;opacity:1;color:#969799;color:var(--field-input-disabled-text-color,#969799)}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__placeholder{position:absolute;top:0;right:0;left:0;pointer-events:none;color:#969799;color:var(--field-placeholder-text-color,#969799)}.van-field__placeholder--error{color:#ee0a24;color:var(--field-error-message-color,#ee0a24)}.van-field__icon-root{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;min-height:24px;min-height:var(--cell-line-height,24px)}.van-field__clear-root,.van-field__icon-container{line-height:inherit;vertical-align:middle;padding:0 8px;padding:0 var(--padding-xs,8px);margin-right:-8px;margin-right:-var(--padding-xs,8px)}.van-field__button,.van-field__clear-root,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear-root{color:#c8c9cc;color:var(--field-clear-icon-color,#c8c9cc)}.van-field__icon-container{color:#969799;color:var(--field-icon-container-color,#969799)}.van-field__icon-container:empty{display:none}.van-field__button{padding-left:8px;padding-left:var(--padding-xs,8px)}.van-field__button:empty{display:none}.van-field__error-message{text-align:left;font-size:12px;font-size:var(--field-error-message-text-font-size,12px);color:#ee0a24;color:var(--field-error-message-color,#ee0a24)}.van-field__error-message--center{text-align:center}.van-field__error-message--right{text-align:right}
+@import '../common/index.wxss';.van-field{--cell-icon-size:16px;--cell-icon-size:var(--field-icon-size,16px)}.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{line-height:1.2em}.van-field__body--textarea,.van-field__input{min-height:24px;min-height:var(--cell-line-height,24px)}.van-field__input{position:relative;display:block;box-sizing:border-box;width:100%;margin:0;padding:0;line-height:inherit;text-align:left;background-color:initial;border:0;resize:none;color:#323233;color:var(--field-input-text-color,#323233);height:24px;height:var(--cell-line-height,24px)}.van-field__input--textarea{height:18px;height:var(--field-text-area-min-height,18px);min-height:18px;min-height:var(--field-text-area-min-height,18px)}.van-field__input--error{color:#ee0a24;color:var(--field-input-error-text-color,#ee0a24)}.van-field__input--disabled{background-color:initial;opacity:1;color:#969799;color:var(--field-input-disabled-text-color,#969799)}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__placeholder{position:absolute;top:0;right:0;left:0;pointer-events:none;color:#969799;color:var(--field-placeholder-text-color,#969799)}.van-field__placeholder--error{color:#ee0a24;color:var(--field-error-message-color,#ee0a24)}.van-field__icon-root{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;min-height:24px;min-height:var(--cell-line-height,24px)}.van-field__clear-root,.van-field__icon-container{line-height:inherit;vertical-align:middle;padding:0 8px;padding:0 var(--padding-xs,8px);margin-right:-8px;margin-right:-var(--padding-xs,8px)}.van-field__button,.van-field__clear-root,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear-root{font-size:16px;font-size:var(--field-clear-icon-size,16px);color:#c8c9cc;color:var(--field-clear-icon-color,#c8c9cc)}.van-field__icon-container{font-size:16px;font-size:var(--field-icon-size,16px);color:#969799;color:var(--field-icon-container-color,#969799)}.van-field__icon-container:empty{display:none}.van-field__button{padding-left:8px;padding-left:var(--padding-xs,8px)}.van-field__button:empty{display:none}.van-field__error-message{text-align:left;font-size:12px;font-size:var(--field-error-message-text-font-size,12px);color:#ee0a24;color:var(--field-error-message-color,#ee0a24)}.van-field__error-message--center{text-align:center}.van-field__error-message--right{text-align:right}.van-field__word-limit{text-align:right;margin-top:4px;margin-top:var(--padding-base,4px);color:#646566;color:var(--field-word-limit-color,#646566);font-size:12px;font-size:var(--field-word-limit-font-size,12px);line-height:16px;line-height:var(--field-word-limit-line-height,16px)}.van-field__word-num{display:inline}.van-field__word-num--full{color:#ee0a24;color:var(--field-word-num-full-color,#ee0a24)}

lib/grid-item/index.js

@@ -9,6 +9,7 @@ component_1.VantComponent({
         type: 'ancestor',
         current: 'grid-item',
     },
+    classes: ['content-class', 'icon-class', 'text-class'],
     mixins: [link_1.link],
     props: {
         icon: String,

lib/grid-item/index.wxml

@@ -1,19 +1,19 @@
 <wxs src="../wxs/utils.wxs" module="utils" />
 
-<view class="{{ utils.bem('grid-item', { square }) }}" style="{{ viewStyle }}" bindtap="onClick">
+<view class="custom-class {{ utils.bem('grid-item', { square }) }}" style="{{ viewStyle }}" bindtap="onClick">
   <view
-    class="{{ utils.bem('grid-item__content', { center, square, clickable, surround: border && gutter }) }} {{ border ? 'van-hairline--surround' : '' }}"
+    class="content-class {{ utils.bem('grid-item__content', { center, square, clickable, surround: border && gutter }) }} {{ border ? 'van-hairline--surround' : '' }}"
     style="{{ contentStyle }}"
   >
     <block wx:if="{{ useSlot }}">
       <slot />
     </block>
     <block wx:else>
-      <view class="van-grid-item__icon">
+      <view class="van-grid-item__icon icon-class">
         <van-icon wx:if="{{ icon }}" name="{{ icon }}" dot="{{ dot }}" info="{{ info }}" />
         <slot wx:else name="icon"></slot>
       </view>
-      <view class="van-grid-item__text">
+      <view class="van-grid-item__text text-class">
         <text wx:if="{{ text }}">{{ text }}</text>
         <slot wx:else name="text"></slot>
       </view>

lib/grid/index.wxml

@@ -1,3 +1,3 @@
-<view class="van-grid {{ border && !gutter ? 'van-hairline--top' : '' }}" style="{{ viewStyle }}">
+<view class="van-grid custom-class {{ border && !gutter ? 'van-hairline--top' : '' }}" style="{{ viewStyle }}">
   <slot />
 </view>

lib/mixins/button.js

@@ -4,10 +4,7 @@ exports.button = Behavior({
     externalClasses: ['hover-class'],
     properties: {
         id: String,
-        lang: {
-            type: String,
-            value: 'en'
-        },
+        lang: String,
         businessId: Number,
         sessionFrom: String,
         sendMessageTitle: String,

lib/popup/index.js

@@ -9,7 +9,8 @@ component_1.VantComponent({
         'enter-to-class',
         'leave-class',
         'leave-active-class',
-        'leave-to-class'
+        'leave-to-class',
+        'close-icon-class'
     ],
     mixins: [transition_1.transition(false)],
     props: {

lib/popup/index.wxml

@@ -18,7 +18,7 @@
   <van-icon
     wx:if="{{ closeable }}"
     name="{{ closeIcon }}"
-    class="van-popup__close-icon van-popup__close-icon--{{ closeIconPosition }}"
+    class="close-icon-class van-popup__close-icon van-popup__close-icon--{{ closeIconPosition }}"
     bind:tap="onClickCloseIcon"
   />
 </view>

lib/sidebar-item/index.wxml

@@ -13,6 +13,7 @@
       info="{{ info }}"
       custom-style="right: 4px"
     />
-    {{ title }}
+    <view wx:if="{{ title }}">{{ title }}</view>
+    <slot wx:else name="title" />
   </view>
 </view>

lib/steps/index.js

@@ -25,5 +25,11 @@ component_1.VantComponent({
             value: 'checked'
         },
         inactiveIcon: String
-    }
+    },
+    methods: {
+        onClick: function (event) {
+            var index = event.currentTarget.dataset.index;
+            this.$emit('click-step', index);
+        }
+    },
 });

lib/steps/index.wxml

@@ -5,6 +5,8 @@
     <view
       wx:for="{{ steps }}"
       wx:key="index"
+      bindtap="onClick"
+      data-index="{{ index }}"
       class="{{ utils.bem('step', [direction, status(index, active)]) }} van-hairline"
       style="{{ status(index, active) === 'inactive' ? 'color: ' + inactiveColor: '' }}"
     >

lib/uploader/index.js

@@ -13,77 +13,48 @@ var __assign = (this && this.__assign) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 var component_1 = require("../common/component");
 var utils_1 = require("./utils");
+var shared_1 = require("./shared");
 component_1.VantComponent({
-    props: {
-        disabled: Boolean,
-        multiple: Boolean,
-        uploadText: String,
-        useBeforeRead: Boolean,
-        previewSize: {
+    props: __assign(__assign({ disabled: Boolean, multiple: Boolean, uploadText: String, useBeforeRead: Boolean, afterRead: null, beforeRead: null, previewSize: {
             type: null,
             value: 90
-        },
-        name: {
+        }, name: {
             type: [Number, String],
             value: ''
-        },
-        accept: {
+        }, accept: {
             type: String,
             value: 'image'
-        },
-        sizeType: {
-            type: Array,
-            value: ['original', 'compressed']
-        },
-        capture: {
-            type: Array,
-            value: ['album', 'camera']
-        },
-        fileList: {
+        }, fileList: {
             type: Array,
             value: [],
             observer: 'formatFileList'
-        },
-        maxSize: {
+        }, maxSize: {
             type: Number,
             value: Number.MAX_VALUE
-        },
-        maxCount: {
+        }, maxCount: {
             type: Number,
             value: 100
-        },
-        deletable: {
+        }, deletable: {
             type: Boolean,
             value: true
-        },
-        previewImage: {
+        }, showUpload: {
             type: Boolean,
             value: true
-        },
-        previewFullImage: {
+        }, previewImage: {
             type: Boolean,
             value: true
-        },
-        imageFit: {
+        }, previewFullImage: {
+            type: Boolean,
+            value: true
+        }, imageFit: {
             type: String,
             value: 'scaleToFill'
-        },
-        camera: {
+        }, uploadIcon: {
             type: String,
-            value: 'back'
-        },
-        compressed: {
-            type: Boolean,
-            value: true
-        },
-        maxDuration: {
-            type: Number,
-            value: 60
-        }
-    },
+            value: 'photograph'
+        } }, shared_1.chooseImageProps), shared_1.chooseVideoProps),
     data: {
         lists: [],
-        computedPreviewSize: '',
         isInCount: true
     },
     methods: {
@@ -92,50 +63,18 @@ component_1.VantComponent({
             var lists = fileList.map(function (item) { return (__assign(__assign({}, item), { isImage: typeof item.isImage === 'undefined' ? utils_1.isImageFile(item) : item.isImage })); });
             this.setData({ lists: lists, isInCount: lists.length < maxCount });
         },
+        getDetail: function (index) {
+            return {
+                name: this.data.name,
+                index: index == null ? this.data.fileList.length : index
+            };
+        },
         startUpload: function () {
             var _this = this;
-            if (this.data.disabled)
+            var _a = this.data, maxCount = _a.maxCount, multiple = _a.multiple, accept = _a.accept, lists = _a.lists, disabled = _a.disabled;
+            if (disabled)
                 return;
-            var _a = this.data, _b = _a.name, name = _b === void 0 ? '' : _b, capture = _a.capture, maxCount = _a.maxCount, multiple = _a.multiple, maxSize = _a.maxSize, accept = _a.accept, sizeType = _a.sizeType, lists = _a.lists, camera = _a.camera, compressed = _a.compressed, maxDuration = _a.maxDuration, _c = _a.useBeforeRead // 是否定义了 beforeRead
-            , useBeforeRead = _c === void 0 ? false : _c // 是否定义了 beforeRead
-            ;
-            var chooseFile = null;
-            var newMaxCount = maxCount - lists.length;
-            // 设置为只选择图片的时候使用 chooseImage 来实现
-            if (accept === 'image') {
-                chooseFile = new Promise(function (resolve, reject) {
-                    wx.chooseImage({
-                        count: multiple ? (newMaxCount > 9 ? 9 : newMaxCount) : 1,
-                        sourceType: capture,
-                        sizeType: sizeType,
-                        success: resolve,
-                        fail: reject
-                    });
-                });
-            }
-            else if (accept === 'video') {
-                chooseFile = new Promise(function (resolve, reject) {
-                    wx.chooseVideo({
-                        sourceType: capture,
-                        compressed: compressed,
-                        maxDuration: maxDuration,
-                        camera: camera,
-                        success: resolve,
-                        fail: reject
-                    });
-                });
-            }
-            else {
-                chooseFile = new Promise(function (resolve, reject) {
-                    wx.chooseMessageFile({
-                        count: multiple ? newMaxCount : 1,
-                        type: 'file',
-                        success: resolve,
-                        fail: reject
-                    });
-                });
-            }
-            chooseFile
+            utils_1.chooseFile(__assign(__assign({}, this.data), { maxCount: maxCount - lists.length }))
                 .then(function (res) {
                 var file = null;
                 if (utils_1.isVideo(res, accept)) {
@@ -144,54 +83,66 @@ component_1.VantComponent({
                 else {
                     file = multiple ? res.tempFiles : res.tempFiles[0];
                 }
-                // 检查文件大小
-                if (file instanceof Array) {
-                    var sizeEnable = file.every(function (item) { return item.size <= maxSize; });
-                    if (!sizeEnable) {
-                        _this.$emit('oversize', { name: name });
-                        return;
-                    }
-                }
-                else if (file.size > maxSize) {
-                    _this.$emit('oversize', { name: name });
-                    return;
-                }
-                // 触发上传之前的钩子函数
-                if (useBeforeRead) {
-                    _this.$emit('before-read', {
-                        file: file,
-                        name: name,
-                        callback: function (result) {
-                            if (result) {
-                                // 开始上传
-                                _this.$emit('after-read', { file: file, name: name });
-                            }
-                        }
-                    });
-                }
-                else {
-                    _this.$emit('after-read', { file: file, name: name });
-                }
+                _this.onBeforeRead(file);
             })
                 .catch(function (error) {
                 _this.$emit('error', error);
             });
         },
+        onBeforeRead: function (file) {
+            var _this = this;
+            var _a = this.data, beforeRead = _a.beforeRead, useBeforeRead = _a.useBeforeRead;
+            var res = true;
+            if (typeof beforeRead === 'function') {
+                res = beforeRead(file, this.getDetail());
+            }
+            if (useBeforeRead) {
+                res = new Promise(function (resolve, reject) {
+                    _this.$emit('before-read', __assign(__assign({ file: file }, _this.getDetail()), { callback: function (ok) {
+                            ok ? resolve() : reject();
+                        } }));
+                });
+            }
+            if (!res) {
+                return;
+            }
+            if (utils_1.isPromise(res)) {
+                res.then(function (data) { return _this.onAfterRead(data || file); });
+            }
+            else {
+                this.onAfterRead(file);
+            }
+        },
+        onAfterRead: function (file) {
+            var maxSize = this.data.maxSize;
+            var oversize = Array.isArray(file)
+                ? file.some(function (item) { return item.size > maxSize; })
+                : file.size > maxSize;
+            if (oversize) {
+                this.$emit('oversize', __assign({ file: file }, this.getDetail()));
+                return;
+            }
+            if (typeof this.data.afterRead === 'function') {
+                this.data.afterRead(file, this.getDetail());
+            }
+            this.$emit('after-read', __assign({ file: file }, this.getDetail()));
+        },
         deleteItem: function (event) {
             var index = event.currentTarget.dataset.index;
-            this.$emit('delete', { index: index, name: this.data.name });
+            this.$emit('delete', __assign(__assign({}, this.getDetail(index)), { file: this.data.fileList[index] }));
         },
-        doPreviewImage: function (event) {
+        onPreviewImage: function (event) {
+            var index = event.currentTarget.dataset.index;
+            var lists = this.data.lists;
+            var item = lists[index];
+            this.$emit('click-preview', __assign({ url: item.url || item.path }, this.getDetail(index)));
             if (!this.data.previewFullImage)
                 return;
-            var curUrl = event.currentTarget.dataset.url;
-            var images = this.data.lists
-                .filter(function (item) { return item.isImage; })
-                .map(function (item) { return item.url || item.path; });
-            this.$emit('click-preview', { url: curUrl, name: this.data.name });
             wx.previewImage({
-                urls: images,
-                current: curUrl,
+                urls: lists
+                    .filter(function (item) { return item.isImage; })
+                    .map(function (item) { return item.url || item.path; }),
+                current: item.url || item.path,
                 fail: function () {
                     wx.showToast({ title: '预览图片失败', icon: 'none' });
                 }

lib/uploader/index.wxml

@@ -16,8 +16,8 @@
         alt="{{ item.name || ('图片' + index) }}"
         class="van-uploader__preview-image"
         style="width: {{ utils.addUnit(previewSize) }}; height: {{ utils.addUnit(previewSize) }};"
-        data-url="{{ item.url || item.path }}"
-        bind:tap="doPreviewImage"
+        data-index="{{ index }}"
+        bind:tap="onPreviewImage"
       />
       <view
         wx:else
@@ -44,11 +44,12 @@
 
       <!-- 默认上传样式 -->
       <view
+        wx:if="{{ showUpload }}"
         class="van-uploader__upload {{ disabled ? 'van-uploader__upload--disabled': ''}}"
         style="width: {{ utils.addUnit(previewSize) }}; height: {{ utils.addUnit(previewSize) }};"
         bind:tap="startUpload"
       >
-        <van-icon name="plus" class="van-uploader__upload-icon" />
+        <van-icon name="{{ uploadIcon }}" class="van-uploader__upload-icon" />
         <text wx:if="{{ uploadText }}" class="van-uploader__upload-text">{{ uploadText }}</text>
       </view>
     </block>

lib/uploader/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap}.van-uploader__slot:empty{display:none}.van-uploader__slot:not(:empty)+.van-uploader__upload{display:none!important}.van-uploader__upload{position:relative;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;width:80px;height:80px;margin:0 8px 8px 0;background-color:#fff;border:1px dashed #ebedf0;border-radius:4px}.van-uploader__upload-icon{display:inline-block;width:24px;height:24px;color:#969799;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__upload--disabled{opacity:.5;opacity:var(--uploader-disabled-opacity,.5)}.van-uploader__preview{position:relative;margin:0 8px 8px 0}.van-uploader__preview-image{display:block;width:80px;height:80px;border-radius:4px}.van-uploader__preview-delete{position:absolute;top:-8px;right:-8px;color:#969799;font-size:18px;background-color:#fff;border-radius:100%}.van-uploader__file{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;width:80px;height:80px;background-color:#f7f8fa;border-radius:4px}.van-uploader__file-icon{display:inline-block;width:20px;height:20px;color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 5px;color:#646566;font-size:12px;text-align:center}
+@import '../common/index.wxss';.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap}.van-uploader__slot:empty{display:none}.van-uploader__slot:not(:empty)+.van-uploader__upload{display:none!important}.van-uploader__upload{position:relative;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;width:80px;height:80px;margin:0 8px 8px 0;background-color:#f7f8fa;border-radius:8px}.van-uploader__upload:active{background-color:#f2f3f5}.van-uploader__upload-icon{color:#dcdee0;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__upload--disabled{opacity:.5;opacity:var(--uploader-disabled-opacity,.5)}.van-uploader__preview{position:relative;margin:0 8px 8px 0;cursor:pointer}.van-uploader__preview-image{display:block;width:80px;height:80px;overflow:hidden;border-radius:8px}.van-uploader__preview-delete{position:absolute;top:-8px;right:-8px;color:#969799;font-size:18px;background-color:#fff;border-radius:100%}.van-uploader__file{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;width:80px;height:80px;background-color:#f7f8fa;border-radius:8px}.van-uploader__file-icon{color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 4px;color:#646566;font-size:12px;text-align:center}

lib/uploader/shared.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// props for choose image
+exports.chooseImageProps = {
+    sizeType: {
+        type: Array,
+        value: ['original', 'compressed']
+    },
+    capture: {
+        type: Array,
+        value: ['album', 'camera']
+    }
+};
+// props for choose video
+exports.chooseVideoProps = {
+    capture: {
+        type: Array,
+        value: ['album', 'camera']
+    },
+    compressed: {
+        type: Boolean,
+        value: true
+    },
+    maxDuration: {
+        type: Number,
+        value: 60
+    },
+    camera: {
+        type: String,
+        value: 'back'
+    }
+};

lib/uploader/utils.js

@@ -22,3 +22,50 @@ function isVideo(res, accept) {
     return accept === 'video';
 }
 exports.isVideo = isVideo;
+function chooseFile(_a) {
+    var accept = _a.accept, multiple = _a.multiple, capture = _a.capture, compressed = _a.compressed, maxDuration = _a.maxDuration, sizeType = _a.sizeType, camera = _a.camera, maxCount = _a.maxCount;
+    if (accept === 'image') {
+        return new Promise(function (resolve, reject) {
+            wx.chooseImage({
+                count: multiple ? Math.min(maxCount, 9) : 1,
+                sourceType: capture,
+                sizeType: sizeType,
+                success: resolve,
+                fail: reject
+            });
+        });
+    }
+    if (accept === 'video') {
+        return new Promise(function (resolve, reject) {
+            wx.chooseVideo({
+                sourceType: capture,
+                compressed: compressed,
+                maxDuration: maxDuration,
+                camera: camera,
+                success: resolve,
+                fail: reject
+            });
+        });
+    }
+    return new Promise(function (resolve, reject) {
+        wx.chooseMessageFile({
+            count: multiple ? maxCount : 1,
+            type: 'file',
+            success: resolve,
+            fail: reject
+        });
+    });
+}
+exports.chooseFile = chooseFile;
+function isFunction(val) {
+    return typeof val === 'function';
+}
+exports.isFunction = isFunction;
+function isObject(val) {
+    return val !== null && typeof val === 'object';
+}
+exports.isObject = isObject;
+function isPromise(val) {
+    return isObject(val) && isFunction(val.then) && isFunction(val.catch);
+}
+exports.isPromise = isPromise;