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

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

@@ -37,7 +37,7 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
     isTaroWeApp = _useTaro.isTaroWeApp;
   var wrapperRef = useRef();
   var wrapperUniqueRef = React.useRef(RandomUtils.random());
-  var _useState = useState(month || dayjs()),
+  var _useState = useState(dayjs(month)),
     _useState2 = _slicedToArray(_useState, 2),
     currentMonth = _useState2[0],
     setCurrentMonth = _useState2[1];
@@ -64,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];
 
   /**
    * 计算出每个格子的大小
@@ -159,10 +159,10 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
             // }
             // debugger
             // waiting = true
-            firstMouth = mouths[0];
+            firstMouth = months[0];
             insertMouth = dayjs(new Date(firstMouth.year(), firstMouth.month() - 1, 1));
-            newMouths = [insertMouth].concat(_toConsumableArray(mouths));
-            setMouths(newMouths);
+            newMouths = [insertMouth].concat(_toConsumableArray(months));
+            setMonths(newMouths);
             // const insertMouthLines = mouthLines(insertMouth);
             _context3.t0 = monthLines;
             _context3.next = 7;
@@ -187,20 +187,20 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
     //   return
     // }
     // waiting = true
-    var lastMouth = mouths[mouths.length - 1];
+    var lastMouth = months[months.length - 1];
     var appendMouth = lastMouth.add(1, 'month');
-    var newMouths = [].concat(_toConsumableArray(mouths), [appendMouth]);
-    setMouths(newMouths);
+    var newMouths = [].concat(_toConsumableArray(months), [appendMouth]);
+    setMonths(newMouths);
     // waiting = false
   };
   useEffect(function () {
-    var initMouths = [currentMonth.clone().subtract(1, 'month'), currentMonth.clone(), currentMonth.clone().add(1, 'month')];
+    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 = monthLines;
             _context4.next = 5;
@@ -345,12 +345,12 @@ 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 = 28;
                 break;
               }
@@ -378,7 +378,7 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
                 break;
               }
               // console.log('displayMouth', mouths[i]);
-              displayMouth = mouths[i];
+              displayMouth = months[i];
               return _context6.abrupt("break", 28);
             case 19:
               _bottomLineY = 0 - _mouthHeightSum; //该月份区域底部，对于顶点的偏移量
@@ -399,7 +399,7 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
                 break;
               }
               // console.log('displayMouth', mouths[i]);
-              displayMouth = mouths[i];
+              displayMouth = months[i];
               return _context6.abrupt("break", 28);
             case 25:
               i++;
@@ -421,7 +421,7 @@ 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,
       month: mouth,

package/dist/CalendarDatetimePicker/CalendarDatetimePicker.d.ts

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

package/dist/CalendarDatetimePicker/CalendarDatetimePicker.js

@@ -1,68 +1,164 @@
 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 _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 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); }
 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, PickerView, PickerViewColumn, View } from '@tarojs/components';
+import Taro from '@tarojs/taro';
 import classNames from 'classnames';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
+import Calendar from "../Calendar";
+import ConfigProvider from "../ConfigProvider";
+import { useTaro } from "../hooks";
+import Popup from "../Popup";
+import { DateTimeSwitch } from "./DateTimeSwitch";
 import "./style.scss";
-import { cls } from "./types";
-import CalendarDatetimePopup from "../CalendarDatetimePopup";
+import { cls, Mode } from "./types";
+import { DatetimeUtils } from "../utils/datetime-utils";
 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,
+  var open = _ref.open,
+    _afterOpenChange = _ref.afterOpenChange,
     value = _ref.value,
-    _ref$format = _ref.format,
-    format = _ref$format === void 0 ? 'YYYY-MM-DD HH:mm' : _ref$format,
-    onChange = _ref.onChange,
-    _ref$align = _ref.align,
-    align = _ref$align === void 0 ? 'left' : _ref$align;
-  var _React$useState = React.useState(false),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    innerOpen = _React$useState2[0],
-    setInnerOpen = _React$useState2[1];
-  var _useState = useState(value ? dayjs(value) : undefined),
+    onOk = _ref.onOk,
+    _onClose = _ref.onClose;
+  var _ConfigProvider$useCo = ConfigProvider.useConfig(),
+    locale = _ConfigProvider$useCo.locale;
+  var _useTaro = useTaro(),
+    isTaroWeApp = _useTaro.isTaroWeApp;
+  var _useState = useState(Mode.date),
     _useState2 = _slicedToArray(_useState, 2),
-    internalValue = _useState2[0],
-    setInternalValue = _useState2[1];
-  var handleValueRender = function handleValueRender() {
-    if (internalValue) {
-      return internalValue.format(format);
-    }
-    return null;
+    mode = _useState2[0],
+    setMode = _useState2[1];
+  var valueRef = useRef(dayjs(value));
+  var bodyRef = useRef(null);
+  var datetimeSwitchRef = useRef();
+  var _useState3 = useState(300),
+    _useState4 = _slicedToArray(_useState3, 2),
+    bodyHeight = _useState4[0],
+    setBodyHeight = _useState4[1];
+  var handleClose = function handleClose() {
+    _onClose === null || _onClose === void 0 || _onClose();
+  };
+  var handleOk = function handleOk() {
+    onOk === null || onOk === void 0 || onOk(valueRef.current);
+    handleClose();
   };
+  var handleComputeBodyHeight = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!isTaroWeApp) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return", new Promise(function (resolve) {
+              Taro.createSelectorQuery().in(bodyRef.current.ctx).select(".".concat(cls, "-body")).boundingClientRect()
+              // .fields({ node: true, size: true })
+              .exec(function (res) {
+                var _res$;
+                console.log(res);
+                resolve(res === null || res === void 0 || (_res$ = res[0]) === null || _res$ === void 0 ? void 0 : _res$.height);
+              });
+            }));
+          case 2:
+            return _context.abrupt("return", Promise.resolve(bodyRef.current.offsetHeight));
+          case 3:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleComputeBodyHeight() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   useEffect(function () {
-    if (value === undefined) {
-      return;
+    if (datetimeSwitchRef.current) {
+      datetimeSwitchRef.current.setDatetime(valueRef.current);
     }
-    if (!isSame(value, internalValue)) {
-      setInternalValue(dayjs(value));
-    }
-  }, [value]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CalendarDatetimePopup, {
-    open: innerOpen,
-    value: internalValue || dayjs(),
-    onClose: function onClose() {
-      setInnerOpen(false);
+  }, []);
+  var bodyRender = function bodyRender() {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, mode === Mode.date && /*#__PURE__*/React.createElement("div", {
+      style: {}
+    }, /*#__PURE__*/React.createElement(Calendar, {
+      month: value,
+      value: value,
+      onChange: function onChange(date) {
+        var _datetimeSwitchRef$cu;
+        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", {
+      style: {
+        height: bodyHeight
+      }
+    }, /*#__PURE__*/React.createElement(PickerView, {
+      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;
+        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: open,
+    round: true,
+    afterOpenChange: function afterOpenChange(o) {
+      if (!o) {
+        setMode(Mode.date);
+      }
+      _afterOpenChange === null || _afterOpenChange === void 0 || _afterOpenChange(o);
     },
-    onOk: function onOk(date) {
-      setInternalValue(date);
-      setInnerOpen(false);
-      onChange === null || onChange === void 0 || onChange(date);
+    onClose: function onClose() {
+      _onClose === null || _onClose === void 0 || _onClose();
     }
-  }), /*#__PURE__*/React.createElement("div", {
-    className: classNames(cls, _defineProperty({}, "".concat(cls, "-").concat(align), true)),
-    onClick: function onClick() {
-      setInnerOpen(true);
+  }, /*#__PURE__*/React.createElement("div", {
+    className: classNames(cls)
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(cls, "-header")
+  }, /*#__PURE__*/React.createElement(DateTimeSwitch, {
+    ref: datetimeSwitchRef,
+    mode: mode,
+    value: valueRef.current,
+    onDateTabTap: function onDateTabTap() {
+      return setMode(Mode.date);
+    },
+    onTimeTabTap: function onTimeTabTap() {
+      handleComputeBodyHeight().then(function (height) {
+        setBodyHeight(height);
+        setMode(Mode.time);
+      });
     }
-  }, !internalValue ? /*#__PURE__*/React.createElement("div", {
-    className: "".concat(cls, "-placeholder")
-  }, placeholder) : /*#__PURE__*/React.createElement("div", null, handleValueRender())));
+  }), /*#__PURE__*/React.createElement("a", {
+    className: classNames("".concat(cls, "-header-button"), "".concat(cls, "-header-button-ok")),
+    onClick: handleOk
+  }, locale.common.confirm)), /*#__PURE__*/React.createElement(CustomWrapper, {
+    ref: bodyRef
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(cls, "-body")
+  }, bodyRender()))));
 };

