@zat-design/sisyphus-react 4.0.9 → 4.0.10

package/es/ProConfigProvider/index.d.ts

@@ -1,51 +1,9 @@
 import React, { FC } from 'react';
-import { FormInstance } from 'antd';
 import 'dayjs/locale/zh-cn';
-import type { PropSelectType } from '../ProSelect/propsType';
-import type { ProModalSelectType } from '../ProForm/components/combination/ProModalSelect/propsType';
-import type { ProCascaderType } from '../ProForm/components/combination/ProCascader/propsType';
-import type { ProEnumConfig } from '../ProEnum/propsType';
-export interface ProConfigState {
-    locale?: string;
-    ProEnum?: Partial<ProEnumConfig>;
-    ProSelect?: Partial<PropSelectType> & Record<string, any>;
-    ProModalSelect?: Partial<ProModalSelectType> & Record<string, any>;
-    ProAddressBar?: Partial<ProCascaderType> & Record<string, any>;
-    forms: Record<string, FormInstance | undefined>;
-    [key: string]: any;
-}
-interface ConfigContext {
-    state: ProConfigState;
-    dispatch: React.Dispatch<Actions>;
-}
+import type { ProConfigProviderProps, ConfigContext } from './propsType';
 export declare const ProConfigContext: React.Context<ConfigContext>;
 export declare function useProConfig(): ConfigContext;
 export declare function useProConfig(name: keyof ConfigContext['state']): ConfigContext['state'][keyof ConfigContext['state']];
-type Actions = {
-    type: 'setFormRef';
-    name: string;
-    value: FormInstance;
-} | {
-    type: 'deleteFormRef';
-    name: string;
-} | {
-    type: 'set';
-    payload: ProConfigState;
-} | {
-    type: 'setProEnum';
-    payload: Record<string, any>;
-} | {
-    type: 'setProEnumDic';
-    key: string;
-    payload: any;
-} | {
-    type: 'setWithLocal';
-    payload: ProConfigState;
-};
-export declare const ProConfigProvider: FC<{
-    value?: ProConfigState;
-    locale?: string;
-    onSuccess?: (data: any, params: any) => void;
-    children?: React.ReactNode;
-}>;
+export declare const ProConfigProvider: FC<ProConfigProviderProps>;
+export type { ProConfigProviderType, ProConfigProviderProps } from './propsType';
 export default ProConfigProvider;

package/es/ProConfigProvider/index.js

@@ -37,38 +37,36 @@ var initialState = {
     }]
   }
 };
+var antdLangMap = {
+  'zh-CN': zhCN,
+  'en-US': enUS
+};
 export var ProConfigContext = /*#__PURE__*/React.createContext({
   state: initialState,
   dispatch: () => {}
 });
-
-// eslint-disable-next-line no-redeclare
-
-// eslint-disable-next-line no-redeclare
 export function useProConfig(name) {
   var _useContext = useContext(ProConfigContext),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
-  if (name) {
-    return state[name];
-  }
+  if (name) return state[name];
   return {
     state,
     dispatch
   };
 }
