@pisell/materials 1.0.1046 → 1.0.1047

package/es/components/checkbox/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import * as react0 from "react";
+import * as react2 from "react";
 
 //#region src/components/checkbox/index.d.ts
-declare const Checkbox: (props: any) => react0.JSX.Element;
+declare const Checkbox: (props: any) => react2.JSX.Element;
 //#endregion
 export { Checkbox };

package/es/components/dataSourceComponents/dataSourceShow/dataSourceQRCode/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import * as react1 from "react";
+import * as react0 from "react";
 
 //#region src/components/dataSourceComponents/dataSourceShow/dataSourceQRCode/index.d.ts
-declare const DataSourceQRCode: (props: any) => react1.JSX.Element;
+declare const DataSourceQRCode: (props: any) => react0.JSX.Element;
 //#endregion
 export { DataSourceQRCode };

package/es/components/dataSourceComponents/fields/Checkbox/WithMode.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="react" />
 import { CheckboxGroupProps } from "./type.js";
 import { WithModeProps } from "../../dataSourceForm/utils.js";
-import * as react35 from "react";
+import * as react36 from "react";
 
 //#region src/components/dataSourceComponents/fields/Checkbox/WithMode.d.ts
 type CheckboxComponent = React.FC & {
   Group: typeof CheckboxGroupWithMode;
 };
 declare const CheckboxWithMode: CheckboxComponent;
-declare const CheckboxGroupWithMode: react35.FC<CheckboxGroupProps & WithModeProps>;
+declare const CheckboxGroupWithMode: react36.FC<CheckboxGroupProps & WithModeProps>;
 //#endregion
 export { CheckboxWithMode };

package/es/components/dataSourceComponents/fields/Radio/WithMode.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="react" />
 import { WithModeProps } from "../../dataSourceForm/utils.js";
 import { RadioGroupProps } from "./type.js";
-import * as react36 from "react";
+import * as react35 from "react";
 
 //#region src/components/dataSourceComponents/fields/Radio/WithMode.d.ts
 type RadioComponent = React.FC & {
   Group: typeof RadioGroupWithMode;
 };
 declare const RadioWithMode: RadioComponent;
-declare const RadioGroupWithMode: react36.FC<RadioGroupProps & WithModeProps>;
+declare const RadioGroupWithMode: react35.FC<RadioGroupProps & WithModeProps>;
 //#endregion
 export { RadioWithMode };

package/es/components/date-picker/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import * as react2 from "react";
+import * as react1 from "react";
 
 //#region src/components/date-picker/index.d.ts
-declare const DatePicker: (props: any) => react2.JSX.Element;
+declare const DatePicker: (props: any) => react1.JSX.Element;
 //#endregion
 export { DatePicker };

package/es/components/pisellDateTimeDisplay/PisellDateTimeDisplay.js

@@ -1,4 +1,5 @@
 import { _objectSpread2 } from "../../_virtual/_@oxc-project_runtime@0.108.0/helpers/objectSpread2.js";
+import useEngineContext_default from "../../hooks/useEngineContext.js";
 import { getDayjsLocale, isChinese } from "./utils/localeUtils.js";
 import { useCurrentTime } from "./hooks/useCurrentTime.js";
 import { getRelativeDay, getRelativeDayLabel } from "./utils/relativeDay.js";