package/dist/CalendarDatetimePicker/style.scss

@@ -1,24 +1,62 @@
 @use "../style/variable" as variable;
+
 $calendarDatetimePickerCls: 'triones-antm-calendar-datetime-picker';
 
 .#{$calendarDatetimePickerCls} {
-  width: 100%;
-  line-height: 1.4;
-  display: flex;
+  border-top-left-radius: variable.$trionesBorderRadius;
+  border-top-right-radius: variable.$trionesBorderRadius;
 
-  &-left {
-    justify-content: flex-start;
-  }
+  &-header {
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1Px solid variable.$trionesBorderColor;
 
-  &-center {
-    justify-content: center;
-  }
 
-  &-right {
-    justify-content: flex-end;
+    &-display {
+      display: flex;
+      padding-left: 8Px;
+
+      &-date {
+        padding-inline: 8Px;
+        cursor: default;
+        display: flex;
+        align-items: center;
+      }
+
+      &-time {
+        padding-inline: 12Px;
+        display: flex;
+        align-items: center;
+        cursor: default;
+      }
+
+      &-active {
+        color: variable.$trionesColorText;
+        font-weight: bold;
+        background-color: variable.$trionesColorBgTextActive;
+      }
+    }
+
+    &-button {
+      padding: 12Px 16Px;
+
+      &-cancel {}
+
+      &-ok {
+        color: variable.$trionesColorPrimary;
+      }
+    }
   }
 
-  &-placeholder {
-    color: variable.$trionesColorTextPlaceholder;
+  &-body {
+    .time-picker {
+      .time-item {
+        flex-shrink: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 32Px;
+      }
+    }
   }
-}
+}

