bhd-components 0.9.3 → 0.9.4

package/es2017/bhdDatePicker/index.js

@@ -2,13 +2,29 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "@ice/jsx-runtime/jsx-runtime";
 import * as React from "react";
-import { useState, useEffect, useRef } from "react";
+import { useState, useEffect, useRef, useCallback } from "react";
 import styles from "./index.module.less";
 import { ConfigProvider, Button, DatePicker } from "antd";
 import { CustomArrow } from "../icons";
 // import dayjs from "dayjs";
+// import type { Dayjs } from "dayjs";
 import i18Conversion from "../i18n";
 const { RangePicker } = DatePicker;
+let months = [
+    "一月",
+    "二月",
+    "三月",
+    "四月",
+    "五月",
+    "六月",
+    "七月",
+    "八月",
+    "九月",
+    "十月",
+    "十一月",
+    "十二月"
+];
+//January_February_March_April_May_June_July_August_September_October_November_December
 const BhdDatePicker = (props)=>{
     const lang = ConfigProvider.lang === "en" ? "en_US" : "zh_CN";
     // if (lang === "en_US") {
@@ -18,6 +34,7 @@ const BhdDatePicker = (props)=>{
     //   const zhCN = require("dayjs/locale/zh-cn");
     //   dayjs.locale(zhCN);
     // }
+    const id = "BhdDatePicker_" + new Date().getTime();
     // 默认格式
     const getDefaultFormat = ()=>{
         if (props.format) {
@@ -47,7 +64,7 @@ const BhdDatePicker = (props)=>{
         }
     };
     // 自己组件内使用的，或者自己处理的
-    let { kind = "single", extraItems, extraReadonly = false, useType = "", open = false, mode, picker, value = props.kind === "range" ? [] : "", format = getDefaultFormat(), presets = [], className, popupClassName, showTime, showNow = true, allowClear = true, onClick, onBlur, onChange, onOk, onCalendarChange, onOpenChange, onPanelChange, disabledDate, cellRender, renderExtraFooter } = props;
+    let { kind = "single", extraItems, extraReadonly = false, useType = "", open = false, mode, picker, value = props.kind === "range" ? [] : "", format = getDefaultFormat(), presets = [], className, popupClassName, showTime, showNow = true, showToday = true, allowClear = true, onClick, onBlur, onChange, onOk, onCalendarChange, onOpenChange, onPanelChange, disabledDate, cellRender, renderExtraFooter } = props;
     const bhdDatePickerRef = useRef(null);
     const [panelOpen, setPanelOpen] = useState(open);
     const [panelMode, setPanelMode] = useState("date");
@@ -62,6 +79,7 @@ const BhdDatePicker = (props)=>{
     const [selectedRangeDate, setSelectedRangeDate] = useState(value);
     const [selectedRangeDateString, setSelectedRangeDateString] = useState([]);
     const [rangeOpenChange, setRangeOpenChange] = useState(false); // 用于范围选择失去焦点后，判断是否关闭
+    const isChange = useRef(false);
     useEffect(()=>{
         setDefaultMode();
         if (kind === "range") {
@@ -79,7 +97,18 @@ const BhdDatePicker = (props)=>{
                 });
             }
         }
+        return ()=>{
+            var _document_getElementsByClassName__getElementsByClassName, _document_getElementsByClassName_, _document_getElementsByClassName, _btn;
+            const btn = (_document_getElementsByClassName = document.getElementsByClassName(id)) === null || _document_getElementsByClassName === void 0 ? void 0 : (_document_getElementsByClassName_ = _document_getElementsByClassName[0]) === null || _document_getElementsByClassName_ === void 0 ? void 0 : (_document_getElementsByClassName__getElementsByClassName = _document_getElementsByClassName_.getElementsByClassName("bhd-picker-today-btn")) === null || _document_getElementsByClassName__getElementsByClassName === void 0 ? void 0 : _document_getElementsByClassName__getElementsByClassName[0];
+            (_btn = btn) === null || _btn === void 0 ? void 0 : _btn.removeEventListener("click", todayClick);
+        };
     }, []);
+    useEffect(()=>{
+        isChange.current = true;
+    }, [
+        selectedDate,
+        selectedRangeDate
+    ]);
     // 传给 DatePicker 的props参数
     const getConfig = ()=>{
         let config = _object_spread_props(_object_spread({
@@ -144,6 +173,7 @@ const BhdDatePicker = (props)=>{
                 config.allowClear = false; // 日程安排查看时，不显示清除按钮
             }
         }
+        config.popupClassName = `${config.popupClassName} ${id}`;
         return config;
     };
     // 设置默认mode
@@ -182,9 +212,14 @@ const BhdDatePicker = (props)=>{
         }
         // 月份 中文模式下显示全名称（例：一月），英文模式下显示短名称（例：Jan）
         if (info.type === "month") {
+            // return (
+            //   <div className={`${"bhd-picker-cell-inner"}`}>
+            //     {current.format(dayjs.locale() === "zh-cn" ? "MMMM" : "MMM")}
+            //   </div>
+            // );
             return /*#__PURE__*/ _jsx("div", {
                 className: `${"bhd-picker-cell-inner"}`,
-                children: current.format(lang === "zh_CN" ? "MMMM" : "MMM")
+                children: i18Conversion(months[Number(current.format("M")) - 1])
             });
         }
         return info.originNode;
@@ -214,14 +249,14 @@ const BhdDatePicker = (props)=>{
             children: [
                 renderExtraFooter && /*#__PURE__*/ _jsx("div", {
                     className: "bhddatepicker-picker-footer-extra-extend",
-                    children: renderExtraFooter()
+                    children: renderExtraFooter(mode)
                 }),
                 !showTime ? /*#__PURE__*/ _jsx(_Fragment, {
                     children: /*#__PURE__*/ _jsxs("ul", {
                         className: "bhd-picker-ranges",
                         children: [
                             selfRenderPresets(),
-                            renderNow(),
+                            renderToday(),
                             /*#__PURE__*/ _jsx("li", {
                                 className: "bhd-picker-ok",
                                 children: /*#__PURE__*/ _jsx(Button, {
@@ -241,20 +276,24 @@ const BhdDatePicker = (props)=>{
         });
     };
     // 渲染今天
-    const renderNow = ()=>{
+    const renderToday = ()=>{
         // 显示now
-        if (showNow) {
+        if (showToday) {
             var _extraItems;
             // 日程安排时： extraItems中今天是否是可选或者已选择状态
-            let hasNow = ((_extraItems = extraItems) === null || _extraItems === void 0 ? void 0 : _extraItems.filter((item)=>item.status !== "noselectable").length) > 0;
+            let hasNow = ((_extraItems = extraItems) === null || _extraItems === void 0 ? void 0 : _extraItems.filter((item)=>item.status !== "noselectable" && // item.date.format(format) === dayjs().format(format)
+                item.date.format("YYYYMMDD") === getToday()).length) > 0;
             if (kind === "single" || kind === "extra" && hasNow) {
                 if (mode === "date" || mode === undefined) {
                     return /*#__PURE__*/ _jsx("li", {
                         className: "bhd-picker-now",
                         children: /*#__PURE__*/ _jsx("a", {
                             className: "bhd-picker-now-btn",
+                            style: {
+                                visibility: "hidden"
+                            },
                             onClick: todayClick,
-                            children: showTime ? i18Conversion("此刻") : i18Conversion("今天")
+                            children: i18Conversion("今天")
                         })
                     });
                 }
@@ -262,6 +301,11 @@ const BhdDatePicker = (props)=>{
         }
         return null;
     };
+    // 获取到年月日
+    const getToday = ()=>{
+        const date = new Date();
+        return date.getFullYear().toString() + date.getMonth().toString().padStart(2, "0") + date.getDay().toString().padStart(2, "0");
+    };
     // 渲染预设
     const selfRenderPresets = ()=>{
         return /*#__PURE__*/ _jsx("li", {
@@ -287,42 +331,58 @@ const BhdDatePicker = (props)=>{
                 setPanelOpen(true);
             }
         } else {
-            if (selectedDate && selectedDateString) {
-                onChange && onChange(selectedDate, selectedDateString);
+            if (selectedDateRef.current && selectedDateStringRef.current) {
+                onChange && onChange(selectedDateRef.current, selectedDateStringRef.current);
                 setPanelOpen(false);
             }
         }
     };
     // 今天点击
-    const todayClick = ()=>{
-    // var today = dayjs();
-    // var todayString = today.format(format);
-    // setSelectedDate((prevState) => {
-    //   selectedDateRef.current = today;
-    //   return selectedDateRef.current;
-    // });
-    // setSelectedDateString((prevState) => {
-    //   selectedDateStringRef.current = todayString;
-    //   return selectedDateStringRef.current;
-    // });
-    // onChange && onChange(today, todayString);
-    // setPanelOpen(false);
+    const todayClick = useCallback(()=>{
+        setTimeout(()=>{
+            okClick();
+        }, 0);
+    }, []);
+    const todayClickEventListener = (value)=>{
+        if (!value) return;
+        if (showToday) {
+            var _document_getElementsByClassName__getElementsByClassName, _document_getElementsByClassName_, _document_getElementsByClassName;
+            const btn = (_document_getElementsByClassName = document.getElementsByClassName(id)) === null || _document_getElementsByClassName === void 0 ? void 0 : (_document_getElementsByClassName_ = _document_getElementsByClassName[0]) === null || _document_getElementsByClassName_ === void 0 ? void 0 : (_document_getElementsByClassName__getElementsByClassName = _document_getElementsByClassName_.getElementsByClassName("bhd-picker-today-btn")) === null || _document_getElementsByClassName__getElementsByClassName === void 0 ? void 0 : _document_getElementsByClassName__getElementsByClassName[0];
+            if (value) {
+                var _btn, _btn1;
+                (_btn = btn) === null || _btn === void 0 ? void 0 : _btn.removeEventListener("click", todayClick);
+                (_btn1 = btn) === null || _btn1 === void 0 ? void 0 : _btn1.addEventListener("click", todayClick, {
+                    once: true
+                });
+            }
+        }
     };
     //预设点击
     const presetClick = (info)=>{
         console.log(typeof info.value);
         const value = typeof info.value === "function" ? info.value() : info.value;
-        const valueString = value.format(format);
-        setSelectedDate((prevState)=>{
-            selectedDateRef.current = value;
-            return selectedDateRef.current;
-        });
-        setSelectedDateString((prevState)=>{
-            selectedDateStringRef.current = valueString;
-            return selectedDateStringRef.current;
-        });
-        onChange && onChange(value, valueString);
-        setPanelOpen(false);
+        if (kind === "range") {
+            const valueString = [
+                value[0].format(format),
+                value[1].format(format)
+            ];
+            setSelectedRangeDate(value);
+            setSelectedRangeDateString(valueString);
+            onChange && onChange(value, valueString);
+            setPanelOpen(false);
+        } else {
+            const valueString = value.format(format);
+            setSelectedDate((prevState)=>{
+                selectedDateRef.current = value;
+                return selectedDateRef.current;
+            });
+            setSelectedDateString((prevState)=>{
+                selectedDateStringRef.current = valueString;
+                return selectedDateStringRef.current;
+            });
+            onChange && onChange(value, valueString);
+            setPanelOpen(false);
+        }
     };
     return /*#__PURE__*/ _jsxs("span", {
         className: `${styles.bhdDatePicker}`,
@@ -330,8 +390,8 @@ const BhdDatePicker = (props)=>{
         children: [
             (kind === "single" || kind === "extra") && /*#__PURE__*/ _jsx(_Fragment, {
                 children: /*#__PURE__*/ _jsx(DatePicker, _object_spread_props(_object_spread({}, getConfig()), {
+                    id: id,
                     value: selectedDate,
-                    showNow: showTime ? showNow : false,
                     mode: panelMode,
                     open: panelOpen,
                     disabledDate: selfDisabledDate,
@@ -343,6 +403,7 @@ const BhdDatePicker = (props)=>{
                         // 打开设置默认mode
                         if (value) {
                             setDefaultMode();
+                            todayClickEventListener(value);
                         }
                         onOpenChange && onOpenChange(value);
                     },
@@ -379,7 +440,6 @@ const BhdDatePicker = (props)=>{
             kind === "range" && /*#__PURE__*/ _jsx(_Fragment, {
                 children: /*#__PURE__*/ _jsx(RangePicker, _object_spread_props(_object_spread({}, getConfig()), {
                     value: selectedRangeDate,
-                    showNow: false,
                     mode: rangePanelMode,
                     open: panelOpen,
                     disabledDate: selfDisabledDate,

package/es2017/bhdDatePicker/index.module.less

@@ -255,6 +255,7 @@
         }
       }
 
+
       // 多面板
       .bhd-picker-panels {
         & .bhd-picker-panel {
@@ -383,11 +384,16 @@
 
         // 隐藏默认的当前
         & > a {
-          display: none;
+          // display: none;
         }
         // & > .bhd-picker-ranges {
         //   display: none;
         // }
+        
+        & > a.bhd-picker-today-btn {
+          position: absolute;
+          right: 91px;
+        }
       }
 
       // 默认颜色
@@ -442,27 +448,6 @@
         }
       }
     }
-
-    // &.showNow {
-    //   :global {
-    //     .bhd-picker-footer {
-    //       & > a.bhd-picker-today-btn {
-    //         position: absolute;
-    //         right: 91px;
-    //       }
-    //     }
-    //   }
-    // }
-
-    // &.hideShow {
-    //   :global {
-    //     .bhd-picker-footer {
-    //       & > a {
-    //         display: none;
-    //       }
-    //     }
-    //   }
-    // }
   }
 
   // 单选

package/es2017/i18n/en_US.js

@@ -6,6 +6,18 @@ const en_US = {
     Load: "Loading...",
     确定: 'OK',
     此刻: 'Now',
-    今天: 'Today'
+    今天: 'Today',
+    一月: 'Jan',
+    二月: 'Feb',
+    三月: 'Mar',
+    四月: 'Apr',
+    五月: 'May',
+    六月: 'Jun',
+    七月: 'Jul',
+    八月: 'Aug',
+    九月: 'Sep',
+    十月: 'Oct',
+    十一月: 'Nov',
+    十二月: 'Dec'
 };
 export default en_US;

package/es2017/i18n/zh_CN.js

@@ -6,6 +6,18 @@ const zh_CN = {
     Load: "正在加载...",
     确定: '确定',
     此刻: '此刻',
-    今天: '今天'
+    今天: '今天',
+    一月: '一月',
+    二月: '二月',
+    三月: '三月',
+    四月: '四月',
+    五月: '五月',
+    六月: '六月',
+    七月: '七月',
+    八月: '八月',
+    九月: '九月',
+    十月: '十月',
+    十一月: '十一月',
+    十二月: '十二月'
 };
 export default zh_CN;

package/esm/bhdDatePicker/index.js

@@ -4,13 +4,29 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "@ice/jsx-runtime/jsx-runtime";
 import * as React from "react";
-import { useState, useEffect, useRef } from "react";
+import { useState, useEffect, useRef, useCallback } from "react";
 import styles from "./index.module.less";
 import { ConfigProvider, Button, DatePicker } from "antd";
 import { CustomArrow } from "../icons";
 // import dayjs from "dayjs";
+// import type { Dayjs } from "dayjs";
 import i18Conversion from "../i18n";
 var RangePicker = DatePicker.RangePicker;
+var months = [
+    "一月",
+    "二月",
+    "三月",
+    "四月",
+    "五月",
+    "六月",
+    "七月",
+    "八月",
+    "九月",
+    "十月",
+    "十一月",
+    "十二月"
+];
+//January_February_March_April_May_June_July_August_September_October_November_December
 var BhdDatePicker = function(props) {
     var lang = ConfigProvider.lang === "en" ? "en_US" : "zh_CN";
     // if (lang === "en_US") {
@@ -20,6 +36,7 @@ var BhdDatePicker = function(props) {
     //   const zhCN = require("dayjs/locale/zh-cn");
     //   dayjs.locale(zhCN);
     // }
+    var id = "BhdDatePicker_" + new Date().getTime();
     // 默认格式
     var getDefaultFormat = function() {
         if (props.format) {
@@ -49,7 +66,7 @@ var BhdDatePicker = function(props) {
         }
     };
     // 自己组件内使用的，或者自己处理的
-    var _props_kind = props.kind, kind = _props_kind === void 0 ? "single" : _props_kind, extraItems = props.extraItems, _props_extraReadonly = props.extraReadonly, extraReadonly = _props_extraReadonly === void 0 ? false : _props_extraReadonly, _props_useType = props.useType, useType = _props_useType === void 0 ? "" : _props_useType, _props_open = props.open, open = _props_open === void 0 ? false : _props_open, mode = props.mode, picker = props.picker, _props_value = props.value, value = _props_value === void 0 ? props.kind === "range" ? [] : "" : _props_value, _props_format = props.format, format = _props_format === void 0 ? getDefaultFormat() : _props_format, _props_presets = props.presets, presets = _props_presets === void 0 ? [] : _props_presets, className = props.className, popupClassName = props.popupClassName, showTime = props.showTime, _props_showNow = props.showNow, showNow = _props_showNow === void 0 ? true : _props_showNow, _props_allowClear = props.allowClear, allowClear = _props_allowClear === void 0 ? true : _props_allowClear, onClick = props.onClick, onBlur = props.onBlur, onChange = props.onChange, onOk = props.onOk, onCalendarChange = props.onCalendarChange, onOpenChange = props.onOpenChange, onPanelChange = props.onPanelChange, disabledDate = props.disabledDate, cellRender = props.cellRender, renderExtraFooter = props.renderExtraFooter;
+    var _props_kind = props.kind, kind = _props_kind === void 0 ? "single" : _props_kind, extraItems = props.extraItems, _props_extraReadonly = props.extraReadonly, extraReadonly = _props_extraReadonly === void 0 ? false : _props_extraReadonly, _props_useType = props.useType, useType = _props_useType === void 0 ? "" : _props_useType, _props_open = props.open, open = _props_open === void 0 ? false : _props_open, mode = props.mode, picker = props.picker, _props_value = props.value, value = _props_value === void 0 ? props.kind === "range" ? [] : "" : _props_value, _props_format = props.format, format = _props_format === void 0 ? getDefaultFormat() : _props_format, _props_presets = props.presets, presets = _props_presets === void 0 ? [] : _props_presets, className = props.className, popupClassName = props.popupClassName, showTime = props.showTime, _props_showNow = props.showNow, showNow = _props_showNow === void 0 ? true : _props_showNow, _props_showToday = props.showToday, showToday = _props_showToday === void 0 ? true : _props_showToday, _props_allowClear = props.allowClear, allowClear = _props_allowClear === void 0 ? true : _props_allowClear, onClick = props.onClick, onBlur = props.onBlur, onChange = props.onChange, onOk = props.onOk, onCalendarChange = props.onCalendarChange, onOpenChange = props.onOpenChange, onPanelChange = props.onPanelChange, disabledDate = props.disabledDate, cellRender = props.cellRender, renderExtraFooter = props.renderExtraFooter;
     var bhdDatePickerRef = useRef(null);
     var _useState = _sliced_to_array(useState(open), 2), panelOpen = _useState[0], setPanelOpen = _useState[1];
     var _useState1 = _sliced_to_array(useState("date"), 2), panelMode = _useState1[0], setPanelMode = _useState1[1];
@@ -64,6 +81,7 @@ var BhdDatePicker = function(props) {
     var _useState5 = _sliced_to_array(useState(value), 2), selectedRangeDate = _useState5[0], setSelectedRangeDate = _useState5[1];
     var _useState6 = _sliced_to_array(useState([]), 2), selectedRangeDateString = _useState6[0], setSelectedRangeDateString = _useState6[1];
     var _useState7 = _sliced_to_array(useState(false), 2), rangeOpenChange = _useState7[0], setRangeOpenChange = _useState7[1]; // 用于范围选择失去焦点后，判断是否关闭
+    var isChange = useRef(false);
     useEffect(function() {
         setDefaultMode();
         if (kind === "range") {
@@ -81,7 +99,18 @@ var BhdDatePicker = function(props) {
                 });
             }
         }
+        return function() {
+            var _document_getElementsByClassName__getElementsByClassName, _document_getElementsByClassName_, _document_getElementsByClassName, _btn;
+            var btn = (_document_getElementsByClassName = document.getElementsByClassName(id)) === null || _document_getElementsByClassName === void 0 ? void 0 : (_document_getElementsByClassName_ = _document_getElementsByClassName[0]) === null || _document_getElementsByClassName_ === void 0 ? void 0 : (_document_getElementsByClassName__getElementsByClassName = _document_getElementsByClassName_.getElementsByClassName("bhd-picker-today-btn")) === null || _document_getElementsByClassName__getElementsByClassName === void 0 ? void 0 : _document_getElementsByClassName__getElementsByClassName[0];
+            (_btn = btn) === null || _btn === void 0 ? void 0 : _btn.removeEventListener("click", todayClick);
+        };
     }, []);
+    useEffect(function() {
+        isChange.current = true;
+    }, [
+        selectedDate,
+        selectedRangeDate
+    ]);
     // 传给 DatePicker 的props参数
     var getConfig = function() {
         var config = _object_spread_props(_object_spread({
@@ -145,6 +174,7 @@ var BhdDatePicker = function(props) {
                 config.allowClear = false; // 日程安排查看时，不显示清除按钮
             }
         }
+        config.popupClassName = "".concat(config.popupClassName, " ").concat(id);
         return config;
     };
     // 设置默认mode
@@ -185,9 +215,14 @@ var BhdDatePicker = function(props) {
         }
         // 月份 中文模式下显示全名称（例：一月），英文模式下显示短名称（例：Jan）
         if (info.type === "month") {
+            // return (
+            //   <div className={`${"bhd-picker-cell-inner"}`}>
+            //     {current.format(dayjs.locale() === "zh-cn" ? "MMMM" : "MMM")}
+            //   </div>
+            // );
             return /*#__PURE__*/ _jsx("div", {
                 className: "bhd-picker-cell-inner",
-                children: current.format(lang === "zh_CN" ? "MMMM" : "MMM")
+                children: i18Conversion(months[Number(current.format("M")) - 1])
             });
         }
         return info.originNode;
@@ -219,14 +254,14 @@ var BhdDatePicker = function(props) {
             children: [
                 renderExtraFooter && /*#__PURE__*/ _jsx("div", {
                     className: "bhddatepicker-picker-footer-extra-extend",
-                    children: renderExtraFooter()
+                    children: renderExtraFooter(mode)
                 }),
                 !showTime ? /*#__PURE__*/ _jsx(_Fragment, {
                     children: /*#__PURE__*/ _jsxs("ul", {
                         className: "bhd-picker-ranges",
                         children: [
                             selfRenderPresets(),
-                            renderNow(),
+                            renderToday(),
                             /*#__PURE__*/ _jsx("li", {
                                 className: "bhd-picker-ok",
                                 children: /*#__PURE__*/ _jsx(Button, {
@@ -246,13 +281,14 @@ var BhdDatePicker = function(props) {
         });
     };
     // 渲染今天
-    var renderNow = function() {
+    var renderToday = function() {
         // 显示now
-        if (showNow) {
+        if (showToday) {
             var _extraItems;
             // 日程安排时： extraItems中今天是否是可选或者已选择状态
             var hasNow = ((_extraItems = extraItems) === null || _extraItems === void 0 ? void 0 : _extraItems.filter(function(item) {
-                return item.status !== "noselectable";
+                return item.status !== "noselectable" && // item.date.format(format) === dayjs().format(format)
+                item.date.format("YYYYMMDD") === getToday();
             }).length) > 0;
             if (kind === "single" || kind === "extra" && hasNow) {
                 if (mode === "date" || mode === undefined) {
@@ -260,8 +296,11 @@ var BhdDatePicker = function(props) {
                         className: "bhd-picker-now",
                         children: /*#__PURE__*/ _jsx("a", {
                             className: "bhd-picker-now-btn",
+                            style: {
+                                visibility: "hidden"
+                            },
                             onClick: todayClick,
-                            children: showTime ? i18Conversion("此刻") : i18Conversion("今天")
+                            children: i18Conversion("今天")
                         })
                     });
                 }
@@ -269,6 +308,11 @@ var BhdDatePicker = function(props) {
         }
         return null;
     };
+    // 获取到年月日
+    var getToday = function() {
+        var date = new Date();
+        return date.getFullYear().toString() + date.getMonth().toString().padStart(2, "0") + date.getDay().toString().padStart(2, "0");
+    };
     // 渲染预设
     var selfRenderPresets = function() {
         return /*#__PURE__*/ _jsx("li", {
@@ -294,42 +338,58 @@ var BhdDatePicker = function(props) {
                 setPanelOpen(true);
             }
         } else {
-            if (selectedDate && selectedDateString) {
-                onChange && onChange(selectedDate, selectedDateString);
+            if (selectedDateRef.current && selectedDateStringRef.current) {
+                onChange && onChange(selectedDateRef.current, selectedDateStringRef.current);
                 setPanelOpen(false);
             }
         }
     };
     // 今天点击
-    var todayClick = function() {
-    // var today = dayjs();
-    // var todayString = today.format(format);
-    // setSelectedDate((prevState) => {
-    //   selectedDateRef.current = today;
-    //   return selectedDateRef.current;
-    // });
-    // setSelectedDateString((prevState) => {
-    //   selectedDateStringRef.current = todayString;
-    //   return selectedDateStringRef.current;
-    // });
-    // onChange && onChange(today, todayString);
-    // setPanelOpen(false);
+    var todayClick = useCallback(function() {
+        setTimeout(function() {
+            okClick();
+        }, 0);
+    }, []);
+    var todayClickEventListener = function(value) {
+        if (!value) return;
+        if (showToday) {
+            var _document_getElementsByClassName__getElementsByClassName, _document_getElementsByClassName_, _document_getElementsByClassName;
+            var btn = (_document_getElementsByClassName = document.getElementsByClassName(id)) === null || _document_getElementsByClassName === void 0 ? void 0 : (_document_getElementsByClassName_ = _document_getElementsByClassName[0]) === null || _document_getElementsByClassName_ === void 0 ? void 0 : (_document_getElementsByClassName__getElementsByClassName = _document_getElementsByClassName_.getElementsByClassName("bhd-picker-today-btn")) === null || _document_getElementsByClassName__getElementsByClassName === void 0 ? void 0 : _document_getElementsByClassName__getElementsByClassName[0];
+            if (value) {
+                var _btn, _btn1;
+                (_btn = btn) === null || _btn === void 0 ? void 0 : _btn.removeEventListener("click", todayClick);
+                (_btn1 = btn) === null || _btn1 === void 0 ? void 0 : _btn1.addEventListener("click", todayClick, {
+                    once: true
+                });
+            }
+        }
     };
     //预设点击
     var presetClick = function(info) {
         console.log(_type_of(info.value));
         var value = typeof info.value === "function" ? info.value() : info.value;
-        var valueString = value.format(format);
-        setSelectedDate(function(prevState) {
-            selectedDateRef.current = value;
-            return selectedDateRef.current;
-        });
-        setSelectedDateString(function(prevState) {
-            selectedDateStringRef.current = valueString;
-            return selectedDateStringRef.current;
-        });
-        onChange && onChange(value, valueString);
-        setPanelOpen(false);
+        if (kind === "range") {
+            var valueString = [
+                value[0].format(format),
+                value[1].format(format)
+            ];
+            setSelectedRangeDate(value);
+            setSelectedRangeDateString(valueString);
+            onChange && onChange(value, valueString);
+            setPanelOpen(false);
+        } else {
+            var valueString1 = value.format(format);
+            setSelectedDate(function(prevState) {
+                selectedDateRef.current = value;
+                return selectedDateRef.current;
+            });
+            setSelectedDateString(function(prevState) {
+                selectedDateStringRef.current = valueString1;
+                return selectedDateStringRef.current;
+            });
+            onChange && onChange(value, valueString1);
+            setPanelOpen(false);
+        }
     };
     return /*#__PURE__*/ _jsxs("span", {
         className: "".concat(styles.bhdDatePicker),
@@ -337,8 +397,8 @@ var BhdDatePicker = function(props) {
         children: [
             (kind === "single" || kind === "extra") && /*#__PURE__*/ _jsx(_Fragment, {
                 children: /*#__PURE__*/ _jsx(DatePicker, _object_spread_props(_object_spread({}, getConfig()), {
+                    id: id,
                     value: selectedDate,
-                    showNow: showTime ? showNow : false,
                     mode: panelMode,
                     open: panelOpen,
                     disabledDate: selfDisabledDate,
@@ -350,6 +410,7 @@ var BhdDatePicker = function(props) {
                         // 打开设置默认mode
                         if (value) {
                             setDefaultMode();
+                            todayClickEventListener(value);
                         }
                         onOpenChange && onOpenChange(value);
                     },
@@ -386,7 +447,6 @@ var BhdDatePicker = function(props) {
             kind === "range" && /*#__PURE__*/ _jsx(_Fragment, {
                 children: /*#__PURE__*/ _jsx(RangePicker, _object_spread_props(_object_spread({}, getConfig()), {
                     value: selectedRangeDate,
-                    showNow: false,
                     mode: rangePanelMode,
                     open: panelOpen,
                     disabledDate: selfDisabledDate,