@trionesdev/antd-taro-react 0.0.2-beta.10 → 0.0.2-beta.12

package/dist/Calendar/calendar-grid.d.ts

@@ -1,27 +1,28 @@
 import { FC } from 'react';
 import './style.scss';
+import dayjs, { ConfigType } from "dayjs";
 export type CalendarGridProps = {
-    mouth?: Date;
+    month?: dayjs.Dayjs;
     /**
      * @description 值，如果是区间模式，则 0,1 索引的值有效，0是开始时间，1是结束时间
      */
-    value?: Date[];
+    value?: dayjs.Dayjs[];
     /**
      * @description 默认值，如果是区间模式，则 0,1 索引的值有效，0是开始时间，1是结束时间
      */
-    defaultValue?: Date[];
-    onChange?: (value: Date[]) => void;
+    defaultValue?: dayjs.Dayjs[];
+    onChange?: (value: dayjs.Dayjs[]) => void;
     /**
      * @description 是否为范围选择
      */
     range?: boolean;
-    onSelect?: (date: Date) => void;
+    onSelect?: (date: ConfigType) => void;
 };
 export type CalendarCellProps = {
-    mouth?: Date;
-    date?: Date;
-    value?: Date[];
+    month?: dayjs.Dayjs;
+    date?: dayjs.Dayjs;
+    value?: dayjs.Dayjs[];
     range?: boolean;
-    onSelect?: (date: Date) => void;
+    onSelect?: (date: dayjs.Dayjs) => void;
 };
 export declare const CalendarGrid: FC<CalendarGridProps>;

package/dist/Calendar/calendar-grid.js

@@ -1,8 +1,4 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -16,40 +12,32 @@ import classNames from 'classnames';
 import { isEmpty } from 'lodash-es';
 import React, { forwardRef, memo, useEffect, useMemo, useState } from 'react';
 import "./style.scss";
