@zat-design/sisyphus-react 4.0.10 → 4.0.11

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

@@ -75,35 +75,38 @@ 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;
+    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
+    trim?: boolean;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     className?: string;
+    prefixCls?: string;
     style?: React.CSSProperties;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    rootClassName?: string;
+    onReset?: () => void;
     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]>;
+    id?: string;
     vertical?: boolean;
-    valueType?: import("../../../render/propsType").ProFormValueType;
-    colon?: 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;
-    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;
@@ -111,10 +114,9 @@ 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;
@@ -122,11 +124,9 @@ 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;
-    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, "precision" | "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow">;
+    componentProps: import("lodash").Omit<any, "format" | "clearNotShow" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "precision">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

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

@@ -130,22 +130,41 @@ export var getThemeUpdaters = () => ({
 // Provider 组件
 
 export var ThemeProvider = _ref => {
-  var children = _ref.children;
+  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, _initial$antdConfig$t;
+          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 !== ((_initial$antdConfig$t = initial.antdConfig.token) === null || _initial$antdConfig$t === void 0 ? void 0 : _initial$antdConfig$t.colorPrimary)) {
-            return _objectSpread(_objectSpread({}, initial), {}, {
+          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({}, initial.localConfig), {}, {
+              localConfig: _objectSpread(_objectSpread({}, finalState.localConfig), {}, {
                 zauiBrand: cssZauiBrand
               })
             });
@@ -154,7 +173,7 @@ export var ThemeProvider = _ref => {
           // 忽略错误
         }
       }
-      return initial;
+      return finalState;
     }),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
@@ -230,6 +249,12 @@ export var ThemeProvider = _ref => {
             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);
+          }
         });
       });
     }

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

@@ -75,35 +75,38 @@ 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;
+    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
+    trim?: boolean;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     className?: string;
+    prefixCls?: string;
     style?: React.CSSProperties;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    rootClassName?: string;
+    onReset?: () => void;
     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]>;
+    id?: string;
     vertical?: boolean;
-    valueType?: import("../../../render/propsType").ProFormValueType;
-    colon?: 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;
-    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;
@@ -111,10 +114,9 @@ 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;
@@ -122,11 +124,9 @@ 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;
-    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, "precision" | "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow">;
+    componentProps: import("lodash").Omit<any, "format" | "clearNotShow" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "precision">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

package/lib/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/lib/ProForm/index.js

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

package/lib/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/lib/ProForm/propsType.js

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

package/lib/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/lib/ProThemeTools/context/ThemeContext.js

@@ -134,22 +134,41 @@ var getThemeUpdaters = () => ({
 // Provider 组件
 exports.getThemeUpdaters = getThemeUpdaters;
 var ThemeProvider = _ref => {
-  var children = _ref.children;
+  var children = _ref.children,
+    initialLocalConfig = _ref.initialLocalConfig,
+    initialAntdConfig = _ref.initialAntdConfig;
   // 使用惰性初始化，在组件渲染时检查 CSS 变量
   var _useReducer = (0, _react.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, _initial$antdConfig$t;
+          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 !== ((_initial$antdConfig$t = initial.antdConfig.token) === null || _initial$antdConfig$t === void 0 ? void 0 : _initial$antdConfig$t.colorPrimary)) {
-            return _objectSpread(_objectSpread({}, initial), {}, {
+          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({}, initial.localConfig), {}, {
+              localConfig: _objectSpread(_objectSpread({}, finalState.localConfig), {}, {
                 zauiBrand: cssZauiBrand
               })
             });
@@ -158,7 +177,7 @@ var ThemeProvider = _ref => {
           // 忽略错误
         }
       }
-      return initial;
+      return finalState;
     }),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
@@ -234,6 +253,12 @@ var ThemeProvider = _ref => {
             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);
+          }
         });
       });
     }

package/package.json

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