@zat-design/sisyphus-react 4.0.9 → 4.0.11

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,31 +75,32 @@ 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>;
-    style?: React.CSSProperties;
+    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
     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;
+    style?: React.CSSProperties;
     onReset?: () => void;
     status?: "" | "warning" | "error" | "success" | "validating";
+    hidden?: boolean;
     id?: string;
+    vertical?: boolean;
     rootClassName?: string;
     isView?: boolean;
     getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
     desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
     htmlFor?: string;
+    layout?: import("antd/es/form/Form").FormItemLayout;
+    help?: React.ReactNode;
+    preserve?: boolean;
+    trigger?: string;
     colon?: boolean;
+    clearNotShow?: boolean;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
     shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
-    trigger?: string;
     validateTrigger?: string | false | string[];
     validateDebounce?: number;
     valuePropName?: string;
@@ -126,7 +127,6 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     upperCase?: boolean;
     toISOString?: boolean;
     toCSTString?: boolean;
-    clearNotShow?: boolean;
     name: any;
     dependencies: any[];
     tooltip: string | {
@@ -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, "format" | "clearNotShow" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "precision">;
     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/ProForm/index.d.ts

@@ -1,16 +1,6 @@
-import { FormInstance } from 'antd';
 import React from 'react';
 import { FormProviderProps } from 'antd/es/form/context';
-import type { ProFormType } from './propsType';
-import { useForm } from './utils/useForm';
-import useWatch from './utils/useWatch';
-import { useForms } from '../FormsProvider';
-interface IProForm<T = any> extends React.ForwardRefExoticComponent<ProFormType<T> & React.RefAttributes<FormInstance<T>>> {
-    useForm: typeof useForm;
-    useWatch: typeof useWatch;
-    useFormInstances: typeof useForms;
-    [key: string]: any;
-}
-declare const ProFormForward: IProForm;
+import type { ProFormInstanceType } from './propsType';
+declare const ProFormForward: ProFormInstanceType<any>;
 export declare const ProFormProvider: React.FC<FormProviderProps>;
 export default ProFormForward;

package/es/ProForm/index.js

@@ -275,8 +275,6 @@ var ProForm = (props, ref) => {
     })), children]
   }));
 };
-
-// @ts-ignore
 var ProFormForward = /*#__PURE__*/forwardRef(ProForm);
 ProFormForward.useForm = useForm;
 ProFormForward.useWatch = useWatch;

package/es/ProForm/propsType.d.ts

@@ -117,6 +117,17 @@ export interface TransformType<T = any> {
     shouldUpdate?: ShouldUpdate<T>;
 }
 export type DistributiveOmit<T, K extends keyof any> = T extends any ? Omit<T, K> : never;
+/**
+ * ProForm 组件接口类型
+ * 用于定义 ProForm 组件及其静态方法的类型
+ * 注意：此接口的具体实现方法类型在组件文件中定义，这里只提供基础结构
+ */
+export interface ProFormInstanceType<T = any> extends React.ForwardRefExoticComponent<ProFormType<T> & React.RefAttributes<FormInstance<T>>> {
+    useForm: any;
+    useWatch: any;
+    useFormInstances: any;
+    [key: string]: any;
+}
 /**
  * 兼容旧命名导出
  */

package/es/ProForm/propsType.js

@@ -1,5 +1,11 @@
 export var otherKeys = ['isView', 'viewEmpty', 'label', 'valueType', 'viewType', 'name', 'names', 'form', 'type', 'hiddenNames'];
 
+/**
+ * ProForm 组件接口类型
+ * 用于定义 ProForm 组件及其静态方法的类型
+ * 注意：此接口的具体实现方法类型在组件文件中定义，这里只提供基础结构
+ */
+
 /**
  * 兼容旧命名导出
  */

package/es/ProThemeTools/context/ThemeContext.d.ts

@@ -35,6 +35,8 @@ export declare const getThemeUpdaters: () => {
 };
 interface ThemeProviderProps {
     children: ReactNode;
+    initialLocalConfig?: Partial<LocalThemeConfigType>;
+    initialAntdConfig?: AntdThemeConfigType;
 }
 export declare const ThemeProvider: React.FC<ThemeProviderProps>;
 export declare const useTheme: () => ThemeContextType;

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) {
@@ -103,8 +130,51 @@ export var getThemeUpdaters = () => ({
 // Provider 组件
 
 export var ThemeProvider = _ref => {
-  var children = _ref.children;
-  var _useReducer = useReducer(themeReducer, initialState),
+  var children = _ref.children,
+    initialLocalConfig = _ref.initialLocalConfig,
+    initialAntdConfig = _ref.initialAntdConfig;
+  // 使用惰性初始化，在组件渲染时检查 CSS 变量
+  var _useReducer = useReducer(themeReducer, initialState, initial => {
+      // 合并初始配置
+      var finalState = _objectSpread({}, initial);
+
+      // 应用 initialLocalConfig
+      if (initialLocalConfig) {
+        finalState = _objectSpread(_objectSpread({}, finalState), {}, {
+          localConfig: _objectSpread(_objectSpread({}, finalState.localConfig), initialLocalConfig)
+        });
+      }
+
+      // 应用 initialAntdConfig
+      if (initialAntdConfig) {
+        finalState = _objectSpread(_objectSpread({}, finalState), {}, {
+          antdConfig: initialAntdConfig
+        });
+      }
+
+      // 在初始化时检查 CSS 变量
+      if (typeof window !== 'undefined') {
+        try {
+          var _document$documentEle2, _finalState$antdConfi;
+          var cssZauiBrand = (_document$documentEle2 = document.documentElement.style.getPropertyValue('--zaui-brand')) === null || _document$documentEle2 === void 0 ? void 0 : _document$documentEle2.trim();
+          if (cssZauiBrand && cssZauiBrand !== ((_finalState$antdConfi = finalState.antdConfig.token) === null || _finalState$antdConfi === void 0 ? void 0 : _finalState$antdConfi.colorPrimary)) {
+            return _objectSpread(_objectSpread({}, finalState), {}, {
+              antdConfig: {
+                token: {
+                  colorPrimary: cssZauiBrand
+                }
+              },
+              localConfig: _objectSpread(_objectSpread({}, finalState.localConfig), {}, {
+                zauiBrand: cssZauiBrand
+              })
+            });
+          }
+        } catch (e) {
+          // 忽略错误
+        }
+      }
+      return finalState;
+    }),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
@@ -139,12 +209,55 @@ 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();
+          }
+        }).catch(e => {
+          // 在测试环境中，动态导入可能失败，忽略错误
+          // eslint-disable-next-line no-console
+          if (process.env.NODE_ENV !== 'test') {
+            console.warn('Failed to load pending themes:', e);
+          }
+        });
+      });
+    }
   }, [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 格式的主题配置