+import dayjs from "dayjs";
+import { isSame } from "../utils/dayjs";
 var calendarCls = 'triones-antm-calendar';
 var CalendarCell = /*#__PURE__*/memo(function (_ref) {
-  var _ref$mouth = _ref.mouth,
-    mouth = _ref$mouth === void 0 ? new Date() : _ref$mouth,
+  var _ref$month = _ref.month,
+    month = _ref$month === void 0 ? dayjs() : _ref$month,
     _ref$date = _ref.date,
-    date = _ref$date === void 0 ? new Date() : _ref$date,
+    date = _ref$date === void 0 ? dayjs() : _ref$date,
     value = _ref.value,
     range = _ref.range,
     onSelect = _ref.onSelect;
   var disabled = useMemo(function () {
-    return date.getMonth() !== mouth.getMonth();
-  }, [date, mouth]);
+    return !isSame(date, month, 'month');
+  }, [date, month]);
   var selected = useMemo(function () {
     if (disabled || isEmpty(value)) {
       return false;
     }
-    if (value !== null && value !== void 0 && value[0]) {
-      var _value$;
-      value === null || value === void 0 || (_value$ = value[0]) === null || _value$ === void 0 || _value$.setHours(0, 0, 0, 0);
-    }
-    if (value !== null && value !== void 0 && value[1]) {
-      var _value$2;
-      value === null || value === void 0 || (_value$2 = value[1]) === null || _value$2 === void 0 || _value$2.setHours(0, 0, 0, 0);
-    }
-    date.setHours(0, 0, 0, 0);
     if (range) {
       var startDate = value === null || value === void 0 ? void 0 : value[0];
       var endDate = value === null || value === void 0 ? void 0 : value[1];
-      return date.getTime() === (startDate === null || startDate === void 0 ? void 0 : startDate.getTime()) || date.getTime() === (endDate === null || endDate === void 0 ? void 0 : endDate.getTime());
+      return isSame(date, startDate, 'date') || isSame(date, endDate, 'date');
     } else {
-      var _value$3;
-      return date.getTime() === (value === null || value === void 0 || (_value$3 = value[0]) === null || _value$3 === void 0 ? void 0 : _value$3.getTime());
+      return isSame(date, value === null || value === void 0 ? void 0 : value[0], 'date');
     }
-  }, [mouth, date, value]);
+  }, [month, date, value]);
   var selectedRange = useMemo(function () {
     if (disabled || !range) {
       return false;
@@ -59,13 +47,10 @@ var CalendarCell = /*#__PURE__*/memo(function (_ref) {
     if (!startDate || !endDate) {
       return false;
     }
-    date.setHours(0, 0, 0, 0);
-    startDate.setHours(0, 0, 0, 0);
-    endDate.setHours(0, 0, 0, 0);
-    return date.getTime() > startDate.getTime() && date.getTime() < endDate.getTime();
-  }, [mouth, date, value]);
+    return dayjs(date).isAfter(startDate, 'date') && dayjs(date).isBefore(endDate, 'date');
+  }, [month, date, value]);
   return /*#__PURE__*/React.createElement("div", {
-    className: classNames("".concat(calendarCls, "-cell"), _defineProperty(_defineProperty(_defineProperty({}, "".concat(calendarCls, "-cell-disabled"), disabled), "".concat(calendarCls, "-cell-selected"), selected), "".concat(calendarCls, "-cell-selected-range"), selectedRange))
+    className: classNames("".concat(calendarCls, "-cell"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(calendarCls, "-cell-disabled"), disabled), "".concat(calendarCls, "-cell-selected"), selected), "".concat(calendarCls, "-cell-today"), isSame(date, dayjs(), 'day')), "".concat(calendarCls, "-cell-selected-range"), selectedRange))
     // style={{ width: size, height: size }}
     ,
     onClick: function onClick() {
@@ -73,14 +58,14 @@ var CalendarCell = /*#__PURE__*/memo(function (_ref) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(calendarCls, "-cell-date"))
-  }, date.getDate()), date.getDate() === 1 && /*#__PURE__*/React.createElement("div", {
+  }, dayjs(date).date()), dayjs(date).date() === 1 && /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(calendarCls, "-cell-mouth"))
-  }, "".concat(date.getMonth() + 1, "\u6708")));
+  }, "".concat(dayjs(date).month() + 1, "\u6708")));
 });
 export var CalendarGrid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (_ref2, ref) {
   var _ref3;
-  var _ref2$mouth = _ref2.mouth,
-    mouth = _ref2$mouth === void 0 ? new Date() : _ref2$mouth,
+  var _ref2$month = _ref2.month,
+    month = _ref2$month === void 0 ? dayjs() : _ref2$month,
     value = _ref2.value,
     defaultValue = _ref2.defaultValue,
     _ref2$range = _ref2.range,
@@ -92,14 +77,13 @@ export var CalendarGrid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (_
     innerValue = _useState2[0],
     setInnerValue = _useState2[1];
   var handleSelect = function handleSelect(date) {
-    date.setHours(0, 0, 0, 0);
     var _value = innerValue;
     if (range) {
       if (!_value[0]) {
         _value = [date];
       } else if (!_value[1]) {
         var startDate = _value[0];
-        if (date.getTime() < startDate.getTime()) {
+        if (dayjs(date).isBefore(startDate, 'date')) {
           _value = [date, startDate];
         } else {
           _value = [startDate, date];
@@ -115,35 +99,27 @@ export var CalendarGrid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (_
     onChange === null || onChange === void 0 || onChange(_value);
   };
   var cells = useMemo(function () {
-    var firstDate = new Date(mouth.getFullYear(), mouth.getMonth(), 1);
-    var lastDate = new Date(mouth.getFullYear(), mouth.getMonth() + 1, 0);
-    var beforeDays = Array.from({
-      length: firstDate.getDay()
-    }).map(function (_, index) {
-      var date = new Date(firstDate);
-      date.setDate(firstDate.getDate() - (firstDate.getDay() - index));
-      return date;
-    });
-    var afterDays = Array.from({
-      length: 6 - lastDate.getDay()
-    }).map(function (_, index) {
-      var date = new Date(lastDate);
-      date.setDate(lastDate.getDate() + index + 1);
-      return date;
+    var firstDate = dayjs(month).startOf('month');
+
+    // 固定生成42天的日期网格（6行7列）
+    var startDate = firstDate.subtract(firstDate.day(), 'day');
+    var cells = Array.from({
+      length: 42
+    }, function (_, index) {
+      return startDate.add(index, 'day');
     });
-    var mouthDays = Array.from({
-      length: lastDate.getDate()
-    }).map(function (_, index) {
-      var date = new Date(firstDate);
-      date.setDate(date.getDate() + index);
-      return date;
-    });
-    return [].concat(_toConsumableArray(beforeDays), _toConsumableArray(mouthDays), _toConsumableArray(afterDays));
-  }, [mouth]);
+    return cells;
+  }, [month]);
   useEffect(function () {
     if (value !== undefined) {
-      if (value !== innerValue) {
-        setInnerValue(value);
+      if (range) {
+        if (!isSame(value[0], innerValue[0], 'day') || !isSame(value[1], innerValue[1], 'day')) {
+          setInnerValue(value);
+        }
+      } else {
+        if (!isSame(value[0], innerValue[0], 'day')) {
+          setInnerValue(value);
+        }
       }
     }
   }, [value]);
@@ -153,7 +129,7 @@ export var CalendarGrid = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (_
   }, cells.map(function (item, index) {
     return /*#__PURE__*/React.createElement(CalendarCell, {
       key: index,
-      mouth: mouth,
+      month: month,
       date: item,
       value: innerValue,
       range: range,

package/dist/Calendar/calendar-header.d.ts

@@ -1,7 +1,8 @@
 import { FC } from "react";
+import dayjs from "dayjs";
 type CalendarHeaderProps = {
-    mouth: Date;
-    onChange: (mouth: Date) => void;
+    month: dayjs.Dayjs;
+    onChange: (mouth: dayjs.Dayjs) => void;
 };
 export declare const CalendarHeader: FC<CalendarHeaderProps>;
 export {};

package/dist/Calendar/calendar-header.js

@@ -3,33 +3,36 @@ import classNames from "classnames";
 import ConfigProvider from "../ConfigProvider";
 var calendarCls = 'triones-antm-calendar';
 export var CalendarHeader = function CalendarHeader(_ref) {
-  var mouth = _ref.mouth,
+  var month = _ref.month,
     onChange = _ref.onChange;
   var _ConfigProvider$useCo = ConfigProvider.useConfig(),
     locale = _ConfigProvider$useCo.locale;
+  if (!month) {
+    return null;
+  }
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(calendarCls, "-header"))
   }, /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(calendarCls, "-header-button")),
     onClick: function onClick() {
-      onChange(new Date(mouth.getFullYear() - 1, mouth.getMonth(), 1));
+      onChange(month.subtract(1, 'year'));
     }
   }, "<<"), /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(calendarCls, "-header-button")),
     onClick: function onClick() {
-      onChange(new Date(mouth.getFullYear(), mouth.getMonth() - 1, 1));
+      onChange(month.subtract(1, 'month'));
     }
   }, "<"), /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(calendarCls, "-header-title"))
-  }, "".concat(mouth.getFullYear(), "\u5E74").concat(mouth.getMonth() + 1, "\u6708")), /*#__PURE__*/React.createElement("div", {
+  }, "".concat(month.year(), "\u5E74").concat(month.month() + 1, "\u6708")), /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(calendarCls, "-header-button")),
     onClick: function onClick() {
-      onChange(new Date(mouth.getFullYear(), mouth.getMonth() + 1, 1));
+      onChange(month.add(1, 'month'));
     }
   }, ">"), /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(calendarCls, "-header-button")),
     onClick: function onClick() {
-      onChange(new Date(mouth.getFullYear() + 1, mouth.getMonth(), 1));
+      onChange(month.add(1, 'year'));
     }
   }, ">>")), /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(calendarCls, "-week"))

package/dist/Calendar/calendar-range.d.ts

@@ -1,9 +1,10 @@
 import { FC } from 'react';
 import './style.scss';
+import dayjs from "dayjs";
 type CalendarProps = {
-    mouth?: Date;
-    value?: Date[];
-    onChange?: (date: Date[]) => void;
+    month?: dayjs.Dayjs | Date;
+    value?: dayjs.Dayjs[] | Date[];
+    onChange?: (date: dayjs.Dayjs[]) => void;
     slideable?: boolean;
 };
 export declare const CalendarRange: FC<CalendarProps>;

package/dist/Calendar/calendar-range.js

@@ -5,49 +5,53 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import classNames from 'classnames';
-import _ from 'lodash-es';
 import React, { memo, useEffect, useRef, useState } from 'react';
 import { CalendarGrid } from "./calendar-grid";
 import { CalendarHeader } from "./calendar-header";
 import "./style.scss";
 import { TouchableCalendarGrid } from "./touchable-calendar-grid";
