@pisell/materials 6.11.5 → 6.11.6

package/lib/components/pisellDateTimeDisplay/PisellDateTimeDisplay.stories.js

@@ -49,6 +49,7 @@ __export(PisellDateTimeDisplay_stories_exports, {
   DateMDY: () => DateMDY,
   DisableRefresh: () => DisableRefresh,
   HorizontalLayout: () => HorizontalLayout,
+  InlineDateTimeWeekdayZh: () => InlineDateTimeWeekdayZh,
   InlineLayout: () => InlineLayout,
   InlineWithCustomSeparator: () => InlineWithCustomSeparator,
   LocaleChinese: () => LocaleChinese,
@@ -56,6 +57,9 @@ __export(PisellDateTimeDisplay_stories_exports, {
   MultiLanguage: () => MultiLanguage,
   OnlyDate: () => OnlyDate,
   OnlyTime: () => OnlyTime,
+  RelativeDay: () => RelativeDay,
+  RelativeDayCustomLabels: () => RelativeDayCustomLabels,
+  RelativeDayEn: () => RelativeDayEn,
   ScenarioDashboard: () => ScenarioDashboard,
   ScenarioLargeScreen: () => ScenarioLargeScreen,
   ScenarioStatusBar: () => ScenarioStatusBar,
@@ -122,6 +126,23 @@ var InlineWithCustomSeparator = {
     inlineSeparator: " | "
   }
 };
+var InlineDateTimeWeekdayZh = {
+  args: {
+    layout: "inline",
+    locale: "zh-cn",
+    fields: {
+      fieldOrder: ["date", "time", "weekday"],
+      inlineSeparators: [" - ", " "]
+    },
+    dateFormat: {
+      order: "YMD",
+      showYear: true,
+      separator: "-",
+      showChineseUnit: false,
+      showRelativeDay: false
+    }
+  }
+};
 var Time12Hour = {
   args: {
     timeFormat: {
@@ -196,6 +217,44 @@ var DateChinese = {
     }
   }
 };
+var RelativeDay = {
+  args: {
+    layout: "horizontal",
+    dateFormat: {
+      showRelativeDay: true,
+      showYear: true,
+      showChineseUnit: true
+    },
+    locale: "zh-cn"
+  }
+};
+var RelativeDayEn = {
+  args: {
+    layout: "horizontal",
+    dateFormat: {
+      showRelativeDay: true,
+      order: "MDY",
+      showYear: true
+    },
+    locale: "en"
+  }
+};
+var RelativeDayCustomLabels = {
+  args: {
+    layout: "horizontal",
+    dateFormat: {
+      showRelativeDay: true,
+      relativeDayLabels: {
+        today: "今日",
+        yesterday: "昨日",
+        tomorrow: "翌日"
+      },
+      showYear: true,
+      showChineseUnit: true
+    },
+    locale: "zh-cn"
+  }
+};
 var DateFullMonth = {
   args: {
     locale: "en",
@@ -758,6 +817,7 @@ var DarkTheme = {
   DateMDY,
   DisableRefresh,
   HorizontalLayout,
+  InlineDateTimeWeekdayZh,
   InlineLayout,
   InlineWithCustomSeparator,
   LocaleChinese,
@@ -765,6 +825,9 @@ var DarkTheme = {
   MultiLanguage,
   OnlyDate,
   OnlyTime,
+  RelativeDay,
+  RelativeDayCustomLabels,
+  RelativeDayEn,
   ScenarioDashboard,
   ScenarioLargeScreen,
   ScenarioStatusBar,

package/lib/components/pisellDateTimeDisplay/components/DateDisplay.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { Dayjs } from 'dayjs';
+import { type Dayjs } from 'dayjs';
 import type { DateFormatConfig, TextStyleConfig } from '../types';
 /**
  * DateDisplay 组件 Props
@@ -13,6 +13,10 @@ export interface DateDisplayProps {
      * 日期格式配置
      */
     format?: DateFormatConfig;
+    /**
+     * 参考日期（用于「今天/昨天/明天」判定，默认当前时间 dayjs()）
+     */
+    referenceDate?: Dayjs;
     /**
      * 文本样式
      */
@@ -27,6 +31,7 @@ export interface DateDisplayProps {
  *
  * @description
  * - 格式化并展示日期
+ * - 支持 showRelativeDay：今天/昨天/明天时用相对日替换原日期展示，不展示具体日期
  * - 支持不同的日期顺序（YMD/MDY/DMY）
  * - 支持年月日字段显隐
  * - 支持中文单位（年、月、日）

package/lib/components/pisellDateTimeDisplay/components/DateDisplay.js

@@ -34,14 +34,18 @@ __export(DateDisplay_exports, {
 });
 module.exports = __toCommonJS(DateDisplay_exports);
 var import_react = __toESM(require("react"));
+var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("../utils");
 var DateDisplay = ({
   date,
   format,
+  referenceDate = (0, import_dayjs.default)(),
   style,
   className
 }) => {
-  const formattedDate = (0, import_utils.formatDate)(date, format);
+  const labels = format == null ? void 0 : format.relativeDayLabels;
+  const relativeDay = (format == null ? void 0 : format.showRelativeDay) ? (0, import_utils.getRelativeDay)(date, referenceDate) : null;
+  const formattedDate = relativeDay ? (labels == null ? void 0 : labels[relativeDay]) ?? (0, import_utils.getRelativeDayLabel)(relativeDay, date.locale()) : (0, import_utils.formatDate)(date, format);
   if (!formattedDate) {
     return null;
   }

package/lib/components/pisellDateTimeDisplay/formats/dateTimeDisplayFormats.d.ts

@@ -0,0 +1,7 @@
+import type { DateTimeDisplayFormatPreset } from '../types';
+/**
+ * PisellDateTimeDisplay 按语言预设的格式
+ * - zh-cn：完整日期 - 时间 星期（如 2025-12-31 - 2:00 周四）、相对日今天/昨天/明天
+ * - en：时间 星期, 日期（如 2:00 Sat, 21 Mar, 2026）、相对日 Today/Yesterday/Tomorrow
+ */
+export declare const DATETIME_DISPLAY_FORMATS: Record<string, Partial<DateTimeDisplayFormatPreset>>;

package/lib/components/pisellDateTimeDisplay/formats/dateTimeDisplayFormats.js

@@ -0,0 +1,98 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/pisellDateTimeDisplay/formats/dateTimeDisplayFormats.ts
+var dateTimeDisplayFormats_exports = {};
+__export(dateTimeDisplayFormats_exports, {
+  DATETIME_DISPLAY_FORMATS: () => DATETIME_DISPLAY_FORMATS
+});
+module.exports = __toCommonJS(dateTimeDisplayFormats_exports);
+var DATETIME_DISPLAY_FORMATS = {
+  "zh-cn": {
+    dateFormat: {
+      order: "YMD",
+      showYear: true,
+      separator: "-",
+      showChineseUnit: false,
+      showRelativeDay: true
+    },
+    timeFormat: {
+      use12Hour: false,
+      showSeconds: false
+    },
+    weekdayFormat: {
+      full: false,
+      singleLetter: false
+    },
+    fields: {
+      showTime: true,
+      showDate: true,
+      showWeekday: true,
+      fieldOrder: ["date", "time", "weekday"],
+      inlineSeparators: [" - ", " "]
+    }
+  },
+  zh: {
+    // 兜底 zh
+    dateFormat: {
+      order: "YMD",
+      showYear: true,
+      separator: "-",
+      showChineseUnit: false,
+      showRelativeDay: true
+    },
+    timeFormat: { use12Hour: false, showSeconds: false },
+    weekdayFormat: { full: false, singleLetter: false },
+    fields: {
+      showTime: true,
+      showDate: true,
+      showWeekday: true,
+      fieldOrder: ["date", "time", "weekday"],
+      inlineSeparators: [" - ", " "]
+    }
+  },
+  en: {
+    dateFormat: {
+      order: "DMY",
+      shortMonth: true,
+      showYear: true,
+      showRelativeDay: true,
+      useCommaBeforeYear: true
+    },
+    timeFormat: {
+      use12Hour: false,
+      showSeconds: false
+    },
+    weekdayFormat: {
+      full: false,
+      singleLetter: false,
+      trailingComma: true
+    },
+    fields: {
+      showTime: true,
+      showDate: true,
+      showWeekday: true,
+      fieldOrder: ["time", "weekday", "date"],
+      inlineSeparators: [" ", " "]
+    }
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DATETIME_DISPLAY_FORMATS
+});

package/lib/components/pisellDateTimeDisplay/formats/index.d.ts

@@ -0,0 +1 @@
+export { DATETIME_DISPLAY_FORMATS } from './dateTimeDisplayFormats';

package/lib/components/pisellDateTimeDisplay/formats/index.js

@@ -0,0 +1,29 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/pisellDateTimeDisplay/formats/index.ts
+var formats_exports = {};
+__export(formats_exports, {
+  DATETIME_DISPLAY_FORMATS: () => import_dateTimeDisplayFormats.DATETIME_DISPLAY_FORMATS
+});
+module.exports = __toCommonJS(formats_exports);
+var import_dateTimeDisplayFormats = require("./dateTimeDisplayFormats");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DATETIME_DISPLAY_FORMATS
+});

package/lib/components/pisellDateTimeDisplay/hooks/useCurrentTime.d.ts

@@ -15,7 +15,7 @@ export interface UseCurrentTimeOptions {
     disabled?: boolean;
     /**
      * dayjs locale
-     * @default 优先使用全局配置，其次使用浏览器语言
+     * @default 优先使用全局配置，其次使用 i18n 当前语言（getCurrentLocale）
      * @example 'zh-CN' | 'zh-HK' | 'en' | 'en-US' | 'ja'
      */
     locale?: string;
@@ -30,7 +30,7 @@ export interface UseCurrentTimeOptions {
  * @description
  * - 自动创建定时器刷新时间
  * - 支持自定义刷新间隔
- * - 支持国际化（locale）：优先级为 用户指定 > 全局配置 > 浏览器语言
+ * - 支持国际化（locale）：优先级为 用户指定 > 全局配置 > i18n 当前语言
  * - 组件卸载时自动清除定时器
  *
  * @example

package/lib/components/pisellDateTimeDisplay/types.d.ts

@@ -99,6 +99,26 @@ export interface DateFormatConfig {
      * @default true
      */
     showDay?: boolean;
+    /**
+     * 英文 DMY 时年月之间是否加逗号（如 21 Mar, 2026；false 时为 22 Jan 2025）
+     * @default true
+     */
+    useCommaBeforeYear?: boolean;
+    /**
+     * 是否在「今天/昨天/明天」时用相对日替换具体日期
+     * 开启后：与参考日同天显示「今天」，前一天「昨天」，后一天「明天」；其他日期仍按原格式
+     * @default false
+     */
+    showRelativeDay?: boolean;
+    /**
+     * 相对日文案覆盖（用于 i18n 或自定义）
+     * 不传时按 locale 使用默认：zh 今天/昨天/明天，en Today/Yesterday/Tomorrow
+     */
+    relativeDayLabels?: {
+        today?: string;
+        yesterday?: string;
+        tomorrow?: string;
+    };
 }
 /**
  * 星期格式配置
@@ -116,6 +136,11 @@ export interface WeekdayFormatConfig {
      * @example true -> "S" / "六" | false -> "Sat" / "周六"
      */
     singleLetter?: boolean;
+    /**
+     * 是否在星期后加逗号（用于与日期拼接如 "Sat, 21 Mar, 2026"）
+     * @default false
+     */
+    trailingComma?: boolean;
 }
 /**
  * 字段配置
@@ -141,6 +166,12 @@ export interface FieldConfig {
      * @default ['time', 'date', 'weekday']
      */
     fieldOrder?: FieldType[];
+    /**
+     * 单行布局时每段之间的分隔符，按顺序对应字段之间
+     * 如 ['date','time','weekday'] 配 inlineSeparators: [' - ', ' '] => "2025-12-31 - 2:00 周四"
+     * 不足时用组件 inlineSeparator 补齐
+     */
+    inlineSeparators?: string[];
 }
 /**
  * 文本样式配置
@@ -202,6 +233,16 @@ export interface ContainerStyleConfig {
      */
     gap?: number | string;
 }
+/**
+ * 多语言格式预设（日期/时间/星期 + 字段顺序与分隔符）
+ * 用于 formatByLocale[locale] 或默认多语言配置
+ */
+export interface DateTimeDisplayFormatPreset {
+    dateFormat?: DateFormatConfig;
+    timeFormat?: TimeFormatConfig;
+    weekdayFormat?: WeekdayFormatConfig;
+    fields?: FieldConfig;
+}
 /**
  * PisellDateTimeDisplay 组件 Props
  */
@@ -220,6 +261,11 @@ export interface PisellDateTimeDisplayProps {
      * 字段显示配置
      */
     fields?: FieldConfig;
+    /**
+     * 多语言格式配置：按 locale 取对应格式预设，再与下方单项配置合并（单项优先）
+     * @example formatByLocale={{ 'zh-cn': { dateFormat: {...}, fields: { fieldOrder: ['date','time','weekday'], inlineSeparators: [' - ', ' '] } }, 'en': {...} }}
+     */
+    formatByLocale?: Record<string, Partial<DateTimeDisplayFormatPreset>>;
     /**
      * 时间格式配置
      */
@@ -274,11 +320,11 @@ export interface PisellDateTimeDisplayProps {
     disableAutoRefresh?: boolean;
     /**
      * dayjs locale（语言代码）
-     * @default 优先使用全局配置（usePisellConfig），其次使用浏览器语言
+     * @default 优先使用全局配置（usePisellConfig），其次使用 i18n 当前语言（getCurrentLocale：全局配置 / umi_locale）
      * @example 'zh-CN' | 'zh-HK' | 'en' | 'en-US' | 'ja'
      * @description
      * - 支持标准 BCP 47 语言代码，会自动标准化为 dayjs 兼容格式
-     * - 优先级：组件 locale 属性 > PisellConfigProvider 全局配置 > 浏览器语言
+     * - 优先级：组件 locale 属性 > PisellConfigProvider 全局配置 > i18n 当前语言
      */
     locale?: string;
     /**

package/lib/components/pisellDateTimeDisplay/utils/formatDate.js

@@ -32,7 +32,8 @@ function formatDate(date, config) {
     separator = "-",
     showYear = false,
     showMonth = true,
-    showDay = true
+    showDay = true,
+    useCommaBeforeYear = true
   } = config || {};
   const locale = date.locale();
   const isChinese = (0, import_localeUtils.isChinese)(locale);
@@ -84,6 +85,18 @@ function formatDate(date, config) {
     }
     return formatted;
   }
+  if (order === "DMY" && !isChinese) {
+    const formatted = date.format(parts.join(" "));
+    if (showYear && showMonth && showDay && useCommaBeforeYear) {
+      const [day, month, year] = formatted.split(" ");
+      return `${day} ${month}, ${year}`;
+    }
+    if (showYear && showDay && !showMonth && useCommaBeforeYear) {
+      const [day, year] = formatted.split(" ");
+      return `${day}, ${year}`;
+    }
+    return formatted;
+  }
   return date.format(parts.join(separator));
 }
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/pisellDateTimeDisplay/utils/formatDateOrRelative.d.ts

@@ -0,0 +1,17 @@
+import type { Dayjs } from 'dayjs';
+import type { DateFormatConfig, WeekdayFormatConfig } from '../types';
+/**
+ * 获取「日期部分」的展示文案（相对日内置在 datetime）
+ * - 若开启 showRelativeDay 且日期为今天/昨天/明天，返回相对日文案（如「今天」「Yesterday」）
+ * - 否则返回「星期, 日期」格式（用于时间区间跨天等场景）
+ *
+ * 供 PisellDateTimeDisplay、PisellTimeRangeDisplay 等统一使用，相对时间逻辑只在此处维护
+ */
+export declare function getDatePartDisplay(params: {
+    date: Dayjs;
+    dateFormat?: DateFormatConfig;
+    weekdayFormat?: WeekdayFormatConfig;
+    referenceDate: Dayjs;
+    /** 覆盖日期格式（如跨天时的 order: 'DMY', shortMonth: true） */
+    dateFormatOverride?: Partial<DateFormatConfig>;
+}): string;

package/lib/components/pisellDateTimeDisplay/utils/formatDateOrRelative.js

@@ -0,0 +1,54 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/pisellDateTimeDisplay/utils/formatDateOrRelative.ts
+var formatDateOrRelative_exports = {};
+__export(formatDateOrRelative_exports, {
+  getDatePartDisplay: () => getDatePartDisplay
+});
+module.exports = __toCommonJS(formatDateOrRelative_exports);
+var import_formatDate = require("./formatDate");
+var import_formatWeekday = require("./formatWeekday");
+var import_relativeDay = require("./relativeDay");
+function getDatePartDisplay(params) {
+  const {
+    date,
+    dateFormat,
+    weekdayFormat,
+    referenceDate,
+    dateFormatOverride
+  } = params;
+  if (dateFormat == null ? void 0 : dateFormat.showRelativeDay) {
+    const rel = (0, import_relativeDay.getRelativeDay)(date, referenceDate);
+    if (rel) {
+      const labels = dateFormat.relativeDayLabels;
+      return (labels == null ? void 0 : labels[rel]) ?? (0, import_relativeDay.getRelativeDayLabel)(rel, date.locale());
+    }
+  }
+  const mergedDateConfig = {
+    ...dateFormat,
+    ...dateFormatOverride
+  };
+  const weekdayStr = (0, import_formatWeekday.formatWeekday)(date, { ...weekdayFormat, trailingComma: true });
+  const dateStr = (0, import_formatDate.formatDate)(date, mergedDateConfig);
+  return `${weekdayStr} ${dateStr}`;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getDatePartDisplay
+});

package/lib/components/pisellDateTimeDisplay/utils/formatWeekday.js

@@ -24,21 +24,21 @@ __export(formatWeekday_exports, {
 module.exports = __toCommonJS(formatWeekday_exports);
 var import_localeUtils = require("./localeUtils");
 function formatWeekday(weekday, config) {
-  const { full = false, singleLetter = false } = config || {};
+  const { full = false, singleLetter = false, trailingComma = false } = config || {};
   const locale = weekday.locale();
   const isChinese = (0, import_localeUtils.isChinese)(locale);
+  const appendComma = (s) => trailingComma ? isChinese ? `${s}，` : `${s},` : s;
   if (singleLetter) {
     if (isChinese) {
       const weekdayMap = ["日", "一", "二", "三", "四", "五", "六"];
-      return weekdayMap[weekday.day()];
-    } else {
-      return weekday.format("dd").charAt(0);
+      return appendComma(weekdayMap[weekday.day()]);
     }
+    return appendComma(weekday.format("dd").charAt(0));
   }
   if (full) {
-    return weekday.format("dddd");
+    return appendComma(weekday.format("dddd"));
   }
-  return weekday.format("ddd");
+  return appendComma(weekday.format("ddd"));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/components/pisellDateTimeDisplay/utils/index.d.ts

@@ -1,5 +1,7 @@
 export { formatTime } from './formatTime';
 export { formatDate } from './formatDate';
 export { formatWeekday } from './formatWeekday';
+export { getDatePartDisplay } from './formatDateOrRelative';
 export { getRefreshInterval } from './getRefreshInterval';
-export { getBrowserLocale, normalizeLocale, isChinese, getDayjsLocale, } from './localeUtils';
+export { getRelativeDay, getRelativeDayLabel, type RelativeDay, } from './relativeDay';
+export { normalizeLocale, isChinese, getDayjsLocale, } from './localeUtils';

package/lib/components/pisellDateTimeDisplay/utils/index.js

@@ -22,9 +22,11 @@ __export(utils_exports, {
   formatDate: () => import_formatDate.formatDate,
   formatTime: () => import_formatTime.formatTime,
   formatWeekday: () => import_formatWeekday.formatWeekday,
-  getBrowserLocale: () => import_localeUtils.getBrowserLocale,
+  getDatePartDisplay: () => import_formatDateOrRelative.getDatePartDisplay,
   getDayjsLocale: () => import_localeUtils.getDayjsLocale,
   getRefreshInterval: () => import_getRefreshInterval.getRefreshInterval,
+  getRelativeDay: () => import_relativeDay.getRelativeDay,
+  getRelativeDayLabel: () => import_relativeDay.getRelativeDayLabel,
   isChinese: () => import_localeUtils.isChinese,
   normalizeLocale: () => import_localeUtils.normalizeLocale
 });
@@ -32,16 +34,20 @@ module.exports = __toCommonJS(utils_exports);
 var import_formatTime = require("./formatTime");
 var import_formatDate = require("./formatDate");
 var import_formatWeekday = require("./formatWeekday");
+var import_formatDateOrRelative = require("./formatDateOrRelative");
 var import_getRefreshInterval = require("./getRefreshInterval");
+var import_relativeDay = require("./relativeDay");
 var import_localeUtils = require("./localeUtils");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   formatDate,
   formatTime,
   formatWeekday,
-  getBrowserLocale,
+  getDatePartDisplay,
   getDayjsLocale,
   getRefreshInterval,
+  getRelativeDay,
+  getRelativeDayLabel,
   isChinese,
   normalizeLocale
 });

package/lib/components/pisellDateTimeDisplay/utils/localeUtils.d.ts

@@ -1,9 +1,3 @@
-/**
- * 获取浏览器语言
- * @returns 浏览器语言代码
- * @example 'zh-CN' | 'en' | 'zh-HK'
- */
-export declare function getBrowserLocale(): string;
 /**
  * 标准化 locale 代码
  * @param locale 原始 locale 代码
@@ -20,7 +14,8 @@ export declare function normalizeLocale(locale: string): string;
 export declare function isChinese(locale: string): boolean;
 /**
  * 获取 dayjs 兼容的 locale 代码
- * @param locale 原始 locale 代码
+ * 未传 locale 时使用 i18n 当前语言（全局配置 / umi_locale），不再使用浏览器语言
+ * @param locale 原始 locale 代码（可选）
  * @returns dayjs 兼容的 locale 代码
  * @example 'zh-CN' -> 'zh-cn', 'en-US' -> 'en'
  */

package/lib/components/pisellDateTimeDisplay/utils/localeUtils.js

@@ -19,19 +19,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/pisellDateTimeDisplay/utils/localeUtils.ts
 var localeUtils_exports = {};
 __export(localeUtils_exports, {
-  getBrowserLocale: () => getBrowserLocale,
   getDayjsLocale: () => getDayjsLocale,
   isChinese: () => isChinese,
   normalizeLocale: () => normalizeLocale
 });
 module.exports = __toCommonJS(localeUtils_exports);
-function getBrowserLocale() {
-  if (typeof window === "undefined" || typeof navigator === "undefined") {
-    return "en";
-  }
-  const browserLang = navigator.language || navigator.userLanguage || "en";
-  return browserLang;
-}
+var import_locale = require("../../../utils/locale");
 function normalizeLocale(locale) {
   return locale.toLowerCase();
 }
@@ -41,14 +34,12 @@ function isChinese(locale) {
 }
 function getDayjsLocale(locale) {
   if (!locale) {
-    const browserLocale = getBrowserLocale();
-    return normalizeLocale(browserLocale);
+    return normalizeLocale((0, import_locale.getCurrentLocale)());
   }
   return normalizeLocale(locale);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getBrowserLocale,
   getDayjsLocale,
   isChinese,
   normalizeLocale

package/lib/components/pisellDateTimeDisplay/utils/relativeDay.d.ts

@@ -0,0 +1,23 @@
+import type { Dayjs } from 'dayjs';
+export declare type RelativeDay = 'today' | 'yesterday' | 'tomorrow';
+/**
+ * 判断日期相对于参考日期是今天、昨天还是明天
+ *
+ * @param date 要展示的日期
+ * @param reference 参考日期（通常为「当前」dayjs()）
+ * @returns 'today' | 'yesterday' | 'tomorrow' | null
+ *
+ * @example
+ * getRelativeDay(dayjs(), dayjs())           // => 'today'
+ * getRelativeDay(dayjs().add(1,'day'), dayjs()) // => 'tomorrow'
+ * getRelativeDay(dayjs().subtract(1,'day'), dayjs()) // => 'yesterday'
+ */
+export declare function getRelativeDay(date: Dayjs, reference: Dayjs): RelativeDay | null;
+/**
+ * 根据 locale 返回相对日期的展示文案
+ *
+ * @param day 'today' | 'yesterday' | 'tomorrow'
+ * @param locale dayjs locale，如 'zh-cn'、'en'
+ * @returns 如 '今天'、'Today'
+ */
+export declare function getRelativeDayLabel(day: RelativeDay, locale?: string): string;