@tuya-miniapp/smart-ui 1.3.0-beta-2 → 1.3.1-beta-2

package/dist/calendar/components/month-list/index.js

@@ -0,0 +1,112 @@
+// components/month-list.js
+import { getMonths } from '../../utils';
+import { SmartComponent } from '../../../common/component';
+SmartComponent({
+    /**
+     * 组件的属性列表
+     */
+    props: {
+        date: {
+            type: null,
+            observer(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.calcMonth();
+                }
+            },
+        },
+        minDate: {
+            type: null,
+            value: new Date(new Date().getFullYear(), 0, 1).getTime(),
+        },
+        maxDate: {
+            type: null,
+            value: new Date(new Date().getFullYear(), 11, 31).getTime(),
+        },
+        currentYear: {
+            type: null,
+            value: new Date().getFullYear(),
+        },
+        visibleIndex: {
+            type: Number,
+            value: 0,
+            observer(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.getMonthList();
+                }
+            },
+        },
+        monthsFormatter: {
+            type: null,
+            value: [
+                'Jan',
+                'Feb',
+                'Mar',
+                'Apr',
+                'May',
+                'Jun',
+                'Jul',
+                'Aug',
+                'Sept',
+                'Oct',
+                'Nov',
+                'Dec',
+            ],
+        },
+    },
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        months: [],
+        currentMonth: null,
+    },
+    created() {
+        this.getMonthList();
+        this.calcMonth();
+    },
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        calcMonth() {
+            const date = new Date(this.data.date);
+            const cur = date.getMonth();
+            this.setData({
+                currentMonth: cur,
+            });
+        },
+        getMonthList() {
+            const { minDate, maxDate, visibleIndex, monthsFormatter = [], } = this.data;
+            const cur = new Date().getFullYear() + visibleIndex;
+            const start = new Date(cur, 0, 1).getTime();
+            const end = new Date(cur, 11, 31).getTime();
+            const minDateTime = new Date(minDate).getTime();
+            const maxDateTime = new Date(maxDate).getTime();
+            const months = getMonths(start, end);
+            const monthlist = months.map((date) => {
+                const monthVal = new Date(date).getMonth();
+                const time = new Date(date).getTime();
+                const isDisabled = time < minDateTime || time > maxDateTime;
+                return {
+                    value: date,
+                    month: monthVal,
+                    text: monthsFormatter[monthVal] || monthVal + 1,
+                    type: isDisabled ? 'disabled' : '',
+                };
+            });
+            this.setData({
+                months: monthlist,
+            });
+        },
+        onClick(event) {
+            const { index } = event.currentTarget.dataset;
+            const item = this.data.months[index];
+            if (item.type !== 'disabled') {
+                this.$emit('click', item.value);
+                this.setData({
+                    date: item.value,
+                });
+            }
+        },
+    },
+});

package/dist/calendar/components/month-list/index.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "smart-row": "../../../row/index",
+    "smart-col": "../../../col/index"
+  }
+}

package/dist/calendar/components/month-list/index.wxml

@@ -0,0 +1,9 @@
+<view class="contain">
+  <smart-row>
+    <smart-col wx:for="{{months}}" span="6">
+      <view class="item {{ currentMonth === item.month ? 'item_active' : '' }} {{ item.type === 'disabled' ? 'item_disabled' : '' }}" data-index="{{index}}" bindtap="onClick">
+        {{item.text}}
+      </view>
+    </smart-col>
+  </smart-row>
+</view>

package/dist/calendar/components/month-list/index.wxss