+import dayjs from "dayjs";
+import { isSame, toDayjsArray } from "../utils/dayjs";
 var calendarCls = 'triones-antm-calendar';
 export var CalendarRange = /*#__PURE__*/memo(function (_ref) {
-  var _ref2, _ref3;
-  var _ref$mouth = _ref.mouth,
-    mouth = _ref$mouth === void 0 ? new Date() : _ref$mouth,
-    value = _ref.value,
+  var _ref2, _toDayjsArray, _ref3, _toDayjsArray2;
+  var month = _ref.month,
+    _ref$value = _ref.value,
+    value = _ref$value === void 0 ? [] : _ref$value,
     _onChange = _ref.onChange,
     slideable = _ref.slideable;
-  var _useState = useState(mouth),
+  var _useState = useState(dayjs(month)),
     _useState2 = _slicedToArray(_useState, 2),
-    currentMouth = _useState2[0],
-    setCurrentMouth = _useState2[1];
-  var valueRef = useRef();
+    currentMonth = _useState2[0],
+    setCurrentMonth = _useState2[1];
+  var valueRef = useRef(value ? value.map(function (v) {
+    return dayjs(v);
+  }) : []);
   useEffect(function () {
     if (value !== undefined) {
-      if (!_.isEqual(value, valueRef.current)) {
-        valueRef.current = value;
+      var _valueRef$current, _valueRef$current2;
+      if (!isSame(value === null || value === void 0 ? void 0 : value[0], (_valueRef$current = valueRef.current) === null || _valueRef$current === void 0 ? void 0 : _valueRef$current[0], 'day') || !isSame(value === null || value === void 0 ? void 0 : value[1], (_valueRef$current2 = valueRef.current) === null || _valueRef$current2 === void 0 ? void 0 : _valueRef$current2[1], 'day')) {
+        valueRef.current = toDayjsArray(value) || [];
       }
     }
   }, [value]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(calendarCls))
   }, /*#__PURE__*/React.createElement(CalendarHeader, {
-    mouth: currentMouth,
-    onChange: setCurrentMouth
+    month: currentMonth,
+    onChange: setCurrentMonth
   }), slideable ? /*#__PURE__*/React.createElement(TouchableCalendarGrid, {
-    mouth: currentMouth,
-    value: (_ref2 = value !== null && value !== void 0 ? value : valueRef.current) !== null && _ref2 !== void 0 ? _ref2 : [],
-    onMouthChange: setCurrentMouth,
+    month: currentMonth,
+    value: (_ref2 = (_toDayjsArray = toDayjsArray(value)) !== null && _toDayjsArray !== void 0 ? _toDayjsArray : valueRef.current) !== null && _ref2 !== void 0 ? _ref2 : [],
+    onMonthChange: setCurrentMonth,
     onChange: function onChange(value) {
       valueRef.current = value;
       _onChange === null || _onChange === void 0 || _onChange(value);
     },
     range: true
   }) : /*#__PURE__*/React.createElement(CalendarGrid, {
-    mouth: currentMouth,
-    value: (_ref3 = value !== null && value !== void 0 ? value : valueRef.current) !== null && _ref3 !== void 0 ? _ref3 : [],
+    month: currentMonth,
+    value: (_ref3 = (_toDayjsArray2 = toDayjsArray(value)) !== null && _toDayjsArray2 !== void 0 ? _toDayjsArray2 : valueRef.current) !== null && _ref3 !== void 0 ? _ref3 : [],
     onChange: function onChange(value) {
       valueRef.current = value;
       _onChange === null || _onChange === void 0 || _onChange(value);

package/dist/Calendar/calendar.d.ts

@@ -1,10 +1,11 @@
 import React from 'react';
 import './style.scss';
+import dayjs from "dayjs";
 export type CalendarProps = {
-    mouth?: Date;
-    value?: Date;
-    onChange?: (date: Date) => void;
-    onMouthChange?: (mouth: Date) => void;
+    month?: dayjs.Dayjs | Date;
+    value?: dayjs.Dayjs | Date;
+    onChange?: (date: dayjs.Dayjs) => void;
+    onMonthChange?: (month: dayjs.Dayjs) => void;
     slideable?: boolean;
 };
 export declare const Calendar: React.MemoExoticComponent<React.ForwardRefExoticComponent<CalendarProps & React.RefAttributes<HTMLDivElement>>>;

package/dist/Calendar/calendar.js

@@ -6,42 +6,55 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { CalendarGrid } from "./..";
 import classNames from 'classnames';
-import React, { forwardRef, memo, useState } from 'react';
+import React, { forwardRef, memo, useEffect, useState } from 'react';
 import { CalendarHeader } from "./calendar-header";
 import "./style.scss";
 import { TouchableCalendarGrid } from "./touchable-calendar-grid";
-import { cloneDeep } from "lodash-es";
+import dayjs from "dayjs";
+import { isSame } from "../utils/dayjs";
 var calendarCls = 'triones-antm-calendar';
 export var Calendar = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (_ref, ref) {
-  var mouth = _ref.mouth,
+  var month = _ref.month,
     value = _ref.value,
     _onChange = _ref.onChange,
-    _onMouthChange = _ref.onMouthChange,
+    onMonthChange = _ref.onMonthChange,
     _ref$slideable = _ref.slideable,
     slideable = _ref$slideable === void 0 ? false : _ref$slideable;
-  var _useState = useState(mouth || new Date()),
+  var _useState = useState(dayjs(month)),
     _useState2 = _slicedToArray(_useState, 2),
-    currentMouth = _useState2[0],
-    setCurrentMouth = _useState2[1];
+    currentMonth = _useState2[0],
+    setCurrentMonth = _useState2[1];
+  var handleMonthChange = function handleMonthChange(newMonth) {
+    if (isSame(currentMonth, newMonth, 'month')) {
+      return;
+    }
+    setCurrentMonth(newMonth);
+    onMonthChange === null || onMonthChange === void 0 || onMonthChange(newMonth);
+  };
+  useEffect(function () {
+    if (month == undefined) {
+      return;
+    }
+    if (!isSame(month, currentMonth, 'month')) {
+      setCurrentMonth(dayjs(month));
+    }
+  }, [month]);
   return /*#__PURE__*/React.createElement("div", {
     ref: ref,
     className: classNames("".concat(calendarCls))
   }, /*#__PURE__*/React.createElement(CalendarHeader, {
-    mouth: currentMouth,
-    onChange: setCurrentMouth
+    month: currentMonth,
+    onChange: handleMonthChange
   }), slideable ? /*#__PURE__*/React.createElement(TouchableCalendarGrid, {
-    mouth: currentMouth,
-    value: value ? [cloneDeep(value)] : [],
-    onMouthChange: function onMouthChange(newMouth) {
-      setCurrentMouth(newMouth);
-      _onMouthChange === null || _onMouthChange === void 0 || _onMouthChange(newMouth);
-    },
+    month: currentMonth,
+    value: value ? [dayjs(value)] : [],
+    onMonthChange: handleMonthChange,
     onChange: function onChange(value) {
       _onChange === null || _onChange === void 0 || _onChange(value === null || value === void 0 ? void 0 : value[0]);
     }
   }) : /*#__PURE__*/React.createElement(CalendarGrid, {
-    mouth: currentMouth,
-    value: value ? [cloneDeep(value)] : [],
+    month: currentMonth,
+    value: value ? [dayjs(value)] : [],
     onChange: function onChange(value) {
       _onChange === null || _onChange === void 0 || _onChange(value === null || value === void 0 ? void 0 : value[0]);
     }

package/dist/Calendar/style.scss

@@ -34,10 +34,13 @@ $calendarCls: 'triones-antm-calendar';
   }
 
   &.#{$calendarCls}-cell {
+    box-sizing: border-box;
     &-disabled {
       color: #999999;
     }
-
+    &-today{
+      border: 1Px solid variable.$trionesColorPrimary;
+    }
     &-selected {
       background-color: variable.$trionesColorPrimary;
       color: white;

package/dist/Calendar/touchable-calendar-grid.d.ts

@@ -1,10 +1,11 @@
 import { FC } from 'react';
+import dayjs from "dayjs";
 type CalendarPickerViewProps = {
-    mouth?: Date;
-    value?: Date[];
-    defaultValue?: Date[];
-    onChange?: (value: Date[]) => void;
-    onMouthChange?: (mouth: Date) => void;
+    month?: dayjs.Dayjs;
+    value?: dayjs.Dayjs[];
+    defaultValue?: dayjs.Dayjs[];
+    onChange?: (value: dayjs.Dayjs[]) => void;
+    onMonthChange?: (mouth: dayjs.Dayjs) => void;
     range?: boolean;
 };
 /**

package/dist/Calendar/touchable-calendar-grid.js

@@ -15,30 +15,32 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { memo, useEffect, useRef, useState } from 'react';
 import Taro from '@tarojs/taro';
 import { CalendarGrid } from "../Calendar";
-import { useTaro } from "../hooks/useTaro";
+import { useTaro } from "../hooks";
 import { RandomUtils } from "../utils/random-utils";
 import classNames from "classnames";
+import dayjs from "dayjs";
+var monthLines = 6;
+
 /**
  * 可以手势滑动的日历组件
  */
 export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
   var _wrapperRef$current3;
-  var _ref$mouth = _ref.mouth,
-    mouth = _ref$mouth === void 0 ? new Date() : _ref$mouth,
+  var month = _ref.month,
     value = _ref.value,
     defaultValue = _ref.defaultValue,
     onChange = _ref.onChange,
-    onMouthChange = _ref.onMouthChange,
+    onMonthChange = _ref.onMonthChange,
     range = _ref.range;
   var _useTaro = useTaro(),
     isTaroEnv = _useTaro.isTaroEnv,
     isTaroWeApp = _useTaro.isTaroWeApp;
   var wrapperRef = useRef();
   var wrapperUniqueRef = React.useRef(RandomUtils.random());
-  var _useState = useState(mouth),
+  var _useState = useState(month || dayjs()),
     _useState2 = _slicedToArray(_useState, 2),
-    currentMouth = _useState2[0],
-    setCurrentMouth = _useState2[1];
+    currentMonth = _useState2[0],
+    setCurrentMonth = _useState2[1];
   var waiting = false;
   var _useState3 = useState(200),
     _useState4 = _slicedToArray(_useState3, 2),
@@ -139,16 +141,16 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
    * @param mouth
    */
   var mouthLines = function mouthLines(mouth) {
-    var firstDate = new Date(mouth.getFullYear(), mouth.getMonth(), 1);
-    var lastDate = new Date(mouth.getFullYear(), mouth.getMonth() + 1, 0);
-    var beforeDays = firstDate.getDay();
-    var afterDays = 6 - lastDate.getDay();
-    var countDays = beforeDays + lastDate.getDate() + afterDays;
+    var firstDate = dayjs(new Date(mouth.year(), mouth.month(), 1));
+    var lastDate = dayjs(new Date(mouth.year(), mouth.month() + 1, 0));
+    var beforeDays = firstDate.day();
+    var afterDays = 6 - lastDate.day();
+    var countDays = beforeDays + lastDate.date() + afterDays;
     return Math.ceil(countDays / 7);
   };
   var handleInsertMouth = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var firstMouth, insertMouth, newMouths, insertMouthLines, insertMouthHeight;
+      var firstMouth, insertMouth, newMouths, insertMouthHeight;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -158,19 +160,19 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
             // debugger
             // waiting = true
             firstMouth = mouths[0];
-            insertMouth = new Date(firstMouth.getFullYear(), firstMouth.getMonth() - 1, 1);
+            insertMouth = dayjs(new Date(firstMouth.year(), firstMouth.month() - 1, 1));
             newMouths = [insertMouth].concat(_toConsumableArray(mouths));
             setMouths(newMouths);
-            insertMouthLines = mouthLines(insertMouth);
-            _context3.t0 = insertMouthLines;
-            _context3.next = 8;
+            // const insertMouthLines = mouthLines(insertMouth);
+            _context3.t0 = monthLines;
+            _context3.next = 7;
             return cellSize();
-          case 8:
+          case 7:
             _context3.t1 = _context3.sent;
             insertMouthHeight = _context3.t0 * _context3.t1;
             setTranslateY(translateY - insertMouthHeight);
             // waiting  = false
-          case 11:
+          case 10:
           case "end":
             return _context3.stop();
         }
@@ -186,13 +188,13 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
     // }
     // waiting = true
     var lastMouth = mouths[mouths.length - 1];
-    var appendMouth = new Date(lastMouth.getFullYear(), lastMouth.getMonth() + 1, 1);
+    var appendMouth = lastMouth.add(1, 'month');
     var newMouths = [].concat(_toConsumableArray(mouths), [appendMouth]);
     setMouths(newMouths);
     // waiting = false
   };
   useEffect(function () {
-    var initMouths = [new Date(currentMouth.getFullYear(), currentMouth.getMonth() - 1, 1), new Date(currentMouth.getFullYear(), currentMouth.getMonth(), 1), new Date(currentMouth.getFullYear(), currentMouth.getMonth() + 1, 1)];
+    var initMouths = [currentMonth.clone().subtract(1, 'month'), currentMonth.clone(), currentMonth.clone().add(1, 'month')];
     Promise.all([]).then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var firstMouthHeight;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -200,14 +202,14 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
           case 0:
             setMouths(initMouths);
             _context4.t0 = setMouthHeight;
-            _context4.t1 = mouthLines(currentMouth);
+            _context4.t1 = monthLines;
             _context4.next = 5;
             return cellSize();
           case 5:
             _context4.t2 = _context4.sent;
             _context4.t3 = _context4.t1 * _context4.t2;
             (0, _context4.t0)(_context4.t3);
-            _context4.t4 = mouthLines(initMouths[0]);
+            _context4.t4 = monthLines;
             _context4.next = 11;
             return cellSize();
           case 11:
@@ -220,15 +222,15 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
         }
       }, _callee4);
     })));
-  }, [currentMouth]);
+  }, [currentMonth]);
   useEffect(function () {
-    if (mouth !== undefined) {
-      var newMouth = new Date(mouth.getFullYear(), mouth.getMonth(), 1);
-      if (currentMouth === null || !(currentMouth.getFullYear() === newMouth.getFullYear() && currentMouth.getMonth() === newMouth.getMonth())) {
-        setCurrentMouth(newMouth);
+    if (month !== undefined) {
+      var newMouth = dayjs(new Date(month.year(), month.month(), 1));
+      if (currentMonth === null || !(currentMonth !== null && currentMonth !== void 0 && currentMonth.isSame(newMouth, 'month'))) {
+        setCurrentMonth(newMouth);
       }
     }
-  }, [mouth]);
+  }, [month]);
   useEffect(function () {
     if (value !== undefined) {}
   }, [value]);
