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

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(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),
@@ -62,8 +64,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];
 
   /**
    * 计算出每个格子的大小
@@ -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:
@@ -157,20 +159,20 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
             // }
             // debugger
             // waiting = true
-            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;
+            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();
         }
@@ -185,29 +187,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:
@@ -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();
           }
@@ -345,72 +345,73 @@ 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)) {
-                _context6.next = 40;
+              if (!(i < months.length)) {
+                _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]);
-              displayMouth = mouths[i];
-              return _context6.abrupt("break", 40);
-            case 27:
+              // console.log('displayMouth', mouths[i]);
+              displayMouth = months[i];
+              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]);
-              displayMouth = mouths[i];
-              return _context6.abrupt("break", 40);
-            case 37:
+              // console.log('displayMouth', mouths[i]);
+              displayMouth = months[i];
+              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();
           }
@@ -420,10 +421,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

@@ -8,41 +8,34 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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 { CustomWrapper } from '@tarojs/components';
+import { CustomWrapper, PickerView, PickerViewColumn, View } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 import classNames from 'classnames';
 import React, { useEffect, useRef, useState } from 'react';
 import Calendar from "../Calendar";
 import ConfigProvider from "../ConfigProvider";
-import { useTaro } from "../hooks/useTaro";
-import PickerView from "../PickerView";
+import { useTaro } from "../hooks";
 import Popup from "../Popup";
-import { DatetimeUtils } from "../utils/datetime-utils";
 import { DateTimeSwitch } from "./DateTimeSwitch";
 import "./style.scss";
 import { cls, Mode } from "./types";
+import { DatetimeUtils } from "../utils/datetime-utils";
+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,
+    _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 _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),
@@ -50,7 +43,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() {
@@ -62,7 +54,7 @@ export var CalendarDatetimePicker = function CalendarDatetimePicker(_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;
             }
@@ -87,21 +79,6 @@ export var CalendarDatetimePicker = function CalendarDatetimePicker(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
-  useEffect(function () {
-    afterOpenChange === null || afterOpenChange === void 0 || afterOpenChange(innerOpen);
-    if (!innerOpen) {
-      _onClose === null || _onClose === void 0 || _onClose();
-    }
-  }, [innerOpen]);
-  useEffect(function () {
-    if (open === undefined) {
-      return;
-    }
-    if (open === innerOpen) {
-      return;
-    }
-    setInnerOpen(open);
-  }, [open]);
   useEffect(function () {
     if (datetimeSwitchRef.current) {
       datetimeSwitchRef.current.setDatetime(valueRef.current);
@@ -111,11 +88,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", {
@@ -123,30 +100,40 @@ export var CalendarDatetimePicker = function CalendarDatetimePicker(_ref) {
         height: bodyHeight
       }
     }, /*#__PURE__*/React.createElement(PickerView, {
-      columns: [Array(24).fill(0).map(function (_, i) {
-        return {
-          label: "".concat(DatetimeUtils.twoDigits(i)),
-          value: "".concat(i)
-        };
-      }), Array(60).fill(0).map(function (_, i) {
-        return {
-          label: "".concat(DatetimeUtils.twoDigits(i)),
-          value: "".concat(i)
-        };
-      })],
-      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())],
-      onChange: function onChange(v) {
+      className: "time-picker",
+      indicatorStyle: "height: 32Px;",
+      style: {
+        height: bodyHeight
+      },
+      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;
-        valueRef.current = new Date(valueRef.current.getFullYear(), valueRef.current.getMonth(), valueRef.current.getDate(), v[0], v[1]);
+        var v = e.detail.value;
+        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) {
+      return /*#__PURE__*/React.createElement(View, {
+        key: "hour-".concat(i),
+        className: "time-item"
+      }, DatetimeUtils.twoDigits(i));
+    })), /*#__PURE__*/React.createElement(PickerViewColumn, null, Array(60).fill(0).map(function (_, i) {
+      return /*#__PURE__*/React.createElement(View, {
+        key: "minute-".concat(i),
+        className: "time-item"
+      }, DatetimeUtils.twoDigits(i));
+    })))));
   };
   return /*#__PURE__*/React.createElement(Popup, {
-    open: innerOpen,
+    open: open,
+    round: true,
+    afterOpenChange: function afterOpenChange(o) {
+      if (!o) {
+        setMode(Mode.date);
+      }
+      _afterOpenChange === null || _afterOpenChange === void 0 || _afterOpenChange(o);
+    },
     onClose: function onClose() {
-      setInnerOpen(false);
       _onClose === null || _onClose === void 0 || _onClose();
     }
   }, /*#__PURE__*/React.createElement("div", {
@@ -169,13 +156,9 @@ export var CalendarDatetimePicker = function CalendarDatetimePicker(_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/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

@@ -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/CalendarDatetimePicker/style.scss

@@ -40,15 +40,23 @@ $calendarDatetimePickerCls: 'triones-antm-calendar-datetime-picker';
     &-button {
       padding: 12Px 16Px;
 
-      &-cancel {
-      }
+      &-cancel {}
 
       &-ok {
         color: variable.$trionesColorPrimary;
       }
     }
   }
-  &-body {
 
+  &-body {
+    .time-picker {
+      .time-item {
+        flex-shrink: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 32Px;
+      }
+    }
   }
 }

package/dist/CalendarDatetimePickerCell/CalendarDatetimePickerCell.d.ts

@@ -0,0 +1,9 @@
+import { FC } from 'react';
+import dayjs from "dayjs";
+import { FormCellProps } from "../FormCell";
+export type CalendarDatetimePickerCellProps = Omit<FormCellProps, 'value'> & {
+    value?: dayjs.Dayjs | Date;
+    format?: string;
+    onChange?: (value?: dayjs.Dayjs) => void;
+};
+export declare const CalendarDatetimePickerCell: FC<CalendarDatetimePickerCellProps>;