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

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,40 +5,41 @@ 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 { isEqual } 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 { isSameArray, 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,
+  var _ref2, _toDayjsArray, _ref3;
+  var _ref$month = _ref.month,
+    month = _ref$month === void 0 ? dayjs() : _ref$month,
     value = _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();
   useEffect(function () {
     if (value !== undefined) {
-      if (!isEqual(value, valueRef.current)) {
-        valueRef.current = value;
+      if (!isSameArray(value, valueRef.current, 'day')) {
+        valueRef.current = toDayjsArray(value);
       }
     }
   }, [value]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(calendarCls))
   }, /*#__PURE__*/React.createElement(CalendarHeader, {
-    mouth: currentMouth,
+    month: currentMouth,
     onChange: setCurrentMouth
   }), slideable ? /*#__PURE__*/React.createElement(TouchableCalendarGrid, {
-    mouth: currentMouth,
-    value: (_ref2 = value !== null && value !== void 0 ? value : valueRef.current) !== null && _ref2 !== void 0 ? _ref2 : [],
+    month: currentMouth,
+    value: (_ref2 = (_toDayjsArray = toDayjsArray(value)) !== null && _toDayjsArray !== void 0 ? _toDayjsArray : valueRef.current) !== null && _ref2 !== void 0 ? _ref2 : [],
     onMouthChange: setCurrentMouth,
     onChange: function onChange(value) {
       valueRef.current = value;
@@ -46,7 +47,7 @@ export var CalendarRange = /*#__PURE__*/memo(function (_ref) {
     },
     range: true
   }) : /*#__PURE__*/React.createElement(CalendarGrid, {
-    mouth: currentMouth,
+    month: currentMouth,
     value: (_ref3 = value !== null && value !== void 0 ? value : valueRef.current) !== null && _ref3 !== void 0 ? _ref3 : [],
     onChange: function onChange(value) {
       valueRef.current = 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?: (mouth: dayjs.Dayjs) => void;
     slideable?: boolean;
 };
 export declare const Calendar: React.MemoExoticComponent<React.ForwardRefExoticComponent<CalendarProps & React.RefAttributes<HTMLDivElement>>>;

package/dist/Calendar/calendar.js

@@ -10,38 +10,47 @@ import { CalendarHeader } from "./calendar-header";
 import "./style.scss";
 import { TouchableCalendarGrid } from "./touchable-calendar-grid";
 import { CalendarGrid } from "./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 _ref$month = _ref.month,
+    month = _ref$month === void 0 ? dayjs() : _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);
+  };
   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] : [],
+    month: currentMonth,
+    value: value ? [dayjs(value)] : [],
     onMouthChange: function onMouthChange(newMouth) {
-      setCurrentMouth(newMouth);
-      _onMouthChange === null || _onMouthChange === void 0 || _onMouthChange(newMouth);
+      setCurrentMonth(newMouth);
+      onMonthChange === null || onMonthChange === void 0 || onMonthChange(newMouth);
     },
     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;
 
@@ -39,13 +39,13 @@ $calendarCls: 'triones-antm-calendar';
     }
 
     &-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;
+    onMouthChange?: (mouth: dayjs.Dayjs) => void;
     range?: boolean;
 };
 /**

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

@@ -16,13 +16,15 @@ import React, { memo, useEffect, useRef, useState } from 'react';
 import { CalendarGrid } from "../Calendar";
 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 _ref$month = _ref.month,
+    month = _ref$month === void 0 ? dayjs() : _ref$month,
     value = _ref.value,
     defaultValue = _ref.defaultValue,
     onChange = _ref.onChange,
@@ -30,10 +32,10 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
     range = _ref.range;
   var wrapperRef = useRef();
   var wrapperUniqueRef = React.useRef(RandomUtils.random());
-  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 waiting = false;
   var _useState3 = useState(200),
     _useState4 = _slicedToArray(_useState3, 2),
@@ -57,8 +59,8 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
     setTranslateY = _useState8[1];
   var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    mouths = _useState10[0],
-    setMouths = _useState10[1];
+    months = _useState10[0],
+    setMonths = _useState10[1];
 
   /**
    * 计算出每个格子的大小
@@ -105,34 +107,40 @@ 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;
-    return Math.ceil(countDays / 7);
-  };
+  // const mouthLines = (mouth: Date) => {
+  //   const firstDate = new Date(mouth.getFullYear(), mouth.getMonth(), 1);
+  //   const lastDate = new Date(mouth.getFullYear(), mouth.getMonth() + 1, 0);
+  //   const beforeDays = firstDate.getDay();
+  //   const afterDays = 6 - lastDate.getDay();
+  //   const countDays = beforeDays + lastDate.getDate() + 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:
-            firstMouth = mouths[0];
-            insertMouth = new Date(firstMouth.getFullYear(), firstMouth.getMonth() - 1, 1);
-            newMouths = [insertMouth].concat(_toConsumableArray(mouths));
-            setMouths(newMouths);
-            insertMouthLines = mouthLines(insertMouth);
-            _context3.t0 = insertMouthLines;
-            _context3.next = 8;
+            // if (waiting){
+            //   return
+            // }
+            // debugger
+            // waiting = true
+            firstMouth = months[0];
+            insertMouth = dayjs(new Date(firstMouth.year(), firstMouth.month() - 1, 1));
+            newMouths = [insertMouth].concat(_toConsumableArray(months));
+            setMonths(newMouths);
+            // 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();
         }
@@ -147,29 +155,29 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
     //   return
     // }
     // waiting = true
-    var lastMouth = mouths[mouths.length - 1];
-    var appendMouth = new Date(lastMouth.getFullYear(), lastMouth.getMonth() + 1, 1);
-    var newMouths = [].concat(_toConsumableArray(mouths), [appendMouth]);
-    setMouths(newMouths);
+    var lastMouth = months[months.length - 1];
+    var appendMouth = lastMouth.add(1, 'month');
+    var newMouths = [].concat(_toConsumableArray(months), [appendMouth]);
+    setMonths(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 initMonths = [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) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            setMouths(initMouths);
+            setMonths(initMonths);
             _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:
@@ -182,15 +190,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]);
@@ -307,18 +315,18 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
               }
               return _context6.abrupt("return");
             case 3:
-              console.log(mouths);
+              console.log(months);
               //region 判断当前月份是否在视窗内
               _mouthHeightSum = 0;
               i = 0;
             case 6:
-              if (!(i < mouths.length)) {
+              if (!(i < months.length)) {
                 _context6.next = 40;
                 break;
               }
               console.log('mouthHeight', mouthHeight);
-              console.log('mouths[i]', mouths[i], i);
-              _context6.t0 = mouthLines(mouths[i]);
+              console.log('mouths[i]', months[i], i);
+              _context6.t0 = monthLines;
               _context6.next = 12;
               return cellSize();
             case 12:
@@ -341,8 +349,8 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
                 _context6.next = 27;
                 break;
               }
-              console.log('displayMouth', mouths[i]);
-              displayMouth = mouths[i];
+              console.log('displayMouth', months[i]);
+              displayMouth = months[i];
               return _context6.abrupt("break", 40);
             case 27:
               _bottomLineY = 0 - _mouthHeightSum; //该月份区域底部，对于顶点的偏移量
@@ -359,8 +367,8 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
                 _context6.next = 37;
                 break;
               }
-              console.log('displayMouth', mouths[i]);
-              displayMouth = mouths[i];
+              console.log('displayMouth', months[i]);
+              displayMouth = months[i];
               return _context6.abrupt("break", 40);
             case 37:
               i++;
@@ -369,7 +377,7 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
             case 40:
               //endregion
               if (displayMouth) {
-                setCurrentMouth(displayMouth);
+                setCurrentMonth(displayMouth);
                 onMouthChange === null || onMouthChange === void 0 || onMouthChange(displayMouth);
               }
             case 41:
@@ -382,10 +390,10 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
         return _ref7.apply(this, arguments);
       };
     }())
-  }, mouths.map(function (mouth, index) {
+  }, months.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 = {
     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 CalendarDatetimePicker: FC<CalendarDatetimePickerProps>;

package/dist/CalendarDatetimePicker/CalendarDatetimePicker.js

@@ -18,25 +18,21 @@ import { DatetimeUtils } from "../utils/datetime-utils";
 import { DateTimeSwitch } from "./DateTimeSwitch";
 import "./style.scss";
 import { cls, Mode } from "./types";
+import dayjs from "dayjs";
 export var CalendarDatetimePicker = function CalendarDatetimePicker(_ref) {
   var _bodyRef$current;
   var open = _ref.open,
     afterOpenChange = _ref.afterOpenChange,
-    _ref$value = _ref.value,
-    value = _ref$value === void 0 ? new Date() : _ref$value,
+    value = _ref.value,
     onOk = _ref.onOk,
     onClose = _ref.onClose;
   var _ConfigProvider$useCo = ConfigProvider.useConfig(),
     locale = _ConfigProvider$useCo.locale;
-  var _React$useState = React.useState(open || false),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    innerOpen = _React$useState2[0],
-    setInnerOpen = _React$useState2[1];
   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),
@@ -44,7 +40,6 @@ export var CalendarDatetimePicker = function CalendarDatetimePicker(_ref) {
     bodyHeight = _useState4[0],
     setBodyHeight = _useState4[1];
   var handleClose = function handleClose() {
-    setInnerOpen(false);
     onClose === null || onClose === void 0 || onClose();
   };
   var handleOk = function handleOk() {
@@ -68,19 +63,11 @@ export var CalendarDatetimePicker = function CalendarDatetimePicker(_ref) {
     };
   }();
   useEffect(function () {
-    afterOpenChange === null || afterOpenChange === void 0 || afterOpenChange(innerOpen);
-    if (!innerOpen) {
-      onClose === null || onClose === void 0 || onClose();
+    if (open) {
+      afterOpenChange === null || afterOpenChange === void 0 || afterOpenChange(true);
+    } else {
+      afterOpenChange === null || afterOpenChange === void 0 || afterOpenChange(false);
     }
-  }, [innerOpen]);
-  useEffect(function () {
-    if (open === undefined) {
-      return;
-    }
-    if (open === innerOpen) {
-      return;
-    }
-    setInnerOpen(open);
   }, [open]);
   useEffect(function () {
     if (datetimeSwitchRef.current) {
@@ -91,11 +78,11 @@ export var CalendarDatetimePicker = function CalendarDatetimePicker(_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", {
@@ -115,19 +102,18 @@ export var CalendarDatetimePicker = function CalendarDatetimePicker(_ref) {
         };
       })],
       labelInValue: false,
-      value: ["".concat(valueRef === null || valueRef === void 0 ? void 0 : valueRef.current.getHours()), "".concat(valueRef === null || valueRef === void 0 ? void 0 : valueRef.current.getMinutes())],
+      value: ["".concat(valueRef === null || valueRef === void 0 ? void 0 : valueRef.current.hour()), "".concat(valueRef === null || valueRef === void 0 ? void 0 : valueRef.current.minute())],
       onChange: function onChange(v) {
         var _datetimeSwitchRef$cu2;
-        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);
       }
     })));
   };
   return /*#__PURE__*/React.createElement(Popup, {
-    open: innerOpen,
-    onClose: function onClose() {
-      setInnerOpen(false);
-    }
+    open: open,
+    onClose: onClose,
+    round: true
   }, /*#__PURE__*/React.createElement("div", {
     className: classNames(cls)
   }, /*#__PURE__*/React.createElement("div", {

package/dist/CalendarDatetimePicker/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/CalendarDatetimePicker/DateTimeSwitch.js

@@ -13,12 +13,13 @@ import React, { forwardRef, useImperativeHandle, useState } from 'react';
 import { DatetimeUtils } from "../utils/datetime-utils";
 import "./style.scss";
 import { cls, Mode } from "./types";
+import dayjs from "dayjs";
 export var DateTimeSwitch = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var onDateTabTap = _ref.onDateTabTap,
     onTimeTabTap = _ref.onTimeTabTap,
     mode = _ref.mode,
     value = _ref.value;
-  var _useState = useState(value),
+  var _useState = useState(dayjs(value)),
     _useState2 = _slicedToArray(_useState, 2),
     datetime = _useState2[0],
     setDatetime = _useState2[1];
@@ -32,8 +33,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(datetime.getHours(), ":").concat(datetime.getMinutes()) : ''));
+  }, datetime ? "".concat(datetime.hour(), ":").concat(datetime.minute()) : ''));
 });