@@ -265,7 +267,7 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
               event.preventDefault();
               event.stopPropagation();
               if (!touching) {
-                _context5.next = 33;
+                _context5.next = 30;
                 break;
               }
               movePoint = {
@@ -291,38 +293,36 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
               }
               return _context5.abrupt("return");
             case 14:
-              console.log('move', movePoint.clientY - touchPoint.clientY);
+              // console.log('move', movePoint.clientY - touchPoint.clientY);
               newTranslateY = translateY + (movePoint.clientY - touchPoint.clientY);
               setTranslateY(newTranslateY);
               setTouchPoint(movePoint);
               // console.log(newTranslateY,minTranslateY())
               if (!(newTranslateY > -10)) {
-                _context5.next = 24;
+                _context5.next = 22;
                 break;
               }
-              //当向下滑动，顶部距离视窗顶部距离小于10，则插入上一个月份
-              console.log('insert');
-              _context5.next = 22;
+              _context5.next = 20;
               return handleInsertMouth();
-            case 22:
-              _context5.next = 33;
+            case 20:
+              _context5.next = 30;
               break;
-            case 24:
+            case 22:
               _context5.t4 = newTranslateY;
-              _context5.next = 27;
+              _context5.next = 25;
               return minTranslateY();
-            case 27:
+            case 25:
               _context5.t5 = _context5.sent;
               _context5.t6 = 0 - _context5.t5;
               _context5.t7 = _context5.t6 + 10;
               if (!(_context5.t4 < _context5.t7)) {
-                _context5.next = 33;
+                _context5.next = 30;
                 break;
               }
               //当向下滑动，底部距离视窗底部距离小于10，则追加下一个月份
