@trionesdev/antd-taro-react 0.0.2-beta.2 → 0.0.2-beta.21

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,41 +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];
-      console.log('value', value);
-      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;
@@ -60,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() {
@@ -74,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,
@@ -93,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];
@@ -116,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]);
@@ -154,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 dayjs from "dayjs";
+import { isSame } from "../utils/dayjs";
 var calendarCls = 'triones-antm-calendar';
 export var Calendar = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (_ref, ref) {
-  var _ref$mouth = _ref.mouth,
-    mouth = _ref$mouth === void 0 ? new Date() : _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),
+  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 ? [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 ? [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

@@ -1,4 +1,4 @@
-@use "../style/variable" as *;
+@use "../style/variable" as variable;
 
 $calendarCls: 'triones-antm-calendar';
 
@@ -14,7 +14,7 @@ $calendarCls: 'triones-antm-calendar';
   display: flex;
   justify-content: center;
   align-items: center;
-  border-radius: $trionesBorderRadius;
+  border-radius: variable.$trionesBorderRadius;
   cursor: default;
   flex-direction: column;
 
@@ -34,18 +34,21 @@ $calendarCls: 'triones-antm-calendar';
   }
 
   &.#{$calendarCls}-cell {
+    box-sizing: border-box;
     &-disabled {
       color: #999999;
     }
-
+    &-today{
+      border: 1Px solid variable.$trionesColorPrimary;
+    }
     &-selected {
-      background-color: $trionesColorPrimary;
+      background-color: variable.$trionesColorPrimary;
       color: white;
     }
 
     &-selected-range {
       border-radius: 0;
-      background-color: $trionesColorPrimaryBg;
+      background-color: variable.$trionesColorPrimaryBg;
       color: black;
     }
   }

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;
 };
 /**