@canlooks/can-ui 0.0.88 → 0.0.90

package/dist/cjs/components/calendar/calendar.d.ts

@@ -1,7 +1,8 @@
 import { Size } from '../../types';
 import { Dayjs } from 'dayjs';
-import { Dispatch, SetStateAction } from 'react';
+import { Dispatch, ReactNode, SetStateAction } from 'react';
 import { FlexProps } from '../flex';
+import { ButtonProps } from '../button';
 export type ViewLevel = 'date' | 'month' | 'year';
 type SharedProps = {
     min?: Dayjs;
@@ -9,6 +10,8 @@ type SharedProps = {
     disabledDates?: (date: Dayjs) => boolean;
     /** 是否显示`回今天`按钮，默认为`true` */
     showToday?: boolean;
+    todayButtonText?: ReactNode;
+    todayButtonProps?: ButtonProps;
     /** @private */
     _defaultNull?: boolean;
 };
@@ -28,5 +31,5 @@ export interface PanelProps extends SharedProps {
     setViewType: Dispatch<SetStateAction<'date' | 'month' | 'year'>>;
     onSelected(newValue: Dayjs): void;
 }
-export declare const Calendar: ({ viewLevel, showToday, size, defaultValue, min, max, disabledDates, value, onChange, _defaultNull, ...props }: CalendarProps) => import("@emotion/react/jsx-runtime").JSX.Element;
+export declare const Calendar: ({ viewLevel, showToday, todayButtonText, todayButtonProps, size, defaultValue, min, max, disabledDates, value, onChange, _defaultNull, ...props }: CalendarProps) => import("@emotion/react/jsx-runtime").JSX.Element;
 export {};

package/dist/cjs/components/calendar/calendar.js

@@ -11,7 +11,7 @@ const calendar_style_1 = require("./calendar.style");
 const flex_1 = require("../flex");
 const panelYear_1 = require("./panelYear");
 const panelMonth_1 = require("./panelMonth");
-const Calendar = ({ viewLevel = 'date', showToday = true, size = 'medium', defaultValue = null, min, max, disabledDates, value, onChange, _defaultNull, ...props }) => {
+const Calendar = ({ viewLevel = 'date', showToday = true, todayButtonText = '回今天', todayButtonProps, size = 'medium', defaultValue = null, min, max, disabledDates, value, onChange, _defaultNull, ...props }) => {
     const [innerValue, setInnerValue] = (0, utils_1.useControlled)(defaultValue, value, onChange);
     const [viewType, setViewType] = (0, react_1.useState)(viewLevel);
     const [innerD, setInnerD] = (0, react_1.useState)(() => innerValue.current ?? (0, dayjs_1.default)().startOf('date'));
@@ -34,6 +34,8 @@ const Calendar = ({ viewLevel = 'date', showToday = true, size = 'medium', defau
             }
         },
         showToday,
+        todayButtonText,
+        todayButtonProps,
         _defaultNull
     };
     const renderPanel = () => {

package/dist/cjs/components/calendar/calendar.style.js

@@ -16,128 +16,128 @@ exports.classes = (0, utils_1.defineInnerClasses)('calendar', [
     'yearItem',
     'foot'
 ]);
-exports.style = (0, utils_1.defineCss)(({ divider, text, spacing }) => (0, react_1.css) `
-    .${exports.classes.head} {
-        height: 40px;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        border-bottom: 1px solid ${divider};
-        padding: 0 ${menuItem_style_1.menuListPadding}px;
-        position: relative;
-
-        .${exports.classes.headSide} {
-            z-index: 1;
-        }
-
-        .${exports.classes.headControl} {
-            color: ${text.placeholder};
-        }
-
-        .${exports.classes.headCenter} {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            position: absolute;
-            inset: 0;
-
-            .${exports.classes.headButton} {
-                font-weight: bold;
-                color: ${text.primary};
-            }
-        }
-    }
-
-    .${exports.classes.body} {
-        padding: ${spacing[3]}px ${spacing[4]}px;
-        display: grid;
-        place-items: center;
-
-        &[data-view-type=date] {
-            font-size: ${13 / 14}em;
-            grid-template-columns: repeat(7, 36px);
-            grid-template-rows: repeat(7, 36px);
-
-            .${exports.classes.dateItem} {
-                width: 24px;
-                height: 24px;
-    
-                &:not([data-variant=filled]) {
-                    color: ${text.primary};
-                    border-color: ${text.disabled};
-    
-                    &[data-other-month=true] {
-                        color: ${text.placeholder};
-                    }
-                }
-
-                &:disabled {
-                    width: 100%;
-                    border-radius: 0;
-                }
-            }
-        }
-
-        &[data-view-type=month], &[data-view-type=year] {
-            grid-template-columns: repeat(3, 84px);
-            grid-template-rows: repeat(4, 63px);
-
-            .${exports.classes.monthItem},
-            .${exports.classes.yearItem} {
-                width: 72px;
-                padding-inline: 0;
-
-                &:not([data-variant=filled]) {
-                    color: ${text.primary};
-                }
-            }
-        }
-    }
-    
-    &[data-size=small] {
-        .${exports.classes.body} {
-            &[data-view-type=date] {
-                grid-template-columns: repeat(7, 30px);
-                grid-template-rows: repeat(7, 30px);
-            }
-
-            &[data-view-type=month], &[data-view-type=year] {
-                grid-template-columns: repeat(3, 70px);
-                grid-template-rows: repeat(4, 52.5px);
-
-                .${exports.classes.monthItem},
-                .${exports.classes.yearItem} {
-                    width: 60px;
-                }
-            }
-        }
-    }
-
-    &[data-size=large] {
-        .${exports.classes.body} {
-            &[data-view-type=date] {
-                font-size: 1em;
-                grid-template-columns: repeat(7, 42px);
-                grid-template-rows: repeat(7, 42px);
-
-                .${exports.classes.dateItem} {
-                    width: 32px;
-                    height: 32px;
-                }
-            }
-
-            &[data-view-type=month], &[data-view-type=year] {
-                grid-template-columns: repeat(3, 98px);
-                grid-template-rows: repeat(4, 73.5px);
-            }
-        }
-    }
-
-    .${exports.classes.foot} {
-        height: 41px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border-top: 1px solid ${divider};
-    }
+exports.style = (0, utils_1.defineCss)(({ divider, text, spacing }) => (0, react_1.css) `
+    .${exports.classes.head} {
+        height: 40px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        border-bottom: 1px solid ${divider};
+        padding: 0 ${menuItem_style_1.menuListPadding}px;
+        position: relative;
+
+        .${exports.classes.headSide} {
+            z-index: 1;
+        }
+
+        .${exports.classes.headControl} {
+            color: ${text.placeholder};
+        }
+
+        .${exports.classes.headCenter} {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            position: absolute;
+            inset: 0;
+
+            .${exports.classes.headButton} {
+                font-weight: bold;
+                color: ${text.primary};
+            }
+        }
+    }
+
+    .${exports.classes.body} {
+        padding: ${spacing[3]}px ${spacing[4]}px;
+        display: grid;
+        place-items: center;
+
+        &[data-view-type=date] {
+            font-size: ${13 / 14}em;
+            grid-template-columns: repeat(7, 36px);
+            grid-template-rows: repeat(7, 36px);
+
+            .${exports.classes.dateItem} {
+                width: 24px;
+                height: 24px;
+    
+                &:not([data-variant=filled]) {
+                    color: ${text.primary};
+                    border-color: ${text.disabled};
+    
+                    &[data-other-month=true] {
+                        color: ${text.placeholder};
+                    }
+                }
+
+                &:disabled {
+                    width: 100%;
+                    border-radius: 0;
+                }
+            }
+        }
+
+        &[data-view-type=month], &[data-view-type=year] {
+            grid-template-columns: repeat(3, 84px);
+            grid-template-rows: repeat(4, 63px);
+
+            .${exports.classes.monthItem},
+            .${exports.classes.yearItem} {
+                width: 72px;
+                padding-inline: 0;
+
+                &:not([data-variant=filled]) {
+                    color: ${text.primary};
+                }
+            }
+        }
+    }
+    
+    &[data-size=small] {
+        .${exports.classes.body} {
+            &[data-view-type=date] {
+                grid-template-columns: repeat(7, 30px);
+                grid-template-rows: repeat(7, 30px);
+            }
+
+            &[data-view-type=month], &[data-view-type=year] {
+                grid-template-columns: repeat(3, 70px);
+                grid-template-rows: repeat(4, 52.5px);
+
+                .${exports.classes.monthItem},
+                .${exports.classes.yearItem} {
+                    width: 60px;
+                }
+            }
+        }
+    }
+
+    &[data-size=large] {
+        .${exports.classes.body} {
+            &[data-view-type=date] {
+                font-size: 1em;
+                grid-template-columns: repeat(7, 42px);
+                grid-template-rows: repeat(7, 42px);
+
+                .${exports.classes.dateItem} {
+                    width: 32px;
+                    height: 32px;
+                }
+            }
+
+            &[data-view-type=month], &[data-view-type=year] {
+                grid-template-columns: repeat(3, 98px);
+                grid-template-rows: repeat(4, 73.5px);
+            }
+        }
+    }
+
+    .${exports.classes.foot} {
+        height: 41px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-top: 1px solid ${divider};
+    }
 `);

package/dist/cjs/components/calendar/panelDates.d.ts

@@ -1,2 +1,2 @@
 import { PanelProps } from './calendar';
-export declare const PanelDates: import("react").MemoExoticComponent<({ value, setValue, innerD, setInnerD, setViewType, min, max, disabledDates, showToday, _defaultNull }: PanelProps) => import("@emotion/react/jsx-runtime").JSX.Element>;
+export declare const PanelDates: import("react").MemoExoticComponent<({ value, setValue, innerD, setInnerD, setViewType, min, max, disabledDates, showToday, todayButtonText, todayButtonProps, _defaultNull }: PanelProps) => import("@emotion/react/jsx-runtime").JSX.Element>;

package/dist/cjs/components/calendar/panelDates.js

@@ -26,7 +26,7 @@ const commonButtonProps = {
     size: 'small',
     color: 'text'
 };
-exports.PanelDates = (0, react_1.memo)(({ value, setValue, innerD, setInnerD, setViewType, min, max, disabledDates, showToday, _defaultNull }) => {
+exports.PanelDates = (0, react_1.memo)(({ value, setValue, innerD, setInnerD, setViewType, min, max, disabledDates, showToday, todayButtonText = '回今天', todayButtonProps, _defaultNull }) => {
     const today = (0, dayjs_1.default)();
     const prevMonth = () => {
         setInnerD(d => d.subtract(1, 'month'));
@@ -70,5 +70,8 @@ exports.PanelDates = (0, react_1.memo)(({ value, setValue, innerD, setInnerD, se
         return ret;
     };
     return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)("div", { className: calendar_style_1.classes.head, children: [(0, jsx_runtime_1.jsxs)("div", { className: calendar_style_1.classes.headSide, children: [renderHeadControl((0, jsx_runtime_1.jsx)(icon_1.Icon, { icon: faAnglesLeft_1.faAnglesLeft }), '上一年', prevYear), renderHeadControl((0, jsx_runtime_1.jsx)(icon_1.Icon, { icon: faAngleLeft_1.faAngleLeft }), '上一月', prevMonth)] }), (0, jsx_runtime_1.jsxs)("div", { className: calendar_style_1.classes.headSide, children: [renderHeadControl((0, jsx_runtime_1.jsx)(icon_1.Icon, { icon: faAngleRight_1.faAngleRight }), '下一月', nextMonth), renderHeadControl((0, jsx_runtime_1.jsx)(icon_1.Icon, { icon: faAnglesRight_1.faAnglesRight }), '下一年', nextYear)] }), (0, jsx_runtime_1.jsxs)("div", { className: calendar_style_1.classes.headCenter, children: [(0, jsx_runtime_1.jsxs)(button_1.Button, { ...commonButtonProps, className: calendar_style_1.classes.headButton, onClick: () => setViewType('year'), children: [innerD.year(), "\u5E74"] }), (0, jsx_runtime_1.jsxs)(button_1.Button, { ...commonButtonProps, className: calendar_style_1.classes.headButton, onClick: () => setViewType('month'), children: [(innerD.month() + 1).toString().padStart(2, '0'), "\u6708"] })] })] }), (0, jsx_runtime_1.jsxs)("div", { className: calendar_style_1.classes.body, "data-view-type": "date", children: [renderedDaysList, renderDates()] }), showToday &&
-                (0, jsx_runtime_1.jsx)("div", { className: calendar_style_1.classes.foot, children: (0, jsx_runtime_1.jsx)(button_1.Button, { variant: "text", onClick: () => setValue((0, dayjs_1.default)()), children: "\u56DE\u4ECA\u5929" }) })] }));
+                (0, jsx_runtime_1.jsx)("div", { className: calendar_style_1.classes.foot, children: (0, jsx_runtime_1.jsx)(button_1.Button, { variant: "text", ...todayButtonProps, onClick: e => {
+                            todayButtonProps?.onClick?.(e);
+                            setValue((0, dayjs_1.default)());
+                        }, children: todayButtonText }) })] }));
 });

package/dist/cjs/components/clickAway/clickAway.d.ts

@@ -60,7 +60,7 @@ export declare function ClickAway({ ref, container, eventType, onClickAway, disa
     results: number;
     security: string;
     unselectable: "off" | "on";
-    popover: "" | "auto" | "manual";
+    popover: "" | "auto" | "manual" | "hint";
     popoverTargetAction: "toggle" | "hide" | "show";
     popoverTarget: string;
     inert: boolean;

package/dist/cjs/components/curd/curd.js

@@ -123,7 +123,7 @@ exports.Curd = (0, react_1.memo)((props) => {
             const res = await loadRows(props.paginatable !== false
                 ? {
                     page: innerPage.current,
-                    pageSize: innerPageSize.current,
+                    pageSize: innerPageSize.current
                 }
                 : void 0, innerFilterRef.current.getFormValue(), innerOrderColumn.current
                 ? {
@@ -187,24 +187,24 @@ exports.Curd = (0, react_1.memo)((props) => {
         innerLoadRows().then();
         message.success(deleteName + '成功').then();
     };
-    return ((0, jsx_runtime_1.jsxs)("div", { ...wrapperProps, css: curd_style_1.style, className: (0, utils_1.clsx)(curd_style_1.classes.root, wrapperProps?.className), "data-variant": variant, children: [(0, jsx_runtime_1.jsxs)(form_1.Form, { ...(0, utils_1.mergeComponentProps)({
+    return ((0, jsx_runtime_1.jsxs)("div", { ...wrapperProps, css: curd_style_1.style, className: (0, utils_1.clsx)(curd_style_1.classes.root, wrapperProps?.className), "data-variant": variant, children: [(0, jsx_runtime_1.jsx)(form_1.Form, { ...(0, utils_1.mergeComponentProps)({
                     variant: 'plain',
                     initialValue: initialFilterValue
                 }, filterProps, {
                     ref: innerFilterRef,
                     onFinish: filterHandler
-                }), children: [renderFilterableFn(), (creatable || toolbarLeft || toolbarRight || reloadable || resizable || columnConfigurable) &&
-                        (0, jsx_runtime_1.jsxs)("div", { className: curd_style_1.classes.toolbar, children: [(0, jsx_runtime_1.jsxs)("div", { className: curd_style_1.classes.toolbarLeft, children: [creatable &&
-                                            (0, jsx_runtime_1.jsxs)(button_1.Button, { prefix: (0, jsx_runtime_1.jsx)(icon_1.Icon, { icon: faPlus_1.faPlus }), ...createButtonProps, onClick: createHandler, children: [createName, dataName] }), toolbarLeft] }), (0, jsx_runtime_1.jsxs)("div", { className: curd_style_1.classes.toolbarRight, children: [!!toolbarRight &&
-                                            (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [toolbarRight, (0, jsx_runtime_1.jsx)(divider_1.Divider, { className: curd_style_1.classes.divider, orientation: "vertical" })] }), reloadable &&
-                                            (0, jsx_runtime_1.jsx)(tooltip_1.Tooltip, { title: "\u5237\u65B0", children: (0, jsx_runtime_1.jsx)(button_1.Button, { shape: "circular", variant: "text", color: "text.secondary", prefix: (0, jsx_runtime_1.jsx)(icon_1.Icon, { icon: faRotateRight_1.faRotateRight }), loading: innerLoading.current, onClick: reloadHandler }) }), resizable &&
-                                            (0, jsx_runtime_1.jsx)(curdResizable_1.CurdResizable, { innerSize: innerSize.current, setInnerSize: setInnerSize }), columnConfigurable &&
-                                            (0, jsx_runtime_1.jsx)(curdColumnConfig_1.CurdColumnConfig, { columns: orderedColumns, innerVisible: innerVisible.current, setInnerVisible: setInnerVisible, setInnerOrder: setInnerOrder })] })] }), (0, jsx_runtime_1.jsx)("div", { className: curd_style_1.classes.card, children: (0, jsx_runtime_1.jsx)(dataGrid_1.DataGrid, { ...dataGridProps, columns: actualColumns, tableProps: {
-                                ...props.tableProps,
-                                ...resizable && { size: innerSize.current }
-                            }, loading: innerLoading.current, rows: innerRows.current, paginatable: !loadRows && props.paginatable, renderPagination: loadRows && props.paginatable !== false
-                                ? () => (0, jsx_runtime_1.jsx)(pagination_1.Pagination, { ...props.paginationProps, total: innerTotal.current, page: innerPage.current, onPageChange: setInnerPage, pageSize: innerPageSize.current, onPageSizeChange: setInnerPageSize })
-                                : props.renderPagination, orderColumn: innerOrderColumn.current, orderType: innerOrderType.current, onOrderChange: orderChangeHandler }) })] }), (creatable || updatable) &&
+                }), children: renderFilterableFn() }), (creatable || toolbarLeft || toolbarRight || reloadable || resizable || columnConfigurable) &&
+                (0, jsx_runtime_1.jsxs)("div", { className: curd_style_1.classes.toolbar, children: [(0, jsx_runtime_1.jsxs)("div", { className: curd_style_1.classes.toolbarLeft, children: [creatable &&
+                                    (0, jsx_runtime_1.jsxs)(button_1.Button, { prefix: (0, jsx_runtime_1.jsx)(icon_1.Icon, { icon: faPlus_1.faPlus }), ...createButtonProps, onClick: createHandler, children: [createName, dataName] }), toolbarLeft] }), (0, jsx_runtime_1.jsxs)("div", { className: curd_style_1.classes.toolbarRight, children: [!!toolbarRight &&
+                                    (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [toolbarRight, (0, jsx_runtime_1.jsx)(divider_1.Divider, { className: curd_style_1.classes.divider, orientation: "vertical" })] }), reloadable &&
+                                    (0, jsx_runtime_1.jsx)(tooltip_1.Tooltip, { title: "\u5237\u65B0", children: (0, jsx_runtime_1.jsx)(button_1.Button, { shape: "circular", variant: "text", color: "text.secondary", prefix: (0, jsx_runtime_1.jsx)(icon_1.Icon, { icon: faRotateRight_1.faRotateRight }), loading: innerLoading.current, onClick: reloadHandler }) }), resizable &&
+                                    (0, jsx_runtime_1.jsx)(curdResizable_1.CurdResizable, { innerSize: innerSize.current, setInnerSize: setInnerSize }), columnConfigurable &&
+                                    (0, jsx_runtime_1.jsx)(curdColumnConfig_1.CurdColumnConfig, { columns: orderedColumns, innerVisible: innerVisible.current, setInnerVisible: setInnerVisible, setInnerOrder: setInnerOrder })] })] }), (0, jsx_runtime_1.jsx)("div", { className: curd_style_1.classes.card, children: (0, jsx_runtime_1.jsx)(dataGrid_1.DataGrid, { ...dataGridProps, columns: actualColumns, tableProps: {
+                        ...props.tableProps,
+                        ...resizable && { size: innerSize.current }
+                    }, loading: innerLoading.current, rows: innerRows.current, paginatable: !loadRows && props.paginatable, renderPagination: loadRows && props.paginatable !== false
+                        ? () => (0, jsx_runtime_1.jsx)(pagination_1.Pagination, { ...props.paginationProps, total: innerTotal.current, page: innerPage.current, onPageChange: setInnerPage, pageSize: innerPageSize.current, onPageSizeChange: setInnerPageSize })
+                        : props.renderPagination, orderColumn: innerOrderColumn.current, orderType: innerOrderType.current, onOrderChange: orderChangeHandler }) }), (creatable || updatable) &&
                 (0, jsx_runtime_1.jsx)(curdDialog_1.CurdDialog, { ...dialogProps, ref: curdDialogRef, onFinish: finishHandler, curdProps: props })] }));
 });
 exports.Curd.Filter = curdFilterable_1.CurdFilterable;

package/dist/cjs/components/curd/curd.style.js

@@ -88,7 +88,7 @@ exports.style = (0, utils_1.defineCss)(({ spacing, text, background, borderRadiu
         min-height: 0;
         border-radius: ${borderRadius}px;
 
-        .${loading_style_1.classes.container} {
+        .${loading_style_1.classes.root} {
             height: 100%;
         }
     }

package/dist/cjs/components/dataGrid/dataGrid.style.js

@@ -139,6 +139,7 @@ exports.style = (0, utils_1.defineCss)(({ spacing, mode, gray, text, colors, eas
     }
 
     .${exports.classes.empty} {
+        height: auto;
         position: sticky;
         left: 0;
     }

package/dist/cjs/components/dateTimePicker/dateTimePicker.js

@@ -49,8 +49,8 @@ exports.DateTimePicker = (0, react_1.memo)(({ inputProps, popperProps, min, max,
             content: ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [showCalendar &&
                         (0, jsx_runtime_1.jsx)(calendar_1.Calendar, { viewLevel: format.includes('D') ? 'date'
                                 : format.includes('M') ? 'month'
-                                    : 'year', _defaultNull: !dateValue.current, value: innerValue, onChange: setDateValue, min: min, max: max, disabledDates: disabledDates }), showTimer &&
-                        (0, jsx_runtime_1.jsx)(DateTimePickerContext, { value: contextValue, children: (0, jsx_runtime_1.jsx)(timer_1.Timer, { showHours: format.includes('H'), showMinutes: format.includes('m'), showSeconds: format.includes('s'), value: innerValue, onChange: setDateValue }) })] }))
+                                    : 'year', _defaultNull: !dateValue.current, value: innerValue, onChange: setDateValue, min: min, max: max, disabledDates: disabledDates, todayButtonText: showTimer ? '现在' : void 0 }), showTimer &&
+                        (0, jsx_runtime_1.jsx)(DateTimePickerContext, { value: contextValue, children: (0, jsx_runtime_1.jsx)(timer_1.Timer, { showHours: format.includes('H'), showMinutes: format.includes('m'), showSeconds: format.includes('s'), value: dateValue.current, onChange: setDateValue }) })] }))
         }, popperProps, {
             onOpenChange: setInnerOpen,
             onPointerDown: e => e.preventDefault()

package/dist/cjs/components/dateTimePicker/timer.d.ts

@@ -3,6 +3,6 @@ export declare const Timer: import("react").MemoExoticComponent<({ showHours, sh
     showHours: boolean;
     showMinutes: boolean;
     showSeconds: boolean;
-    value: Dayjs;
+    value: Dayjs | null;
     onChange(value: Dayjs): void;
 }) => import("@emotion/react/jsx-runtime").JSX.Element>;

package/dist/cjs/components/dateTimePicker/timer.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Timer = void 0;
+const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("@emotion/react/jsx-runtime");
 const react_1 = require("react");
 const timer_style_1 = require("./timer.style");
 const menuItem_1 = require("../menuItem");
+const dayjs_1 = tslib_1.__importDefault(require("dayjs"));
 const dateTimePicker_1 = require("./dateTimePicker");
 const popper_1 = require("../popper");
 exports.Timer = (0, react_1.memo)(({ showHours, showMinutes, showSeconds, value, onChange }) => {
@@ -12,10 +14,14 @@ exports.Timer = (0, react_1.memo)(({ showHours, showMinutes, showSeconds, value,
 });
 function TimerItem({ type, value, onChange }) {
     const { min, max, disabledHours, disabledMinutes, disabledSeconds } = (0, dateTimePicker_1.useDateTimePickerContext)();
-    const currentNum = type === 'hour' ? value.hour()
-        : type === 'minute' ? value.minute()
-            : value.second();
+    const currentNum = !value ? -1
+        : type === 'hour' ? value.hour()
+            : type === 'minute' ? value.minute()
+                : value.second();
     const isDisabled = (num) => {
+        if (!value) {
+            return false;
+        }
         if (type === 'hour') {
             if (disabledHours && !disabledHours(value, num)) {
                 return true;
@@ -34,17 +40,19 @@ function TimerItem({ type, value, onChange }) {
         if (min && min.isSame(value, 'date') && min.get(type) > num) {
             return true;
         }
-        if (max && max.isSame(value, 'date') && max.get(type) < num) {
-            return true;
-        }
-        return false;
+        return !!(max && max.isSame(value, 'date') && max.get(type) < num);
     };
     const scrollerRef = (0, react_1.useRef)(null);
     const selectedItemRef = (0, popper_1.useScrollToTarget)(scrollerRef);
     const renderItems = (count) => {
         const ret = [];
         for (let i = 0; i < count; i++) {
-            ret.push((0, jsx_runtime_1.jsx)(menuItem_1.MenuItem, { ref: i === currentNum ? selectedItemRef : void 0, className: timer_style_1.classes.timerItem, label: i.toString().padStart(2, '0'), selected: i === currentNum, onClick: () => i !== currentNum && onChange(value.set(type, i)), disabled: isDisabled(i) }, i));
+            ret.push((0, jsx_runtime_1.jsx)(menuItem_1.MenuItem, { ref: i === currentNum ? selectedItemRef : void 0, className: timer_style_1.classes.timerItem, label: i.toString().padStart(2, '0'), selected: i === currentNum, onClick: () => {
+                    if (i !== currentNum) {
+                        value ||= (0, dayjs_1.default)();
+                        onChange(value.set(type, i));
+                    }
+                }, disabled: isDisabled(i) }, i));
         }
         return ret;
     };

package/dist/cjs/components/popper/popperContext.d.ts

@@ -17,4 +17,4 @@ export declare function usePopperContext(): {
  * 当弹框打开时，滚动至已选项
  * @returns {RefObject} ref
  */
-export declare function useScrollToTarget<T extends HTMLElement>(scrollerRef: RefObject<Element | null>): RefObject<T | null>;
+export declare function useScrollToTarget<T extends HTMLElement>(scrollerRef: RefObject<HTMLElement | null>): RefObject<T | null>;

package/dist/cjs/components/popper/popperContext.js

@@ -23,16 +23,18 @@ function usePopperContext() {
 function useScrollToTarget(scrollerRef) {
     const ref = (0, react_1.useRef)(null);
     const { beforeOpenCallbacks } = usePopperContext();
-    (0, react_1.useEffect)(() => {
-        const beforeOpen = () => {
-            if (ref.current && scrollerRef.current && scrollerRef.current.scrollHeight > scrollerRef.current.clientHeight) {
-                scrollerRef.current.scrollTop = ref.current.offsetTop + ref.current.clientHeight / 2 - scrollerRef.current.clientHeight / 2;
-            }
-        };
+    const beforeOpen = (0, react_1.useCallback)(() => {
+        const targetEl = ref.current;
+        const scrollerEl = scrollerRef.current;
+        if (targetEl && scrollerEl && scrollerEl.scrollHeight > scrollerEl.clientHeight) {
+            scrollerEl.scrollTop = targetEl.offsetTop + targetEl.clientHeight / 2 - scrollerEl.clientHeight / 2;
+        }
+    }, []);
+    (0, react_1.useMemo)(() => {
         beforeOpenCallbacks.add(beforeOpen);
-        return () => {
-            beforeOpenCallbacks.delete(beforeOpen);
-        };
+    }, []);
+    (0, react_1.useEffect)(() => () => {
+        beforeOpenCallbacks.delete(beforeOpen);
     }, []);
     return ref;
 }

package/dist/cjs/components/status/status.d.ts

@@ -3,12 +3,12 @@ import { DivProps, Status as IStatus } from '../../types';
 import { FontAwesomeIconProps } from '@fortawesome/react-fontawesome';
 export type StatusType = IStatus | 'confirm' | 'unknown';
 export declare const statusMapToIconDefinition: {
-    info: import("@fortawesome/fontawesome-common-types").IconDefinition;
-    success: import("@fortawesome/fontawesome-common-types").IconDefinition;
-    warning: import("@fortawesome/fontawesome-common-types").IconDefinition;
-    error: import("@fortawesome/fontawesome-common-types").IconDefinition;
-    confirm: import("@fortawesome/fontawesome-common-types").IconDefinition;
-    unknown: import("@fortawesome/fontawesome-common-types").IconDefinition;
+    info: import("@fortawesome/free-solid-svg-icons").IconDefinition;
+    success: import("@fortawesome/free-solid-svg-icons").IconDefinition;
+    warning: import("@fortawesome/free-solid-svg-icons").IconDefinition;
+    error: import("@fortawesome/free-solid-svg-icons").IconDefinition;
+    confirm: import("@fortawesome/free-solid-svg-icons").IconDefinition;
+    unknown: import("@fortawesome/free-solid-svg-icons").IconDefinition;
 };
 export interface StatusIconProps extends Partial<FontAwesomeIconProps> {
     status?: StatusType;

package/dist/cjs/extensions/reactiveForm/reactiveFormItem.js

@@ -23,6 +23,7 @@ function InnerFormItem({ dependencies, checked, value, onChange, ...props }) {
         checked,
         value,
         onChange(e) {
+            props.children.props?.onChange?.(e);
             onChange?.(e);
             context.onChange?.();
         }

package/dist/esm/components/calendar/calendar.d.ts

@@ -1,7 +1,8 @@
 import { Size } from '../../types';
 import { Dayjs } from 'dayjs';
-import { Dispatch, SetStateAction } from 'react';
+import { Dispatch, ReactNode, SetStateAction } from 'react';
 import { FlexProps } from '../flex';
+import { ButtonProps } from '../button';
 export type ViewLevel = 'date' | 'month' | 'year';
 type SharedProps = {
     min?: Dayjs;
@@ -9,6 +10,8 @@ type SharedProps = {
     disabledDates?: (date: Dayjs) => boolean;
     /** 是否显示`回今天`按钮，默认为`true` */
     showToday?: boolean;
+    todayButtonText?: ReactNode;
+    todayButtonProps?: ButtonProps;
     /** @private */
     _defaultNull?: boolean;
 };
@@ -28,5 +31,5 @@ export interface PanelProps extends SharedProps {
     setViewType: Dispatch<SetStateAction<'date' | 'month' | 'year'>>;
     onSelected(newValue: Dayjs): void;
 }
-export declare const Calendar: ({ viewLevel, showToday, size, defaultValue, min, max, disabledDates, value, onChange, _defaultNull, ...props }: CalendarProps) => import("@emotion/react/jsx-runtime").JSX.Element;
+export declare const Calendar: ({ viewLevel, showToday, todayButtonText, todayButtonProps, size, defaultValue, min, max, disabledDates, value, onChange, _defaultNull, ...props }: CalendarProps) => import("@emotion/react/jsx-runtime").JSX.Element;
 export {};

package/dist/esm/components/calendar/calendar.js

@@ -7,7 +7,7 @@ import { classes, style } from './calendar.style';
 import { Flex } from '../flex';
 import { PanelYear } from './panelYear';
 import { PanelMonth } from './panelMonth';
-export const Calendar = ({ viewLevel = 'date', showToday = true, size = 'medium', defaultValue = null, min, max, disabledDates, value, onChange, _defaultNull, ...props }) => {
+export const Calendar = ({ viewLevel = 'date', showToday = true, todayButtonText = '回今天', todayButtonProps, size = 'medium', defaultValue = null, min, max, disabledDates, value, onChange, _defaultNull, ...props }) => {
     const [innerValue, setInnerValue] = useControlled(defaultValue, value, onChange);
     const [viewType, setViewType] = useState(viewLevel);
     const [innerD, setInnerD] = useState(() => innerValue.current ?? dayjs().startOf('date'));
@@ -30,6 +30,8 @@ export const Calendar = ({ viewLevel = 'date', showToday = true, size = 'medium'
             }
         },
         showToday,
+        todayButtonText,
+        todayButtonProps,
         _defaultNull
     };
     const renderPanel = () => {