-              console.log('append');
+              // console.log('append');
               handleAppendMouth();
-            case 33:
+            case 30:
             case "end":
               return _context5.stop();
           }
@@ -351,66 +351,67 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
               i = 0;
             case 6:
               if (!(i < mouths.length)) {
-                _context6.next = 40;
+                _context6.next = 28;
                 break;
               }
-              console.log('mouthHeight', mouthHeight);
-              console.log('mouths[i]', mouths[i], i);
-              _context6.t0 = mouthLines(mouths[i]);
-              _context6.next = 12;
+              _context6.t0 = monthLines;
+              _context6.next = 10;
               return cellSize();
-            case 12:
+            case 10:
               _context6.t1 = _context6.sent;
               _mouthHeight = _context6.t0 * _context6.t1;
               _mouthHeightSum += _mouthHeight;
-              console.log('_mouthHeightSum', _mouthHeightSum);
-              console.log('translateY', translateY);
+              // console.log('_mouthHeightSum', _mouthHeightSum);
+              // console.log('translateY', translateY);
               _topLineY = 0 - (_mouthHeightSum - _mouthHeight); //该月份区域顶部，对于顶点的偏移量
-              console.log('_topLineY', _topLineY);
+              // console.log('_topLineY', _topLineY);
               if (!(_topLineY <= translateY && _topLineY >= translateY - mouthHeight)) {
-                _context6.next = 27;
+                _context6.next = 19;
                 break;
               }
               //该月份区域的顶部在视窗内
-              console.log('top_in');
+              // console.log('top_in');
               _windowDisplayHeight = _mouthHeightSum - (0 - translateY); //该月份区域底部距离视窗顶部的距离
-              console.log('_windowDisplayHeight——top', _windowDisplayHeight);
+              // console.log('_windowDisplayHeight——top', _windowDisplayHeight);
               if (!(_windowDisplayHeight >= mouthHeight / 2)) {
-                _context6.next = 27;
+                _context6.next = 19;
                 break;
               }
-              console.log('displayMouth', mouths[i]);
+              // console.log('displayMouth', mouths[i]);
               displayMouth = mouths[i];
-              return _context6.abrupt("break", 40);
-            case 27:
+              return _context6.abrupt("break", 28);
+            case 19:
               _bottomLineY = 0 - _mouthHeightSum; //该月份区域底部，对于顶点的偏移量
-              console.log('_bottomLineY', _bottomLineY);
+              // console.log('_bottomLineY', _bottomLineY);
               if (!(_bottomLineY <= translateY && _bottomLineY >= translateY - mouthHeight)) {
-                _context6.next = 37;
+                _context6.next = 25;
                 break;
               }
               //该月份区域的底部在视窗内
-              console.log('bottom_in');
+              // console.log('bottom_in');
               _windowDisplayHeight2 = _mouthHeightSum - (0 - translateY); //该月份区域底部距离视窗顶部的距离
-              console.log('_windowDisplayHeight-bottom', _windowDisplayHeight2);
+              // console.log(
+              //   '_windowDisplayHeight-bottom',
+              //   _windowDisplayHeight,
+              // );
               if (!(_windowDisplayHeight2 >= mouthHeight / 2)) {
-                _context6.next = 37;
+                _context6.next = 25;
                 break;
               }
-              console.log('displayMouth', mouths[i]);
+              // console.log('displayMouth', mouths[i]);
               displayMouth = mouths[i];
-              return _context6.abrupt("break", 40);
-            case 37:
+              return _context6.abrupt("break", 28);
+            case 25:
               i++;
               _context6.next = 6;
               break;
