@pisell/materials 3.3.85 → 3.3.86

package/es/components/pisellCurrency/index.js

@@ -2,6 +2,21 @@
  * PisellCurrency 组件导出
  */
 
-export { default as PisellCurrency } from "./PisellCurrency";
+import { getText } from "../../locales";
+import PisellCurrency from "./PisellCurrency";
+
+/** RecordBoard 列 type 联动排序：内置 0 → 9 / 9 → 0 */
+PisellCurrency.SortOptions = {
+  getSortItems: function getSortItems(fieldKey) {
+    return [{
+      key: "".concat(fieldKey, ":asc"),
+      label: getText('sort-0-9')
+    }, {
+      key: "".concat(fieldKey, ":desc"),
+      label: getText('sort-9-0')
+    }];
+  }
+};
+export { PisellCurrency };
 
 // 公共类型从 types 中重新导出，方便使用

package/es/components/pisellDataSourceContainer/components/ColumnsSetting/index.d.ts

@@ -6,6 +6,7 @@ export declare const COLUMNS_SHARED_STATE_KEYS: {
 };
 export interface ColumnsSettingProps {
     scopeId?: string;
+    __id?: string;
 }
 export interface ColumnSettingItem {
     key: string;
@@ -16,7 +17,12 @@ export interface ColumnSettingItem {
     sortIndex?: number;
     fixed?: 'left' | 'right' | boolean;
 }
-declare const _default: React.ForwardRefExoticComponent<Omit<ColumnsSettingProps & DataSourceContainerContextType & React.RefAttributes<unknown> & {
+/**
+ * 暴露给父组件的 ref 方法
+ */
+export interface ColumnsSettingRef {
+}
+declare const _default: React.ForwardRefExoticComponent<Omit<ColumnsSettingProps & DataSourceContainerContextType & React.RefAttributes<ColumnsSettingRef> & {
     refId?: string | undefined;
 }, "ref"> & React.RefAttributes<any>>;
 export default _default;

package/es/components/pisellDataSourceContainer/components/ColumnsSetting/index.js

@@ -4,9 +4,10 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { forwardRef, useState, useEffect } from 'react';
+import React, { forwardRef, useState, useEffect, useImperativeHandle } from 'react';
 import withContainer from "../../utils/withContainer";
 import ColumnsSetting from "../../../table/Actions/component/ColumnsSetting";
+import { saveColumnSettingToLocal } from "./utils";
 export var COLUMNS_SHARED_STATE_KEYS = {
   columnsValue: function columnsValue(instanceId) {
     return "".concat(instanceId, ":columns:value");
@@ -15,14 +16,23 @@ export var COLUMNS_SHARED_STATE_KEYS = {
     return "".concat(instanceId, ":columns:change");
   }
 };
-var WithColumnsSetting = /*#__PURE__*/forwardRef(function (props) {
+
+/**
+ * 暴露给父组件的 ref 方法
+ */
+
+var WithColumnsSetting = /*#__PURE__*/forwardRef(function (props, ref) {
   var refManager = props.refManager,
     _props$scopeId = props.scopeId,
-    scopeId = _props$scopeId === void 0 ? 'table' : _props$scopeId;
+    scopeId = _props$scopeId === void 0 ? 'table' : _props$scopeId,
+    __id = props.__id;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
+  useImperativeHandle(ref, function () {
+    return {};
+  }, []);
   useEffect(function () {
     var unsubscribe = refManager.subscribeSharedState(COLUMNS_SHARED_STATE_KEYS.columnsValue(scopeId), setValue);
     return unsubscribe;
@@ -31,6 +41,23 @@ var WithColumnsSetting = /*#__PURE__*/forwardRef(function (props) {
     var typedValue = newValue;
     setValue(typedValue);
     refManager.setSharedState(COLUMNS_SHARED_STATE_KEYS.columnsChange(scopeId), typedValue);
+    if (__id) {
+      saveColumnSettingToLocal({
+        componentId: __id,
+        columnSetting: typedValue.map(function (col, index) {
+          var _col$sortIndex;
+          return {
+            key: col.key,
+            dataIndex: col.dataIndex,
+            title: col.title,
+            titleString: col.titleString,
+            isShow: col.isShow,
+            sortIndex: (_col$sortIndex = col.sortIndex) !== null && _col$sortIndex !== void 0 ? _col$sortIndex : index,
+            fixed: col.fixed
+          };
+        })
+      });
+    }
   };
   return /*#__PURE__*/React.createElement(ColumnsSetting, {
     value: value,

package/es/components/pisellDataSourceContainer/components/ColumnsSetting/utils.d.ts

@@ -0,0 +1,28 @@
+/**
+ * 列设置工具：持久化复用 @pisell/utils 的 saveColumnSettingToLocal / getColumnSettingFromLocal；
+ * mergeColumnSettingSimple 为 Table 列与本地缓存的合并逻辑，保留在此。
+ */
+import React from 'react';
+import { getColumnSettingFromLocal, clearColumnSettingFromLocal } from '@pisell/utils';
+export { getColumnSettingFromLocal, clearColumnSettingFromLocal };
+/** 与 DataSourceContainer ColumnsSetting 调用处类型兼容的列设置项（含 React.ReactNode title） */
+export interface ColumnSettingItemForSave {
+    key: string;
+    dataIndex: string;
+    title?: React.ReactNode;
+    titleString?: string;
+    isShow: boolean;
+    sortIndex?: number;
+    fixed?: 'left' | 'right' | boolean;
+}
+export declare const saveColumnSettingToLocal: (params: {
+    componentId: string;
+    columnSetting: ColumnSettingItemForSave[];
+}) => void;
+export declare const mergeColumnSettingSimple: ({ columns, componentId, }: {
+    columns: Record<string, any>[];
+    componentId?: string | undefined;
+}) => {
+    isShow: any;
+    sortIndex: any;
+}[];

package/es/components/pisellDataSourceContainer/components/ColumnsSetting/utils.js

@@ -0,0 +1,68 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ * 列设置工具：持久化复用 @pisell/utils 的 saveColumnSettingToLocal / getColumnSettingFromLocal；
+ * mergeColumnSettingSimple 为 Table 列与本地缓存的合并逻辑，保留在此。
+ */
+
+import { saveColumnSettingToLocal as saveColumnSettingToLocalFromUtils, getColumnSettingFromLocal, clearColumnSettingFromLocal } from '@pisell/utils';
+export { getColumnSettingFromLocal, clearColumnSettingFromLocal };
+
+/** 与 DataSourceContainer ColumnsSetting 调用处类型兼容的列设置项（含 React.ReactNode title） */
+
+export var saveColumnSettingToLocal = function saveColumnSettingToLocal(params) {
+  saveColumnSettingToLocalFromUtils({
+    componentId: params.componentId,
+    columnSetting: params.columnSetting
+  });
+};
+export var mergeColumnSettingSimple = function mergeColumnSettingSimple(_ref) {
+  var columns = _ref.columns,
+    componentId = _ref.componentId;
+  if (!componentId) {
+    return columns.map(function (item, index) {
+      var _item$isShow;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        isShow: (_item$isShow = item.isShow) !== null && _item$isShow !== void 0 ? _item$isShow : true,
+        sortIndex: index
+      });
+    });
+  }
+  var cachedColumns = getColumnSettingFromLocal(componentId);
+  if (!cachedColumns || !Array.isArray(cachedColumns)) {
+    return columns.map(function (item, index) {
+      var _item$isShow2;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        isShow: (_item$isShow2 = item.isShow) !== null && _item$isShow2 !== void 0 ? _item$isShow2 : true,
+        sortIndex: index
+      });
+    });
+  }
+  var cachedMap = new Map(cachedColumns.map(function (item) {
+    return [item.dataIndex, item];
+  }));
+  var mergedColumns = columns.map(function (item, index) {
+    var _item$isShow3;
+    var cached = cachedMap.get(item.dataIndex);
+    if (cached) {
+      var _cached$isShow, _cached$sortIndex;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        isShow: (_cached$isShow = cached.isShow) !== null && _cached$isShow !== void 0 ? _cached$isShow : true,
+        sortIndex: (_cached$sortIndex = cached.sortIndex) !== null && _cached$sortIndex !== void 0 ? _cached$sortIndex : index
+      });
+    }
+    return _objectSpread(_objectSpread({}, item), {}, {
+      isShow: (_item$isShow3 = item.isShow) !== null && _item$isShow3 !== void 0 ? _item$isShow3 : true,
+      sortIndex: index
+    });
+  });
+  mergedColumns.sort(function (a, b) {
+    var _a$sortIndex, _b$sortIndex;
+    return ((_a$sortIndex = a.sortIndex) !== null && _a$sortIndex !== void 0 ? _a$sortIndex : 0) - ((_b$sortIndex = b.sortIndex) !== null && _b$sortIndex !== void 0 ? _b$sortIndex : 0);
+  });
+  return mergedColumns;
+};

package/es/components/pisellDataSourceContainer/components/Table/index.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import { DataSourceContainerContextType } from '../../type';
 declare const _default: React.ForwardRefExoticComponent<Omit<Partial<import("antd").TableProps<any>> & DataSourceContainerContextType & {
     scopeId?: string | undefined;
+    __id?: string | undefined;
 } & React.RefAttributes<unknown> & {
     refId?: string | undefined;
 }, "ref"> & React.RefAttributes<any>>;

package/es/components/pisellDataSourceContainer/components/Table/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["serverActions", "refManager", "columns", "scopeId"];
+var _excluded = ["serverActions", "refManager", "columns", "scopeId", "__id"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -19,14 +19,16 @@ var WithTable = /*#__PURE__*/forwardRef(function (props) {
     columns = props.columns,
     _props$scopeId = props.scopeId,
     scopeId = _props$scopeId === void 0 ? 'table' : _props$scopeId,
+    __id = props.__id,
     otherProps = _objectWithoutProperties(props, _excluded);
   var data = listAction.data,
     loading = listAction.loading;
-  // 🔥 使用 useColumns hook 管理列状态
+  // 🔥 使用 useColumns hook 管理列状态（支持本地缓存）
   var _useColumns = useColumns({
       columns: columns || [],
       scopeId: scopeId,
-      refManager: refManager
+      refManager: refManager,
+      __id: __id
     }),
     visibleColumns = _useColumns.visibleColumns;
   return /*#__PURE__*/React.createElement(Table, _extends({}, otherProps, {

package/es/components/pisellDataSourceContainer/components/Table/useColumns.d.ts

@@ -6,6 +6,7 @@ interface UseColumnsParams {
     columns: any[];
     scopeId: string;
     refManager: RefManagerContextType;
+    __id?: string;
 }
 declare const useColumns: (params: UseColumnsParams) => {
     visibleColumns: any[];

package/es/components/pisellDataSourceContainer/components/Table/useColumns.js

@@ -6,6 +6,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useState, useEffect, useMemo } from 'react';
 import { COLUMNS_SHARED_STATE_KEYS } from "../ColumnsSetting";
+import { mergeColumnSettingSimple } from "../ColumnsSetting/utils";
 
 /**
  * useColumns Hook 参数
@@ -14,7 +15,8 @@ import { COLUMNS_SHARED_STATE_KEYS } from "../ColumnsSetting";
 var useColumns = function useColumns(params) {
   var columns = params.columns,
     scopeId = params.scopeId,
-    refManager = params.refManager;
+    refManager = params.refManager,
+    __id = params.__id;
 
   // 本地状态：存储列配置
   var _useState = useState([]),
@@ -23,14 +25,30 @@ var useColumns = function useColumns(params) {
     setColumnSettings = _useState2[1];
   useEffect(function () {
     if (!(columns !== null && columns !== void 0 && columns.length)) return;
-    var settings = columns.map(function (col, index) {
+
+    // 🔄 合并本地缓存和默认配置
+    var mergedColumns = mergeColumnSettingSimple({
+      columns: columns.map(function (col, index) {
+        return {
+          key: col.key || col.dataIndex,
+          dataIndex: col.dataIndex,
+          title: col.title,
+          titleString: typeof col.title === 'string' ? col.title : col.dataIndex,
+          isShow: typeof col.isShow === 'boolean' ? col.isShow : true,
+          sortIndex: index,
+          fixed: col.fixed
+        };
+      }),
+      componentId: __id
+    });
+    var settings = mergedColumns.map(function (col) {
       return {
-        key: col.key || col.dataIndex,
+        key: col.key,
         dataIndex: col.dataIndex,
         title: col.title,
-        titleString: typeof col.title === 'string' ? col.title : col.dataIndex,
-        isShow: typeof col.isShow === 'boolean' ? col.isShow : true,
-        sortIndex: index,
+        titleString: col.titleString,
+        isShow: col.isShow,
+        sortIndex: col.sortIndex,
         fixed: col.fixed
       };
     });
@@ -38,7 +56,7 @@ var useColumns = function useColumns(params) {
     // 写入共享状态（使用统一的 key，供 ColumnsSetting 读取）
     refManager.setSharedState(COLUMNS_SHARED_STATE_KEYS.columnsValue(scopeId), settings);
     setColumnSettings(settings);
-  }, [columns, refManager, scopeId]);
+  }, [columns, refManager, scopeId, __id]);
 
   /**
    * 订阅：监听 ColumnsSetting 的修改
@@ -47,22 +65,26 @@ var useColumns = function useColumns(params) {
     var unsubscribe = refManager.subscribeSharedState(COLUMNS_SHARED_STATE_KEYS.columnsChange(scopeId), setColumnSettings);
     return unsubscribe;
   }, [refManager, scopeId]);
-  var visibleColumns = useMemo(function () {
-    if (!(columns !== null && columns !== void 0 && columns.length)) return [];
-    if (!(columnSettings !== null && columnSettings !== void 0 && columnSettings.length)) return columns;
+  return useMemo(function () {
+    if (!(columns !== null && columns !== void 0 && columns.length)) return {
+      visibleColumns: []
+    };
+    if (!(columnSettings !== null && columnSettings !== void 0 && columnSettings.length)) return {
+      visibleColumns: columns
+    };
 
     // 创建 dataIndex 到原始 column 的映射
     var columnMap = new Map(columns.map(function (col) {
       return [col.dataIndex, col];
     }));
-    return columnSettings.filter(function (setting) {
+    var visibleColumns = columnSettings.filter(function (setting) {
       return setting.isShow;
     }).map(function (setting) {
       return columnMap.get(setting.dataIndex);
-    }).filter(Boolean); // 过滤掉不存在的 column
+    }).filter(Boolean);
+    return {
+      visibleColumns: visibleColumns
+    };
   }, [columns, columnSettings]);
-  return {
-    visibleColumns: visibleColumns
-  };
 };
 export default useColumns;

package/es/components/pisellDateTimeDisplay/PisellDateTimeDisplay.js

@@ -12,6 +12,7 @@ import { useCurrentTime } from "./hooks";
 import { getRefreshInterval, isChinese as checkIsChinese, getRelativeDay, getRelativeDayLabel, getDayjsLocale } from "./utils";
 import { TimeDisplay, DateDisplay, WeekdayDisplay } from "./components";
 import { DATETIME_DISPLAY_FORMATS } from "./formats/dateTimeDisplayFormats";
+import useEngineContext from "../../hooks/useEngineContext";
 import "./PisellDateTimeDisplay.less";
 
 /**
@@ -42,8 +43,9 @@ import "./PisellDateTimeDisplay.less";
  * />
  */
 export var PisellDateTimeDisplay = function PisellDateTimeDisplay(props) {
-  var _ref, _presetSource$localeK;
-  var _props$layout = props.layout,
+  var _context$engine, _ref, _presetSource$localeK;
+  var valueProp = props.value,
+    _props$layout = props.layout,
     layout = _props$layout === void 0 ? 'horizontal' : _props$layout,
     _props$textAlign = props.textAlign,
     textAlign = _props$textAlign === void 0 ? 'center' : _props$textAlign,
@@ -67,9 +69,10 @@ export var PisellDateTimeDisplay = function PisellDateTimeDisplay(props) {
     onClick = props.onClick,
     className = props.className,
     style = props.style;
-
+  var context = useEngineContext();
+  var resolvedLocale = locale || (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || 'en';
   // 多语言格式：formatByLocale 优先，否则用内置 DATETIME_DISPLAY_FORMATS；再与单项 props 合并（单项优先）
-  var localeKey = getDayjsLocale(locale);
+  var localeKey = getDayjsLocale(resolvedLocale);
   var baseLocale = localeKey.split('-')[0];
   var presetSource = formatByLocale !== null && formatByLocale !== void 0 ? formatByLocale : DATETIME_DISPLAY_FORMATS;
   var preset = (_ref = (_presetSource$localeK = presetSource[localeKey]) !== null && _presetSource$localeK !== void 0 ? _presetSource$localeK : presetSource[baseLocale]) !== null && _ref !== void 0 ? _ref : {};
@@ -81,17 +84,20 @@ export var PisellDateTimeDisplay = function PisellDateTimeDisplay(props) {
   // 计算刷新间隔
   var computedRefreshInterval = refreshInterval !== null && refreshInterval !== void 0 ? refreshInterval : getRefreshInterval(effectiveTimeFormat);
 
-  // 使用自定义 hook 管理当前时间
+  // 使用自定义 hook 管理当前时间（仅在没有 value 时用于展示）
   var currentTime = useCurrentTime({
     refreshInterval: computedRefreshInterval,
-    disabled: disableAutoRefresh,
-    locale: locale,
+    disabled: disableAutoRefresh || valueProp !== undefined,
+    locale: resolvedLocale,
     onUpdate: onTimeUpdate
   });
 
+  // 展示时间：传入 value 时用 value 并应用当前 locale，否则用已带 locale 的 currentTime
+  var displayTime = valueProp !== undefined && valueProp !== null ? dayjs(valueProp).locale(localeKey) : currentTime;
+
   // 如果有自定义格式化，直接使用
   if (customFormat) {
-    var formattedTime = currentTime.format(customFormat);
+    var formattedTime = displayTime.format(customFormat);
     var _containerInlineStyle = _objectSpread({
       background: containerStyle === null || containerStyle === void 0 ? void 0 : containerStyle.background,
       borderRadius: containerStyle === null || containerStyle === void 0 ? void 0 : containerStyle.borderRadius,
@@ -120,7 +126,7 @@ export var PisellDateTimeDisplay = function PisellDateTimeDisplay(props) {
 
   // 日期与星期一体：若日期以相对日（今天/昨天/明天）展示，则不展示星期
   var referenceDate = dayjs();
-  var relativeDay = effectiveDateFormat !== null && effectiveDateFormat !== void 0 && effectiveDateFormat.showRelativeDay ? getRelativeDay(currentTime, referenceDate) : null;
+  var relativeDay = effectiveDateFormat !== null && effectiveDateFormat !== void 0 && effectiveDateFormat.showRelativeDay ? getRelativeDay(displayTime, referenceDate) : null;
   var hideWeekdayWhenDateRelative = showDate && relativeDay !== null;
 
   // 构建容器样式
@@ -140,14 +146,14 @@ export var PisellDateTimeDisplay = function PisellDateTimeDisplay(props) {
       case 'time':
         return showTime ? /*#__PURE__*/React.createElement(TimeDisplay, {
           key: "time",
-          time: currentTime,
+          time: displayTime,
           format: effectiveTimeFormat,
           style: timeStyle
         }) : null;
       case 'date':
         return showDate ? /*#__PURE__*/React.createElement(DateDisplay, {
           key: "date",
-          date: currentTime,
+          date: displayTime,
           format: effectiveDateFormat,
           referenceDate: dayjs(),
           style: dateStyle
@@ -155,7 +161,7 @@ export var PisellDateTimeDisplay = function PisellDateTimeDisplay(props) {
       case 'weekday':
         return showWeekday && !hideWeekdayWhenDateRelative ? /*#__PURE__*/React.createElement(WeekdayDisplay, {
           key: "weekday",
-          weekday: currentTime,
+          weekday: displayTime,
           format: effectiveWeekdayFormat,
           style: weekdayStyle
         }) : null;
@@ -203,15 +209,15 @@ export var PisellDateTimeDisplay = function PisellDateTimeDisplay(props) {
     var timeField = showTime ? renderField('time') : null;
 
     // 判断是否为中文环境
-    var currentLocale = currentTime.locale();
+    var currentLocale = displayTime.locale();
     var isChinese = checkIsChinese(currentLocale);
 
     // 当同时显示日期和星期时，使用合并格式；有相对日时只展示相对日，不展示具体日期与星期
     if (showDate && showWeekday) {
       var _labels$relativeDay;
       var labels = effectiveDateFormat === null || effectiveDateFormat === void 0 ? void 0 : effectiveDateFormat.relativeDayLabels;
-      var dateStr = relativeDay ? (_labels$relativeDay = labels === null || labels === void 0 ? void 0 : labels[relativeDay]) !== null && _labels$relativeDay !== void 0 ? _labels$relativeDay : getRelativeDayLabel(relativeDay, currentTime.locale()) : isChinese ? currentTime.format('M月D日') : currentTime.format('D MMM');
-      var weekdayStr = currentTime.format('ddd');
+      var dateStr = relativeDay ? (_labels$relativeDay = labels === null || labels === void 0 ? void 0 : labels[relativeDay]) !== null && _labels$relativeDay !== void 0 ? _labels$relativeDay : getRelativeDayLabel(relativeDay, displayTime.locale()) : isChinese ? displayTime.format('M月D日') : displayTime.format('D MMM');
+      var weekdayStr = displayTime.format('ddd');
       // 相对日替换掉原日期展示：有今天/昨天/明天时只显示相对日，不拼接具体日期或星期
       var combinedStr = relativeDay ? dateStr : isChinese ? "".concat(weekdayStr, " ").concat(dateStr) : "".concat(weekdayStr, ", ").concat(dateStr);
 

package/es/components/pisellDateTimeDisplay/PisellDateTimeDisplay.less

@@ -64,9 +64,10 @@
     line-height: 1.2;
   }
 
-  // 分隔符
+  // 分隔符：保留空格占位，避免纯空格时被折叠不显示
   &-separator {
     display: inline-block;
+    white-space: pre;
   }
 
   // 自定义格式化

package/es/components/pisellDateTimeDisplay/hooks/useCurrentTime.js

@@ -8,6 +8,7 @@ import { useState, useEffect } from 'react';
 import dayjs from 'dayjs';
 import { getDayjsLocale } from "../utils/localeUtils";
 import usePisellConfig from "../../pisell-config-provider/hooks/usePisellConfig";
+import useEngineContext from "../../../hooks/useEngineContext";
 
 /**
  * useCurrentTime Hook 配置项
@@ -33,6 +34,7 @@ import usePisellConfig from "../../pisell-config-provider/hooks/usePisellConfig"
  * @returns 当前时间（Dayjs 对象）
  */
 export function useCurrentTime(options) {
+  var _context$engine;
   var _ref = options || {},
     _ref$refreshInterval = _ref.refreshInterval,
     refreshInterval = _ref$refreshInterval === void 0 ? 60000 : _ref$refreshInterval,
@@ -40,13 +42,13 @@ export function useCurrentTime(options) {
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     userLocale = _ref.locale,
     onUpdate = _ref.onUpdate;
-
-  // 获取全局配置中的 locale
   var globalConfig = usePisellConfig();
+  var context = useEngineContext();
   var globalLocale = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.locale;
+  var engineLocale = context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale;
 
-  // 获取实际使用的 locale（优先级：用户指定 > 全局配置 > i18n 当前语言）
-  var dayjsLocale = getDayjsLocale(userLocale || globalLocale);
+  // 优先级：用户指定 > 全局配置 > engine.props.locale > 'en'
+  var dayjsLocale = getDayjsLocale(userLocale || globalLocale || engineLocale || 'en');
 
   // 初始化时间
   var _useState = useState(function () {

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

@@ -14,9 +14,9 @@ export declare function normalizeLocale(locale: string): string;
 export declare function isChinese(locale: string): boolean;
 /**
  * 获取 dayjs 兼容的 locale 代码
- * 未传 locale 时使用 i18n 当前语言（全局配置 / umi_locale），不再使用浏览器语言
+ * 未传 locale 时：优先 materials 当前语言（globalConfig / umi_locale），若为默认 en-US 则用 @pisell/utils getLocale
  * @param locale 原始 locale 代码（可选）
- * @returns dayjs 兼容的 locale 代码
+ * @returns dayjs 兼容的 locale 代码（与已加载的 zh-cn、en 对齐）
  * @example 'zh-CN' -> 'zh-cn', 'en-US' -> 'en'
  */
 export declare function getDayjsLocale(locale?: string): string;

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

@@ -1,3 +1,4 @@
+import { locales as utilsLocales } from '@pisell/utils';
 import { getCurrentLocale } from "../../../utils/locale";
 
 /**
@@ -21,16 +22,26 @@ export function isChinese(locale) {
   return normalizedLocale.startsWith('zh');
 }
 
+/** dayjs 常用 locale 与项目已加载的 locale 对齐（zh-cn、en），en-us 等统一用 en */
+function toDayjsLoadedLocale(normalized) {
+  if (normalized.startsWith('en')) return 'en';
+  return normalized;
+}
+
 /**
  * 获取 dayjs 兼容的 locale 代码
- * 未传 locale 时使用 i18n 当前语言（全局配置 / umi_locale），不再使用浏览器语言
+ * 未传 locale 时：优先 materials 当前语言（globalConfig / umi_locale），若为默认 en-US 则用 @pisell/utils getLocale
  * @param locale 原始 locale 代码（可选）
- * @returns dayjs 兼容的 locale 代码
+ * @returns dayjs 兼容的 locale 代码（与已加载的 zh-cn、en 对齐）
  * @example 'zh-CN' -> 'zh-cn', 'en-US' -> 'en'
  */
 export function getDayjsLocale(locale) {
   if (!locale) {
-    return normalizeLocale(getCurrentLocale());
+    var fromMaterials = getCurrentLocale();
+    var fromUtils = typeof utilsLocales.getLocale === 'function' ? utilsLocales.getLocale() : undefined;
+    // 优先 materials（umi_locale / ConfigProvider），仅当为默认 en-US 时再用 utils，保证多语言能展示
+    var raw = (fromMaterials && fromMaterials !== 'en-US' ? fromMaterials : undefined) || (typeof fromUtils === 'string' && fromUtils ? fromUtils : undefined) || fromMaterials;
+    return toDayjsLoadedLocale(normalizeLocale(raw));
   }
-  return normalizeLocale(locale);
+  return toDayjsLoadedLocale(normalizeLocale(locale));
 }

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

@@ -15,6 +15,7 @@ export declare type RelativeDay = 'today' | 'yesterday' | 'tomorrow';
 export declare function getRelativeDay(date: Dayjs, reference: Dayjs): RelativeDay | null;
 /**
  * 根据 locale 返回相对日期的展示文案
+ * 未传 locale 时使用 getDayjsLocale()（与 locales.getLocale 同源）
  *
  * @param day 'today' | 'yesterday' | 'tomorrow'
  * @param locale dayjs locale，如 'zh-cn'、'en'

package/es/components/pisellDateTimeDisplay/utils/relativeDay.js

@@ -1,4 +1,4 @@
-import { isChinese as checkIsChinese } from "./localeUtils";
+import { isChinese as checkIsChinese, getDayjsLocale } from "./localeUtils";
 var LABELS_ZH = {
   today: '今天',
   yesterday: '昨天',
@@ -34,12 +34,14 @@ export function getRelativeDay(date, reference) {
 
 /**
  * 根据 locale 返回相对日期的展示文案
+ * 未传 locale 时使用 getDayjsLocale()（与 locales.getLocale 同源）
  *
  * @param day 'today' | 'yesterday' | 'tomorrow'
  * @param locale dayjs locale，如 'zh-cn'、'en'
  * @returns 如 '今天'、'Today'
  */
 export function getRelativeDayLabel(day, locale) {
-  var isZh = locale ? checkIsChinese(locale) : false;
+  var resolvedLocale = locale !== null && locale !== void 0 ? locale : getDayjsLocale();
+  var isZh = checkIsChinese(resolvedLocale);
   return isZh ? LABELS_ZH[day] : LABELS_EN[day];
 }