package/dist/CalendarDatetimePicker/types.d.ts

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

package/dist/CalendarDatetimePicker/types.js

@@ -1 +1,6 @@
-export var cls = 'triones-antm-calendar-datetime-picker';
+export var cls = 'triones-antm-calendar-datetime-picker';
+export var Mode = /*#__PURE__*/function (Mode) {
+  Mode[Mode["date"] = 0] = "date";
+  Mode[Mode["time"] = 1] = "time";
+  return Mode;
+}({});

package/dist/CalendarDatetimePickerCell/CalendarDatetimePickerCell.d.ts

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

package/dist/CalendarDatetimePickerCell/CalendarDatetimePickerCell.js

@@ -0,0 +1,60 @@
+var _excluded = ["value", "format", "onChange"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+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); }
+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; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import React, { useEffect, useState } from 'react';
+import CalendarDatetimePicker from "../CalendarDatetimePicker";
+import dayjs from "dayjs";
+import { isSame } from "../utils/dayjs";
+import Cell from "../Cell";
+export var CalendarDatetimePickerCell = function CalendarDatetimePickerCell(_ref) {
+  var value = _ref.value,
+    _ref$format = _ref.format,
+    format = _ref$format === void 0 ? 'YYYY-MM-DD HH:mm' : _ref$format,
+    onChange = _ref.onChange,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  var _React$useState = React.useState(false),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    innerOpen = _React$useState2[0],
+    setInnerOpen = _React$useState2[1];
+  var _useState = useState(value ? dayjs(value) : undefined),
+    _useState2 = _slicedToArray(_useState, 2),
+    internalValue = _useState2[0],
+    setInternalValue = _useState2[1];
+  var handleValueRender = function handleValueRender() {
+    if (internalValue) {
+      return internalValue.format(format);
+    }
+    return null;
+  };
+  useEffect(function () {
+    if (value === undefined) {
+      return;
+    }
+    if (!isSame(value, internalValue)) {
+      setInternalValue(dayjs(value));
+    }
+  }, [value]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CalendarDatetimePicker, {
+    open: innerOpen,
+    value: internalValue || dayjs(),
+    onClose: function onClose() {
+      setInnerOpen(false);
+    },
+    onOk: function onOk(date) {
+      setInternalValue(date);
+      setInnerOpen(false);
+      onChange === null || onChange === void 0 || onChange(date);
+    }
+  }), /*#__PURE__*/React.createElement(Cell, _extends({
+    onClick: function onClick() {
+      setInnerOpen(true);
+    }
+  }, rest), handleValueRender()));
+};

package/dist/CalendarDatetimePickerCell/index.d.ts

@@ -0,0 +1,3 @@
+import { CalendarDatetimePickerCell, CalendarDatetimePickerCellProps } from "./CalendarDatetimePickerCell";
+export type { CalendarDatetimePickerCellProps };
+export default CalendarDatetimePickerCell;

package/dist/CalendarDatetimePickerCell/index.js

@@ -0,0 +1,2 @@
+import { CalendarDatetimePickerCell } from "./CalendarDatetimePickerCell";
+export default CalendarDatetimePickerCell;

package/dist/CalendarPicker/CalendarPicker.d.ts