-            case 40:
+            case 28:
               //endregion
               if (displayMouth) {
-                setCurrentMouth(displayMouth);
-                onMouthChange === null || onMouthChange === void 0 || onMouthChange(displayMouth);
+                setCurrentMonth(displayMouth);
+                onMonthChange === null || onMonthChange === void 0 || onMonthChange(displayMouth);
               }
-            case 41:
+            case 29:
             case "end":
               return _context6.stop();
           }
@@ -423,7 +424,7 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
   }, mouths.map(function (mouth, index) {
     return /*#__PURE__*/React.createElement(CalendarGrid, {
       key: index,
-      mouth: mouth,
+      month: mouth,
       value: value,
       defaultValue: defaultValue,
       onChange: onChange,

package/dist/CalendarDatetimePicker/CalendarDatetimePicker.d.ts

@@ -1,10 +1,11 @@
 import { FC } from 'react';
 import './style.scss';
+import dayjs from "dayjs";
 export type CalendarDatetimePickerProps = {
     placeholder?: string;
-    value?: Date;
+    value?: dayjs.Dayjs | Date;
     format?: string;
-    onChange?: (value?: Date) => void;
+    onChange?: (value?: dayjs.Dayjs) => void;
     align?: 'left' | 'right' | 'center';
 };
 export declare const CalendarDatetimePicker: FC<CalendarDatetimePickerProps>;

package/dist/CalendarDatetimePicker/CalendarDatetimePicker.js

@@ -14,6 +14,7 @@ import "./style.scss";
 import { cls } from "./types";
 import CalendarDatetimePopup from "../CalendarDatetimePopup";
 import dayjs from "dayjs";
+import { isSame } from "../utils/dayjs";
 export var CalendarDatetimePicker = function CalendarDatetimePicker(_ref) {
   var _ref$placeholder = _ref.placeholder,
     placeholder = _ref$placeholder === void 0 ? '请选择' : _ref$placeholder,
@@ -27,13 +28,13 @@ export var CalendarDatetimePicker = function CalendarDatetimePicker(_ref) {
     _React$useState2 = _slicedToArray(_React$useState, 2),
     innerOpen = _React$useState2[0],
     setInnerOpen = _React$useState2[1];
-  var _useState = useState(value),
+  var _useState = useState(value ? dayjs(value) : undefined),
     _useState2 = _slicedToArray(_useState, 2),
     internalValue = _useState2[0],
     setInternalValue = _useState2[1];
   var handleValueRender = function handleValueRender() {
     if (internalValue) {
-      return dayjs(internalValue).format(format);
+      return internalValue.format(format);
     }
     return null;
   };
@@ -41,13 +42,13 @@ export var CalendarDatetimePicker = function CalendarDatetimePicker(_ref) {
     if (value === undefined) {
       return;
     }
-    if (value !== internalValue) {
-      setInternalValue(value);
+    if (!isSame(value, internalValue)) {
+      setInternalValue(dayjs(value));
     }
   }, [value]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CalendarDatetimePopup, {
     open: innerOpen,
-    value: internalValue,
+    value: internalValue || dayjs(),
     onClose: function onClose() {
       setInnerOpen(false);
     },

package/dist/CalendarDatetimePopup/CalendarDatetimePopup.d.ts

@@ -1,10 +1,11 @@
 import { FC } from 'react';
 import './style.scss';
+import dayjs from "dayjs";
 export type CalendarDatetimePopupProps = {
     open?: boolean;
     afterOpenChange?: (open: boolean) => void;
-    value?: Date;
-    onOk?: (value?: Date) => void;
+    value?: dayjs.Dayjs | Date;
+    onOk?: (value?: dayjs.Dayjs) => void;
     onClose?: () => void;
 };
 export declare const CalendarDatetimePopup: FC<CalendarDatetimePopupProps>;

package/dist/CalendarDatetimePopup/CalendarDatetimePopup.js

@@ -20,23 +20,22 @@ import { DateTimeSwitch } from "./DateTimeSwitch";
 import "./style.scss";
 import { cls, Mode } from "./types";
 import { DatetimeUtils } from "../utils/datetime-utils";
+import dayjs from "dayjs";
 export var CalendarDatetimePopup = function CalendarDatetimePopup(_ref) {
-  var _bodyRef$current;
   var open = _ref.open,
-    afterOpenChange = _ref.afterOpenChange,
+    _afterOpenChange = _ref.afterOpenChange,
     value = _ref.value,
     onOk = _ref.onOk,
     _onClose = _ref.onClose;
   var _ConfigProvider$useCo = ConfigProvider.useConfig(),
     locale = _ConfigProvider$useCo.locale;
   var _useTaro = useTaro(),
-    isTaroEnv = _useTaro.isTaroEnv,
     isTaroWeApp = _useTaro.isTaroWeApp;
   var _useState = useState(Mode.date),
     _useState2 = _slicedToArray(_useState, 2),
     mode = _useState2[0],
     setMode = _useState2[1];
-  var valueRef = useRef(value || new Date());
+  var valueRef = useRef(dayjs(value));
   var bodyRef = useRef(null);
   var datetimeSwitchRef = useRef();
   var _useState3 = useState(300),
@@ -55,7 +54,7 @@ export var CalendarDatetimePopup = function CalendarDatetimePopup(_ref) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!(isTaroEnv && isTaroWeApp)) {
+            if (!isTaroWeApp) {
               _context.next = 2;
               break;
             }
@@ -89,11 +88,11 @@ export var CalendarDatetimePopup = function CalendarDatetimePopup(_ref) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, mode === Mode.date && /*#__PURE__*/React.createElement("div", {
       style: {}
     }, /*#__PURE__*/React.createElement(Calendar, {
-      mouth: value,
+      month: value,
       value: value,
       onChange: function onChange(date) {
         var _datetimeSwitchRef$cu;
-        valueRef.current = new Date(date.getFullYear(), date.getMonth(), date.getDate(), valueRef.current.getHours(), valueRef.current.getMinutes());
+        valueRef.current = dayjs(new Date(date.year(), date.month(), date.date(), valueRef.current.hour(), valueRef.current.minute()));
         (_datetimeSwitchRef$cu = datetimeSwitchRef.current) === null || _datetimeSwitchRef$cu === void 0 || _datetimeSwitchRef$cu.setDatetime(valueRef.current);
       }
     })), mode === Mode.time && /*#__PURE__*/React.createElement("div", {
@@ -106,11 +105,11 @@ export var CalendarDatetimePopup = function CalendarDatetimePopup(_ref) {
       style: {
         height: bodyHeight
       },
-      value: [valueRef === null || valueRef === void 0 ? void 0 : valueRef.current.getHours(), valueRef === null || valueRef === void 0 ? void 0 : valueRef.current.getMinutes()],
+      value: [valueRef === null || valueRef === void 0 ? void 0 : valueRef.current.hour(), valueRef === null || valueRef === void 0 ? void 0 : valueRef.current.minute()],
       onChange: function onChange(e) {
         var _datetimeSwitchRef$cu2;
         var v = e.detail.value;
-        valueRef.current = new Date(valueRef.current.getFullYear(), valueRef.current.getMonth(), valueRef.current.getDate(), v[0], v[1]);
+        valueRef.current = dayjs(new Date(valueRef.current.year(), valueRef.current.month(), valueRef.current.date(), v[0], v[1]));
         (_datetimeSwitchRef$cu2 = datetimeSwitchRef.current) === null || _datetimeSwitchRef$cu2 === void 0 || _datetimeSwitchRef$cu2.setDatetime(valueRef.current);
       }
     }, /*#__PURE__*/React.createElement(PickerViewColumn, null, Array(24).fill(0).map(function (_, i) {
@@ -128,6 +127,12 @@ export var CalendarDatetimePopup = function CalendarDatetimePopup(_ref) {
   return /*#__PURE__*/React.createElement(Popup, {
     open: open,
     round: true,
+    afterOpenChange: function afterOpenChange(o) {
+      if (!o) {
+        setMode(Mode.date);
+      }
+      _afterOpenChange === null || _afterOpenChange === void 0 || _afterOpenChange(o);
+    },
     onClose: function onClose() {
       _onClose === null || _onClose === void 0 || _onClose();
     }
@@ -151,13 +156,9 @@ export var CalendarDatetimePopup = function CalendarDatetimePopup(_ref) {
   }), /*#__PURE__*/React.createElement("a", {
     className: classNames("".concat(cls, "-header-button"), "".concat(cls, "-header-button-ok")),
     onClick: handleOk
-  }, locale.common.confirm)), isTaroEnv ? /*#__PURE__*/React.createElement(CustomWrapper, {
+  }, locale.common.confirm)), /*#__PURE__*/React.createElement(CustomWrapper, {
     ref: bodyRef
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(cls, "-body")
-  }, bodyRender())) : /*#__PURE__*/React.createElement("div", {
-    className: "".concat(cls, "-body"),
-    ref: bodyRef,
-    id: (_bodyRef$current = bodyRef.current) === null || _bodyRef$current === void 0 ? void 0 : _bodyRef$current.uid
-  }, bodyRender())));
+  }, bodyRender()))));
 };

package/dist/CalendarDatetimePopup/DateTimeSwitch.d.ts

@@ -1,14 +1,15 @@
 import React from 'react';
 import './style.scss';
 import { Mode } from './types';
+import dayjs from "dayjs";
 export interface DateTimeSwitchHandle {
-    setDatetime: (datetime: Date) => void;
+    setDatetime: (datetime: dayjs.Dayjs) => void;
 }
 type DateTimeSwitchProps = {
     onDateTabTap?: () => void;
     onTimeTabTap?: () => void;
     mode?: Mode;
-    value?: Date;
+    value?: dayjs.Dayjs;
 };
 export declare const DateTimeSwitch: React.ForwardRefExoticComponent<DateTimeSwitchProps & React.RefAttributes<DateTimeSwitchHandle>>;
 export {};

package/dist/CalendarDatetimePopup/DateTimeSwitch.js

@@ -32,8 +32,8 @@ export var DateTimeSwitch = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(cls, "-header-display-date"), _defineProperty({}, "".concat(cls, "-header-display-active"), mode === Mode.date)),
     onClick: onDateTabTap
-  }, datetime ? "".concat(datetime.getFullYear(), "-").concat(DatetimeUtils.twoDigits(datetime.getMonth() + 1), "-").concat(DatetimeUtils.twoDigits(datetime.getDate())) : ''), /*#__PURE__*/React.createElement("div", {
+  }, datetime ? "".concat(datetime.year(), "-").concat(DatetimeUtils.twoDigits(datetime.month() + 1), "-").concat(DatetimeUtils.twoDigits(datetime.date())) : ''), /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(cls, "-header-display-time"), _defineProperty({}, "".concat(cls, "-header-display-active"), mode === Mode.time)),
     onClick: onTimeTabTap
-  }, datetime ? "".concat(DatetimeUtils.twoDigits(datetime.getHours()), ":").concat(DatetimeUtils.twoDigits(datetime.getMinutes())) : ''));
+  }, datetime ? "".concat(DatetimeUtils.twoDigits(datetime.hour()), ":").concat(DatetimeUtils.twoDigits(datetime.minute())) : ''));
 });