@@ -42,9 +43,13 @@ import "./PisellDateTimeDisplay.less";
 * />
 */
 const PisellDateTimeDisplay = (props) => {
-	var _ref, _presetSource$localeK;
+	var _context$engine, _ref, _presetSource$localeK;
 	const { value: valueProp, layout = "horizontal", textAlign = "center", fields, formatByLocale, timeFormat, dateFormat, weekdayFormat, customFormat, inlineSeparator = " · ", containerStyle, timeStyle, dateStyle, weekdayStyle, refreshInterval, disableAutoRefresh = false, locale, onTimeUpdate, onClick, className, style } = props;
-	const localeKey = getDayjsLocale(locale);
+	const context = useEngineContext_default();
+	const 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";
+	console.log("resolvedLocale", resolvedLocale);
+	const localeKey = getDayjsLocale(resolvedLocale);
+	console.log("localeKey", localeKey);
 	const baseLocale = localeKey.split("-")[0];
 	const presetSource = formatByLocale !== null && formatByLocale !== void 0 ? formatByLocale : DATETIME_DISPLAY_FORMATS;
 	const preset = (_ref = (_presetSource$localeK = presetSource[localeKey]) !== null && _presetSource$localeK !== void 0 ? _presetSource$localeK : presetSource[baseLocale]) !== null && _ref !== void 0 ? _ref : {};
@@ -55,10 +60,10 @@ const PisellDateTimeDisplay = (props) => {
 	const currentTime = useCurrentTime({
 		refreshInterval: refreshInterval !== null && refreshInterval !== void 0 ? refreshInterval : getRefreshInterval(effectiveTimeFormat),
 		disabled: disableAutoRefresh || valueProp !== void 0,
-		locale,
+		locale: resolvedLocale,
 		onUpdate: onTimeUpdate
 	});
-	const displayTime = valueProp !== void 0 && valueProp !== null ? dayjs(valueProp) : currentTime;
+	const displayTime = valueProp !== void 0 && valueProp !== null ? dayjs(valueProp).locale(localeKey) : currentTime;
 	if (customFormat) {
 		const formattedTime = displayTime.format(customFormat);
 		const containerInlineStyle$1 = _objectSpread2({

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

@@ -1,4 +1,5 @@
 import usePisellConfig_default from "../../pisell-config-provider/hooks/usePisellConfig.js";
+import useEngineContext_default from "../../../hooks/useEngineContext.js";
 import { getDayjsLocale } from "../utils/localeUtils.js";
 import { useEffect, useState } from "react";
 import dayjs from "dayjs";
@@ -24,10 +25,13 @@ import dayjs from "dayjs";
 * @returns 当前时间（Dayjs 对象）
 */
 function useCurrentTime(options) {
+	var _context$engine;
 	const { refreshInterval = 6e4, disabled = false, locale: userLocale, onUpdate } = options || {};
 	const globalConfig = usePisellConfig_default();
+	const context = useEngineContext_default();
 	const globalLocale = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.locale;
-	const dayjsLocale = getDayjsLocale(userLocale || globalLocale);
+	const 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;
+	const dayjsLocale = getDayjsLocale(userLocale || globalLocale || engineLocale || "en");
 	const [currentTime, setCurrentTime] = useState(() => {
 		return dayjs().locale(dayjsLocale);
 	});

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

@@ -20,19 +20,25 @@ function normalizeLocale(locale) {
 function isChinese(locale) {
 	return normalizeLocale(locale).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 时与 locale.getText 同源：优先 @pisell/utils 当前语言（getLocale），无则 materials 全局配置 / 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'
 */
 function getDayjsLocale(locale) {
 	if (!locale) {
+		const fromMaterials = getCurrentLocale();
 		const fromUtils = typeof locales.getLocale === "function" ? locales.getLocale() : void 0;
-		return normalizeLocale(typeof fromUtils === "string" && fromUtils ? fromUtils : getCurrentLocale());
+		return toDayjsLoadedLocale(normalizeLocale((fromMaterials && fromMaterials !== "en-US" ? fromMaterials : void 0) || (typeof fromUtils === "string" && fromUtils ? fromUtils : void 0) || fromMaterials));
 	}
-	return normalizeLocale(locale);
+	return toDayjsLoadedLocale(normalizeLocale(locale));
 }
 
 //#endregion

package/es/components/pisellTimeRangeDisplay/PisellTimeRangeDisplay.js

@@ -1,4 +1,5 @@
 import { _objectSpread2 } from "../../_virtual/_@oxc-project_runtime@0.108.0/helpers/objectSpread2.js";
+import useEngineContext_default from "../../hooks/useEngineContext.js";
 import { getDayjsLocale } from "../pisellDateTimeDisplay/utils/localeUtils.js";
 import { getRelativeDay } from "../pisellDateTimeDisplay/utils/relativeDay.js";
 import { parseTimeRange } from "./utils/parseTimeRange.js";
@@ -38,9 +39,11 @@ import "./PisellTimeRangeDisplay.less";
 * />
 */
 const PisellTimeRangeDisplay = (props) => {
-	var _durationFormat$showS;
+	var _context$engine, _durationFormat$showS;
 	const { startAt, endAt, textAlign = "center", fields, showDateForSameDay = true, timeFormat, dateFormat, weekdayFormat, durationFormat, containerStyle, timeStyle, dateStyle, weekdayStyle, durationStyle, locale: localeProp, className, style, onClick } = props;
-	const effectiveLocale = useMemo(() => localeProp !== null && localeProp !== void 0 ? localeProp : getDayjsLocale(), [localeProp]);
+	const context = useEngineContext_default();
+	const resolvedLocale = localeProp || (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";
+	const effectiveLocale = useMemo(() => getDayjsLocale(resolvedLocale), [resolvedLocale]);
 	const { start, end, isSameDay } = useMemo(() => parseTimeRange(startAt, endAt, effectiveLocale), [
 		startAt,
 		endAt,

package/lib/components/dataSourceComponents/fields/Checkbox/WithMode.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="react" />
 import { CheckboxGroupProps } from "./type.js";
 import { WithModeProps } from "../../dataSourceForm/utils.js";
-import * as react36 from "react";
+import * as react35 from "react";
 
 //#region src/components/dataSourceComponents/fields/Checkbox/WithMode.d.ts
 type CheckboxComponent = React.FC & {
   Group: typeof CheckboxGroupWithMode;
 };
 declare const CheckboxWithMode: CheckboxComponent;
-declare const CheckboxGroupWithMode: react36.FC<CheckboxGroupProps & WithModeProps>;
+declare const CheckboxGroupWithMode: react35.FC<CheckboxGroupProps & WithModeProps>;
 //#endregion
 export { CheckboxWithMode };

package/lib/components/pisellDataSourceContainer/components/Pagination/index.d.ts

@@ -1,9 +1,9 @@
 import { DataSourceContainerContextType } from "../../type.js";
-import * as antd23 from "antd";
+import * as antd24 from "antd";
 import React from "react";
 
 //#region src/components/pisellDataSourceContainer/components/Pagination/index.d.ts
-declare const _default: React.ForwardRefExoticComponent<Omit<Partial<antd23.PaginationProps> & DataSourceContainerContextType & React.RefAttributes<unknown> & {
+declare const _default: React.ForwardRefExoticComponent<Omit<Partial<antd24.PaginationProps> & DataSourceContainerContextType & React.RefAttributes<unknown> & {
   refId?: string | undefined;
 }, "ref"> & React.RefAttributes<any>>;
 //#endregion

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

@@ -1,9 +1,9 @@
 import { DataSourceContainerContextType } from "../../type.js";
-import * as antd24 from "antd";
+import * as antd23 from "antd";
 import React from "react";
 
 //#region src/components/pisellDataSourceContainer/components/Table/index.d.ts
-declare const _default: React.ForwardRefExoticComponent<Omit<Partial<antd24.TableProps<any>> & DataSourceContainerContextType & {
+declare const _default: React.ForwardRefExoticComponent<Omit<Partial<antd23.TableProps<any>> & DataSourceContainerContextType & {
   scopeId?: string | undefined;
   __id?: string | undefined;
 } & React.RefAttributes<unknown> & {

package/lib/components/pisellDateTimeDisplay/PisellDateTimeDisplay.js

@@ -1,5 +1,6 @@
 const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.js');
 const require_objectSpread2 = require('../../_virtual/_@oxc-project_runtime@0.108.0/helpers/objectSpread2.js');
+const require_useEngineContext = require('../../hooks/useEngineContext.js');
 const require_localeUtils = require('./utils/localeUtils.js');
 const require_useCurrentTime = require('./hooks/useCurrentTime.js');
 const require_relativeDay = require('./utils/relativeDay.js');
@@ -45,9 +46,13 @@ require("./PisellDateTimeDisplay.less");
 * />
 */
 const PisellDateTimeDisplay = (props) => {
-	var _ref, _presetSource$localeK;
+	var _context$engine, _ref, _presetSource$localeK;
 	const { value: valueProp, layout = "horizontal", textAlign = "center", fields, formatByLocale, timeFormat, dateFormat, weekdayFormat, customFormat, inlineSeparator = " · ", containerStyle, timeStyle, dateStyle, weekdayStyle, refreshInterval, disableAutoRefresh = false, locale, onTimeUpdate, onClick, className, style } = props;
-	const localeKey = require_localeUtils.getDayjsLocale(locale);
+	const context = require_useEngineContext.default();
+	const 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";
+	console.log("resolvedLocale", resolvedLocale);
+	const localeKey = require_localeUtils.getDayjsLocale(resolvedLocale);
+	console.log("localeKey", localeKey);
 	const baseLocale = localeKey.split("-")[0];
 	const presetSource = formatByLocale !== null && formatByLocale !== void 0 ? formatByLocale : require_dateTimeDisplayFormats.DATETIME_DISPLAY_FORMATS;
 	const preset = (_ref = (_presetSource$localeK = presetSource[localeKey]) !== null && _presetSource$localeK !== void 0 ? _presetSource$localeK : presetSource[baseLocale]) !== null && _ref !== void 0 ? _ref : {};
@@ -58,10 +63,10 @@ const PisellDateTimeDisplay = (props) => {
 	const currentTime = require_useCurrentTime.useCurrentTime({
 		refreshInterval: refreshInterval !== null && refreshInterval !== void 0 ? refreshInterval : require_getRefreshInterval.getRefreshInterval(effectiveTimeFormat),
 		disabled: disableAutoRefresh || valueProp !== void 0,
-		locale,
+		locale: resolvedLocale,
 		onUpdate: onTimeUpdate
 	});
-	const displayTime = valueProp !== void 0 && valueProp !== null ? (0, dayjs.default)(valueProp) : currentTime;
+	const displayTime = valueProp !== void 0 && valueProp !== null ? (0, dayjs.default)(valueProp).locale(localeKey) : currentTime;
 	if (customFormat) {
 		const formattedTime = displayTime.format(customFormat);
 		const containerInlineStyle$1 = require_objectSpread2._objectSpread2({

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

@@ -1,5 +1,6 @@
 const require_rolldown_runtime = require('../../../_virtual/rolldown_runtime.js');
 const require_usePisellConfig = require('../../pisell-config-provider/hooks/usePisellConfig.js');
+const require_useEngineContext = require('../../../hooks/useEngineContext.js');
 const require_localeUtils = require('../utils/localeUtils.js');
 let react = require("react");
 let dayjs = require("dayjs");
@@ -26,10 +27,13 @@ dayjs = require_rolldown_runtime.__toESM(dayjs);
 * @returns 当前时间（Dayjs 对象）
 */
 function useCurrentTime(options) {
+	var _context$engine;
 	const { refreshInterval = 6e4, disabled = false, locale: userLocale, onUpdate } = options || {};
 	const globalConfig = require_usePisellConfig.default();
+	const context = require_useEngineContext.default();
 	const globalLocale = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.locale;
-	const dayjsLocale = require_localeUtils.getDayjsLocale(userLocale || globalLocale);
+	const 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;
+	const dayjsLocale = require_localeUtils.getDayjsLocale(userLocale || globalLocale || engineLocale || "en");
 	const [currentTime, setCurrentTime] = (0, react.useState)(() => {
 		return (0, dayjs.default)().locale(dayjsLocale);
 	});

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

@@ -21,19 +21,25 @@ function normalizeLocale(locale) {
 function isChinese(locale) {
 	return normalizeLocale(locale).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 时与 locale.getText 同源：优先 @pisell/utils 当前语言（getLocale），无则 materials 全局配置 / 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'
 */
 function getDayjsLocale(locale) {
 	if (!locale) {
+		const fromMaterials = require_locale.getCurrentLocale();
 		const fromUtils = typeof _pisell_utils.locales.getLocale === "function" ? _pisell_utils.locales.getLocale() : void 0;
-		return normalizeLocale(typeof fromUtils === "string" && fromUtils ? fromUtils : require_locale.getCurrentLocale());
+		return toDayjsLoadedLocale(normalizeLocale((fromMaterials && fromMaterials !== "en-US" ? fromMaterials : void 0) || (typeof fromUtils === "string" && fromUtils ? fromUtils : void 0) || fromMaterials));
 	}
-	return normalizeLocale(locale);
+	return toDayjsLoadedLocale(normalizeLocale(locale));
 }
 
 //#endregion

package/lib/components/pisellTimeRangeDisplay/PisellTimeRangeDisplay.js

@@ -1,5 +1,6 @@
 const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.js');
 const require_objectSpread2 = require('../../_virtual/_@oxc-project_runtime@0.108.0/helpers/objectSpread2.js');
+const require_useEngineContext = require('../../hooks/useEngineContext.js');
 const require_localeUtils = require('../pisellDateTimeDisplay/utils/localeUtils.js');
 const require_relativeDay = require('../pisellDateTimeDisplay/utils/relativeDay.js');
 const require_parseTimeRange = require('./utils/parseTimeRange.js');
@@ -41,9 +42,11 @@ require("./PisellTimeRangeDisplay.less");
 * />
 */
 const PisellTimeRangeDisplay = (props) => {
-	var _durationFormat$showS;
+	var _context$engine, _durationFormat$showS;
 	const { startAt, endAt, textAlign = "center", fields, showDateForSameDay = true, timeFormat, dateFormat, weekdayFormat, durationFormat, containerStyle, timeStyle, dateStyle, weekdayStyle, durationStyle, locale: localeProp, className, style, onClick } = props;
-	const effectiveLocale = (0, react.useMemo)(() => localeProp !== null && localeProp !== void 0 ? localeProp : require_localeUtils.getDayjsLocale(), [localeProp]);
+	const context = require_useEngineContext.default();
+	const resolvedLocale = localeProp || (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";
+	const effectiveLocale = (0, react.useMemo)(() => require_localeUtils.getDayjsLocale(resolvedLocale), [resolvedLocale]);
 	const { start, end, isSameDay } = (0, react.useMemo)(() => require_parseTimeRange.parseTimeRange(startAt, endAt, effectiveLocale), [
 		startAt,
 		endAt,

package/lib/components/section-footers/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import * as react17 from "react";
+import * as react19 from "react";
 
 //#region src/components/section-footers/index.d.ts
 interface SectionFooterProps {
@@ -8,6 +8,6 @@ interface SectionFooterProps {
   right?: React.ReactNode;
   className?: string;
 }
-declare const SectionFooters: (props: SectionFooterProps) => react17.JSX.Element;
+declare const SectionFooters: (props: SectionFooterProps) => react19.JSX.Element;
 //#endregion
 export { SectionFooters };

package/lib/components/skeleton/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import * as react19 from "react";
+import * as react20 from "react";
 
 //#region src/components/skeleton/index.d.ts
-declare const Skeleton: (props: any) => react19.JSX.Element;
+declare const Skeleton: (props: any) => react20.JSX.Element;
 //#endregion
 export { Skeleton };

package/lib/components/time-picker/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import * as react20 from "react";
+import * as react21 from "react";
 
 //#region src/components/time-picker/index.d.ts
-declare const TimePicker: (props: any) => react20.JSX.Element;
+declare const TimePicker: (props: any) => react21.JSX.Element;
 //#endregion
 export { TimePicker };

package/lib/components/upload/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import * as react21 from "react";
+import * as react17 from "react";
 
 //#region src/components/upload/index.d.ts
-declare const Upload: (props: any) => react21.JSX.Element;
+declare const Upload: (props: any) => react17.JSX.Element;
 //#endregion
 export { Upload };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.1046",
+  "version": "1.0.1047",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -89,9 +89,9 @@
     "swiper": "^8.4.7",
     "antd-mobile": "^5.38.1",
     "vod-js-sdk-v6": "^1.4.11",
+    "@pisell/icon": "0.0.10",
     "@pisell/date-picker": "1.0.134",
-    "@pisell/utils": "1.0.61",
-    "@pisell/icon": "0.0.10"
+    "@pisell/utils": "1.0.61"
   },
   "peerDependencies": {
     "react": "^18.0.0",