@@ -0,0 +1,4 @@
+import { FC } from 'react';
+import './style.scss';
+import { CalendarPickerProps } from './types';
+export declare const CalendarPicker: FC<CalendarPickerProps>;

package/dist/{CalendarPopup/CalendarPopup.js → CalendarPicker/CalendarPicker.js}

@@ -12,7 +12,8 @@ import Popup from "../Popup";
 import "./style.scss";
 import { cls } from "./types";
 import dayjs from "dayjs";
-export var CalendarPopup = /*#__PURE__*/memo(function (_ref) {
+import { isSame } from "../utils/dayjs";
+export var CalendarPicker = /*#__PURE__*/memo(function (_ref) {
   var month = _ref.month,
     open = _ref.open,
     title = _ref.title,
@@ -46,7 +47,7 @@ export var CalendarPopup = /*#__PURE__*/memo(function (_ref) {
   }, [innerOpen]);
   useEffect(function () {
     if (value !== undefined) {
-      if (value !== valueRef.current) {
+      if (!isSame(value, valueRef.current, 'day')) {
         valueRef.current = value;
       }
     }

package/dist/CalendarPicker/CalendarRangePicker.d.ts

@@ -0,0 +1,4 @@
+import { FC } from "react";
+import "./style.scss";
+import { CalendarPickerRangeProps } from "./types";
+export declare const CalendarRangePicker: FC<CalendarPickerRangeProps>;

package/dist/{CalendarPopup/CalendarRangePopup.js → CalendarPicker/CalendarRangePicker.js}

@@ -11,7 +11,8 @@ import Calendar from "../Calendar";
 import "./style.scss";
 import { cls } from "./types";
 import ConfigProvider from "../ConfigProvider";
-export var CalendarRangePopup = /*#__PURE__*/memo(function (_ref) {
+import { isSameArray } from "../utils/dayjs";
+export var CalendarRangePicker = /*#__PURE__*/memo(function (_ref) {
   var month = _ref.month,
     open = _ref.open,
     title = _ref.title,
@@ -44,7 +45,7 @@ export var CalendarRangePopup = /*#__PURE__*/memo(function (_ref) {
   }, [innerOpen]);
   useEffect(function () {
     if (value !== undefined) {
-      if (value !== valueRef.current) {
+      if (!isSameArray(value, valueRef.current, 'day')) {
         valueRef.current = value;
       }
     }

package/dist/CalendarPicker/index.d.ts

@@ -0,0 +1,8 @@
+import { CalendarPicker as InternalCalendarPicker } from "./CalendarPicker";
+import { CalendarRangePicker } from "./CalendarRangePicker";
+type CompoundedComponent = typeof InternalCalendarPicker & {
+    Range: typeof CalendarRangePicker;
+};
+declare const CalendarPicker: CompoundedComponent;
+export type { CalendarPickerProps, CalendarPickerRangeProps } from "./types";
+export default CalendarPicker;

package/dist/CalendarPicker/index.js

@@ -0,0 +1,5 @@
+import { CalendarPicker as InternalCalendarPicker } from "./CalendarPicker";
+import { CalendarRangePicker } from "./CalendarRangePicker";
+var CalendarPicker = InternalCalendarPicker;
+CalendarPicker.Range = CalendarRangePicker;
+export default CalendarPicker;

package/dist/{CalendarPopup → CalendarPicker}/style.scss

@@ -1,8 +1,8 @@
 @use "../style/variable" as variable;
 
-$calendarPopupCls: 'triones-antm-calendar-popup';
+$calendarPickerCls: 'triones-antm-calendar-picker';
 
-.#{$calendarPopupCls} {
+.#{$calendarPickerCls} {
   border-top-left-radius: variable.$trionesBorderRadius;
   border-top-right-radius: variable.$trionesBorderRadius;
 

package/dist/{CalendarPopup → CalendarPicker}/types.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 import dayjs from "dayjs";
-export declare const cls = "triones-antm-calendar-popup";
-export type CalendarPopupProps = {
+export declare const cls = "triones-antm-calendar-picker";
+export type CalendarPickerProps = {
     month?: dayjs.Dayjs;
     open?: boolean;
     title?: React.ReactNode;
@@ -11,7 +11,7 @@ export type CalendarPopupProps = {
     onCancel?: () => void;
     onClose?: () => void;
 };
-export type CalendarPopupRangeProps = {
+export type CalendarPickerRangeProps = {
     month?: dayjs.Dayjs;
     open?: boolean;
     title?: React.ReactNode;

package/dist/CalendarPicker/types.js

@@ -0,0 +1 @@
+export var cls = 'triones-antm-calendar-picker';