@@ -0,0 +1 @@
+@import '../../../common/index.wxss';.item{border-radius:50%;color:rgba(0,0,0,.9);font-size:15px;font-weight:500;line-height:104rpx;text-align:center}.item,.item_active{height:104rpx;width:104rpx}.item_active{background:#3678e3;color:#fff}.item_disabled{opacity:.5}

package/dist/calendar/components/year-list/index.css

@@ -0,0 +1 @@
+@import '../../../common/index.css';.contain{margin:24rpx 0}.item{border-radius:50%;color:rgba(0,0,0,.9);font-size:15px;font-weight:500;line-height:104rpx;text-align:center}.item,.item_active{height:104rpx;width:104rpx}.item_active{background:#3678e3;color:#fff}.item_disabled{opacity:.5}

package/dist/calendar/components/year-list/index.d.ts

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

package/dist/calendar/components/year-list/index.js

@@ -0,0 +1,100 @@
+// components/month-list.js
+import { getYears } from '../../utils';
+import { SmartComponent } from '../../../common/component';
+SmartComponent({
+    /**
+     * 组件的属性列表
+     */
+    props: {
+        date: {
+            type: null,
+            observer(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.calcYear();
+                }
+            },
+        },
+        minDate: {
+            type: null,
+            value: new Date(new Date().getFullYear() - 30, 0, 1).getTime(),
+        },
+        maxDate: {
+            type: null,
+            value: new Date(new Date().getFullYear() + 30, 11, 31).getTime(),
+        },
+        currentYear: {
+            type: null,
+            value: new Date().getFullYear(),
+        },
+        yearFormatter: {
+            type: null,
+            value: 'YYYY',
+        },
+        visibleIndex: {
+            type: Number,
+            value: 0,
+            observer(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.getYearList();
+                }
+            },
+        },
+    },
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        years: [],
+        currentYear: null,
+    },
+    created() {
+        this.getYearList();
+        this.calcYear();
+    },
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        calcYear() {
+            const date = new Date(this.data.date);
+            const cur = date.getFullYear();
+            this.setData({
+                currentYear: cur,
+            });
+        },
+        getYearList() {
+            const { minDate, maxDate, yearFormatter = 'YYYY', visibleIndex, date, } = this.data;
+            const cur = new Date(date).getFullYear();
+            const offset = visibleIndex * 12;
+            const start = new Date(cur + offset - 5, 0, 1).getTime();
+            const end = new Date(cur + offset + 6, 11, 31).getTime();
+            const minStart = new Date(minDate).getTime();
+            const maxStart = new Date(maxDate).getTime();
+            const years = getYears(start, end);
+            const yearlist = years.map((date) => {
+                const yearVal = new Date(date).getFullYear();
+                const curTime = new Date(date).getTime();
+                const disabled = curTime <= minStart || curTime >= maxStart;
+                return {
+                    value: date,
+                    year: yearVal,
+                    text: yearFormatter.replace('YYYY', yearVal),
+                    type: disabled ? 'disabled' : '',
+                };
+            });
+            this.setData({
+                years: yearlist,
+            });
+        },
+        onClick(event) {
+            const { index } = event.currentTarget.dataset;
+            const item = this.data.years[index];
+            if (item.type !== 'disabled') {
+                this.$emit('click', item.value);
+                this.setData({
+                    date: item.value,
+                });
+            }
+        },
+    },
+});

package/dist/calendar/components/year-list/index.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "smart-row": "../../../row/index",
+    "smart-col": "../../../col/index"
+  }
+}

package/dist/calendar/components/year-list/index.wxml

@@ -0,0 +1,9 @@
+<view class="contain">
+  <smart-row>
+    <smart-col wx:for="{{years}}" span="6">
+      <view class="item {{ currentYear === item.year ? 'item_active' : '' }} {{ item.type === 'disabled' ? 'item_disabled' : '' }}" data-index="{{index}}" bindtap="onClick">
+        {{item.text}}
+      </view>
+    </smart-col>
+  </smart-row>
+</view>

package/dist/calendar/components/year-list/index.wxss