-var reducer = (state, action) => {
-  var _state$ProEnum;
+function reducer(state, action) {
+  var _state$forms, _state$forms2, _state$ProEnum$dics, _state$ProEnum;
   switch (action.type) {
     case 'setFormRef':
       return _objectSpread(_objectSpread({}, state), {}, {
-        forms: _objectSpread(_objectSpread({}, state.forms), {}, {
+        forms: _objectSpread(_objectSpread({}, (_state$forms = state.forms) !== null && _state$forms !== void 0 ? _state$forms : {}), {}, {
           [action.name]: action.value
         })
       });
     case 'deleteFormRef':
       return _objectSpread(_objectSpread({}, state), {}, {
-        forms: _objectSpread(_objectSpread({}, state.forms), {}, {
+        forms: _objectSpread(_objectSpread({}, (_state$forms2 = state.forms) !== null && _state$forms2 !== void 0 ? _state$forms2 : {}), {}, {
           [action.name]: undefined
         })
       });
@@ -81,19 +79,16 @@ var reducer = (state, action) => {
     case 'setProEnumDic':
       return _objectSpread(_objectSpread({}, state), {}, {
         ProEnum: _objectSpread(_objectSpread({}, state.ProEnum), {}, {
-          dics: _objectSpread(_objectSpread({}, ((_state$ProEnum = state.ProEnum) === null || _state$ProEnum === void 0 ? void 0 : _state$ProEnum.dataSource) || {}), action.payload)
+          dics: _objectSpread(_objectSpread({}, (_state$ProEnum$dics = (_state$ProEnum = state.ProEnum) === null || _state$ProEnum === void 0 ? void 0 : _state$ProEnum.dics) !== null && _state$ProEnum$dics !== void 0 ? _state$ProEnum$dics : {}), action.payload)
         })
       });
     case 'setWithLocal':
-      // 本地配置合并
       localStorage.setItem('localConfig', JSON.stringify(action.payload));
       return _objectSpread({}, state);
     default:
-      return _objectSpread({}, state);
+      return state;
   }
-};
-
-// 内部组件，用于监听主题变化并应用到 ConfigProvider
+}
 var ThemeAwareConfigProvider = _ref => {
   var locale = _ref.locale,
     children = _ref.children;
@@ -108,45 +103,33 @@ var ThemeAwareConfigProvider = _ref => {
   });
 };
 export var ProConfigProvider = props => {
-  var _props$value, _props$value2, _props$value3, _props$value4;
+  var _props$value, _props$value2, _props$value3, _props$value4, _ref2, _ref3, _state$locale, _antdLangMap$lang;
   var _useReducer = useReducer(reducer, initialState),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
   var enumRes = useEnumRequest(_objectSpread(_objectSpread(_objectSpread({}, state.ProEnum), props === null || props === void 0 || (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.ProEnum), props === null || props === void 0 || (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.globalConfig), dispatch);
-
-  // 处理频繁枚举请求
   var frequentEnumRes = useFrequentEnumRequest(_objectSpread(_objectSpread(_objectSpread({}, state.ProEnum), props === null || props === void 0 || (_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3.ProEnum), props === null || props === void 0 || (_props$value4 = props.value) === null || _props$value4 === void 0 ? void 0 : _props$value4.globalConfig), dispatch);
+  var cacheLang = localStorage.getItem('locale');
+  var lang = (_ref2 = (_ref3 = (_state$locale = state === null || state === void 0 ? void 0 : state.locale) !== null && _state$locale !== void 0 ? _state$locale : cacheLang) !== null && _ref3 !== void 0 ? _ref3 : props === null || props === void 0 ? void 0 : props.locale) !== null && _ref2 !== void 0 ? _ref2 : 'zh-CN';
   useEffect(() => {
-    // 本地配置取出
-    var localConfigStr = localStorage.getItem('localConfig');
-    var localConfig = JSON.parse(localConfigStr || '{}');
+    var raw = localStorage.getItem('localConfig');
+    var localConfig = JSON.parse(raw || '{}');
     dispatch({
       type: 'set',
-      payload: merge(state, localConfig)
+      payload: merge(initialState, localConfig)
     });
   }, []);
-  var cacheLang = localStorage.getItem('locale');
-  // 如果是用户切换了语言那么优先使用用户切换的，否则从缓存中取用户语言，在取默认值
-  var lang = (state === null || state === void 0 ? void 0 : state.locale) || cacheLang || (props === null || props === void 0 ? void 0 : props.locale);
   useEffect(() => {
     setLanguage(lang);
   }, [lang]);
   useEffect(() => {
-    if (enumRes !== null && enumRes !== void 0 && enumRes.data) {
-      (props === null || props === void 0 ? void 0 : props.onSuccess) && (props === null || props === void 0 ? void 0 : props.onSuccess(enumRes === null || enumRes === void 0 ? void 0 : enumRes.data, enumRes === null || enumRes === void 0 ? void 0 : enumRes.params));
-    }
+    var _props$onSuccess;
+    if (enumRes !== null && enumRes !== void 0 && enumRes.data) props === null || props === void 0 || (_props$onSuccess = props.onSuccess) === null || _props$onSuccess === void 0 || _props$onSuccess.call(props, enumRes.data, enumRes.params);
   }, [enumRes === null || enumRes === void 0 ? void 0 : enumRes.loading]);
-  var antdLangMap = {
-    'zh-CN': zhCN,
-    // zh-CN 中文
-    'en-US': enUS // en-US
-  };
-  // 处理频繁枚举的成功回调
   useEffect(() => {
-    if (frequentEnumRes !== null && frequentEnumRes !== void 0 && frequentEnumRes.data) {
-      (props === null || props === void 0 ? void 0 : props.onSuccess) && (props === null || props === void 0 ? void 0 : props.onSuccess(frequentEnumRes === null || frequentEnumRes === void 0 ? void 0 : frequentEnumRes.data, frequentEnumRes === null || frequentEnumRes === void 0 ? void 0 : frequentEnumRes.params));
-    }
+    var _props$onSuccess2;
+    if (frequentEnumRes !== null && frequentEnumRes !== void 0 && frequentEnumRes.data) props === null || props === void 0 || (_props$onSuccess2 = props.onSuccess) === null || _props$onSuccess2 === void 0 || _props$onSuccess2.call(props, frequentEnumRes.data, frequentEnumRes.params);
   }, [frequentEnumRes === null || frequentEnumRes === void 0 ? void 0 : frequentEnumRes.loading]);
   return /*#__PURE__*/_jsx(ThemeProvider, {
     children: /*#__PURE__*/_jsx(ProConfigContext.Provider, {
@@ -155,7 +138,7 @@ export var ProConfigProvider = props => {
         dispatch
       },
       children: /*#__PURE__*/_jsx(ThemeAwareConfigProvider, {
-        locale: antdLangMap[lang],
+        locale: (_antdLangMap$lang = antdLangMap[lang]) !== null && _antdLangMap$lang !== void 0 ? _antdLangMap$lang : zhCN,
         children: props.children
       })
     })

package/es/ProConfigProvider/propsType.d.ts

@@ -0,0 +1,55 @@
+import type React from 'react';
+import type { FormInstance } from 'antd';
+import type { PropSelectType } from '../ProSelect/propsType';
+import type { ProModalSelectType } from '../ProForm/components/combination/ProModalSelect/propsType';
+import type { ProCascaderType } from '../ProForm/components/combination/ProCascader/propsType';
+import type { ProEnumConfigType } from '../ProEnum/propsType';
+/** 对外配置项类型（value、内部 state 均为此类型，字段均可选） */
+export interface ProConfigProviderType {
+    locale?: string;
+    ProEnum?: Partial<ProEnumConfigType>;
+    ProSelect?: Partial<PropSelectType> & Record<string, any>;
+    ProModalSelect?: Partial<ProModalSelectType> & Record<string, any>;
+    ProAddressBar?: Partial<ProCascaderType> & Record<string, any>;
+    forms?: Record<string, FormInstance | undefined>;
+    [key: string]: any;
+}
+/** ProConfigProvider 组件 Props（内部使用） */
+export interface ProConfigProviderProps {
+    value?: ProConfigProviderType;
+    locale?: string;
+    onSuccess?: (data: any, params: any) => void;
+    children?: React.ReactNode;
+}
+/** Config 上下文 */
+export interface ConfigContext {
+    state: ProConfigProviderType;
+    dispatch: React.Dispatch<ProConfigActions>;
+}
+/** ThemeAwareConfigProvider 内部组件 Props */
+export interface ThemeAwareConfigProviderProps {
+    locale: any;
+    children: React.ReactNode;
+}
+/** Reducer Actions */
+export type ProConfigActions = {
+    type: 'setFormRef';
+    name: string;
+    value: FormInstance;
+} | {
+    type: 'deleteFormRef';
+    name: string;
+} | {
+    type: 'set';
+    payload: ProConfigProviderType;
+} | {
+    type: 'setProEnum';
+    payload: Record<string, any>;
+} | {
+    type: 'setProEnumDic';
+    key: string;
+    payload: any;
+} | {
+    type: 'setWithLocal';
+    payload: ProConfigProviderType;
+};

package/es/ProConfigProvider/propsType.js

@@ -0,0 +1 @@
+export {};

package/es/ProEnum/propsType.d.ts

@@ -303,7 +303,6 @@ export interface TagPropsMapType {
  */
 export type ProEnumType = Omit<ProEnumBaseType, 'type'> & (PropProSelectsMapType | PropRadioPropsMapType | CheckboxPropsMapType | TagPropsMapType);
 export type DataOption = DataOptionType;
-export type ProEnumConfig = ProEnumConfigType;
 export type ProEnum = ProEnumBaseType;
 export type PropProSelectsMap = PropProSelectsMapType;
 export type PropRadioPropsMap = PropRadioPropsMapType;

package/es/ProForm/components/combination/Group/utils/index.d.ts

@@ -75,37 +75,35 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     confirm?: boolean | import("antd").ModalFuncProps | import("../../../render/propsType").FunctionArgs<any, boolean | import("antd").ModalFuncProps>;
     show?: boolean | ReactiveFunction<any, boolean>;
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
+    validateTrigger?: string | false | string[];
+    isView?: boolean;
+    id?: string;
+    prefixCls?: string;
+    className?: string;
     style?: React.CSSProperties;
-    trim?: boolean;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    className?: string;
-    hidden?: boolean;
-    layout?: import("antd/es/form/Form").FormItemLayout;
-    help?: React.ReactNode;
-    vertical?: boolean;
-    preserve?: boolean;
-    prefixCls?: string;
-    onReset?: () => void;
-    status?: "" | "warning" | "error" | "success" | "validating";
-    id?: string;
     rootClassName?: string;
-    isView?: boolean;
+    status?: "" | "warning" | "error" | "success" | "validating";
     getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
+    hidden?: boolean;
+    onReset?: () => void;
     desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
-    htmlFor?: string;
+    vertical?: boolean;
+    valueType?: import("../../../render/propsType").ProFormValueType;
     colon?: boolean;
+    htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
     trigger?: string;
-    validateTrigger?: string | false | string[];
     validateDebounce?: number;
     valuePropName?: string;
     messageVariables?: Record<string, string>;
     initialValue?: any;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
+    preserve?: boolean;
     isListField?: boolean;
     isList?: boolean;
     noStyle?: boolean;
@@ -113,9 +111,10 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
     validateStatus?: "" | "warning" | "error" | "success" | "validating";
+    layout?: import("antd/es/form/Form").FormItemLayout;
     wrapperCol?: import("antd").ColProps;
+    help?: React.ReactNode;
     fieldId?: string;
-    valueType?: import("../../../render/propsType").ProFormValueType;
     switchValue?: [any, any];
     viewRender?: (value: any, record: any, { form, index, namePath, }: {
         [key: string]: any;
@@ -123,6 +122,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         index?: number;
     }) => string | React.ReactElement<any, any>;
     viewType?: import("../../../render/propsType").ViewType;
+    trim?: boolean;
     upperCase?: boolean;
     toISOString?: boolean;
     toCSTString?: boolean;
@@ -141,7 +141,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
  * 创建组件属性
  */
 export declare const createComponentProps: (column: FlexibleGroupColumnType, formItemProps: any) => {
-    componentProps: import("lodash").Omit<any, "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow" | "precision">;
+    componentProps: import("lodash").Omit<any, "precision" | "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

package/es/ProForm/components/render/propsType.d.ts

@@ -55,7 +55,7 @@ export type FunctionArgs<Values, R = any> = (value: any, record: any, { form, in
     namePath?: NamePath;
     [key: string]: any;
 }) => R;
-type TransformToFormField<T extends ControlProps, Values> = DistributiveOmit<T, 'onChange' | 'value'> & {
+type TransformToFormField<T extends ControlProps, Values> = DistributiveOmit<T, 'onChange' | 'value' | 'role'> & {
     value?: T['value'];
     onChange?: (value: Parameters<T['onChange']>[0], options: Parameters<T['onChange']>[1], form: FormInstance<Values>) => void;
     onFieldChange?: FunctionArgs<Values>;
@@ -66,7 +66,7 @@ type TransformToFormField<T extends ControlProps, Values> = DistributiveOmit<T,
 type ProEnumFormType<Values> = TransformToFormField<ProEnum, Values> | TransformToFormField<ProEnum & PropProSelectsMap, Values> | TransformToFormField<ProEnum & PropRadioPropsMap, Values> | TransformToFormField<ProEnum & CheckboxPropsMap, Values>;
 type ProEnumTableType<Values> = TransformToTableField<ProEnum, Values> | TransformToTableField<ProEnum & PropProSelectsMap, Values> | TransformToTableField<ProEnum & PropRadioPropsMap, Values> | TransformToTableField<ProEnum & CheckboxPropsMap, Values>;
 type ProEnumFieldType<Values, TT> = TT extends 'ProForm' ? ProEnumFormType<Values> | ReactiveFunction<Values, ProEnumFormType<Values>> : ProEnumTableType<Values> | ((text: any, values: Values, index: number) => ProEnumTableType<Values>);
-type TransformToTableField<T extends ControlProps, Values> = Omit<T, 'onChange' | 'value' | 'onBlur'> & {
+type TransformToTableField<T extends ControlProps, Values> = Omit<T, 'onChange' | 'value' | 'onBlur' | 'role'> & {
     value?: T['value'];
     onChange?: (value: Parameters<T['onChange']>[0], options: Parameters<T['onChange']>[1], record: any, index: number, form: FormInstance<Values>) => void;
     onFieldChange?: FunctionArgs<Values>;

package/es/ProThemeTools/context/ThemeContext.js

@@ -9,7 +9,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }
-import React, { createContext, useContext, useReducer, useCallback } from 'react';
+import React, { createContext, useContext, useReducer, useCallback, useEffect } from 'react';
 
 // antd5 主题配置接口
 
@@ -36,17 +36,44 @@ var defaultThemeConfig = {
   zauiStripe: true
 };
 
-// 初始状态
-var initialState = {
-  localConfig: defaultThemeConfig,
-  antdConfig: {
+// 获取初始状态，检查是否有待应用的主题
+var getInitialState = () => {
+  // 检查是否有待应用的主题（在模块加载时可能已经设置）
+  var initialAntdConfig = {
     token: {
-      colorPrimary: '#006AFF'
+      colorPrimary: defaultThemeConfig.zauiBrand
+    }
+  };
+
+  // 尝试获取待应用的主题（避免循环依赖，使用动态导入）
+  if (typeof window !== 'undefined') {
+    try {
+      var _document$documentEle;
+      // 使用同步方式检查 pendingThemes（通过全局变量访问）
+      // 注意：这里不能直接导入 utils，因为会有循环依赖
+      // 但我们可以通过检查 CSS 变量来判断是否有待应用的主题
+      var cssZauiBrand = (_document$documentEle = document.documentElement.style.getPropertyValue('--zaui-brand')) === null || _document$documentEle === void 0 ? void 0 : _document$documentEle.trim();
+      if (cssZauiBrand && cssZauiBrand !== defaultThemeConfig.zauiBrand) {
+        initialAntdConfig = {
+          token: {
+            colorPrimary: cssZauiBrand
+          }
+        };
+      }
+    } catch (e) {
+      // 忽略错误，使用默认配置
     }
-  },
-  cssVariables: {}
+  }
+  return {
+    localConfig: defaultThemeConfig,
+    antdConfig: initialAntdConfig,
+    cssVariables: {}
+  };
 };
 
+// 初始状态
+var initialState = getInitialState();
+
 // Reducer 函数
 function themeReducer(state, action) {
   switch (action.type) {
@@ -104,7 +131,31 @@ export var getThemeUpdaters = () => ({
 
 export var ThemeProvider = _ref => {
   var children = _ref.children;
-  var _useReducer = useReducer(themeReducer, initialState),
+  // 使用惰性初始化，在组件渲染时检查 CSS 变量
+  var _useReducer = useReducer(themeReducer, initialState, initial => {
+      // 在初始化时检查 CSS 变量
+      if (typeof window !== 'undefined') {
+        try {
+          var _document$documentEle2, _initial$antdConfig$t;
+          var cssZauiBrand = (_document$documentEle2 = document.documentElement.style.getPropertyValue('--zaui-brand')) === null || _document$documentEle2 === void 0 ? void 0 : _document$documentEle2.trim();
+          if (cssZauiBrand && cssZauiBrand !== ((_initial$antdConfig$t = initial.antdConfig.token) === null || _initial$antdConfig$t === void 0 ? void 0 : _initial$antdConfig$t.colorPrimary)) {
+            return _objectSpread(_objectSpread({}, initial), {}, {
+              antdConfig: {
+                token: {
+                  colorPrimary: cssZauiBrand
+                }
+              },
+              localConfig: _objectSpread(_objectSpread({}, initial.localConfig), {}, {
+                zauiBrand: cssZauiBrand
+              })
+            });
+          }
+        } catch (e) {
+          // 忽略错误
+        }
+      }
+      return initial;
+    }),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
@@ -139,12 +190,49 @@ export var ThemeProvider = _ref => {
   }, []);
 
   // 注册全局更新函数，供 setThemes 静态方法使用
-  React.useEffect(() => {
+  useEffect(() => {
     registerThemeUpdaters({
       updateAntdConfig,
       updateCssVariables,
       updateLocalConfig
     });
+
+    // 应用待应用的主题配置（如果存在）
+    // 使用同步方式应用以避免闪烁，但需要避免循环依赖
+    // 由于初始状态已经检查了 CSS 变量，这里只需要确保 Context 状态同步
+    if (typeof window !== 'undefined') {
+      var _document$documentEle3, _state$antdConfig$tok;
+      // 检查 CSS 变量，如果与当前状态不一致，更新 Context
+      var cssZauiBrand = (_document$documentEle3 = document.documentElement.style.getPropertyValue('--zaui-brand')) === null || _document$documentEle3 === void 0 ? void 0 : _document$documentEle3.trim();
+      if (cssZauiBrand && cssZauiBrand !== ((_state$antdConfig$tok = state.antdConfig.token) === null || _state$antdConfig$tok === void 0 ? void 0 : _state$antdConfig$tok.colorPrimary)) {
+        var antdConfig = {
+          token: {
+            colorPrimary: cssZauiBrand
+          }
+        };
+        updateAntdConfig(antdConfig);
+        updateLocalConfig({
+          zauiBrand: cssZauiBrand
+        });
+      }
+
+      // 也检查是否有待应用的主题（通过动态导入）
+      // 使用微任务确保在同一个渲染周期内执行，但避免阻塞
+      Promise.resolve().then(() => {
+        // 动态导入以避免循环依赖
+        import("../utils/index").then(_ref2 => {
+          var getPendingThemes = _ref2.getPendingThemes,
+            setThemes = _ref2.setThemes,
+            clearPendingThemes = _ref2.clearPendingThemes;
+          var pending = getPendingThemes();
+          if (pending) {
+            // 重新调用 setThemes 以应用主题（此时更新函数已经注册）
+            setThemes(pending);
+            clearPendingThemes();
+          }
+        });
+      });
+    }
   }, [updateAntdConfig, updateCssVariables, updateLocalConfig]);
   var contextValue = {
     state,

package/es/ProThemeTools/utils/index.d.ts

@@ -7,6 +7,8 @@ declare let getThemeUpdaters: (() => {
     updateLocalConfig: ((config: any) => void) | null;
 }) | null;
 export declare const setThemeUpdatersGetter: (getter: typeof getThemeUpdaters) => void;
+export declare const getPendingThemes: () => ThemesProps | null;
+export declare const clearPendingThemes: () => void;
 /**
  * 将 kebab-case 的主题配置转换为 antd5 的 token 格式
  * @param themes kebab-case 格式的主题配置

package/es/ProThemeTools/utils/index.js

@@ -9,14 +9,45 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }
+import { getThemeUpdaters as getThemeUpdatersFromContext } from "../context/ThemeContext";
 // 动态导入 getThemeUpdaters，避免循环依赖
+// 保留向后兼容性，但优先使用 ThemeContext 中的 getThemeUpdaters
 var getThemeUpdaters = null;
 
-// 设置 getThemeUpdaters 函数（由 index.tsx 调用）
+// 设置 getThemeUpdaters 函数（由 index.tsx 调用，用于向后兼容）
 export var setThemeUpdatersGetter = getter => {
   getThemeUpdaters = getter;
 };
 
+// 保存待应用的主题配置（用于 ThemeProvider 初始化前设置的主题）
+var pendingThemes = null;
+
+// 获取待应用的主题配置
+export var getPendingThemes = () => {
+  return pendingThemes;
+};
+
+// 清除待应用的主题配置
+export var clearPendingThemes = () => {
+  pendingThemes = null;
+};
+
+// 获取主题更新函数的统一入口
+// 优先使用 ThemeContext 中的 getThemeUpdaters，如果不可用则使用局部变量
+var getThemeUpdatersWrapper = () => {
+  try {
+    // 优先使用 ThemeContext 中的 getThemeUpdaters（不依赖 ProThemeTools 组件）
+    var contextUpdaters = getThemeUpdatersFromContext();
+    if (contextUpdaters && (contextUpdaters.updateAntdConfig || contextUpdaters.updateCssVariables || contextUpdaters.updateLocalConfig)) {
+      return contextUpdaters;
+    }
+  } catch (e) {
+    // ThemeContext 可能还未初始化，继续使用局部变量
+  }
+  // 回退到局部变量（向后兼容）
+  return getThemeUpdaters ? getThemeUpdaters() : null;
+};
+
 /** antd5 主题配置 mapping */
 var antd5ConfigMapping = {
   'zaui-brand': 'colorPrimary'
@@ -77,9 +108,9 @@ export var setThemes = themes => {
   });
 
   // 同步更新 Context（如果已注册）
-  if (getThemeUpdaters) {
-    var updaters = getThemeUpdaters();
-
+  // 使用统一的获取函数，优先使用 ThemeContext 中的更新函数
+  var updaters = getThemeUpdatersWrapper();
+  if (updaters) {
     // 更新 CSS 变量到 Context
     if (updaters.updateCssVariables) {
       updaters.updateCssVariables(filteredThemes.reduce((acc, _ref5) => {
@@ -121,6 +152,11 @@ export var setThemes = themes => {
         updaters.updateLocalConfig(localConfig);
       }
     }
+    // 清除待应用的主题配置（因为已经应用了）
+    pendingThemes = null;
+  } else {
+    // 如果更新函数不可用，保存主题配置，等待 ThemeProvider 初始化后应用
+    pendingThemes = _objectSpread({}, themes);
   }
   return true;
 };

package/es/index.d.ts

@@ -27,20 +27,21 @@ export { default as ProAction } from './ProAction';
 export * from './ProConfigProvider';
 export * from './locale';
 export { default as ProBackBtn } from './ProLayout/components/ProHeader/components/ProBackBtn';
+export type { ProConfigProviderType } from './ProConfigProvider';
 export type { ProFormType, ProColumnProps, ProFormColumnType } from './ProForm/propsType';
 export type { ProFormComponentType } from './ProForm/components';
-export type { ProTableType, ProTableColumnType, ProTableSummaryType, ProTableUseAntdTableType, ProTableProps, ProTableSummaryProps, ProTableColumn, UseAntdTableState } from './ProTable/propsType';
+export type { ProTableType, ProTableColumnType, ProTableSummaryType, ProTableUseAntdTableType, ProTableProps, ProTableSummaryProps, ProTableColumn, UseAntdTableState, } from './ProTable/propsType';
 export type { ProUploadType, ProUploadProps } from './ProUpload/propsType';
 export type { ProTabsType, ProTabsItemType, ProTabsProps, ProTabsItemsProps } from './ProTabs/propType';
-export type { BreadcrumbColumnType, SubDescribeColumnType, DescribeColumnType, ProHeaderType, ProHeaderProps, BreadcrumbColumnsProps, SubDescribeColumnsProps, DescribeColumnsProps } from './ProLayout/components/ProHeader/PropTypes';
+export type { BreadcrumbColumnType, SubDescribeColumnType, DescribeColumnType, ProHeaderType, ProHeaderProps, BreadcrumbColumnsProps, SubDescribeColumnsProps, DescribeColumnsProps, } from './ProLayout/components/ProHeader/PropTypes';
 export type { ProLayoutTabsInstance, AddTabParams, AddTabOptions } from './ProLayout/propTypes';
 export type { ProTooltipType, ProTooltipProps } from './ProTooltip/propsType';
 export type { ProIconType, ProIconProps } from './ProIcon/propsTypes';
 export type { ProTreeType, ProTreeSelectType, ProTreeProps, PropTreeSelectProps } from './ProTree/propsType';
-export type { ProTreeModalType, ProTreeModalActionType, ProTreeModalProps, ProTreeModalAction } from './ProTreeModal/propsType';
-export type { ProEditTableType, ProEditTableColumnType, ProEditTableSummaryColumnType, ProEditTableSummaryConfigType, ProEditTableActionType, ProEditTableProps, ProEditTableColumnsProps, SummaryProps, SummaryColumnProps, BaseActionProps } from './ProEditTable/propsType';
-export type { ProStepType, ProStepContextType, ProStepItemType, ProStepPropsType, ProStepItemPropsType } from './ProStep/propsType';
+export type { ProTreeModalType, ProTreeModalActionType, ProTreeModalProps, ProTreeModalAction, } from './ProTreeModal/propsType';
+export type { ProEditTableType, ProEditTableColumnType, ProEditTableSummaryColumnType, ProEditTableSummaryConfigType, ProEditTableActionType, ProEditTableProps, ProEditTableColumnsProps, SummaryProps, SummaryColumnProps, BaseActionProps, } from './ProEditTable/propsType';
+export type { ProStepType, ProStepContextType, ProStepItemType, ProStepPropsType, ProStepItemPropsType, } from './ProStep/propsType';
 export type { ProDrawerFormType, ProDrawerFormPropsType } from './ProDrawerForm/propsType';
-export type { ProModalSelectType, ProModalSelectConfigType, ProModalSelectPropsType } from './ProForm/components/combination/ProModalSelect/propsType';
+export type { ProModalSelectType, ProModalSelectConfigType, ProModalSelectPropsType, } from './ProForm/components/combination/ProModalSelect/propsType';
 export type { ProStepTabType, ProStepTabResultType } from './ProStepTab/propsType';
 export * from './tokens';

package/es/index.js

@@ -39,7 +39,6 @@ export * from "./ProConfigProvider";
 export * from "./locale";
 export { default as ProBackBtn } from "./ProLayout/components/ProHeader/components/ProBackBtn";
 
-// TS类型导出
 // TS类型导出
 
 // token导出

package/lib/ProConfigProvider/index.d.ts

@@ -1,51 +1,9 @@
 import React, { FC } from 'react';
-import { FormInstance } from 'antd';
 import 'dayjs/locale/zh-cn';
-import type { PropSelectType } from '../ProSelect/propsType';
-import type { ProModalSelectType } from '../ProForm/components/combination/ProModalSelect/propsType';
-import type { ProCascaderType } from '../ProForm/components/combination/ProCascader/propsType';
-import type { ProEnumConfig } from '../ProEnum/propsType';
-export interface ProConfigState {
-    locale?: string;
-    ProEnum?: Partial<ProEnumConfig>;
-    ProSelect?: Partial<PropSelectType> & Record<string, any>;
-    ProModalSelect?: Partial<ProModalSelectType> & Record<string, any>;
-    ProAddressBar?: Partial<ProCascaderType> & Record<string, any>;
-    forms: Record<string, FormInstance | undefined>;
-    [key: string]: any;
-}
-interface ConfigContext {
-    state: ProConfigState;
-    dispatch: React.Dispatch<Actions>;
-}
+import type { ProConfigProviderProps, ConfigContext } from './propsType';
 export declare const ProConfigContext: React.Context<ConfigContext>;
 export declare function useProConfig(): ConfigContext;
 export declare function useProConfig(name: keyof ConfigContext['state']): ConfigContext['state'][keyof ConfigContext['state']];
-type Actions = {
-    type: 'setFormRef';
-    name: string;
-    value: FormInstance;
-} | {
-    type: 'deleteFormRef';
-    name: string;
-} | {
-    type: 'set';
-    payload: ProConfigState;
-} | {
-    type: 'setProEnum';
-    payload: Record<string, any>;
-} | {
-    type: 'setProEnumDic';
-    key: string;
-    payload: any;
-} | {
-    type: 'setWithLocal';
-    payload: ProConfigState;
-};
-export declare const ProConfigProvider: FC<{
-    value?: ProConfigState;
-    locale?: string;
-    onSuccess?: (data: any, params: any) => void;
-    children?: React.ReactNode;
-}>;
+export declare const ProConfigProvider: FC<ProConfigProviderProps>;
+export type { ProConfigProviderType, ProConfigProviderProps } from './propsType';
 export default ProConfigProvider;

package/lib/ProConfigProvider/index.js

@@ -47,38 +47,36 @@ var initialState = {
     }]
   }
 };
+var antdLangMap = {
+  'zh-CN': _zh_CN.default,
+  'en-US': _en_US.default
+};
 var ProConfigContext = exports.ProConfigContext = /*#__PURE__*/_react.default.createContext({
   state: initialState,
   dispatch: () => {}
 });
-
-// eslint-disable-next-line no-redeclare
-
-// eslint-disable-next-line no-redeclare
 function useProConfig(name) {
   var _useContext = (0, _react.useContext)(ProConfigContext),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
-  if (name) {
-    return state[name];
-  }
+  if (name) return state[name];
   return {
     state,
     dispatch
   };
 }
-var reducer = (state, action) => {
-  var _state$ProEnum;
+function reducer(state, action) {
+  var _state$forms, _state$forms2, _state$ProEnum$dics, _state$ProEnum;
   switch (action.type) {
     case 'setFormRef':
       return _objectSpread(_objectSpread({}, state), {}, {
-        forms: _objectSpread(_objectSpread({}, state.forms), {}, {
+        forms: _objectSpread(_objectSpread({}, (_state$forms = state.forms) !== null && _state$forms !== void 0 ? _state$forms : {}), {}, {
           [action.name]: action.value
         })
       });
     case 'deleteFormRef':
       return _objectSpread(_objectSpread({}, state), {}, {
-        forms: _objectSpread(_objectSpread({}, state.forms), {}, {
+        forms: _objectSpread(_objectSpread({}, (_state$forms2 = state.forms) !== null && _state$forms2 !== void 0 ? _state$forms2 : {}), {}, {
           [action.name]: undefined
         })
       });
@@ -91,19 +89,16 @@ var reducer = (state, action) => {
     case 'setProEnumDic':
       return _objectSpread(_objectSpread({}, state), {}, {
         ProEnum: _objectSpread(_objectSpread({}, state.ProEnum), {}, {
-          dics: _objectSpread(_objectSpread({}, ((_state$ProEnum = state.ProEnum) === null || _state$ProEnum === void 0 ? void 0 : _state$ProEnum.dataSource) || {}), action.payload)
+          dics: _objectSpread(_objectSpread({}, (_state$ProEnum$dics = (_state$ProEnum = state.ProEnum) === null || _state$ProEnum === void 0 ? void 0 : _state$ProEnum.dics) !== null && _state$ProEnum$dics !== void 0 ? _state$ProEnum$dics : {}), action.payload)
         })
       });
     case 'setWithLocal':
-      // 本地配置合并
       localStorage.setItem('localConfig', JSON.stringify(action.payload));
       return _objectSpread({}, state);
     default:
-      return _objectSpread({}, state);
+      return state;
   }
-};
-
-// 内部组件，用于监听主题变化并应用到 ConfigProvider
+}
 var ThemeAwareConfigProvider = _ref => {
   var locale = _ref.locale,
     children = _ref.children;
@@ -118,45 +113,33 @@ var ThemeAwareConfigProvider = _ref => {
   });
 };
 var ProConfigProvider = props => {
-  var _props$value, _props$value2, _props$value3, _props$value4;
+  var _props$value, _props$value2, _props$value3, _props$value4, _ref2, _ref3, _state$locale, _antdLangMap$lang;
   var _useReducer = (0, _react.useReducer)(reducer, initialState),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
   var enumRes = (0, _useEnumRequest.default)(_objectSpread(_objectSpread(_objectSpread({}, state.ProEnum), props === null || props === void 0 || (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.ProEnum), props === null || props === void 0 || (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.globalConfig), dispatch);
-
-  // 处理频繁枚举请求
   var frequentEnumRes = (0, _useFrequentEnumRequest.default)(_objectSpread(_objectSpread(_objectSpread({}, state.ProEnum), props === null || props === void 0 || (_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3.ProEnum), props === null || props === void 0 || (_props$value4 = props.value) === null || _props$value4 === void 0 ? void 0 : _props$value4.globalConfig), dispatch);
+  var cacheLang = localStorage.getItem('locale');
+  var lang = (_ref2 = (_ref3 = (_state$locale = state === null || state === void 0 ? void 0 : state.locale) !== null && _state$locale !== void 0 ? _state$locale : cacheLang) !== null && _ref3 !== void 0 ? _ref3 : props === null || props === void 0 ? void 0 : props.locale) !== null && _ref2 !== void 0 ? _ref2 : 'zh-CN';
   (0, _react.useEffect)(() => {
-    // 本地配置取出
-    var localConfigStr = localStorage.getItem('localConfig');
-    var localConfig = JSON.parse(localConfigStr || '{}');
+    var raw = localStorage.getItem('localConfig');
+    var localConfig = JSON.parse(raw || '{}');
     dispatch({
       type: 'set',
-      payload: (0, _merge.default)(state, localConfig)
+      payload: (0, _merge.default)(initialState, localConfig)
     });
   }, []);
-  var cacheLang = localStorage.getItem('locale');
-  // 如果是用户切换了语言那么优先使用用户切换的，否则从缓存中取用户语言，在取默认值
-  var lang = (state === null || state === void 0 ? void 0 : state.locale) || cacheLang || (props === null || props === void 0 ? void 0 : props.locale);
   (0, _react.useEffect)(() => {
     (0, _locale.setLanguage)(lang);
   }, [lang]);
   (0, _react.useEffect)(() => {
-    if (enumRes !== null && enumRes !== void 0 && enumRes.data) {
-      (props === null || props === void 0 ? void 0 : props.onSuccess) && (props === null || props === void 0 ? void 0 : props.onSuccess(enumRes === null || enumRes === void 0 ? void 0 : enumRes.data, enumRes === null || enumRes === void 0 ? void 0 : enumRes.params));
-    }
+    var _props$onSuccess;
+    if (enumRes !== null && enumRes !== void 0 && enumRes.data) props === null || props === void 0 || (_props$onSuccess = props.onSuccess) === null || _props$onSuccess === void 0 || _props$onSuccess.call(props, enumRes.data, enumRes.params);
   }, [enumRes === null || enumRes === void 0 ? void 0 : enumRes.loading]);
-  var antdLangMap = {
-    'zh-CN': _zh_CN.default,
-    // zh-CN 中文
-    'en-US': _en_US.default // en-US
-  };
-  // 处理频繁枚举的成功回调
   (0, _react.useEffect)(() => {
-    if (frequentEnumRes !== null && frequentEnumRes !== void 0 && frequentEnumRes.data) {
-      (props === null || props === void 0 ? void 0 : props.onSuccess) && (props === null || props === void 0 ? void 0 : props.onSuccess(frequentEnumRes === null || frequentEnumRes === void 0 ? void 0 : frequentEnumRes.data, frequentEnumRes === null || frequentEnumRes === void 0 ? void 0 : frequentEnumRes.params));
-    }
+    var _props$onSuccess2;
+    if (frequentEnumRes !== null && frequentEnumRes !== void 0 && frequentEnumRes.data) props === null || props === void 0 || (_props$onSuccess2 = props.onSuccess) === null || _props$onSuccess2 === void 0 || _props$onSuccess2.call(props, frequentEnumRes.data, frequentEnumRes.params);
   }, [frequentEnumRes === null || frequentEnumRes === void 0 ? void 0 : frequentEnumRes.loading]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ThemeContext.ThemeProvider, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ProConfigContext.Provider, {
@@ -165,7 +148,7 @@ var ProConfigProvider = props => {
         dispatch
       },
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ThemeAwareConfigProvider, {
-        locale: antdLangMap[lang],
+        locale: (_antdLangMap$lang = antdLangMap[lang]) !== null && _antdLangMap$lang !== void 0 ? _antdLangMap$lang : _zh_CN.default,
         children: props.children
       })
     })

package/lib/ProConfigProvider/propsType.d.ts

@@ -0,0 +1,55 @@
+import type React from 'react';
+import type { FormInstance } from 'antd';
+import type { PropSelectType } from '../ProSelect/propsType';
+import type { ProModalSelectType } from '../ProForm/components/combination/ProModalSelect/propsType';
+import type { ProCascaderType } from '../ProForm/components/combination/ProCascader/propsType';
+import type { ProEnumConfigType } from '../ProEnum/propsType';
+/** 对外配置项类型（value、内部 state 均为此类型，字段均可选） */
+export interface ProConfigProviderType {
+    locale?: string;
+    ProEnum?: Partial<ProEnumConfigType>;
+    ProSelect?: Partial<PropSelectType> & Record<string, any>;
+    ProModalSelect?: Partial<ProModalSelectType> & Record<string, any>;
+    ProAddressBar?: Partial<ProCascaderType> & Record<string, any>;
+    forms?: Record<string, FormInstance | undefined>;
+    [key: string]: any;
+}
+/** ProConfigProvider 组件 Props（内部使用） */
+export interface ProConfigProviderProps {
+    value?: ProConfigProviderType;
+    locale?: string;
+    onSuccess?: (data: any, params: any) => void;
+    children?: React.ReactNode;
+}
+/** Config 上下文 */
+export interface ConfigContext {
+    state: ProConfigProviderType;
+    dispatch: React.Dispatch<ProConfigActions>;
+}
+/** ThemeAwareConfigProvider 内部组件 Props */
+export interface ThemeAwareConfigProviderProps {
+    locale: any;
+    children: React.ReactNode;
+}
+/** Reducer Actions */
+export type ProConfigActions = {
+    type: 'setFormRef';
+    name: string;
+    value: FormInstance;
+} | {
+    type: 'deleteFormRef';
+    name: string;
+} | {
+    type: 'set';
+    payload: ProConfigProviderType;
+} | {
+    type: 'setProEnum';
+    payload: Record<string, any>;
+} | {
+    type: 'setProEnumDic';
+    key: string;
+    payload: any;
+} | {
+    type: 'setWithLocal';
+    payload: ProConfigProviderType;
+};

package/lib/ProConfigProvider/propsType.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/ProEnum/propsType.d.ts

@@ -303,7 +303,6 @@ export interface TagPropsMapType {
  */
 export type ProEnumType = Omit<ProEnumBaseType, 'type'> & (PropProSelectsMapType | PropRadioPropsMapType | CheckboxPropsMapType | TagPropsMapType);
 export type DataOption = DataOptionType;
-export type ProEnumConfig = ProEnumConfigType;
 export type ProEnum = ProEnumBaseType;
 export type PropProSelectsMap = PropProSelectsMapType;
 export type PropRadioPropsMap = PropRadioPropsMapType;

package/lib/ProForm/components/combination/Group/utils/index.d.ts

@@ -75,37 +75,35 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     confirm?: boolean | import("antd").ModalFuncProps | import("../../../render/propsType").FunctionArgs<any, boolean | import("antd").ModalFuncProps>;
     show?: boolean | ReactiveFunction<any, boolean>;
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
+    validateTrigger?: string | false | string[];
+    isView?: boolean;
+    id?: string;
+    prefixCls?: string;
+    className?: string;
     style?: React.CSSProperties;
-    trim?: boolean;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    className?: string;
-    hidden?: boolean;
-    layout?: import("antd/es/form/Form").FormItemLayout;
-    help?: React.ReactNode;
-    vertical?: boolean;
-    preserve?: boolean;
-    prefixCls?: string;
-    onReset?: () => void;
-    status?: "" | "warning" | "error" | "success" | "validating";
-    id?: string;
     rootClassName?: string;
-    isView?: boolean;
+    status?: "" | "warning" | "error" | "success" | "validating";
     getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
+    hidden?: boolean;
+    onReset?: () => void;
     desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
-    htmlFor?: string;
+    vertical?: boolean;
+    valueType?: import("../../../render/propsType").ProFormValueType;
     colon?: boolean;
+    htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
     trigger?: string;
-    validateTrigger?: string | false | string[];
     validateDebounce?: number;
     valuePropName?: string;
     messageVariables?: Record<string, string>;
     initialValue?: any;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
+    preserve?: boolean;
     isListField?: boolean;
     isList?: boolean;
     noStyle?: boolean;
@@ -113,9 +111,10 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
     validateStatus?: "" | "warning" | "error" | "success" | "validating";
+    layout?: import("antd/es/form/Form").FormItemLayout;
     wrapperCol?: import("antd").ColProps;
+    help?: React.ReactNode;
     fieldId?: string;
-    valueType?: import("../../../render/propsType").ProFormValueType;
     switchValue?: [any, any];
     viewRender?: (value: any, record: any, { form, index, namePath, }: {
         [key: string]: any;
@@ -123,6 +122,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         index?: number;
     }) => string | React.ReactElement<any, any>;
     viewType?: import("../../../render/propsType").ViewType;
+    trim?: boolean;
     upperCase?: boolean;
     toISOString?: boolean;
     toCSTString?: boolean;
@@ -141,7 +141,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
  * 创建组件属性
  */
 export declare const createComponentProps: (column: FlexibleGroupColumnType, formItemProps: any) => {
-    componentProps: import("lodash").Omit<any, "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow" | "precision">;
+    componentProps: import("lodash").Omit<any, "precision" | "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

package/lib/ProForm/components/render/propsType.d.ts

@@ -55,7 +55,7 @@ export type FunctionArgs<Values, R = any> = (value: any, record: any, { form, in
     namePath?: NamePath;
     [key: string]: any;
 }) => R;
-type TransformToFormField<T extends ControlProps, Values> = DistributiveOmit<T, 'onChange' | 'value'> & {
+type TransformToFormField<T extends ControlProps, Values> = DistributiveOmit<T, 'onChange' | 'value' | 'role'> & {
     value?: T['value'];
     onChange?: (value: Parameters<T['onChange']>[0], options: Parameters<T['onChange']>[1], form: FormInstance<Values>) => void;
     onFieldChange?: FunctionArgs<Values>;
@@ -66,7 +66,7 @@ type TransformToFormField<T extends ControlProps, Values> = DistributiveOmit<T,
 type ProEnumFormType<Values> = TransformToFormField<ProEnum, Values> | TransformToFormField<ProEnum & PropProSelectsMap, Values> | TransformToFormField<ProEnum & PropRadioPropsMap, Values> | TransformToFormField<ProEnum & CheckboxPropsMap, Values>;
 type ProEnumTableType<Values> = TransformToTableField<ProEnum, Values> | TransformToTableField<ProEnum & PropProSelectsMap, Values> | TransformToTableField<ProEnum & PropRadioPropsMap, Values> | TransformToTableField<ProEnum & CheckboxPropsMap, Values>;
 type ProEnumFieldType<Values, TT> = TT extends 'ProForm' ? ProEnumFormType<Values> | ReactiveFunction<Values, ProEnumFormType<Values>> : ProEnumTableType<Values> | ((text: any, values: Values, index: number) => ProEnumTableType<Values>);
-type TransformToTableField<T extends ControlProps, Values> = Omit<T, 'onChange' | 'value' | 'onBlur'> & {
+type TransformToTableField<T extends ControlProps, Values> = Omit<T, 'onChange' | 'value' | 'onBlur' | 'role'> & {
     value?: T['value'];
     onChange?: (value: Parameters<T['onChange']>[0], options: Parameters<T['onChange']>[1], record: any, index: number, form: FormInstance<Values>) => void;
     onFieldChange?: FunctionArgs<Values>;

package/lib/ProThemeTools/context/ThemeContext.js

@@ -39,17 +39,44 @@ var defaultThemeConfig = exports.defaultThemeConfig = {
   zauiStripe: true
 };
 
-// 初始状态
-var initialState = {
-  localConfig: defaultThemeConfig,
-  antdConfig: {
+// 获取初始状态，检查是否有待应用的主题
+var getInitialState = () => {
+  // 检查是否有待应用的主题（在模块加载时可能已经设置）
+  var initialAntdConfig = {
     token: {
-      colorPrimary: '#006AFF'
+      colorPrimary: defaultThemeConfig.zauiBrand
+    }
+  };
+
+  // 尝试获取待应用的主题（避免循环依赖，使用动态导入）
+  if (typeof window !== 'undefined') {
+    try {
+      var _document$documentEle;
+      // 使用同步方式检查 pendingThemes（通过全局变量访问）
+      // 注意：这里不能直接导入 utils，因为会有循环依赖
+      // 但我们可以通过检查 CSS 变量来判断是否有待应用的主题
+      var cssZauiBrand = (_document$documentEle = document.documentElement.style.getPropertyValue('--zaui-brand')) === null || _document$documentEle === void 0 ? void 0 : _document$documentEle.trim();
+      if (cssZauiBrand && cssZauiBrand !== defaultThemeConfig.zauiBrand) {
+        initialAntdConfig = {
+          token: {
+            colorPrimary: cssZauiBrand
+          }
+        };
+      }
+    } catch (e) {
+      // 忽略错误，使用默认配置
     }
-  },
-  cssVariables: {}
+  }
+  return {
+    localConfig: defaultThemeConfig,
+    antdConfig: initialAntdConfig,
+    cssVariables: {}
+  };
 };
 
+// 初始状态
+var initialState = getInitialState();
+
 // Reducer 函数
 function themeReducer(state, action) {
   switch (action.type) {
@@ -108,7 +135,31 @@ var getThemeUpdaters = () => ({
 exports.getThemeUpdaters = getThemeUpdaters;
 var ThemeProvider = _ref => {
   var children = _ref.children;
-  var _useReducer = (0, _react.useReducer)(themeReducer, initialState),
+  // 使用惰性初始化，在组件渲染时检查 CSS 变量
+  var _useReducer = (0, _react.useReducer)(themeReducer, initialState, initial => {
+      // 在初始化时检查 CSS 变量
+      if (typeof window !== 'undefined') {
+        try {
+          var _document$documentEle2, _initial$antdConfig$t;
+          var cssZauiBrand = (_document$documentEle2 = document.documentElement.style.getPropertyValue('--zaui-brand')) === null || _document$documentEle2 === void 0 ? void 0 : _document$documentEle2.trim();
+          if (cssZauiBrand && cssZauiBrand !== ((_initial$antdConfig$t = initial.antdConfig.token) === null || _initial$antdConfig$t === void 0 ? void 0 : _initial$antdConfig$t.colorPrimary)) {
+            return _objectSpread(_objectSpread({}, initial), {}, {
+              antdConfig: {
+                token: {
+                  colorPrimary: cssZauiBrand
+                }
+              },
+              localConfig: _objectSpread(_objectSpread({}, initial.localConfig), {}, {
+                zauiBrand: cssZauiBrand
+              })
+            });
+          }
+        } catch (e) {
+          // 忽略错误
+        }
+      }
+      return initial;
+    }),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
@@ -143,12 +194,49 @@ var ThemeProvider = _ref => {
   }, []);
 
   // 注册全局更新函数，供 setThemes 静态方法使用
-  _react.default.useEffect(() => {
+  (0, _react.useEffect)(() => {
     registerThemeUpdaters({
       updateAntdConfig,
       updateCssVariables,
       updateLocalConfig
     });
+
+    // 应用待应用的主题配置（如果存在）
+    // 使用同步方式应用以避免闪烁，但需要避免循环依赖
+    // 由于初始状态已经检查了 CSS 变量，这里只需要确保 Context 状态同步
+    if (typeof window !== 'undefined') {
+      var _document$documentEle3, _state$antdConfig$tok;
+      // 检查 CSS 变量，如果与当前状态不一致，更新 Context
+      var cssZauiBrand = (_document$documentEle3 = document.documentElement.style.getPropertyValue('--zaui-brand')) === null || _document$documentEle3 === void 0 ? void 0 : _document$documentEle3.trim();
+      if (cssZauiBrand && cssZauiBrand !== ((_state$antdConfig$tok = state.antdConfig.token) === null || _state$antdConfig$tok === void 0 ? void 0 : _state$antdConfig$tok.colorPrimary)) {
+        var antdConfig = {
+          token: {
+            colorPrimary: cssZauiBrand
+          }
+        };
+        updateAntdConfig(antdConfig);
+        updateLocalConfig({
+          zauiBrand: cssZauiBrand
+        });
+      }
+
+      // 也检查是否有待应用的主题（通过动态导入）
+      // 使用微任务确保在同一个渲染周期内执行，但避免阻塞
+      Promise.resolve().then(() => {
+        // 动态导入以避免循环依赖
+        Promise.resolve().then(() => _interopRequireWildcard(require("../utils/index"))).then(_ref2 => {
+          var getPendingThemes = _ref2.getPendingThemes,
+            setThemes = _ref2.setThemes,
+            clearPendingThemes = _ref2.clearPendingThemes;
+          var pending = getPendingThemes();
+          if (pending) {
+            // 重新调用 setThemes 以应用主题（此时更新函数已经注册）
+            setThemes(pending);
+            clearPendingThemes();
+          }
+        });
+      });
+    }
   }, [updateAntdConfig, updateCssVariables, updateLocalConfig]);
   var contextValue = {
     state,

package/lib/ProThemeTools/utils/index.d.ts

@@ -7,6 +7,8 @@ declare let getThemeUpdaters: (() => {
     updateLocalConfig: ((config: any) => void) | null;
 }) | null;
 export declare const setThemeUpdatersGetter: (getter: typeof getThemeUpdaters) => void;
+export declare const getPendingThemes: () => ThemesProps | null;
+export declare const clearPendingThemes: () => void;
 /**
  * 将 kebab-case 的主题配置转换为 antd5 的 token 格式
  * @param themes kebab-case 格式的主题配置

package/lib/ProThemeTools/utils/index.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setThemes = exports.setThemeUpdatersGetter = exports.setTableNoStripe = exports.setTableBorder = exports.getMapKebabCase = exports.getMapHumpCase = exports.getKebabCase = exports.getAntd5ThemeConfig = exports.convertToAntd5Tokens = void 0;
+exports.setThemes = exports.setThemeUpdatersGetter = exports.setTableNoStripe = exports.setTableBorder = exports.getPendingThemes = exports.getMapKebabCase = exports.getMapHumpCase = exports.getKebabCase = exports.getAntd5ThemeConfig = exports.convertToAntd5Tokens = exports.clearPendingThemes = void 0;
+var _ThemeContext = require("../context/ThemeContext");
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -16,15 +17,47 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 // 动态导入 getThemeUpdaters，避免循环依赖
+// 保留向后兼容性，但优先使用 ThemeContext 中的 getThemeUpdaters
 var getThemeUpdaters = null;
 
-// 设置 getThemeUpdaters 函数（由 index.tsx 调用）
+// 设置 getThemeUpdaters 函数（由 index.tsx 调用，用于向后兼容）
 var setThemeUpdatersGetter = getter => {
   getThemeUpdaters = getter;
 };
 
-/** antd5 主题配置 mapping */
+// 保存待应用的主题配置（用于 ThemeProvider 初始化前设置的主题）
 exports.setThemeUpdatersGetter = setThemeUpdatersGetter;
+var pendingThemes = null;
+
+// 获取待应用的主题配置
+var getPendingThemes = () => {
+  return pendingThemes;
+};
+
+// 清除待应用的主题配置
+exports.getPendingThemes = getPendingThemes;
+var clearPendingThemes = () => {
+  pendingThemes = null;
+};
+
+// 获取主题更新函数的统一入口
+// 优先使用 ThemeContext 中的 getThemeUpdaters，如果不可用则使用局部变量
+exports.clearPendingThemes = clearPendingThemes;
+var getThemeUpdatersWrapper = () => {
+  try {
+    // 优先使用 ThemeContext 中的 getThemeUpdaters（不依赖 ProThemeTools 组件）
+    var contextUpdaters = (0, _ThemeContext.getThemeUpdaters)();
+    if (contextUpdaters && (contextUpdaters.updateAntdConfig || contextUpdaters.updateCssVariables || contextUpdaters.updateLocalConfig)) {
+      return contextUpdaters;
+    }
+  } catch (e) {
+    // ThemeContext 可能还未初始化，继续使用局部变量
+  }
+  // 回退到局部变量（向后兼容）
+  return getThemeUpdaters ? getThemeUpdaters() : null;
+};
+
+/** antd5 主题配置 mapping */
 var antd5ConfigMapping = {
   'zaui-brand': 'colorPrimary'
   // 可以根据需要添加更多映射
@@ -85,9 +118,9 @@ var setThemes = themes => {
   });
 
   // 同步更新 Context（如果已注册）
-  if (getThemeUpdaters) {
-    var updaters = getThemeUpdaters();
-
+  // 使用统一的获取函数，优先使用 ThemeContext 中的更新函数
+  var updaters = getThemeUpdatersWrapper();
+  if (updaters) {
     // 更新 CSS 变量到 Context
     if (updaters.updateCssVariables) {
       updaters.updateCssVariables(filteredThemes.reduce((acc, _ref5) => {
@@ -129,6 +162,11 @@ var setThemes = themes => {
         updaters.updateLocalConfig(localConfig);
       }
     }
+    // 清除待应用的主题配置（因为已经应用了）
+    pendingThemes = null;
+  } else {
+    // 如果更新函数不可用，保存主题配置，等待 ThemeProvider 初始化后应用
+    pendingThemes = _objectSpread({}, themes);
   }
   return true;
 };

package/lib/index.d.ts

@@ -27,20 +27,21 @@ export { default as ProAction } from './ProAction';
 export * from './ProConfigProvider';
 export * from './locale';
 export { default as ProBackBtn } from './ProLayout/components/ProHeader/components/ProBackBtn';
+export type { ProConfigProviderType } from './ProConfigProvider';
 export type { ProFormType, ProColumnProps, ProFormColumnType } from './ProForm/propsType';
 export type { ProFormComponentType } from './ProForm/components';
-export type { ProTableType, ProTableColumnType, ProTableSummaryType, ProTableUseAntdTableType, ProTableProps, ProTableSummaryProps, ProTableColumn, UseAntdTableState } from './ProTable/propsType';
+export type { ProTableType, ProTableColumnType, ProTableSummaryType, ProTableUseAntdTableType, ProTableProps, ProTableSummaryProps, ProTableColumn, UseAntdTableState, } from './ProTable/propsType';
 export type { ProUploadType, ProUploadProps } from './ProUpload/propsType';
 export type { ProTabsType, ProTabsItemType, ProTabsProps, ProTabsItemsProps } from './ProTabs/propType';
-export type { BreadcrumbColumnType, SubDescribeColumnType, DescribeColumnType, ProHeaderType, ProHeaderProps, BreadcrumbColumnsProps, SubDescribeColumnsProps, DescribeColumnsProps } from './ProLayout/components/ProHeader/PropTypes';
+export type { BreadcrumbColumnType, SubDescribeColumnType, DescribeColumnType, ProHeaderType, ProHeaderProps, BreadcrumbColumnsProps, SubDescribeColumnsProps, DescribeColumnsProps, } from './ProLayout/components/ProHeader/PropTypes';
 export type { ProLayoutTabsInstance, AddTabParams, AddTabOptions } from './ProLayout/propTypes';
 export type { ProTooltipType, ProTooltipProps } from './ProTooltip/propsType';
 export type { ProIconType, ProIconProps } from './ProIcon/propsTypes';
 export type { ProTreeType, ProTreeSelectType, ProTreeProps, PropTreeSelectProps } from './ProTree/propsType';
-export type { ProTreeModalType, ProTreeModalActionType, ProTreeModalProps, ProTreeModalAction } from './ProTreeModal/propsType';
-export type { ProEditTableType, ProEditTableColumnType, ProEditTableSummaryColumnType, ProEditTableSummaryConfigType, ProEditTableActionType, ProEditTableProps, ProEditTableColumnsProps, SummaryProps, SummaryColumnProps, BaseActionProps } from './ProEditTable/propsType';
-export type { ProStepType, ProStepContextType, ProStepItemType, ProStepPropsType, ProStepItemPropsType } from './ProStep/propsType';
+export type { ProTreeModalType, ProTreeModalActionType, ProTreeModalProps, ProTreeModalAction, } from './ProTreeModal/propsType';
+export type { ProEditTableType, ProEditTableColumnType, ProEditTableSummaryColumnType, ProEditTableSummaryConfigType, ProEditTableActionType, ProEditTableProps, ProEditTableColumnsProps, SummaryProps, SummaryColumnProps, BaseActionProps, } from './ProEditTable/propsType';
+export type { ProStepType, ProStepContextType, ProStepItemType, ProStepPropsType, ProStepItemPropsType, } from './ProStep/propsType';
 export type { ProDrawerFormType, ProDrawerFormPropsType } from './ProDrawerForm/propsType';
-export type { ProModalSelectType, ProModalSelectConfigType, ProModalSelectPropsType } from './ProForm/components/combination/ProModalSelect/propsType';
+export type { ProModalSelectType, ProModalSelectConfigType, ProModalSelectPropsType, } from './ProForm/components/combination/ProModalSelect/propsType';
 export type { ProStepTabType, ProStepTabResultType } from './ProStepTab/propsType';
 export * from './tokens';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.0.9",
+  "version": "4.0.10",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",