@sia.soul/sia-react-ui 0.1.76 → 0.1.77

package/dist/{chunk-TG7ZYXA7.js → chunk-K5OU5NOT.js}

@@ -223,7 +223,7 @@ function DatePanelFooter({
 }) {
   return /* @__PURE__ */ jsxs("footer", { className: "sia-date-panel__footer", children: [
     /* @__PURE__ */ jsxs("span", { children: [
-      showToday ? /* @__PURE__ */ jsx("button", { type: "button", onClick: onToday, children: "\u4ECA\u5929" }) : null,
+      showToday ? /* @__PURE__ */ jsx("button", { type: "button", onClick: onToday, children: "\u6B64\u523B" }) : null,
       extra
     ] }),
     needConfirm ? /* @__PURE__ */ jsx("button", { type: "button", className: "sia-date-panel__confirm", disabled: disabledConfirm, onClick: onConfirm, children: confirmText }) : null
@@ -348,17 +348,17 @@ function DatePicker({
     if (maximum && day > String(maximum).slice(0, 10)) return true;
     return disabledDate?.(day, { type: "date" }) ?? false;
   }
-  function buildValue(day) {
+  function buildValue(day, time = draftTime) {
     const picked = formatPickerValue(day, picker);
-    return showTime && picker === "date" ? withTime(picked, draftTime, showSecond) : picked;
+    return showTime && picker === "date" ? withTime(picked, time, showSecond) : picked;
   }
-  function selectDate(day) {
+  function selectDate(day, time = draftTime, ensureSelected = false) {
     if (isDisabled(day)) return;
-    const nextValue = buildValue(day);
+    const nextValue = buildValue(day, time);
     if (multiple) {
       const current = Array.isArray(draftValue) ? [...draftValue] : [];
       const exists = current.some((item) => dayFromValue(item) === day);
-      const next = exists ? current.filter((item) => dayFromValue(item) !== day) : [...current, nextValue];
+      const next = exists ? ensureSelected ? current.map((item) => dayFromValue(item) === day ? nextValue : item) : current.filter((item) => dayFromValue(item) !== day) : [...current, nextValue];
       setDraftValue(next);
       if (!resolvedNeedConfirm) setCurrentValue(next);
       return;
@@ -450,7 +450,15 @@ function DatePicker({
           showToday,
           needConfirm: resolvedNeedConfirm,
           disabledConfirm: Array.isArray(draftValue) ? draftValue.length === 0 : !draftValue,
-          onToday: () => selectDate(dateKey(/* @__PURE__ */ new Date())),
+          onToday: () => {
+            const now = /* @__PURE__ */ new Date();
+            const day = dateKey(now);
+            if (isDisabled(day)) return;
+            const time = [now.getHours(), now.getMinutes(), now.getSeconds()].map(pad).join(":");
+            if (showTime) setDraftTime(time);
+            setViewMonth(startOfMonth(now));
+            selectDate(day, time, true);
+          },
           onConfirm: commitDraft
         }
       )
@@ -611,10 +619,13 @@ function DateRangePicker({
       changeOpen(false);
     }
   }
-  function selectDateTime(day, index) {
+  function selectDateTime(day, index, time = index === 1 ? "23:59:59" : times[index]) {
     if (isDisabled(day, index, true)) return;
+    const nextTimes = [...times];
+    nextTimes[index] = time;
+    setTimes(nextTimes);
     const nextValue = [...draftValue];
-    nextValue[index] = buildRangeValue(day, index);
+    nextValue[index] = withTime(day, time, showSecond);
     updateDraft(nextValue);
     setHoverDate("");
     setActiveIndex(index);
@@ -830,7 +841,19 @@ function DateRangePicker({
               " \u5929"
             ] }) : null
           ] }),
-          onToday: () => showTime ? selectDateTime(dateKey(/* @__PURE__ */ new Date()), activeIndex) : selectDate(dateKey(/* @__PURE__ */ new Date())),
+          onToday: () => {
+            const now = /* @__PURE__ */ new Date();
+            const day = dateKey(now);
+            if (isDisabled(day, activeIndex, Boolean(showTime))) return;
+            if (showTime) {
+              const time = [now.getHours(), now.getMinutes(), now.getSeconds()].map(pad).join(":");
+              (activeIndex === 0 ? setViewMonth : setEndViewMonth)(startOfMonth(now));
+              selectDateTime(day, activeIndex, time);
+            } else {
+              setViewMonth(startOfMonth(now));
+              selectDate(day);
+            }
+          },
           onConfirm: confirm
         }
       )

package/dist/index.cjs

@@ -7413,7 +7413,7 @@ function DatePanelFooter({
 }) {
   return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("footer", { className: "sia-date-panel__footer", children: [
     /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("span", { children: [
-      showToday ? /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("button", { type: "button", onClick: onToday, children: "\u4ECA\u5929" }) : null,
+      showToday ? /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("button", { type: "button", onClick: onToday, children: "\u6B64\u523B" }) : null,
       extra
     ] }),
     needConfirm ? /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("button", { type: "button", className: "sia-date-panel__confirm", disabled: disabledConfirm, onClick: onConfirm, children: confirmText }) : null
@@ -7538,17 +7538,17 @@ function DatePicker({
     if (maximum && day > String(maximum).slice(0, 10)) return true;
     return disabledDate?.(day, { type: "date" }) ?? false;
   }
-  function buildValue(day) {
+  function buildValue(day, time = draftTime) {
     const picked = formatPickerValue(day, picker);
-    return showTime && picker === "date" ? withTime(picked, draftTime, showSecond) : picked;
+    return showTime && picker === "date" ? withTime(picked, time, showSecond) : picked;
   }
-  function selectDate(day) {
+  function selectDate(day, time = draftTime, ensureSelected = false) {
     if (isDisabled(day)) return;
-    const nextValue = buildValue(day);
+    const nextValue = buildValue(day, time);
     if (multiple) {
       const current = Array.isArray(draftValue) ? [...draftValue] : [];
       const exists = current.some((item) => dayFromValue(item) === day);
-      const next = exists ? current.filter((item) => dayFromValue(item) !== day) : [...current, nextValue];
+      const next = exists ? ensureSelected ? current.map((item) => dayFromValue(item) === day ? nextValue : item) : current.filter((item) => dayFromValue(item) !== day) : [...current, nextValue];
       setDraftValue(next);
       if (!resolvedNeedConfirm) setCurrentValue(next);
       return;
@@ -7640,7 +7640,15 @@ function DatePicker({
           showToday,
           needConfirm: resolvedNeedConfirm,
           disabledConfirm: Array.isArray(draftValue) ? draftValue.length === 0 : !draftValue,
-          onToday: () => selectDate(dateKey(/* @__PURE__ */ new Date())),
+          onToday: () => {
+            const now = /* @__PURE__ */ new Date();
+            const day = dateKey(now);
+            if (isDisabled(day)) return;
+            const time = [now.getHours(), now.getMinutes(), now.getSeconds()].map(pad2).join(":");
+            if (showTime) setDraftTime(time);
+            setViewMonth(startOfMonth(now));
+            selectDate(day, time, true);
+          },
           onConfirm: commitDraft
         }
       )
@@ -7801,10 +7809,13 @@ function DateRangePicker({
       changeOpen(false);
     }
   }
-  function selectDateTime(day, index) {
+  function selectDateTime(day, index, time = index === 1 ? "23:59:59" : times[index]) {
     if (isDisabled(day, index, true)) return;
+    const nextTimes = [...times];
+    nextTimes[index] = time;
+    setTimes(nextTimes);
     const nextValue = [...draftValue];
-    nextValue[index] = buildRangeValue(day, index);
+    nextValue[index] = withTime(day, time, showSecond);
     updateDraft(nextValue);
     setHoverDate("");
     setActiveIndex(index);
@@ -8020,7 +8031,19 @@ function DateRangePicker({
               " \u5929"
             ] }) : null
           ] }),
-          onToday: () => showTime ? selectDateTime(dateKey(/* @__PURE__ */ new Date()), activeIndex) : selectDate(dateKey(/* @__PURE__ */ new Date())),
+          onToday: () => {
+            const now = /* @__PURE__ */ new Date();
+            const day = dateKey(now);
+            if (isDisabled(day, activeIndex, Boolean(showTime))) return;
+            if (showTime) {
+              const time = [now.getHours(), now.getMinutes(), now.getSeconds()].map(pad2).join(":");
+              (activeIndex === 0 ? setViewMonth : setEndViewMonth)(startOfMonth(now));
+              selectDateTime(day, activeIndex, time);
+            } else {
+              setViewMonth(startOfMonth(now));
+              selectDate(day);
+            }
+          },
           onConfirm: confirm
         }
       )

package/dist/index.d.cts

@@ -5,7 +5,7 @@ import { HTMLAttributes, ReactNode, CSSProperties, ElementType, FormHTMLAttribut
 import { C as ControlSize, I as InputPlaceholderMode, a as ControlStatus } from './shared-Bx4B28Wh.cjs';
 import { O as OverlayContainer, a as OverlayApiHandle, M as ModalOpenConfig, S as SelectOption, b as SelectChangeValue, c as SelectProps, d as ModalActionResult, B as ButtonProps, e as ButtonSize } from './Select-Bv2AmXRD.cjs';
 export { f as Button, g as ButtonVariant, h as Modal, i as ModalProps, j as ModalType, k as Select, l as SelectMode, m as SelectValue } from './Select-Bv2AmXRD.cjs';
-export { D as DatePicker, a as DatePickerDisabledInfo, b as DatePickerPreset, c as DatePickerProps, d as DatePickerShowTime, e as DatePickerType, f as DatePickerValue, g as DateRangePickerPreset, h as DateRangePickerProps, S as SelectDateRange, i as SelectDateRangeProps, j as SelectDateRangeValue } from './select-date-range-DN4eBuVx.cjs';
+export { D as DatePicker, a as DatePickerDisabledInfo, b as DatePickerPreset, c as DatePickerProps, d as DatePickerShowTime, e as DatePickerType, f as DatePickerValue, g as DateRangePickerPreset, h as DateRangePickerProps, S as SelectDateRange, i as SelectDateRangeProps, j as SelectDateRangeValue } from './select-date-range-CRWxqHFp.cjs';
 export { RichTextContent, RichTextContentFormat, RichTextContentProps, RichTextEditor, RichTextEditorProps, RichTextImagePasteHandler, RichTextToolbar } from './rich-text-editor.cjs';
 export { MarkdownEditor, MarkdownEditorMode, MarkdownEditorProps } from './markdown-editor.cjs';
 import * as Monaco from 'monaco-editor';

package/dist/index.d.ts

@@ -5,7 +5,7 @@ import { HTMLAttributes, ReactNode, CSSProperties, ElementType, FormHTMLAttribut
 import { C as ControlSize, I as InputPlaceholderMode, a as ControlStatus } from './shared-Bx4B28Wh.js';
 import { O as OverlayContainer, a as OverlayApiHandle, M as ModalOpenConfig, S as SelectOption, b as SelectChangeValue, c as SelectProps, d as ModalActionResult, B as ButtonProps, e as ButtonSize } from './Select-Cc1owuvN.js';
 export { f as Button, g as ButtonVariant, h as Modal, i as ModalProps, j as ModalType, k as Select, l as SelectMode, m as SelectValue } from './Select-Cc1owuvN.js';
-export { D as DatePicker, a as DatePickerDisabledInfo, b as DatePickerPreset, c as DatePickerProps, d as DatePickerShowTime, e as DatePickerType, f as DatePickerValue, g as DateRangePickerPreset, h as DateRangePickerProps, S as SelectDateRange, i as SelectDateRangeProps, j as SelectDateRangeValue } from './select-date-range-YrK9kuKW.js';
+export { D as DatePicker, a as DatePickerDisabledInfo, b as DatePickerPreset, c as DatePickerProps, d as DatePickerShowTime, e as DatePickerType, f as DatePickerValue, g as DateRangePickerPreset, h as DateRangePickerProps, S as SelectDateRange, i as SelectDateRangeProps, j as SelectDateRangeValue } from './select-date-range-rtYL9egr.js';
 export { RichTextContent, RichTextContentFormat, RichTextContentProps, RichTextEditor, RichTextEditorProps, RichTextImagePasteHandler, RichTextToolbar } from './rich-text-editor.js';
 export { MarkdownEditor, MarkdownEditorMode, MarkdownEditorProps } from './markdown-editor.js';
 import * as Monaco from 'monaco-editor';

package/dist/index.js

@@ -95,7 +95,7 @@ import {
   DatePicker,
   SelectDateRange,
   TimePanel
-} from "./chunk-TG7ZYXA7.js";
+} from "./chunk-K5OU5NOT.js";
 import {
   Checkbox,
   FloatingScrollbarProvider,

package/dist/{select-date-range-DN4eBuVx.d.cts → select-date-range-CRWxqHFp.d.cts}

@@ -71,12 +71,12 @@ interface DatePickerProps extends SharedDatePickerProps {
     /** 选择后需要点击确定才提交；带时间的范围必须确认后保存；纯日期范围点选后立即保存合法值，此属性仅控制是否保留面板供确认关闭。 */
     needConfirm?: boolean;
     /**
-     * 组合时间面板，可显示秒；范围选择始终显示单个面板，点击起止输入区域直接编辑对应端点；先确认当前端点，再切换到另一端点，两个端点确认后提交并关闭；锁定端点无需再次确认，快捷范围只需一次确认
+     * 组合时间面板，可显示秒；范围选择始终显示单个面板，点击起止输入区域直接编辑对应端点。日历点选结束日期时自动填入 23:59，开启 showSecond 时为 23:59:59，可随后手动调整；开始日期保留原时间，“此刻”使用当前时间，快捷范围保留预设时间。先确认当前端点，再切换到另一端点，两个端点确认后提交并关闭；锁定端点无需再次确认，快捷范围只需一次确认。
      * @defaultValue false
      */
     showTime?: DatePickerShowTime;
     /**
-     * 是否显示返回今天的入口。
+     * 是否显示“此刻”入口。点击选择本机当前日期；开启 showTime 时同时填入当前时分，showSecond 为 true 时包含秒。沿用 needConfirm 的提交规则；范围选择仅更新当前编辑端点，禁用日期不可选择。
      * @defaultValue true
      */
     showToday?: boolean;

package/dist/{select-date-range-YrK9kuKW.d.ts → select-date-range-rtYL9egr.d.ts}

@@ -71,12 +71,12 @@ interface DatePickerProps extends SharedDatePickerProps {
     /** 选择后需要点击确定才提交；带时间的范围必须确认后保存；纯日期范围点选后立即保存合法值，此属性仅控制是否保留面板供确认关闭。 */
     needConfirm?: boolean;
     /**
-     * 组合时间面板，可显示秒；范围选择始终显示单个面板，点击起止输入区域直接编辑对应端点；先确认当前端点，再切换到另一端点，两个端点确认后提交并关闭；锁定端点无需再次确认，快捷范围只需一次确认
+     * 组合时间面板，可显示秒；范围选择始终显示单个面板，点击起止输入区域直接编辑对应端点。日历点选结束日期时自动填入 23:59，开启 showSecond 时为 23:59:59，可随后手动调整；开始日期保留原时间，“此刻”使用当前时间，快捷范围保留预设时间。先确认当前端点，再切换到另一端点，两个端点确认后提交并关闭；锁定端点无需再次确认，快捷范围只需一次确认。
      * @defaultValue false
      */
     showTime?: DatePickerShowTime;
     /**
-     * 是否显示返回今天的入口。
+     * 是否显示“此刻”入口。点击选择本机当前日期；开启 showTime 时同时填入当前时分，showSecond 为 true 时包含秒。沿用 needConfirm 的提交规则；范围选择仅更新当前编辑端点，禁用日期不可选择。
      * @defaultValue true
      */
     showToday?: boolean;

package/dist/select-date-range.cjs

@@ -1734,7 +1734,7 @@ function DatePanelFooter({
 }) {
   return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("footer", { className: "sia-date-panel__footer", children: [
     /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("span", { children: [
-      showToday ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("button", { type: "button", onClick: onToday, children: "\u4ECA\u5929" }) : null,
+      showToday ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("button", { type: "button", onClick: onToday, children: "\u6B64\u523B" }) : null,
       extra
     ] }),
     needConfirm ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("button", { type: "button", className: "sia-date-panel__confirm", disabled: disabledConfirm, onClick: onConfirm, children: confirmText }) : null
@@ -1859,17 +1859,17 @@ function DatePicker({
     if (maximum && day > String(maximum).slice(0, 10)) return true;
     return disabledDate?.(day, { type: "date" }) ?? false;
   }
-  function buildValue(day) {
+  function buildValue(day, time = draftTime) {
     const picked = formatPickerValue(day, picker);
-    return showTime && picker === "date" ? withTime(picked, draftTime, showSecond) : picked;
+    return showTime && picker === "date" ? withTime(picked, time, showSecond) : picked;
   }
-  function selectDate(day) {
+  function selectDate(day, time = draftTime, ensureSelected = false) {
     if (isDisabled(day)) return;
-    const nextValue = buildValue(day);
+    const nextValue = buildValue(day, time);
     if (multiple) {
       const current = Array.isArray(draftValue) ? [...draftValue] : [];
       const exists = current.some((item) => dayFromValue(item) === day);
-      const next = exists ? current.filter((item) => dayFromValue(item) !== day) : [...current, nextValue];
+      const next = exists ? ensureSelected ? current.map((item) => dayFromValue(item) === day ? nextValue : item) : current.filter((item) => dayFromValue(item) !== day) : [...current, nextValue];
       setDraftValue(next);
       if (!resolvedNeedConfirm) setCurrentValue(next);
       return;
@@ -1961,7 +1961,15 @@ function DatePicker({
           showToday,
           needConfirm: resolvedNeedConfirm,
           disabledConfirm: Array.isArray(draftValue) ? draftValue.length === 0 : !draftValue,
-          onToday: () => selectDate(dateKey(/* @__PURE__ */ new Date())),
+          onToday: () => {
+            const now = /* @__PURE__ */ new Date();
+            const day = dateKey(now);
+            if (isDisabled(day)) return;
+            const time = [now.getHours(), now.getMinutes(), now.getSeconds()].map(pad).join(":");
+            if (showTime) setDraftTime(time);
+            setViewMonth(startOfMonth(now));
+            selectDate(day, time, true);
+          },
           onConfirm: commitDraft
         }
       )
@@ -2122,10 +2130,13 @@ function DateRangePicker({
       changeOpen(false);
     }
   }
-  function selectDateTime(day, index) {
+  function selectDateTime(day, index, time = index === 1 ? "23:59:59" : times[index]) {
     if (isDisabled(day, index, true)) return;
+    const nextTimes = [...times];
+    nextTimes[index] = time;
+    setTimes(nextTimes);
     const nextValue = [...draftValue];
-    nextValue[index] = buildRangeValue(day, index);
+    nextValue[index] = withTime(day, time, showSecond);
     updateDraft(nextValue);
     setHoverDate("");
     setActiveIndex(index);
@@ -2341,7 +2352,19 @@ function DateRangePicker({
               " \u5929"
             ] }) : null
           ] }),
-          onToday: () => showTime ? selectDateTime(dateKey(/* @__PURE__ */ new Date()), activeIndex) : selectDate(dateKey(/* @__PURE__ */ new Date())),
+          onToday: () => {
+            const now = /* @__PURE__ */ new Date();
+            const day = dateKey(now);
+            if (isDisabled(day, activeIndex, Boolean(showTime))) return;
+            if (showTime) {
+              const time = [now.getHours(), now.getMinutes(), now.getSeconds()].map(pad).join(":");
+              (activeIndex === 0 ? setViewMonth : setEndViewMonth)(startOfMonth(now));
+              selectDateTime(day, activeIndex, time);
+            } else {
+              setViewMonth(startOfMonth(now));
+              selectDate(day);
+            }
+          },
           onConfirm: confirm
         }
       )

package/dist/select-date-range.d.cts

@@ -1,4 +1,4 @@
-export { S as SelectDateRange, i as SelectDateRangeProps, j as SelectDateRangeValue } from './select-date-range-DN4eBuVx.cjs';
+export { S as SelectDateRange, i as SelectDateRangeProps, j as SelectDateRangeValue } from './select-date-range-CRWxqHFp.cjs';
 import 'react';
 import './shared-Bx4B28Wh.cjs';
 import './Select-Bv2AmXRD.cjs';

package/dist/select-date-range.d.ts

@@ -1,4 +1,4 @@
-export { S as SelectDateRange, i as SelectDateRangeProps, j as SelectDateRangeValue } from './select-date-range-YrK9kuKW.js';
+export { S as SelectDateRange, i as SelectDateRangeProps, j as SelectDateRangeValue } from './select-date-range-rtYL9egr.js';
 import 'react';
 import './shared-Bx4B28Wh.js';
 import './Select-Cc1owuvN.js';

package/dist/select-date-range.js

@@ -1,6 +1,6 @@
 import {
   SelectDateRange
-} from "./chunk-TG7ZYXA7.js";
+} from "./chunk-K5OU5NOT.js";
 import "./chunk-TKCXP6RZ.js";
 import "./chunk-YMOOL62S.js";
 import "./chunk-IKAMZNCK.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sia.soul/sia-react-ui",
-  "version": "0.1.76",
+  "version": "0.1.77",
   "description": "Sia Design components and tokens for React",
   "publishConfig": {
     "access": "public",