package/dist/CalendarDatetimePicker/demo/base.js

@@ -29,7 +29,7 @@ export default (function () {
         getContainer: function getContainer() {
           return toastContainer.current;
         },
-        content: "".concat(date.getFullYear(), "-").concat(date.getMonth() + 1, "-").concat(date.getDate(), " ").concat(date.getHours(), ":").concat(date.getMinutes())
+        content: "".concat(date.year(), "-").concat(date.month() + 1, "-").concat(date.date(), " ").concat(date.hour(), ":").concat(date.minute())
       });
     }
   }), /*#__PURE__*/React.createElement(Button, {

package/dist/CalendarDatetimePicker/style.scss

@@ -1,15 +1,15 @@
-@use "../style/variable" as *;
+@use "../style/variable" as variable;
 
-$calendarDatetimePickerCls: 'triones-antm-calendar-datetime-picker';
+$calendarDatetimePopupCls: 'triones-antm-calendar-datetime-popup';
 
-.#{$calendarDatetimePickerCls} {
-  border-top-left-radius: $trionesBorderRadius;
-  border-top-right-radius: $trionesBorderRadius;
+.#{$calendarDatetimePopupCls} {
+  border-top-left-radius: variable.$trionesBorderRadius;
+  border-top-right-radius: variable.$trionesBorderRadius;
 
   &-header {
     display: flex;
     justify-content: space-between;
-    border-bottom: 1Px solid $trionesBorderColor;
+    border-bottom: 1Px solid variable.$trionesBorderColor;
 
 
     &-display {
@@ -31,9 +31,9 @@ $calendarDatetimePickerCls: 'triones-antm-calendar-datetime-picker';
       }
 
       &-active {
-        color: $trionesColorText;
+        color: variable.$trionesColorText;
         font-weight: bold;
-        background-color: $trionesColorBgTextActive;
+        background-color: variable.$trionesColorBgTextActive;
       }
     }
 
@@ -44,7 +44,7 @@ $calendarDatetimePickerCls: 'triones-antm-calendar-datetime-picker';
       }
 
       &-ok {
-        color: $trionesColorPrimary;
+        color: variable.$trionesColorPrimary;
       }
     }
   }

package/dist/CalendarDatetimePicker/types.d.ts

@@ -1,4 +1,4 @@
-export declare const cls = "triones-antm-calendar-datetime-picker";
+export declare const cls = "triones-antm-calendar-datetime-popup";
 export declare enum Mode {
     date = 0,
     time = 1