package/dist/CalendarPopup/CalendarPopup.js

@@ -11,13 +11,14 @@ import ConfigProvider from "../ConfigProvider";
 import Popup from "../Popup";
 import "./style.scss";
 import { cls } from "./types";
+import dayjs from "dayjs";
 export var CalendarPopup = /*#__PURE__*/memo(function (_ref) {
-  var mouth = _ref.mouth,
+  var month = _ref.month,
     open = _ref.open,
     title = _ref.title,
     afterOpenChange = _ref.afterOpenChange,
     _ref$value = _ref.value,
-    value = _ref$value === void 0 ? new Date() : _ref$value,
+    value = _ref$value === void 0 ? dayjs() : _ref$value,
     onOk = _ref.onOk,
     onCancel = _ref.onCancel,
     _onClose = _ref.onClose;
@@ -81,7 +82,7 @@ export var CalendarPopup = /*#__PURE__*/memo(function (_ref) {
   }, locale.common.confirm)), /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(cls, "-body"))
   }, /*#__PURE__*/React.createElement(Calendar, {
-    mouth: mouth,
+    month: month,
     value: value,
     onChange: function onChange(date) {
       valueRef.current = date;

package/dist/CalendarPopup/CalendarRangePopup.js

@@ -12,7 +12,7 @@ import "./style.scss";
 import { cls } from "./types";
 import ConfigProvider from "../ConfigProvider";
 export var CalendarRangePopup = /*#__PURE__*/memo(function (_ref) {
-  var mouth = _ref.mouth,
+  var month = _ref.month,
     open = _ref.open,
     title = _ref.title,
     afterOpenChange = _ref.afterOpenChange,
@@ -80,7 +80,7 @@ export var CalendarRangePopup = /*#__PURE__*/memo(function (_ref) {
   }, locale.common.confirm)), /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(cls, "-body"))
   }, /*#__PURE__*/React.createElement(Calendar.Range, {
-    mouth: mouth,
+    month: month,
     value: value,
     onChange: function onChange(date) {
       valueRef.current = date;

package/dist/CalendarPopup/types.d.ts

@@ -1,22 +1,23 @@
 import React from "react";
+import dayjs from "dayjs";
 export declare const cls = "triones-antm-calendar-popup";
 export type CalendarPopupProps = {
-    mouth?: Date;
+    month?: dayjs.Dayjs;
     open?: boolean;
     title?: React.ReactNode;
     afterOpenChange?: (open: boolean) => void;
-    value?: Date;
-    onOk?: (value?: Date) => void;
+    value?: dayjs.Dayjs;
+    onOk?: (value?: dayjs.Dayjs) => void;
     onCancel?: () => void;
     onClose?: () => void;
 };
 export type CalendarPopupRangeProps = {
-    mouth?: Date;
+    month?: dayjs.Dayjs;
     open?: boolean;
     title?: React.ReactNode;
     afterOpenChange?: (open: boolean) => void;
-    value?: Date[];
-    onOk?: (value?: Date[]) => void;
+    value?: dayjs.Dayjs[];
+    onOk?: (value?: dayjs.Dayjs[]) => void;
     onCancel?: () => void;
     onClose?: () => void;
 };

package/dist/Picker/Picker.js

@@ -5,7 +5,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import classNames from 'classnames';
-import React, { useState } from 'react';
+import { size } from 'lodash-es';
+import React, { useEffect, useState } from 'react';
 import ConfigProvider from "../ConfigProvider";
 import PickerView from "../PickerView";
 import Popup from "../Popup";
@@ -15,7 +16,8 @@ export var Picker = /*#__PURE__*/React.memo(function (_ref) {
   var open = _ref.open,
     afterOpenChange = _ref.afterOpenChange,
     title = _ref.title,
-    columns = _ref.columns,
+    _ref$columns = _ref.columns,
+    columns = _ref$columns === void 0 ? [] : _ref$columns,
     _ref$labelInValue = _ref.labelInValue,
     labelInValue = _ref$labelInValue === void 0 ? false : _ref$labelInValue,
     value = _ref.value,
@@ -24,7 +26,7 @@ export var Picker = /*#__PURE__*/React.memo(function (_ref) {
     onClose = _ref.onClose;
   var _ConfigProvider$useCo = ConfigProvider.useConfig(),
     locale = _ConfigProvider$useCo.locale;
-  var _useState = useState([]),
+  var _useState = useState(value || []),
     _useState2 = _slicedToArray(_useState, 2),
     internalValue = _useState2[0],
     setInternalValue = _useState2[1];
@@ -39,6 +41,30 @@ export var Picker = /*#__PURE__*/React.memo(function (_ref) {
     onCancel === null || onCancel === void 0 || onCancel();
     handleClose();
   };
+  useEffect(function () {
+    if (!value || size(value) === 0 || size(value) !== size(columns)) {
+      if (labelInValue) {
+        setInternalValue(columns.map(function (column, index) {
+          if (index < size(value)) {
+            return column.find(function (option) {
+              return option.value === value[index].value;
+            });
+          }
+          return column[0];
+        }));
+      } else {
+        setInternalValue(columns.map(function (column, index) {
+          if (index < size(value)) {
+            var _column$find;
+            return (_column$find = column.find(function (option) {
+              return option.value === value[index];
+            })) === null || _column$find === void 0 ? void 0 : _column$find.value;
+          }
+          return column[0].value;
+        }));
+      }
+    }
+  }, [columns]);
   return /*#__PURE__*/React.createElement(Popup, {
     open: open,
     onClose: function onClose() {
@@ -55,7 +81,7 @@ export var Picker = /*#__PURE__*/React.memo(function (_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(pickerCls, "-header"))
   }, /*#__PURE__*/React.createElement("a", {
-    className: classNames("".concat(pickerCls, "-header-button")),
+    className: classNames("".concat(pickerCls, "-header-button"), "".concat(pickerCls, "-header-button-cancel")),
     onClick: handelCancel
   }, locale.common.cancel), title && /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(pickerCls, "-header-title"))

package/dist/utils/dayjs.d.ts

@@ -0,0 +1,3 @@
+import dayjs, { OpUnitType } from "dayjs";
+export declare const toDayjsArray: (dateArr?: Date[] | dayjs.Dayjs[]) => dayjs.Dayjs[] | undefined;
+export declare const isSame: (x?: dayjs.Dayjs | Date, y?: dayjs.Dayjs | Date, unit?: OpUnitType) => boolean;

package/dist/utils/dayjs.js

@@ -0,0 +1,29 @@
+import dayjs from "dayjs";
+import { isEmpty, isNil } from "lodash-es";
+export var toDayjsArray = function toDayjsArray(dateArr) {
+  if (isNil(dateArr)) {
+    return dateArr;
+  }
+  if (isEmpty(dateArr)) {
+    return [];
+  }
+  return dateArr === null || dateArr === void 0 ? void 0 : dateArr.map(function (date) {
+    if (isNil(date)) {
+      return date;
+    } else {
+      return dayjs(date);
+    }
+  });
+};
+export var isSame = function isSame(x, y, unit) {
+  if (isNil(x) && isNil(y)) {
+    return true;
+  } else if (isNil(x) && !isNil(y)) {
+    return false;
+  } else if (!isNil(x) && isNil(y)) {
+    return false;
+  } else {
+    var _dayjs;
+    return Boolean((_dayjs = dayjs(x)) === null || _dayjs === void 0 ? void 0 : _dayjs.isSame(y, unit));
+  }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trionesdev/antd-taro-react",
-  "version": "0.0.2-beta.10",
+  "version": "0.0.2-beta.12",
   "description": "antd taro react",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -56,7 +56,7 @@
   },
   "dependencies": {
     "@tarojs/components": "^4.1.8",
-    "@trionesdev/antd-mobile-base-react": "^0.0.2-beta.10",
+    "@trionesdev/antd-mobile-base-react": "^0.0.2-beta.12",
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.19",
     "rc-field-form": "^2.7.0",
@@ -64,7 +64,7 @@
   },
   "optionalDependencies": {
     "@trionesdev/antd-mobile-base-react": "workspace:*",
-    "@trionesdev/antd-mobile-icons-react": "0.0.2-beta.9"
+    "@trionesdev/antd-mobile-icons-react": "0.0.2-beta.10"
   },
-  "gitHead": "c062f3bd8651ea933f9385279c05a1ab0245b2b8"
+  "gitHead": "ac56b7bd2ded2ad9bf30daeb7d9f52b8a43745a6"
 }