bhd-components 0.9.2 → 0.9.4

package/esm/bhdDatePicker/index.js

@@ -1,32 +1,74 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 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 { Button, DatePicker } from "antd";
-import { CustomArrow } from "../icons/index";
-import dayjs from "dayjs";
+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 _props_kind = props.kind, kind = _props_kind === void 0 ? "single" : _props_kind, _props_value = props.value, value = _props_value === void 0 ? props.kind === "range" ? [] : "" : _props_value, extraItems = props.extraItems, _props_extraReadonly = props.extraReadonly, extraReadonly = _props_extraReadonly === void 0 ? false : _props_extraReadonly, picker = props.picker, _props_useType = props.useType, useType = _props_useType === void 0 ? "" : _props_useType, className = props.className, popupClassName = props.popupClassName, showTime = props.showTime, _props_showNow = props.showNow, showNow = _props_showNow === void 0 ? true : _props_showNow, onClick = props.onClick, onBlur = props.onBlur, onChange = props.onChange, onOk = props.onOk, _props_presets = props.presets, presets = _props_presets === void 0 ? [] : _props_presets;
+    var lang = ConfigProvider.lang === "en" ? "en_US" : "zh_CN";
+    // if (lang === "en_US") {
+    //   const enUS = require("dayjs/locale/en");
+    //   dayjs.locale(enUS);
+    // } else {
+    //   const zhCN = require("dayjs/locale/zh-cn");
+    //   dayjs.locale(zhCN);
+    // }
+    var id = "BhdDatePicker_" + new Date().getTime();
+    // 默认格式
+    var getDefaultFormat = function() {
+        if (props.format) {
+            return props.format;
+        } else {
+            var fm = props.showTime ? "YYYY-MM-DD hh:mm:ss" : "YYYY-MM-DD";
+            switch(props.picker){
+                case undefined:
+                case "date":
+                    break;
+                case "week":
+                    fm = "YYYY-wo";
+                    break;
+                case "month":
+                    fm = "YYYY-MM";
+                    break;
+                case "quarter":
+                    fm = "YYYY-QQ";
+                    break;
+                case "year":
+                    fm = "YYYY";
+                    break;
+                default:
+                    break;
+            }
+            return fm;
+        }
+    };
+    // 自己组件内使用的，或者自己处理的
+    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(false), 2), open = _useState[0], setOpen = _useState[1];
+    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];
     var _useState2 = _sliced_to_array(useState([
         "date",
@@ -39,79 +81,122 @@ 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 timer = useRef(null);
+    var isChange = useRef(false);
     useEffect(function() {
         setDefaultMode();
-    }, []);
-    useEffect(function() {
-        if (panelMode === "year") {
-            timer.current = setTimeout(function() {
-                var doms = document.getElementsByClassName("bhd-picker-decade-btn");
-                for(var index = 0; index < doms.length; index++){
-                    var _doms_index, _doms_index_childNodes;
-                    var dom = (_doms_index = doms[index]) === null || _doms_index === void 0 ? void 0 : (_doms_index_childNodes = _doms_index.childNodes) === null || _doms_index_childNodes === void 0 ? void 0 : _doms_index_childNodes[1];
-                    if (dom) {
-                        if (dom.textContent !== " ㅡ ") {
-                            dom.textContent = " ㅡ ";
-                        }
-                    }
-                }
-            }, 0);
+        if (kind === "range") {
+            if (selectedRangeDate[0] && selectedRangeDate[1]) {
+                setSelectedRangeDateString([
+                    selectedRangeDate[0].format(format),
+                    selectedRangeDate[1].format(format)
+                ]);
+            }
+        } else {
+            if (selectedDate) {
+                setSelectedDateString(function(prevState) {
+                    selectedDateStringRef.current = selectedDate.format(format);
+                    return selectedDateStringRef.current;
+                });
+            }
         }
         return function() {
-            clearTimeout(timer.current);
+            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;
     }, [
-        open,
-        panelMode
+        selectedDate,
+        selectedRangeDate
     ]);
+    // 传给 DatePicker 的props参数
     var getConfig = function() {
-        var config = _object_spread({}, props);
-        delete config.cellRender;
-        delete config.className;
-        delete config.prevIcon;
-        delete config.nextIcon;
-        delete config.superPrevIcon;
-        delete config.superNextIcon;
+        var config = _object_spread_props(_object_spread({
+            prevIcon: /*#__PURE__*/ _jsx(CustomArrow, {
+                style: {
+                    transform: "rotate(90deg)"
+                }
+            }),
+            nextIcon: /*#__PURE__*/ _jsx(CustomArrow, {
+                style: {
+                    transform: "rotate(-90deg)"
+                }
+            }),
+            superPrevIcon: /*#__PURE__*/ _jsx(CustomArrow, {
+                style: {
+                    transform: "rotate(90deg)"
+                }
+            }),
+            superNextIcon: /*#__PURE__*/ _jsx(CustomArrow, {
+                style: {
+                    transform: "rotate(-90deg)"
+                }
+            })
+        }, props), {
+            //--------------- 下边是需要处理的
+            className: "".concat(className, " ").concat(useType === "table" ? "table-date-picker" : ""),
+            popupClassName: popupClassName,
+            allowClear: allowClear,
+            showTime: showTime,
+            cellRender: cellRender,
+            renderExtraFooter: selfRenderExtraFooter
+        });
+        //组件支持传入,防止再次传入DatePicker，所以删掉
+        delete config.mode;
         delete config.open;
         delete config.onOpenChange;
-        delete config.renderExtraFooter;
-        delete config.useType;
-        delete config.showNow;
         delete config.onClick;
         delete config.onBlur;
         delete config.onOk;
         delete config.onChange;
-        delete config.presets;
-        delete config.mode;
-        if (kind === "single" || kind === "extra") {
-            delete config.value;
+        delete config.useType; // 组件自己定义的
+        delete config.presets; // 必须删掉，因为预设由官网的左侧换到底部
+        delete config.showNow; // 必须删掉，因为官网的今天按钮有bug，不受showNow的值控制
+        if (!config.cellRender) {
+            config.cellRender = selfCellRender;
         }
-        if (kind === "extra" && picker !== "date") {
-            delete config.extraItems;
+        // 单选
+        if (kind === "single") {
+            config.popupClassName = "\n        ".concat(styles.bhdDatePickerPopup, " ").concat(styles.singlePicker, " ").concat(popupClassName || "", " ").concat(showTime ? styles.showTime : "", " ").concat(renderExtraFooter ? styles.showExtraFooter : "");
         }
+        // 范围选择
+        if (kind === "range") {
+            config.popupClassName = "".concat(styles.bhdDatePickerPopup, " ").concat(styles.rangePicker, " ").concat(popupClassName || "", " ").concat(showTime ? styles.showTime : "", " ").concat(renderExtraFooter ? styles.showExtraFooter : "");
+        }
+        // 日常安排
         if (kind === "extra") {
-            delete config.disabledDate;
+            delete config.showTime; // 日程安排的时候，不允许展示时间面板
+            showTime = false; // 日程安排不选择时间
+            config.popupClassName = "".concat(styles.bhdDatePickerPopup, " ").concat(styles.extraPicker, " ").concat(extraReadonly ? styles.readonly : "", " ").concat(popupClassName || "", " ").concat(showTime ? styles.showTime : "", " ").concat(renderExtraFooter ? styles.showExtraFooter : "");
+            if (extraReadonly) {
+                config.allowClear = false; // 日程安排查看时，不显示清除按钮
+            }
         }
+        config.popupClassName = "".concat(config.popupClassName, " ").concat(id);
         return config;
     };
     // 设置默认mode
     var setDefaultMode = function() {
+        if (kind === "single" || kind === "extra") {
+            setPanelMode(mode || picker || "date");
+        }
         if (kind === "range") {
+            var _mode, _mode1;
             setRangePanelMode([
-                picker || "date",
-                picker || "date"
+                ((_mode = mode) === null || _mode === void 0 ? void 0 : _mode[0]) || picker || "date",
+                ((_mode1 = mode) === null || _mode1 === void 0 ? void 0 : _mode1[1]) || picker || "date"
             ]);
-        } else {
-            setPanelMode(picker || "date");
         }
     };
     //单元格渲染
-    var cellRender = function(current, info) {
+    var selfCellRender = function(current, info) {
         if (info.type === "date") {
             var extraItem = null;
             if (kind === "extra") {
-                extraItem = extraItems === null || extraItems === void 0 ? void 0 : extraItems.find(function(item) {
+                var _extraItems;
+                extraItem = (_extraItems = extraItems) === null || _extraItems === void 0 ? void 0 : _extraItems.find(function(item) {
                     return item.date.format("YYYYMMDD") === current.format("YYYYMMDD");
                 });
             }
@@ -128,71 +213,115 @@ 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: months[Number(current.format("M")) - 1] + "月"
+                children: i18Conversion(months[Number(current.format("M")) - 1])
             });
         }
         return info.originNode;
     };
     //日期禁用
-    var disabledDate = function(current) {
-        // if (extraReadonly) {
-        //   return true;
-        // }
+    var selfDisabledDate = function(current) {
+        // 或者是传过来的
+        if (disabledDate) {
+            return disabledDate(current);
+        }
         // 不能选择的是没有日程安排的
         var extraItem = null;
         if (kind === "extra") {
-            extraItem = extraItems === null || extraItems === void 0 ? void 0 : extraItems.find(function(item) {
+            var _extraItems;
+            extraItem = (_extraItems = extraItems) === null || _extraItems === void 0 ? void 0 : _extraItems.find(function(item) {
                 return item.date.format("YYYYMMDD") === current.format("YYYYMMDD");
             });
             if (extraReadonly && extraItem) {
                 return false;
             }
+            return !extraItem || current && extraItem.status === "noselectable";
         }
-        return !extraItem || current && extraItem.status === "noselectable";
+        return false;
     };
-    // 渲染底部扩展内容
-    var renderExtraFooter = function(mode) {
-        return !showTime ? /*#__PURE__*/ _jsxs("ul", {
-            className: "bhd-picker-ranges",
+    // 渲染底部扩展内容（包括确定按钮、今天按钮、预设、传入的底部扩展）
+    var selfRenderExtraFooter = function(mode) {
+        var _selectedRangeDate, _selectedRangeDate1;
+        return /*#__PURE__*/ _jsxs(_Fragment, {
             children: [
-                renderPresets(),
-                showNow && (kind === "single" || kind === "extra" && extraItems.filter(function(item) {
-                    return item.status !== "noselectable" && item.date.format("YYYY-MM-DD") === dayjs().format("YYYY-MM-DD");
-                }).length > 0) && mode === "date" && /*#__PURE__*/ _jsx("li", {
-                    className: "bhd-picker-now",
-                    children: /*#__PURE__*/ _jsx("a", {
-                        className: "bhd-picker-now-btn",
-                        onClick: todayClick,
-                        children: showTime ? "此刻" : "今天"
-                    })
+                renderExtraFooter && /*#__PURE__*/ _jsx("div", {
+                    className: "bhddatepicker-picker-footer-extra-extend",
+                    children: renderExtraFooter(mode)
                 }),
-                /*#__PURE__*/ _jsx("li", {
-                    className: "bhd-picker-ok",
-                    children: /*#__PURE__*/ _jsx(Button, {
-                        type: "primary",
-                        disabled: kind === "range" ? !((selectedRangeDate === null || selectedRangeDate === void 0 ? void 0 : selectedRangeDate[0]) && (selectedRangeDate === null || selectedRangeDate === void 0 ? void 0 : selectedRangeDate[1])) : !(selectedDate && selectedDateString),
-                        onClick: okClick,
-                        children: "确定"
+                !showTime ? /*#__PURE__*/ _jsx(_Fragment, {
+                    children: /*#__PURE__*/ _jsxs("ul", {
+                        className: "bhd-picker-ranges",
+                        children: [
+                            selfRenderPresets(),
+                            renderToday(),
+                            /*#__PURE__*/ _jsx("li", {
+                                className: "bhd-picker-ok",
+                                children: /*#__PURE__*/ _jsx(Button, {
+                                    type: "primary",
+                                    disabled: kind === "range" ? !(((_selectedRangeDate = selectedRangeDate) === null || _selectedRangeDate === void 0 ? void 0 : _selectedRangeDate[0]) && ((_selectedRangeDate1 = selectedRangeDate) === null || _selectedRangeDate1 === void 0 ? void 0 : _selectedRangeDate1[1])) : !(selectedDate && selectedDateString),
+                                    onClick: okClick,
+                                    children: i18Conversion("确定")
+                                })
+                            })
+                        ]
                     })
+                }) : /*#__PURE__*/ _jsx("ul", {
+                    className: "bhd-picker-ranges showPresets ".concat(showNow ? "showNow" : ""),
+                    children: selfRenderPresets()
                 })
             ]
-        }) : /*#__PURE__*/ _jsx("ul", {
-            className: "bhd-picker-ranges",
-            children: renderPresets()
         });
     };
+    // 渲染今天
+    var renderToday = function() {
+        // 显示now
+        if (showToday) {
+            var _extraItems;
+            // 日程安排时： extraItems中今天是否是可选或者已选择状态
+            var hasNow = ((_extraItems = extraItems) === null || _extraItems === void 0 ? void 0 : _extraItems.filter(function(item) {
+                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) {
+                    return /*#__PURE__*/ _jsx("li", {
+                        className: "bhd-picker-now",
+                        children: /*#__PURE__*/ _jsx("a", {
+                            className: "bhd-picker-now-btn",
+                            style: {
+                                visibility: "hidden"
+                            },
+                            onClick: todayClick,
+                            children: i18Conversion("今天")
+                        })
+                    });
+                }
+            }
+        }
+        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 renderPresets = function() {
+    var selfRenderPresets = function() {
         return /*#__PURE__*/ _jsx("li", {
             className: "bhd-picker-presets",
             children: presets.map(function(item, index) {
                 return /*#__PURE__*/ _jsx("a", {
                     className: "bhd-picker-preset-btn",
                     onClick: function() {
-                        presetClick(item.value);
+                        presetClick(item);
                     },
                     children: item.label
                 }, index);
@@ -204,77 +333,87 @@ var BhdDatePicker = function(props) {
         if (kind === "range") {
             if (selectedRangeDate[0] && selectedRangeDate[1] && selectedRangeDateString[0] && selectedRangeDateString[1]) {
                 onChange && onChange(selectedRangeDate, selectedRangeDateString);
-                setOpen(false);
+                setPanelOpen(false);
             } else {
-                setOpen(true);
+                setPanelOpen(true);
             }
         } else {
-            if (selectedDate && selectedDateString) {
-                onChange && onChange(selectedDate, selectedDateString);
-                setOpen(false);
+            if (selectedDateRef.current && selectedDateStringRef.current) {
+                onChange && onChange(selectedDateRef.current, selectedDateStringRef.current);
+                setPanelOpen(false);
             }
         }
     };
-    var todayClick = function() {
-        var today = dayjs();
-        var todayString = today.format(showTime ? "YYYY-MM-DD hh:mm:ss" : "YYYY-MM-DD");
-        setSelectedDate(today);
-        setSelectedDateString(todayString);
-        onChange && onChange(today, todayString);
-        setOpen(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(value) {
-        var todayString = value.format(showTime ? "YYYY-MM-DD hh:mm:ss" : "YYYY-MM-DD");
-        setSelectedDate(value);
-        setSelectedDateString(todayString);
-        onChange && onChange(value, todayString);
-        setOpen(false);
+    var presetClick = function(info) {
+        console.log(_type_of(info.value));
+        var value = typeof info.value === "function" ? info.value() : info.value;
+        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),
         ref: bhdDatePickerRef,
         children: [
-            kind === "single" && /*#__PURE__*/ _jsx(_Fragment, {
+            (kind === "single" || kind === "extra") && /*#__PURE__*/ _jsx(_Fragment, {
                 children: /*#__PURE__*/ _jsx(DatePicker, _object_spread_props(_object_spread({}, getConfig()), {
-                    id: "pickerRef",
-                    className: "".concat(className, " ").concat(useType === "table" ? "table-date-picker" : ""),
-                    popupClassName: "".concat(styles.bhdDatePickerPopup, " ").concat(styles.singlePicker, " ").concat(popupClassName || ""),
-                    cellRender: cellRender,
-                    prevIcon: /*#__PURE__*/ _jsx(CustomArrow, {
-                        style: {
-                            transform: "rotate(90deg)"
-                        }
-                    }),
-                    nextIcon: /*#__PURE__*/ _jsx(CustomArrow, {
-                        style: {
-                            transform: "rotate(-90deg)"
-                        }
-                    }),
-                    superPrevIcon: /*#__PURE__*/ _jsx(CustomArrow, {
-                        style: {
-                            transform: "rotate(90deg)"
-                        }
-                    }),
-                    superNextIcon: /*#__PURE__*/ _jsx(CustomArrow, {
-                        style: {
-                            transform: "rotate(-90deg)"
-                        }
-                    }),
+                    id: id,
+                    value: selectedDate,
+                    mode: panelMode,
+                    open: panelOpen,
+                    disabledDate: selfDisabledDate,
                     onPanelChange: function(value, mode) {
                         setPanelMode(mode);
+                        onPanelChange && onPanelChange(value, mode);
                     },
-                    mode: panelMode,
-                    open: open,
                     onOpenChange: function(value) {
                         // 打开设置默认mode
                         if (value) {
                             setDefaultMode();
+                            todayClickEventListener(value);
                         }
+                        onOpenChange && onOpenChange(value);
                     },
-                    showNow: showTime ? showNow : false,
-                    defaultPickerValue: selectedDate,
-                    value: selectedDate,
                     onChange: function(date, dateString) {
                         setSelectedDate(function(prevState) {
                             selectedDateRef.current = date;
@@ -285,149 +424,67 @@ var BhdDatePicker = function(props) {
                             return selectedDateStringRef.current;
                         });
                     },
-                    onOk: function() {
+                    onOk: function(date) {
                         if (showTime) {
                             setTimeout(function() {
-                                console.log({
-                                    selectedDate: selectedDateRef.current,
-                                    selectedDateString: selectedDateStringRef.current
-                                });
                                 onChange && onChange(selectedDateRef.current, selectedDateStringRef.current);
-                                setOpen(false);
+                                setPanelOpen(false);
                             }, 0);
                         }
-                        onOk && onOk();
+                        onOk && onOk(date);
                     },
-                    onClick: function() {
-                        setOpen(true);
-                        onClick && onClick();
+                    onClick: function(e) {
+                        setPanelOpen(true);
+                        onClick && onClick(e);
                     },
-                    onBlur: function() {
+                    onBlur: function(e) {
                         okClick();
-                        setOpen(false);
-                        onBlur && onBlur();
-                    },
-                    renderExtraFooter: renderExtraFooter
+                        setPanelOpen(false);
+                        onBlur && onBlur(e);
+                    }
                 }))
             }),
             kind === "range" && /*#__PURE__*/ _jsx(_Fragment, {
                 children: /*#__PURE__*/ _jsx(RangePicker, _object_spread_props(_object_spread({}, getConfig()), {
-                    className: "".concat(className, " ").concat(useType === "table" ? "table-date-picker" : ""),
-                    popupClassName: "".concat(styles.bhdDatePickerPopup, " ").concat(styles.rangePicker, " ").concat(popupClassName || ""),
-                    cellRender: cellRender,
-                    prevIcon: /*#__PURE__*/ _jsx(CustomArrow, {
-                        style: {
-                            transform: "rotate(90deg)"
-                        }
-                    }),
-                    nextIcon: /*#__PURE__*/ _jsx(CustomArrow, {
-                        style: {
-                            transform: "rotate(-90deg)"
-                        }
-                    }),
-                    superPrevIcon: /*#__PURE__*/ _jsx(CustomArrow, {
-                        style: {
-                            transform: "rotate(90deg)"
-                        }
-                    }),
-                    superNextIcon: /*#__PURE__*/ _jsx(CustomArrow, {
-                        style: {
-                            transform: "rotate(-90deg)"
-                        }
-                    }),
+                    value: selectedRangeDate,
+                    mode: rangePanelMode,
+                    open: panelOpen,
+                    disabledDate: selfDisabledDate,
                     onPanelChange: function(value, mode) {
                         setRangePanelMode(mode);
+                        onPanelChange && onPanelChange(value, mode);
                     },
-                    mode: rangePanelMode,
-                    open: open,
                     onOpenChange: function(value) {
                         if (value) {
                             setDefaultMode();
                         }
+                        if (showTime) {
+                            setPanelOpen(value);
+                        }
                         setRangeOpenChange(value);
+                        onOpenChange && onOpenChange(value);
                     },
-                    showNow: false,
-                    defaultPickerValue: selectedRangeDate,
-                    value: selectedRangeDate,
-                    onClick: function() {
-                        setOpen(true);
-                        onClick && onClick();
+                    onClick: function(e) {
+                        setPanelOpen(true);
+                        onClick && onClick(e);
                     },
                     onCalendarChange: function(dates, dateStrings, info) {
                         setSelectedRangeDate(dates);
                         setSelectedRangeDateString(dateStrings);
+                        onCalendarChange && onCalendarChange(dates, dateStrings, info);
                     },
-                    onBlur: function() {
-                        if ((selectedRangeDate === null || selectedRangeDate === void 0 ? void 0 : selectedRangeDate[0]) && (selectedRangeDate === null || selectedRangeDate === void 0 ? void 0 : selectedRangeDate[1])) {
+                    onBlur: function(e) {
+                        var _selectedRangeDate, _selectedRangeDate1, _selectedRangeDate2, _selectedRangeDate3;
+                        if (((_selectedRangeDate = selectedRangeDate) === null || _selectedRangeDate === void 0 ? void 0 : _selectedRangeDate[0]) && ((_selectedRangeDate1 = selectedRangeDate) === null || _selectedRangeDate1 === void 0 ? void 0 : _selectedRangeDate1[1])) {
                             okClick();
-                            setOpen(false);
-                        } else if (!(selectedRangeDate === null || selectedRangeDate === void 0 ? void 0 : selectedRangeDate[0]) || !(selectedRangeDate === null || selectedRangeDate === void 0 ? void 0 : selectedRangeDate[1])) {
-                            setOpen(rangeOpenChange);
+                            setPanelOpen(false);
+                        } else if (!((_selectedRangeDate2 = selectedRangeDate) === null || _selectedRangeDate2 === void 0 ? void 0 : _selectedRangeDate2[0]) || !((_selectedRangeDate3 = selectedRangeDate) === null || _selectedRangeDate3 === void 0 ? void 0 : _selectedRangeDate3[1])) {
+                            setPanelOpen(rangeOpenChange);
                         }
-                        onBlur && onBlur();
-                    },
-                    panelRender: function(panelNode) {
-                        return panelNode;
-                    },
-                    renderExtraFooter: renderExtraFooter
-                }))
-            }),
-            kind === "extra" && /*#__PURE__*/ _jsx(DatePicker, _object_spread_props(_object_spread({}, getConfig()), {
-                className: "".concat(className, " ").concat(useType === "table" ? "hide" : ""),
-                popupClassName: "".concat(styles.bhdDatePickerPopup, " ").concat(styles.extraPicker, " ").concat(extraReadonly ? styles.readonly : "", " ").concat(popupClassName || ""),
-                cellRender: cellRender,
-                prevIcon: /*#__PURE__*/ _jsx(CustomArrow, {
-                    style: {
-                        transform: "rotate(90deg)"
-                    }
-                }),
-                nextIcon: /*#__PURE__*/ _jsx(CustomArrow, {
-                    style: {
-                        transform: "rotate(-90deg)"
-                    }
-                }),
-                superPrevIcon: /*#__PURE__*/ _jsx(CustomArrow, {
-                    style: {
-                        transform: "rotate(90deg)"
+                        onBlur && onBlur(e);
                     }
-                }),
-                superNextIcon: /*#__PURE__*/ _jsx(CustomArrow, {
-                    style: {
-                        transform: "rotate(-90deg)"
-                    }
-                }),
-                disabledDate: disabledDate,
-                allowClear: !extraReadonly,
-                onPanelChange: function(value, mode) {
-                    setPanelMode(mode);
-                },
-                mode: panelMode,
-                onOpenChange: function(value) {
-                    if (value) {
-                        setDefaultMode();
-                    }
-                },
-                open: open,
-                showNow: false,
-                defaultPickerValue: selectedDate,
-                value: selectedDate,
-                onChange: function(date, dateString) {
-                    setSelectedDate(date);
-                    setSelectedDateString(dateString);
-                },
-                onClick: function() {
-                    setOpen(true);
-                    onClick && onClick();
-                },
-                onBlur: function() {
-                    if (!extraReadonly) {
-                        okClick();
-                    }
-                    setOpen(false);
-                    onBlur && onBlur();
-                },
-                renderExtraFooter: extraReadonly ? null : renderExtraFooter
-            }))
+                }))
+            })
         ]
     });
 };