bhd-components 0.9.3 → 0.9.5

package/es2017/bhdDatePicker/index.js

@@ -2,14 +2,30 @@ 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, forwardRef, useImperativeHandle } 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;
-const BhdDatePicker = (props)=>{
+let months = [
+    "一月",
+    "二月",
+    "三月",
+    "四月",
+    "五月",
+    "六月",
+    "七月",
+    "八月",
+    "九月",
+    "十月",
+    "十一月",
+    "十二月"
+];
+//January_February_March_April_May_June_July_August_September_October_November_December
+const BhdDatePicker = /*#__PURE__*/ forwardRef((props, ref)=>{
     const lang = ConfigProvider.lang === "en" ? "en_US" : "zh_CN";
     // if (lang === "en_US") {
     //   const enUS = require("dayjs/locale/en");
@@ -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,39 +64,88 @@ 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 = "", needConfirm = true, open = false, mode, picker, value, format = getDefaultFormat(), presets = [], className, popupClassName, dropdownClassName, showTime, showNow = true, showToday = true, allowClear = true, onClick, onBlur, onChange, onOk, // onCalendarChange,
+    onOpenChange, onPanelChange, disabledDate, cellRender, renderExtraFooter } = props;
     const bhdDatePickerRef = useRef(null);
+    const pickerRef = useRef(null);
     const [panelOpen, setPanelOpen] = useState(open);
     const [panelMode, setPanelMode] = useState("date");
     const [rangePanelMode, setRangePanelMode] = useState([
         "date",
         "date"
     ]);
-    const [selectedDate, setSelectedDate] = useState(value);
-    const [selectedDateString, setSelectedDateString] = useState(null);
-    const selectedDateRef = useRef(value);
-    const selectedDateStringRef = useRef(null);
-    const [selectedRangeDate, setSelectedRangeDate] = useState(value);
-    const [selectedRangeDateString, setSelectedRangeDateString] = useState([]);
-    const [rangeOpenChange, setRangeOpenChange] = useState(false); // 用于范围选择失去焦点后，判断是否关闭
+    const [selectedDate, setSelectedDate] = useState(null);
+    const [selectedDateString, setSelectedDateString] = useState("");
+    const selectedDateRef = useRef(null);
+    const selectedDateStringRef = useRef("");
+    const [selectedRangeDate, setSelectedRangeDate] = useState([
+        null,
+        null
+    ]);
+    const [selectedRangeDateString, setSelectedRangeDateString] = useState([
+        "",
+        ""
+    ]);
+    const selectedRangeDateRef = useRef([
+        null,
+        null
+    ]);
+    const selectedRangeDateStringRef = useRef([
+        "",
+        ""
+    ]);
+    const [panelOpenChange, setPanelOpenChange] = useState(false); // 用于失去焦点后，判断是否关闭
+    const isChange = useRef(false);
+    const selectRange = useRef([]);
+    useImperativeHandle(ref, ()=>{
+        return {};
+    });
     useEffect(()=>{
         setDefaultMode();
+        return ()=>{
+            var _document_getElementsByClassName__getElementsByClassName, _document_getElementsByClassName_, _document_getElementsByClassName, _todayBtn, _document_getElementsByClassName__getElementsByClassName1, _document_getElementsByClassName_1, _document_getElementsByClassName1, _nowBtn;
+            const todayBtn = (_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];
+            (_todayBtn = todayBtn) === null || _todayBtn === void 0 ? void 0 : _todayBtn.removeEventListener("click", todayClick);
+            const nowBtn = (_document_getElementsByClassName1 = document.getElementsByClassName(id)) === null || _document_getElementsByClassName1 === void 0 ? void 0 : (_document_getElementsByClassName_1 = _document_getElementsByClassName1[0]) === null || _document_getElementsByClassName_1 === void 0 ? void 0 : (_document_getElementsByClassName__getElementsByClassName1 = _document_getElementsByClassName_1.getElementsByClassName("bhd-picker-now-btn")) === null || _document_getElementsByClassName__getElementsByClassName1 === void 0 ? void 0 : _document_getElementsByClassName__getElementsByClassName1[0];
+            (_nowBtn = nowBtn) === null || _nowBtn === void 0 ? void 0 : _nowBtn.removeEventListener("click", todayClick);
+        };
+    }, []);
+    useEffect(()=>{
         if (kind === "range") {
-            if (selectedRangeDate[0] && selectedRangeDate[1]) {
-                setSelectedRangeDateString([
-                    selectedRangeDate[0].format(format),
-                    selectedRangeDate[1].format(format)
-                ]);
-            }
+            setSelectedRangeDate((prevState)=>{
+                selectedRangeDateRef.current = value || [
+                    null,
+                    null
+                ];
+                return selectedRangeDateRef.current;
+            });
+            setSelectedRangeDateString((prevState)=>{
+                var _selectedRangeDateRef_current_, _selectedRangeDateRef_current_1;
+                selectedRangeDateStringRef.current = [
+                    ((_selectedRangeDateRef_current_ = selectedRangeDateRef.current[0]) === null || _selectedRangeDateRef_current_ === void 0 ? void 0 : _selectedRangeDateRef_current_.format(format)) || "",
+                    ((_selectedRangeDateRef_current_1 = selectedRangeDateRef.current[1]) === null || _selectedRangeDateRef_current_1 === void 0 ? void 0 : _selectedRangeDateRef_current_1.format(format)) || ""
+                ];
+                return selectedRangeDateStringRef.current;
+            });
         } else {
-            if (selectedDate) {
-                setSelectedDateString((prevState)=>{
-                    selectedDateStringRef.current = selectedDate.format(format);
-                    return selectedDateStringRef.current;
-                });
-            }
+            setSelectedDate((prevState)=>{
+                selectedDateRef.current = value || null;
+                return selectedDateRef.current;
+            });
+            setSelectedDateString((prevState)=>{
+                var _selectedDateRef_current;
+                selectedDateStringRef.current = ((_selectedDateRef_current = selectedDateRef.current) === null || _selectedDateRef_current === void 0 ? void 0 : _selectedDateRef_current.format(format)) || "";
+                return selectedDateStringRef.current;
+            });
         }
-    }, []);
+    }, [
+        value
+    ]);
+    useEffect(()=>{
+        setPanelOpen(open);
+    }, [
+        open
+    ]);
     // 传给 DatePicker 的props参数
     const getConfig = ()=>{
         let config = _object_spread_props(_object_spread({
@@ -109,6 +175,7 @@ const BhdDatePicker = (props)=>{
             popupClassName,
             allowClear,
             showTime,
+            showToday,
             cellRender,
             renderExtraFooter: selfRenderExtraFooter
         });
@@ -122,10 +189,19 @@ const BhdDatePicker = (props)=>{
         delete config.onChange;
         delete config.useType; // 组件自己定义的
         delete config.presets; // 必须删掉，因为预设由官网的左侧换到底部
-        delete config.showNow; // 必须删掉，因为官网的今天按钮有bug，不受showNow的值控制
+        delete config.dropdownClassName;
         if (!config.cellRender) {
             config.cellRender = selfCellRender;
         }
+        // 判断是否显示今天按钮
+        if (!isRenderToday()) {
+            config.showToday = false;
+            showToday = false;
+        }
+        //  不显示今天、预设、确定按钮
+        if (!isSelfRenderExtraFooter()) {
+            delete config.renderExtraFooter;
+        }
         // 单选
         if (kind === "single") {
             config.popupClassName = `
@@ -144,6 +220,7 @@ const BhdDatePicker = (props)=>{
                 config.allowClear = false; // 日程安排查看时，不显示清除按钮
             }
         }
+        config.popupClassName = `${config.popupClassName} ${dropdownClassName} ${needConfirm ? "" : styles.noNeedConfirm} ${id}`;
         return config;
     };
     // 设置默认mode
@@ -182,9 +259,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;
@@ -209,25 +291,24 @@ const BhdDatePicker = (props)=>{
     };
     // 渲染底部扩展内容（包括确定按钮、今天按钮、预设、传入的底部扩展）
     const selfRenderExtraFooter = (mode)=>{
-        var _selectedRangeDate, _selectedRangeDate1;
+        var _selectedRangeDate, _selectedRangeDate1, _selectedRangeDate2, _selectedRangeDate3;
         return /*#__PURE__*/ _jsxs(_Fragment, {
             children: [
-                renderExtraFooter && /*#__PURE__*/ _jsx("div", {
-                    className: "bhddatepicker-picker-footer-extra-extend",
-                    children: renderExtraFooter()
-                }),
                 !showTime ? /*#__PURE__*/ _jsx(_Fragment, {
-                    children: /*#__PURE__*/ _jsxs("ul", {
+                    children: ((picker || "date") === "date" && showToday || presets && presets.length > 0 || needConfirm) && /*#__PURE__*/ _jsxs("ul", {
                         className: "bhd-picker-ranges",
                         children: [
                             selfRenderPresets(),
-                            renderNow(),
-                            /*#__PURE__*/ _jsx("li", {
+                            renderToday(mode),
+                            needConfirm && /*#__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,
+                                    className: `${(kind === "range" ? !(((_selectedRangeDate2 = selectedRangeDate) === null || _selectedRangeDate2 === void 0 ? void 0 : _selectedRangeDate2[0]) && ((_selectedRangeDate3 = selectedRangeDate) === null || _selectedRangeDate3 === void 0 ? void 0 : _selectedRangeDate3[1])) : !(selectedDate && selectedDateString)) ? "disabled" : ""}`,
+                                    onClick: ()=>{
+                                        okClick();
+                                    },
                                     children: i18Conversion("确定")
                                 })
                             })
@@ -236,35 +317,90 @@ const BhdDatePicker = (props)=>{
                 }) : /*#__PURE__*/ _jsx("ul", {
                     className: `bhd-picker-ranges showPresets ${showNow ? "showNow" : ""}`,
                     children: selfRenderPresets()
+                }),
+                renderExtraFooter && /*#__PURE__*/ _jsx("div", {
+                    className: "bhddatepicker-picker-footer-extra-extend",
+                    children: renderExtraFooter(mode)
                 })
             ]
         });
     };
-    // 渲染今天
-    const renderNow = ()=>{
-        // 显示now
-        if (showNow) {
-            var _extraItems;
+    // 判断是否显示今天按钮、预设、确定按钮、传入的底部扩展
+    const isSelfRenderExtraFooter = ()=>{
+        let result = false;
+        if (kind === "range") {
+            result = presets && presets.length > 0 || renderExtraFooter || needConfirm;
+        } else {
+            result = isRenderToday() || presets && presets.length > 0 || renderExtraFooter || needConfirm;
+        }
+        return result;
+    };
+    //判断是否显示今天按钮
+    const isRenderToday = ()=>{
+        if (showToday) {
+            if (kind === "single" && panelMode === "date") {
+                return true;
+            }
             // 日程安排时： extraItems中今天是否是可选或者已选择状态
-            let hasNow = ((_extraItems = extraItems) === null || _extraItems === void 0 ? void 0 : _extraItems.filter((item)=>item.status !== "noselectable").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",
-                            onClick: todayClick,
-                            children: showTime ? i18Conversion("此刻") : i18Conversion("今天")
-                        })
-                    });
+            if (kind === "extra") {
+                var _extraItems;
+                let hasToday = ((_extraItems = extraItems) === null || _extraItems === void 0 ? void 0 : _extraItems.filter((item)=>item.status !== "noselectable" && item.date.format("YYYYMMDD") === getToday()).length) > 0;
+                if (hasToday && panelMode === "date") {
+                    return true;
                 }
             }
         }
-        return null;
+        return false;
+    };
+    // 渲染今天
+    const renderToday = (mode)=>{
+        // // 显示Today
+        // if (showToday) {
+        //   // 日程安排时： extraItems中今天是否是可选或者已选择状态
+        //   let hasNow =
+        //     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") {
+        //       return (
+        //         <li className="bhd-picker-now">
+        //           <a
+        //             className="bhd-picker-now-btn"
+        //             style={{ visibility: "hidden" }}
+        //             onClick={todayClick}
+        //           >
+        //             {i18Conversion("今天")}
+        //           </a>
+        //         </li>
+        //       );
+        //     }
+        //   }
+        // }
+        // return null;
+        return isRenderToday() ? /*#__PURE__*/ _jsx("li", {
+            className: "bhd-picker-now",
+            children: /*#__PURE__*/ _jsx("a", {
+                className: "bhd-picker-now-btn",
+                style: {
+                    visibility: "hidden"
+                },
+                onClick: todayClick,
+                children: i18Conversion("今天")
+            })
+        }) : null;
+    };
+    // 获取到年月日
+    const getToday = ()=>{
+        const date = new Date();
+        return date.getFullYear().toString() + (date.getMonth() + 1).toString().padStart(2, "0") + date.getDate().toString().padStart(2, "0");
     };
     // 渲染预设
     const selfRenderPresets = ()=>{
-        return /*#__PURE__*/ _jsx("li", {
+        return presets && presets.length > 0 ? /*#__PURE__*/ _jsx("li", {
             className: "bhd-picker-presets",
             children: presets.map((item, index)=>{
                 return /*#__PURE__*/ _jsx("a", {
@@ -275,54 +411,100 @@ const BhdDatePicker = (props)=>{
                     children: item.label
                 }, index);
             })
-        });
+        }) : null;
     };
     // 日期选择确认
     const okClick = ()=>{
         if (kind === "range") {
-            if (selectedRangeDate[0] && selectedRangeDate[1] && selectedRangeDateString[0] && selectedRangeDateString[1]) {
-                onChange && onChange(selectedRangeDate, selectedRangeDateString);
+            var _selectedRangeDateRef_current, _selectedRangeDateRef_current1, _selectedRangeDateStringRef_current, _selectedRangeDateStringRef_current1;
+            if (((_selectedRangeDateRef_current = selectedRangeDateRef.current) === null || _selectedRangeDateRef_current === void 0 ? void 0 : _selectedRangeDateRef_current[0]) && ((_selectedRangeDateRef_current1 = selectedRangeDateRef.current) === null || _selectedRangeDateRef_current1 === void 0 ? void 0 : _selectedRangeDateRef_current1[1]) && ((_selectedRangeDateStringRef_current = selectedRangeDateStringRef.current) === null || _selectedRangeDateStringRef_current === void 0 ? void 0 : _selectedRangeDateStringRef_current[0]) && ((_selectedRangeDateStringRef_current1 = selectedRangeDateStringRef.current) === null || _selectedRangeDateStringRef_current1 === void 0 ? void 0 : _selectedRangeDateStringRef_current1[1])) {
+                if (isChange.current) {
+                    onChange && onChange(selectedRangeDateRef.current, selectedRangeDateStringRef.current);
+                    isChange.current = false;
+                // if (pickerRef.current) {
+                //   pickerRef.current.blur();
+                // }
+                }
                 setPanelOpen(false);
-            } else {
-                setPanelOpen(true);
             }
         } else {
-            if (selectedDate && selectedDateString) {
-                onChange && onChange(selectedDate, selectedDateString);
+            if (selectedDateRef.current && selectedDateStringRef.current) {
+                if (isChange.current) {
+                    onChange && onChange(selectedDateRef.current, selectedDateStringRef.current);
+                    isChange.current = false;
+                // if (pickerRef.current) {
+                //   pickerRef.current.blur();
+                // }
+                }
                 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 nowClickEventListener = (value)=>{
+        if (!value) return;
+        if (showTime) {
+            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-now-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((prevState)=>{
+                selectedRangeDateRef.current = value;
+                return selectedRangeDateRef.current;
+            });
+            setSelectedRangeDateString((prevState)=>{
+                selectedRangeDateStringRef.current = valueString;
+                return selectedRangeDateStringRef.current;
+            });
+            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 +512,9 @@ const BhdDatePicker = (props)=>{
         children: [
             (kind === "single" || kind === "extra") && /*#__PURE__*/ _jsx(_Fragment, {
                 children: /*#__PURE__*/ _jsx(DatePicker, _object_spread_props(_object_spread({}, getConfig()), {
+                    ref: pickerRef,
+                    id: id,
                     value: selectedDate,
-                    showNow: showTime ? showNow : false,
                     mode: panelMode,
                     open: panelOpen,
                     disabledDate: selfDisabledDate,
@@ -340,9 +523,12 @@ const BhdDatePicker = (props)=>{
                         onPanelChange && onPanelChange(value, mode);
                     },
                     onOpenChange: (value)=>{
+                        setPanelOpenChange(value);
                         // 打开设置默认mode
                         if (value) {
                             setDefaultMode();
+                            todayClickEventListener(value);
+                            nowClickEventListener(value);
                         }
                         onOpenChange && onOpenChange(value);
                     },
@@ -355,6 +541,12 @@ const BhdDatePicker = (props)=>{
                             selectedDateStringRef.current = dateString;
                             return selectedDateStringRef.current;
                         });
+                        isChange.current = true;
+                        if (!needConfirm) {
+                            setTimeout(()=>{
+                                okClick();
+                            }, 0);
+                        }
                     },
                     onOk: (date)=>{
                         if (showTime) {
@@ -370,16 +562,28 @@ const BhdDatePicker = (props)=>{
                         onClick && onClick(e);
                     },
                     onBlur: (e)=>{
-                        okClick();
-                        setPanelOpen(false);
+                        if (needConfirm) {
+                            var _e_relatedTarget_classList, _e_relatedTarget;
+                            okClick(); // 面板区域内失去焦点时
+                            if ((_e_relatedTarget = e.relatedTarget) === null || _e_relatedTarget === void 0 ? void 0 : (_e_relatedTarget_classList = _e_relatedTarget.classList) === null || _e_relatedTarget_classList === void 0 ? void 0 : _e_relatedTarget_classList.value.includes("bhd-picker-panel")) {
+                                if (pickerRef.current) {
+                                    pickerRef.current.focus();
+                                }
+                                setPanelOpen(true);
+                            } else {
+                                setPanelOpen(false);
+                            }
+                        } else {
+                            setPanelOpen(false);
+                        }
                         onBlur && onBlur(e);
                     }
                 }))
             }),
             kind === "range" && /*#__PURE__*/ _jsx(_Fragment, {
                 children: /*#__PURE__*/ _jsx(RangePicker, _object_spread_props(_object_spread({}, getConfig()), {
+                    ref: pickerRef,
                     value: selectedRangeDate,
-                    showNow: false,
                     mode: rangePanelMode,
                     open: panelOpen,
                     disabledDate: selfDisabledDate,
@@ -388,31 +592,92 @@ const BhdDatePicker = (props)=>{
                         onPanelChange && onPanelChange(value, mode);
                     },
                     onOpenChange: (value)=>{
+                        setPanelOpenChange(value);
                         if (value) {
                             setDefaultMode();
                         }
                         if (showTime) {
                             setPanelOpen(value);
                         }
-                        setRangeOpenChange(value);
                         onOpenChange && onOpenChange(value);
                     },
                     onClick: (e)=>{
                         setPanelOpen(true);
+                        selectRange.current = [];
                         onClick && onClick(e);
                     },
+                    onChange: (dates, dateStrings)=>{
+                        // 清空的时候
+                        if (dates === null) {
+                            setSelectedRangeDate((prevState)=>{
+                                selectedRangeDateRef.current = [
+                                    null,
+                                    null
+                                ];
+                                return selectedRangeDateRef.current;
+                            });
+                            setSelectedRangeDateString((prevState)=>{
+                                selectedRangeDateStringRef.current = [
+                                    "",
+                                    ""
+                                ];
+                                return selectedRangeDateStringRef.current;
+                            });
+                            setPanelOpen(false);
+                            onChange && onChange([
+                                null,
+                                null
+                            ], [
+                                "",
+                                ""
+                            ]);
+                        }
+                    },
                     onCalendarChange: (dates, dateStrings, info)=>{
-                        setSelectedRangeDate(dates);
-                        setSelectedRangeDateString(dateStrings);
-                        onCalendarChange && onCalendarChange(dates, dateStrings, info);
+                        var _dates, _dates1;
+                        setSelectedRangeDate((prevState)=>{
+                            selectedRangeDateRef.current = dates;
+                            return selectedRangeDateRef.current;
+                        });
+                        setSelectedRangeDateString((prevState)=>{
+                            selectedRangeDateStringRef.current = dateStrings;
+                            return selectedRangeDateStringRef.current;
+                        });
+                        if (!selectRange.current.includes(info.range)) {
+                            selectRange.current.push(info.range);
+                        }
+                        if (((_dates = dates) === null || _dates === void 0 ? void 0 : _dates[0]) && ((_dates1 = dates) === null || _dates1 === void 0 ? void 0 : _dates1[1])) {
+                            //不用确认自动提交
+                            if (!needConfirm) {
+                                if (selectRange.current.includes("start") && selectRange.current.includes("end")) {
+                                    isChange.current = true;
+                                    setTimeout(()=>{
+                                        okClick();
+                                    }, 0);
+                                }
+                            } else {
+                                isChange.current = true;
+                            }
+                        }
                     },
                     onBlur: (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();
-                            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);
+                        console.log(panelOpenChange);
+                        if (needConfirm) {
+                            var _selectedRangeDateRef_current, _selectedRangeDateRef_current1, _selectedRangeDateRef_current2, _selectedRangeDateRef_current3;
+                            if (((_selectedRangeDateRef_current = selectedRangeDateRef.current) === null || _selectedRangeDateRef_current === void 0 ? void 0 : _selectedRangeDateRef_current[0]) && ((_selectedRangeDateRef_current1 = selectedRangeDateRef.current) === null || _selectedRangeDateRef_current1 === void 0 ? void 0 : _selectedRangeDateRef_current1[1])) {
+                                if (needConfirm && !panelOpenChange && isChange.current) {
+                                    okClick();
+                                } else {
+                                    setPanelOpen(panelOpenChange);
+                                }
+                                if (!isChange.current) {
+                                    setPanelOpen(false);
+                                }
+                            } else if (!((_selectedRangeDateRef_current2 = selectedRangeDateRef.current) === null || _selectedRangeDateRef_current2 === void 0 ? void 0 : _selectedRangeDateRef_current2[0]) || !((_selectedRangeDateRef_current3 = selectedRangeDateRef.current) === null || _selectedRangeDateRef_current3 === void 0 ? void 0 : _selectedRangeDateRef_current3[1])) {
+                                setPanelOpen(panelOpenChange);
+                            }
+                        } else {
+                            setPanelOpen(panelOpenChange);
                         }
                         onBlur && onBlur(e);
                     }
@@ -420,5 +685,5 @@ const BhdDatePicker = (props)=>{
             })
         ]
     });
-};
+});
 export default BhdDatePicker;