@@ -0,0 +1 @@
+@import '../../../common/index.wxss';.contain{margin:24rpx 0}.item{border-radius:50%;color:rgba(0,0,0,.9);font-size:15px;font-weight:500;line-height:104rpx;text-align:center}.item,.item_active{height:104rpx;width:104rpx}.item_active{background:#3678e3;color:#fff}.item_disabled{opacity:.5}

package/dist/calendar/index.css

@@ -1 +1 @@
-@import '../common/index.css';.smart-calendar{background-color:var(--calendar-background-color,var(--app-B6,#fff));color:var(--calendar-text-color,#000);display:flex;flex-direction:column;height:var(--calendar-height,100%)}.smart-calendar__close-icon{top:11px}.smart-calendar__popup--bottom,.smart-calendar__popup--top{height:var(--calendar-popup-height,90%)}.smart-calendar__popup--left,.smart-calendar__popup--right{height:100%}.smart-calendar__body{-webkit-overflow-scrolling:touch;flex:1;overflow:auto}.smart-calendar__footer{flex-shrink:0;padding:0 var(--padding-md,16px)}.smart-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.smart-calendar__footer+.smart-calendar__footer,.smart-calendar__footer:empty{display:none}.smart-calendar__footer:empty+.smart-calendar__footer{display:block!important}.smart-calendar__confirm{height:var(--calendar-confirm-button-height,36px)!important;line-height:var(--calendar-confirm-button-line-height,34px)!important;margin:var(--calendar-confirm-button-margin,7px 0)!important}
+@import '../common/index.css';.smart-calendar{background-color:var(--calendar-background-color,var(--app-B6,#fff));color:var(--calendar-text-color,#000);display:flex;flex-direction:column;height:auto}.smart-calendar__close-icon{top:11px}.smart-calendar__popup--bottom,.smart-calendar__popup--top{height:848rpx}.smart-calendar__popup--left,.smart-calendar__popup--right{height:100%}.smart-calendar-month{margin-top:44rpx}.smart-calendar__body{-webkit-overflow-scrolling:touch;flex:1;overflow:auto}.smart-calendar__footer{flex-shrink:0;padding:0 var(--padding-md,16px)}.smart-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.smart-calendar__footer+.smart-calendar__footer,.smart-calendar__footer:empty{display:none}.smart-calendar__footer:empty+.smart-calendar__footer{display:block!important}

package/dist/calendar/index.js

@@ -1,7 +1,6 @@
 import { SmartComponent } from '../common/component';
-import { ROW_HEIGHT, getPrevDay, getNextDay, getToday, compareDay, copyDates, calcDateNum, formatMonthTitle, compareMonth, getMonths, getDayByOffset, } from './utils';
+import { ROW_HEIGHT, getPrevDay, getNextDay, getToday, compareDay, copyDates, calcDateNum, getMonths, getDayByOffset, getCurrentIndex, getWeekStartAndEnd, } from './utils';
 import Toast from '../toast/toast';
-import { requestAnimationFrame } from '../common/utils';
 const initialMinDate = getToday().getTime();
 const initialMaxDate = (() => {
     const now = getToday();
@@ -28,15 +27,26 @@ SmartComponent({
             type: Object,
             value: {
                 shortWeekDays: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+                monthsFormatter: [
+                    'Jan',
+                    'Feb',
+                    'Mar',
+                    'Apr',
+                    'May',
+                    'Jun',
+                    'Jul',
+                    'Aug',
+                    'Sept',
+                    'Oct',
+                    'Nov',
+                    'Dec',
+                ],
+                yearFormatter: 'YYYY',
                 subFormatter: 'YYYY-MM',
                 rangeStart: 'Start',
                 rangeEnd: 'End',
             },
         },
-        dayClassMap: {
-            type: Object,
-            value: {},
-        },
         formatter: null,
         confirmText: {
             type: String,
@@ -46,6 +56,10 @@ SmartComponent({
             type: String,
             value: '确定',
         },
+        mode: {
+            type: String,
+            value: 'day',
+        },
         rangePrompt: String,
         showRangePrompt: {
             type: Boolean,
@@ -136,6 +150,7 @@ SmartComponent({
         currentDate: null,
         scrollIntoView: '',
         visibleIndex: 0,
+        months: [],
     },
     watch: {
         minDate() {
@@ -146,9 +161,7 @@ SmartComponent({
         },
     },
     created() {
-        this.setData({
-            currentDate: this.getInitialDate(this.data.defaultDate),
-        });
+        this.initData();
     },
     mounted() {
         this.isMounted = true;
@@ -158,31 +171,75 @@ SmartComponent({
         }
     },
     methods: {
+        onPrev() {
+            const visibleIndex = this.data.visibleIndex - 1;
+            if (this.data.mode === 'year') {
+                this.setData({
+                    visibleIndex,
+                });
+                return;
+            }
+            if (this.data.mode === 'month') {
+                this.setData({
+                    visibleIndex,
+                });
+                return;
+            }
+            if (this.data.months[visibleIndex]) {
+                this.setData({
+                    visibleIndex,
+                });
+            }
+        },
+        onNext() {
+            const visibleIndex = this.data.visibleIndex + 1;
+            if (this.data.mode === 'year') {
+                this.setData({
+                    visibleIndex,
+                });
+                return;
+            }
+            if (this.data.mode === 'month') {
+                this.setData({
+                    visibleIndex,
+                });
+                return;
+            }
+            if (this.data.months[visibleIndex]) {
+                this.setData({
+                    visibleIndex,
+                });
+            }
+        },
         reset() {
             this.setData({ currentDate: this.getInitialDate(this.data.defaultDate) });
             this.scrollIntoView();
         },
+        initYearIdx(currentDate) {
+        },
+        initData() {
+            const currentDate = this.getInitialDate(this.data.defaultDate);
+            const months = getMonths(this.data.minDate, this.data.maxDate);
+            const visibleIndex = this.data.defaultDate
+                ? getCurrentIndex(currentDate, months)
+                : months.length - 1;
+            const isYear = this.data.mode === 'year';
+            const isMonth = this.data.mode === 'month';
+            const data = {
+                currentDate,
+                months,
+                visibleIndex: visibleIndex,
+            };
+            if (isYear || isMonth) {
+                // @ts-ignore
+                delete data.visibleIndex;
+            }
+            this.setData(data);
+        },
         initRect() {
             if (!this.isMounted)
                 return;
-            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('.smart-calendar__body');
-            contentObserver.observe('.month', (res) => {
-                if (res.boundingClientRect.top <= res.relativeRect.top) {
-                    // @ts-ignore
-                    this.setData({
-                        subtitle: formatMonthTitle(res.dataset.date, this.properties.locale.subFormatter),
-                        visibleIndex: res.dataset.index,
-                    });
-                }
-            });
+            this.initData();
         },
         limitDateRange(date, minDate = null, maxDate = null) {
             minDate = minDate || this.data.minDate;
@@ -200,7 +257,7 @@ SmartComponent({
             if (!defaultDate)
                 return [];
             const now = getToday().getTime();
-            if (type === 'range') {
+            if (type === 'range' || type === 'week') {
                 if (!Array.isArray(defaultDate)) {
                     defaultDate = [];
                 }
@@ -225,28 +282,6 @@ SmartComponent({
         scrollIntoView() {
             if (!this.isMounted)
                 return;
-            requestAnimationFrame(() => {
-                const { currentDate, type, show, poppable, minDate, maxDate } = this.data;
-                if (!currentDate)
-                    return;
-                // @ts-ignore
-                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}`,
-                            visibleIndex: index,
-                        });
-                        return true;
-                    }
-                    return false;
-                });
-            });
         },
         onOpen() {
             this.$emit('open');
@@ -266,7 +301,14 @@ SmartComponent({
             }
             let { date } = event.detail;
             const { type, currentDate, allowSameDay } = this.data;
-            if (type === 'range') {
+            if (type === 'week') {
+                const { weekStart, weekEnd } = getWeekStartAndEnd(date);
+                this.select([
+                    Math.max(getTime(weekStart), getTime(this.data.minDate)),
+                    Math.min(getTime(weekEnd), getTime(this.data.maxDate)),
+                ], true);
+            }
+            else if (type === 'range') {
                 // @ts-ignore
                 const [startDay, endDay] = currentDate;
                 if (startDay && !endDay) {
@@ -320,6 +362,13 @@ SmartComponent({
                 this.select(date, true);
             }
         },
+        onClickDate(event) {
+            if (this.data.readonly) {
+                return;
+            }
+            let date = event.detail;
+            this.select(date, true);
+        },
         unselect(dateArray) {
             const date = dateArray[0];
             if (date) {

package/dist/calendar/index.json

@@ -3,8 +3,10 @@
   "usingComponents": {
     "header": "./components/header/index",
     "month": "./components/month/index",
+    "month-list": "./components/month-list/index",
+    "year-list": "./components/year-list/index",
     "smart-button": "../button/index",
     "smart-popup": "../popup/index",
     "smart-toast": "../toast/index"
   }
-}
+}

package/dist/calendar/index.wxml

@@ -10,7 +10,7 @@
   show="{{ show }}"
   round="{{ round }}"
   position="{{ position }}"
-  closeable="{{ showTitle || showSubtitle }}"
+  closeable="{{false}}"
   close-on-click-overlay="{{ closeOnClickOverlay }}"
   safe-area-inset-bottom="{{ safeAreaInsetBottom }}"
   root-portal="{{ rootPortal }}"

package/dist/calendar/index.wxs

@@ -32,11 +32,29 @@ function getButtonDisabled(type, currentDate, minRange) {
 }
 
 function getVisible(visibleIndex, curIndex) {
-  return Math.abs(visibleIndex - curIndex) < 2;
+  return visibleIndex === curIndex;
+}
+
+function formatMonthTitle(date, formatter = 'YYYY-MM') {
+  date = getDate(date);
+  const year = date.getFullYear();
+  const month =
+    date.getMonth() + 1 < 10
+      ? `0${date.getMonth() + 1}`
+      : date.getMonth() + 1 + '';
+  return formatter.replace('YYYY', year + '').replace('MM', month);
+}
+
+function formatYearTitle(date, offset, formatter = 'YYYY') {
+  date = getDate(date);
+  const year = date.getFullYear() + offset;
+  return formatter.replace('YYYY', year + '');
 }
 
 module.exports = {
   getMonths: getMonths,
-  getVisible: getVisible,
-  getButtonDisabled: getButtonDisabled
+  getVisible,
+  getButtonDisabled: getButtonDisabled,
+  formatMonthTitle,
+  formatYearTitle,
 };

package/dist/calendar/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.smart-calendar{background-color:var(--calendar-background-color,var(--app-B6,#fff));color:var(--calendar-text-color,#000);display:flex;flex-direction:column;height:var(--calendar-height,100%)}.smart-calendar__close-icon{top:11px}.smart-calendar__popup--bottom,.smart-calendar__popup--top{height:var(--calendar-popup-height,90%)}.smart-calendar__popup--left,.smart-calendar__popup--right{height:100%}.smart-calendar__body{-webkit-overflow-scrolling:touch;flex:1;overflow:auto}.smart-calendar__footer{flex-shrink:0;padding:0 var(--padding-md,16px)}.smart-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.smart-calendar__footer+.smart-calendar__footer,.smart-calendar__footer:empty{display:none}.smart-calendar__footer:empty+.smart-calendar__footer{display:block!important}.smart-calendar__confirm{height:var(--calendar-confirm-button-height,36px)!important;line-height:var(--calendar-confirm-button-line-height,34px)!important;margin:var(--calendar-confirm-button-margin,7px 0)!important}
+@import '../common/index.wxss';.smart-calendar{background-color:var(--calendar-background-color,var(--app-B6,#fff));color:var(--calendar-text-color,#000);display:flex;flex-direction:column;height:auto}.smart-calendar__close-icon{top:11px}.smart-calendar__popup--bottom,.smart-calendar__popup--top{height:848rpx}.smart-calendar__popup--left,.smart-calendar__popup--right{height:100%}.smart-calendar-month{margin-top:44rpx}.smart-calendar__body{-webkit-overflow-scrolling:touch;flex:1;overflow:auto}.smart-calendar__footer{flex-shrink:0;padding:0 var(--padding-md,16px)}.smart-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.smart-calendar__footer+.smart-calendar__footer,.smart-calendar__footer:empty{display:none}.smart-calendar__footer:empty+.smart-calendar__footer{display:block!important}

package/dist/calendar/utils.d.ts

@@ -1,4 +1,4 @@
-export declare const ROW_HEIGHT = 64;
+export declare const ROW_HEIGHT = 34;
 export declare function formatMonthTitle(date: Date, formatter?: string): string;
 export declare function compareMonth(date1: Date | number, date2: Date | number): 0 | 1 | -1;
 export declare function compareDay(day1: Date | number, day2: Date | number): 0 | 1 | -1;
@@ -10,4 +10,9 @@ 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): number[];
-export declare function formatDate(date: any): string;
+export declare function getYears(minDate: number, maxDate: number): number[];
+export declare function getCurrentIndex(currentDate: any, months: any): number;
+export declare function getWeekStartAndEnd(date: Date): {
+    weekStart: Date;
+    weekEnd: Date;
+};

package/dist/calendar/utils.js

@@ -1,4 +1,4 @@
-export const ROW_HEIGHT = 64;
+export const ROW_HEIGHT = 34;
 export function formatMonthTitle(date, formatter = 'YYYY-MM') {
     if (!(date instanceof Date)) {
         date = new Date(date);
@@ -85,11 +85,47 @@ export function getMonths(minDate, maxDate) {
     } while (compareMonth(cursor, maxDate) !== 1);
     return months;
 }
-export function formatDate(date) {
-    if (!date)
-        return '';
-    const year = date.getFullYear();
-    const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始
-    const day = String(date.getDate()).padStart(2, '0');
-    return `${year}-${month}-${day}`;
+export function getYears(minDate, maxDate) {
+    const years = [];
+    const cursor = new Date(minDate);
+    cursor.setDate(1);
+    do {
+        years.push(cursor.getTime());
+        cursor.setFullYear(cursor.getFullYear() + 1);
+    } while (compareMonth(cursor, maxDate) !== 1);
+    return years;
+}
+function findLastGreaterOrEqual(arr, n) {
+    let left = 0;
+    let right = arr.length - 1;
+    let result = -1; // 初始化为 -1，若无符合条件的元素返回 -1
+    while (left <= right) {
+        const mid = Math.floor((left + right) / 2);
+        if (arr[mid] <= n) {
+            result = mid; // 暂存满足条件的索引
+            left = mid + 1; // 继续向右搜索更大的满足条件的元素
+        }
+        else {
+            right = mid - 1;
+        }
+    }
+    return result;
+}
+export function getCurrentIndex(currentDate, months) {
+    if (Array.isArray(currentDate)) {
+        currentDate = currentDate[0];
+    }
+    return findLastGreaterOrEqual(months, currentDate);
+}
+export function getWeekStartAndEnd(date) {
+    const startOfWeek = new Date(date);
+    const dayOfWeek = startOfWeek.getDay();
+    const diffToMonday = (dayOfWeek + 6) % 7;
+    startOfWeek.setDate(startOfWeek.getDate() - diffToMonday);
+    const endOfWeek = new Date(startOfWeek);
+    endOfWeek.setDate(startOfWeek.getDate() + 6);
+    return {
+        weekStart: startOfWeek,
+        weekEnd: endOfWeek,
+    };
 }

package/dist/checkbox/index.css

@@ -1 +1 @@
-@import '../common/index.css';.smart-checkbox{align-items:center;display:flex;overflow:hidden;-webkit-user-select:none;user-select:none}.smart-checkbox--horizontal{margin-right:12px}.smart-checkbox__icon-wrap,.smart-checkbox__label{line-height:var(--checkbox-size,20px)}.smart-checkbox__icon-wrap{flex:none}.smart-checkbox__icon{align-items:center;border:1px solid var(--checkbox-border-color,#c8c9cc);box-sizing:border-box;color:transparent;display:flex;font-size:var(--checkbox-size,20px);height:1em;justify-content:center;text-align:center;transition-duration:var(--checkbox-transition-duration,.2s);transition-property:color,border-color,background-color;width:1em}.smart-checkbox__icon--round{border-radius:100%}.smart-checkbox__icon--checked{background-color:var(--checkbox-checked-icon-color,#1989fa);border-color:var(--checkbox-checked-icon-color,#1989fa);color:#fff}.smart-checkbox__icon--disabled{background-color:var(--checkbox-disabled-background-color,var(--app-B6-N7,rgba(0,0,0,.1)));border-color:var(--checkbox-disabled-icon-color,var(--app-B6-N7,rgba(0,0,0,.1)))}.smart-checkbox__icon--disabled.smart-checkbox__icon--checked{color:var(--checkbox-disabled-icon-color,var(--app-B6-N7,rgba(0,0,0,.1)))}.smart-checkbox__label{word-wrap:break-word;color:var(--checkbox-label-color,var(--app-B6-N3,rgba(0,0,0,.5)));padding-left:var(--checkbox-label-margin,10px)}.smart-checkbox__label--left{float:left;margin:0 var(--checkbox-label-margin,10px) 0 0}.smart-checkbox__label--disabled{color:var(--checkbox-disabled-label-color,var(--app-B6-N7,rgba(0,0,0,.1)))}.smart-checkbox__label:empty{margin:0}
+@import '../common/index.css';.smart-checkbox{align-items:center;display:flex;overflow:hidden;-webkit-user-select:none;user-select:none}.smart-checkbox--horizontal{margin-right:12px}.smart-checkbox__icon-wrap,.smart-checkbox__label{line-height:var(--checkbox-size,24px)}.smart-checkbox__icon-wrap{display:flex;flex:none}.smart-checkbox__icon{align-items:center;border:2px solid var(--checkbox-border-color,var(--app-B6-N6,rgba(0,0,0,.2)));border-radius:var(--checkbox-border-radius,4px);box-sizing:border-box;color:transparent;display:flex;font-size:var(--checkbox-size,24px);height:1em;justify-content:center;text-align:center;transition-duration:var(--checkbox-transition-duration,.2s);transition-property:color,border,background-color;width:1em}.smart-checkbox__icon--round{border-radius:100%}.smart-checkbox__icon--checked{background-color:var(--checkbox-checked-icon-color,var(--app-M4,#1989fa));border:none;color:#fff}.smart-checkbox__icon--disabled{opacity:.3}.smart-checkbox__label{word-wrap:break-word;color:var(--checkbox-label-color,var(--app-B6-N1,#000));font-size:var(--checkbox-label-size,12px);padding-left:var(--checkbox-label-margin,10px)}.smart-checkbox__label--left{float:left;margin:0 var(--checkbox-label-margin,10px) 0 0}.smart-checkbox__label--disabled{color:var(--checkbox-disabled-label-color,var(--app-B6-N1,#000))}.smart-checkbox__label:empty{margin:0}

package/dist/checkbox/index.js

@@ -25,7 +25,7 @@ SmartComponent({
         },
         iconSize: {
             type: null,
-            value: 20,
+            value: 24,
         },
     },
     data: {

package/dist/checkbox/index.wxml

@@ -13,8 +13,8 @@
     <slot wx:if="{{ useIconSlot }}" name="icon" />
     <smart-icon
       wx:else
-      name="{{icon}}"
-      size="0.8em"
+      name="{{ icon }}"
+      size="1em"
       color="{{ value ? '#fff' : 'none'}}"
       class="{{ utils.bem('checkbox__icon', [shape, { disabled: disabled || parentDisabled, checked: value }]) }}"
       style="{{ computed.iconStyle(checkedColor, value, disabled, parentDisabled, iconSize) }}"