@zat-design/sisyphus-react 4.5.9-beta.1 → 4.5.10-beta.1

package/es/ProAction/components/CheckModalContent/index.js

@@ -17,10 +17,10 @@ const CheckModalContent = props => {
         children: list[0]
       }) : null, Array.isArray(list) && list.length > 1 ? /*#__PURE__*/_jsx("div", {
         className: "list-wrap",
-        children: list.map(item => /*#__PURE__*/_jsx("div", {
+        children: list.map((item, index) => /*#__PURE__*/_jsx("div", {
           className: "err-item",
           children: item
-        }))
+        }, `${item}-${index}`))
       }) : null]
     })
   });

package/es/ProConfigProvider/index.js

@@ -129,10 +129,19 @@ export const ProConfigProvider = props => {
   const lang = state?.locale ?? cacheLang ?? props?.locale ?? 'zh-CN';
   useEffect(() => {
     const raw = localStorage.getItem('localConfig');
-    const localConfig = JSON.parse(raw || '{}');
+    let localConfig;
+    try {
+      localConfig = JSON.parse(raw || '{}');
+    } catch {
+      localStorage.removeItem('localConfig');
+      if (process.env.NODE_ENV !== 'production') {
+        console.warn('ProConfigProvider: invalid localConfig cache has been removed.');
+      }
+      return;
+    }
     dispatch({
       type: 'set',
-      payload: merge(initialState, localConfig)
+      payload: merge({}, initialState, localConfig)
     });
   }, []);
   useEffect(() => {
@@ -147,7 +156,7 @@ export const ProConfigProvider = props => {
   return /*#__PURE__*/_jsx(ThemeProvider, {
     children: /*#__PURE__*/_jsx(ProConfigContext.Provider, {
       value: {
-        state: merge(state, props.value),
+        state: merge({}, state, props.value),
         dispatch
       },
       children: /*#__PURE__*/_jsx(ThemeAwareConfigProvider, {

package/es/ProDownload/index.d.ts

@@ -1,6 +1,7 @@
+import { DownloadRequest } from './utils';
 import type { ProDownloadType } from './propsType';
 declare const ProDownload: {
     (props: ProDownloadType): import("react/jsx-runtime").JSX.Element;
-    downLoadRequest: import("./utils").DownloadRequestProps;
+    downLoadRequest: typeof DownloadRequest;
 };
 export default ProDownload;

package/es/ProDownload/index.js

@@ -6,6 +6,12 @@ import classNames from 'classnames';
 import { BlobMakeFile, DownloadRequest } from "./utils";
 import { useProConfig } from "../ProConfigProvider";
 import { jsx as _jsx } from "react/jsx-runtime";
+const normalizeError = error => {
+  if (error !== null && typeof error === 'object') {
+    return error;
+  }
+  return new Error(error == null ? 'Download request failed' : String(error));
+};
 const ProDownload = props => {
   const {
     source,
@@ -31,40 +37,42 @@ const ProDownload = props => {
     headers,
     onError: onErrorConfig
   } = useProConfig('ProDownload') || {};
+  const reportError = onError || onErrorConfig;
   defaultProps.headers = {
     ...headers,
     ...defaultProps.headers
   };
-  const handDownload = async () => {
+  const handDownload = async (_params = params) => {
     if (source === 'url') {
-      try {
-        fetch(url || action).then(response => {
-          if (response.status > 400) {
-            return Promise.reject(new Error(`Service exception: ${response.status}`));
-          }
-          return response.blob();
-        }).then(res => {
-          const blob = new Blob([res]);
-          BlobMakeFile({
-            blob,
-            fileName
-          });
+      fetch(url || action).then(response => {
+        if (response.status > 400) {
+          return Promise.reject(new Error(`Service exception: ${response.status}`));
+        }
+        return response.blob();
+      }).then(res => {
+        const blob = new Blob([res]);
+        BlobMakeFile({
+          blob,
+          fileName
         });
-      } catch (error) {
-        Promise.reject(error);
-      }
+      }).catch(error => {
+        reportError?.(normalizeError(error));
+      });
       return;
     }
     setState({
       loading: true
     });
-    let _params = params;
-    if (_isFunction(params)) {
-      _params = params.constructor.name === 'AsyncFunction' ? await params() : params();
-    }
-
-    // 发起请求
+    let errorReported = false;
+    const requestOnError = error => {
+      if (errorReported) {
+        return;
+      }
+      errorReported = true;
+      reportError?.(normalizeError(error));
+    };
     try {
+      // 发起请求
       await DownloadRequest({
         url: url || action,
         method,
@@ -73,13 +81,10 @@ const ProDownload = props => {
         transformResponse,
         fileName,
         onFinish,
-        onError: onError || onErrorConfig
+        onError: requestOnError
       });
     } catch (error) {
-      setState({
-        loading: false
-      });
-      return Promise.reject();
+      requestOnError(error);
     } finally {
       setState({
         loading: false
@@ -92,16 +97,24 @@ const ProDownload = props => {
   return /*#__PURE__*/_jsx(Button, {
     className: cls,
     onClick: async () => {
-      if (_isBoolean(beforeDownload) && !beforeDownload) {
-        return false;
-      }
-      if (beforeDownload) {
-        const res = beforeDownload instanceof (async () => {}).constructor ? await beforeDownload() : beforeDownload();
-        if (res === false) {
-          return;
+      let resolvedParams = params;
+      try {
+        if (_isBoolean(beforeDownload) && !beforeDownload) {
+          return false;
         }
+        if (beforeDownload) {
+          const res = await Promise.resolve(beforeDownload());
+          if (res === false) {
+            return;
+          }
+        }
+        if (source !== 'url' && _isFunction(params)) {
+          resolvedParams = await Promise.resolve(params());
+        }
+      } catch {
+        return false;
       }
-      handDownload();
+      return handDownload(resolvedParams);
     },
     ...defaultProps,
     loading: loading,

package/es/ProDownload/utils.d.ts

@@ -3,7 +3,7 @@ export interface PropsWithMakeFilePropsType {
     fileName: string;
     url?: string;
 }
-export interface IDownloadRequestPropsType {
+export interface IDownloadRequestPropsType<TResult = Response> {
     /**
      * @description       下载请求的地址
      * @default           (必选)
@@ -21,12 +21,12 @@ export interface IDownloadRequestPropsType {
     params?: any;
     headers?: any;
     /** 格式化数据 */
-    transformResponse?: (data: any) => any;
+    transformResponse?: (data: any) => TResult | Promise<TResult>;
     /**
      * @description       service 执行完成时触发
      * @default           -
      */
-    onFinish?: (response: object, params: object) => void;
+    onFinish?: (response: Awaited<TResult>, params: object) => void;
     /**
      * @description       下载保存的文件名
      * @default           (必选)
@@ -47,7 +47,6 @@ export interface IDownloadRequestPropsType {
  * @constructor
  */
 export declare function BlobMakeFile({ blob, fileName, url }: PropsWithMakeFilePropsType): void;
-export type DownloadRequestProps = (props: IDownloadRequestPropsType) => Promise<Response>;
 type convertBase64ToBlobType = (base64: string, fileType?: string, slice?: number) => Blob;
 export declare const convertBase64ToBlob: convertBase64ToBlobType;
 /**
@@ -56,5 +55,11 @@ export declare const convertBase64ToBlob: convertBase64ToBlobType;
  * @returns string
  */
 export declare function getFilenameFromContentDisposition(contentDisposition: any): string;
-export declare const DownloadRequest: DownloadRequestProps;
+export declare function DownloadRequest<TResult>(props: IDownloadRequestPropsType<TResult> & {
+    transformResponse: (data: any) => TResult | Promise<TResult>;
+}): Promise<Awaited<TResult>>;
+export declare function DownloadRequest(props: IDownloadRequestPropsType<Response> & {
+    transformResponse?: undefined;
+}): Promise<Response>;
+export type DownloadRequestProps = typeof DownloadRequest;
 export {};

package/es/ProDownload/utils.js

@@ -71,7 +71,8 @@ export function getFilenameFromContentDisposition(contentDisposition) {
 }
 
 // 发起请求获取下载文件
-export const DownloadRequest = async ({
+
+export async function DownloadRequest({
   url,
   method = 'post',
   params,
@@ -80,7 +81,7 @@ export const DownloadRequest = async ({
   fileName,
   onFinish,
   onError
-}) => {
+}) {
   const config = {
     method,
     credentials: 'include',
@@ -105,7 +106,11 @@ export const DownloadRequest = async ({
       ...headers
     };
   }
-  const res = await fetch(url, config).then(async response => {
+  const response = await fetch(url, config);
+  const {
+    res,
+    responseData
+  } = await (async () => {
     try {
       const data = await response.clone().json();
       if (!data) {
@@ -120,16 +125,25 @@ export const DownloadRequest = async ({
         return Promise.reject(errorMsg);
       }
       if (_isFunction(transformResponse)) {
-        return Promise.resolve(transformResponse(data));
+        return Promise.resolve(transformResponse(data)).then(transformedData => ({
+          res: transformedData,
+          responseData: data
+        }));
       }
-      Promise.resolve(data);
+      return Promise.resolve({
+        res: response,
+        responseData: data
+      });
     } catch (error) {
       if (response.ok) {
-        return Promise.resolve(response);
+        return Promise.resolve({
+          res: response,
+          responseData: null
+        });
       }
     }
     return Promise.reject(`${locale.ProDownload.errorMessage}`);
-  });
+  })();
   let fileBlob;
   let data = null;
   let contentFileName = '';
@@ -137,19 +151,20 @@ export const DownloadRequest = async ({
     data = res;
   } else {
     // 优先获取Content-Disposition中filename
-    contentFileName = getFilenameFromContentDisposition(res.headers.get('Content-Disposition'));
-    data = _get(res, 'data');
+    contentFileName = getFilenameFromContentDisposition(response.headers.get('Content-Disposition'));
+    data = _get(responseData, 'data');
   }
   if (data) {
     fileBlob = convertBase64ToBlob(data);
   } else {
-    fileBlob = await res.blob();
+    fileBlob = await response.blob();
   }
   // 完成回调
-  onFinish?.(res, params);
+  const result = _isFunction(transformResponse) ? res : response;
+  onFinish?.(result, params);
   BlobMakeFile({
     blob: fileBlob,
     fileName: fileName || contentFileName
   });
-  return Promise.resolve(res);
-};
+  return result;
+}

package/es/ProEditTable/utils/index.js

@@ -112,7 +112,12 @@ const getActionColumn = config => {
         }
       }
       // 编辑状态使用自定义form值，非编辑状态直接使用行数据
-      const lastRecord = filterInternalFields(form.getFieldValue(rowName) ?? record);
+      const fieldRecord = filterInternalFields(form.getFieldValue(rowName));
+      const lastRecord = {
+        ...record,
+        ...(fieldRecord && typeof fieldRecord === 'object' ? fieldRecord : {}),
+        rowKey: record.rowKey
+      };
       // 新增事件可以设置初始默认值，当做函数的出参导出
       const onEvent = onClick || onHandle;
       let result;

package/es/ProEnum/hooks/useEnumRequest.js

@@ -34,6 +34,7 @@ const useEnumRequest = (props, dispatch) => {
   // 而非跳过 run()。这样 enumRes.data/loading 正常变更，
   // ProConfigProvider 的 onSuccess 回调能正常触发（修复白屏问题）。
   const fromCacheRef = useRef(null);
+  const errorReportedRef = useRef(false);
   const originalService = useRequest?.service;
   const serviceForRequest = useMemo(() => {
     if (!originalService || storage !== 'indexedDB') {
@@ -54,19 +55,102 @@ const useEnumRequest = (props, dispatch) => {
       return originalService(...args);
     };
   }, [originalService, storage, requestRefresh, cacheKey]);
+  const reportBackgroundError = (error, params = []) => {
+    if (errorReportedRef.current) {
+      return;
+    }
+    errorReportedRef.current = true;
+    const normalizedError = error instanceof Error ? error : new Error(String(error));
+    useRequest?.options?.onError?.(normalizedError, params);
+  };
   const enumRes = useRequestFunc(serviceForRequest, {
     manual: true,
     cacheKey,
     cacheTime: -1,
     staleTime: 6e4 * 60,
     ...useRequest?.options,
+    onBefore: params => {
+      errorReportedRef.current = false;
+      useRequest?.options?.onBefore?.(params);
+    },
+    onError: reportBackgroundError,
     setCache: async res => {
-      // 缓存命中时跳过 transformResponse 和重复处理，直接 dispatch
-      if (fromCacheRef.current) {
-        const cachedData = fromCacheRef.current;
+      try {
+        // 缓存命中时跳过 transformResponse 和重复处理，直接 dispatch
+        if (fromCacheRef.current) {
+          const cachedData = fromCacheRef.current;
+          const mergedPayload = {
+            ...dics,
+            ...cachedData,
+            ...dataSource
+          };
+          dispatch({
+            type: 'setProEnumDic',
+            payload: mergedPayload
+          });
+          if (main) {
+            setTimeout(() => {
+              window?.eventCenter?.publish('pro-enum-event', cachedData);
+              logDebug(locale?.ProEnum?.mainInitByCache);
+            }, 10000);
+          }
+          fromCacheRef.current = null;
+          return res;
+        }
+        let response = res.data;
+        if (transformResponse && typeof transformResponse === 'function') {
+          response = await transformResponse(res.data);
+          if (typeof response !== 'object' || response == null) {
+            throw new Error(locale?.ProEnum?.errorMessage);
+          } else {
+            res.data = response;
+          }
+        }
+        if (typeof response !== 'object' || response === null) {
+          throw Error('response enum data must be object');
+        }
+        if (Object.keys(response).length === 0) {
+          throw Error('Please return valid enumeration data');
+        }
+
+        // 只返回fieldNames对象的key
+        if (clear) {
+          // 忽略清洗的 codes
+          const ignoreCodes = useRequest?.options?.ignoreCodes || [];
+          Object.keys(response).forEach(key => {
+            if (!response[key] || !Array.isArray(response[key])) {
+              return;
+            }
+            const options = [...response[key]];
+            if (ignoreCodes.includes(key)) {
+              response[key] = options;
+            } else {
+              response[key] = options.map(item => {
+                return cacheFieldNames(fieldNames, item);
+              });
+            }
+          });
+          res.data = response;
+        }
+
+        // 获取缓存数据（支持异步）
+        const cacheData = await Promise.resolve(getEnumData(storage, cacheKey) || {
+          data: {}
+        });
+
+        // 合并缓存数据
+        res.data = {
+          ...cacheData?.data,
+          ...res.data
+        };
+
+        // 设置缓存数据（支持异步）
+        await Promise.resolve(setEnumData(storage, cacheKey, res));
+
+        // 同步数据到全局
         const mergedPayload = {
           ...dics,
-          ...cachedData,
+          ...res.data,
           ...dataSource
         };
         dispatch({
@@ -75,80 +159,15 @@ const useEnumRequest = (props, dispatch) => {
         });
         if (main) {
           setTimeout(() => {
-            window?.eventCenter?.publish('pro-enum-event', cachedData);
-            logDebug(locale?.ProEnum?.mainInitByCache);
+            window?.eventCenter?.publish('pro-enum-event', res.data);
+            logDebug(locale?.ProEnum?.mainInitByRequest);
           }, 10000);
         }
-        fromCacheRef.current = null;
+        return res;
+      } catch (error) {
+        reportBackgroundError(error);
         return res;
       }
-      let response = res.data;
-      if (transformResponse && typeof transformResponse === 'function') {
-        response = await transformResponse(res.data);
-        if (typeof response !== 'object' || response == null) {
-          throw new Error(locale?.ProEnum?.errorMessage);
-        } else {
-          res.data = response;
-        }
-      }
-      if (typeof response !== 'object' || response === null) {
-        throw Error('response enum data must be object');
-      }
-      if (Object.keys(response).length === 0) {
-        throw Error('Please return valid enumeration data');
-      }
-
-      // 只返回fieldNames对象的key
-      if (clear) {
-        // 忽略清洗的 codes
-        const ignoreCodes = useRequest?.options?.ignoreCodes || [];
-        Object.keys(response).forEach(key => {
-          if (!response[key] || !Array.isArray(response[key])) {
-            return;
-          }
-          const options = [...response[key]];
-          if (ignoreCodes.includes(key)) {
-            response[key] = options;
-          } else {
-            response[key] = options.map(item => {
-              return cacheFieldNames(fieldNames, item);
-            });
-          }
-        });
-        res.data = response;
-      }
-
-      // 获取缓存数据（支持异步）
-      const cacheData = await Promise.resolve(getEnumData(storage, cacheKey) || {
-        data: {}
-      });
-
-      // 合并缓存数据
-      res.data = {
-        ...cacheData?.data,
-        ...res.data
-      };
-
-      // 设置缓存数据（支持异步）
-      await Promise.resolve(setEnumData(storage, cacheKey, res));
-
-      // 同步数据到全局
-      const mergedPayload = {
-        ...dics,
-        ...res.data,
-        ...dataSource
-      };
-      dispatch({
-        type: 'setProEnumDic',
-        payload: mergedPayload
-      });
-      if (main) {
-        setTimeout(() => {
-          window?.eventCenter?.publish('pro-enum-event', res.data);
-          logDebug(locale?.ProEnum?.mainInitByRequest);
-        }, 10000);
-      }
-      return res;
     },
     getCache: params => {
       if (storage === 'indexedDB') {
@@ -250,6 +269,7 @@ const useEnumRequest = (props, dispatch) => {
     }
   };
   useDeepCompareEffect(() => {
+    errorReportedRef.current = false;
     const executeAsync = async () => {
       if (useRequest && useRequest?.service) {
         const {
@@ -264,7 +284,7 @@ const useEnumRequest = (props, dispatch) => {
           }
         }
         enumRes.run(params);
-        mergeData();
+        void mergeData().catch(reportBackgroundError);
       } else if (dataSource && Object.keys(dataSource).length > 0) {
         const res = await Promise.resolve(getEnumData(storage, cacheKey) || {
           data: {}
@@ -294,19 +314,20 @@ const useEnumRequest = (props, dispatch) => {
         });
       }
     };
-    executeAsync();
+    void executeAsync().catch(reportBackgroundError);
   }, [useRequest?.options]);
   const shareProEnumDic = async cacheData => {
     logDebug(cacheData);
     const storageData = await Promise.resolve(getEnumData(storage, cacheKey) || {
       data: {}
     });
+    const storagePayload = typeof storageData?.data === 'object' && storageData.data !== null ? storageData.data : storageData;
     dispatch({
       type: 'setProEnumDic',
       payload: {
         ...dataSource,
         ...cacheData,
-        ...storageData
+        ...storagePayload
       }
     });
   };

package/es/ProEnum/index.js

@@ -150,16 +150,15 @@ const ProEnum = props => {
       list = sourceList;
     }
     if ( /*#__PURE__*/React.isValidElement(component)) {
-      const Component = component;
-      return /*#__PURE__*/_jsx(Component, {
+      return /*#__PURE__*/React.cloneElement(component, {
         ...enumProps,
         dataSource: list,
         fieldNames: {
           label,
           value: fieldValue
         },
-        value: value,
-        onChange: onChange
+        value,
+        onChange
       });
     }
     switch (type) {

package/es/ProForm/components/base/InputNumber/index.js

@@ -244,7 +244,7 @@ const InputNumber = props => {
       value = _min;
     }
     value = parser(String(value), props.precision ?? valueProps?.precision);
-    rest?.onChange(value);
+    rest?.onChange?.(value);
     const limit = {
       min: Number(_min),
       max: Number(_max)

package/es/ProForm/components/combination/FormList/components/ActionButton.js

@@ -250,7 +250,7 @@ const ActionButton = props => {
           });
           if (!_onClick || data === true) {
             // 如果有 addIndex 配置，使用它计算插入位置
-            if (item.addIndex) {
+            if (item.addIndex !== undefined) {
               const insertIndex = typeof item.addIndex === 'function' ? item.addIndex(value, {
                 index,
                 namePath,
@@ -265,7 +265,7 @@ const ActionButton = props => {
           }
           if (item?.type === 'add') {
             // 如果有 addIndex 配置，使用它计算插入位置
-            if (item.addIndex) {
+            if (item.addIndex !== undefined) {
               const insertIndex = typeof item.addIndex === 'function' ? item.addIndex(value, {
                 index,
                 namePath,

package/es/ProForm/components/combination/FormList/components/BlockFields.js

@@ -58,6 +58,7 @@ const BlockFields = props => {
         }), /*#__PURE__*/_jsx("div", {
           className: "pro-form-list-left-content",
           children: /*#__PURE__*/_jsx(ProCollapse, {
+            className: "pro-form-list-left-action-right",
             title: _title,
             index: index,
             form: form,

package/es/ProForm/components/combination/FormList/components/Empty.js

@@ -36,7 +36,7 @@ const Empty = ({
   const getBtnText = () => {
     return emptyBtnText || addConfig?.label || locale.ProForm.formListActions[6];
   };
-  let show = true;
+  let show = toolbarProps !== false;
   if (addConfig?.show !== undefined) {
     show = _isFunction(addConfig.show) ? addConfig.show(form.getFieldValue(namePath), {
       namePath,

package/es/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -20,7 +20,7 @@ const actions = {
 const defaultActionProps = [{
   type: 'add'
 }];
-const filterKeys = ['actionType', 'addIndex'];
+const filterKeys = ['actionType', 'addIndex', 'show'];
 const ToolbarButton = props => {
   const {
     namePath,
@@ -59,7 +59,7 @@ const ToolbarButton = props => {
     if (!callback || data === true) {
       if (item?.type === 'add') {
         // 如果有 addIndex 配置，使用它计算插入位置
-        if (item.addIndex) {
+        if (item.addIndex !== undefined) {
           const insertIndex = typeof item.addIndex === 'function' ? item.addIndex(value, {
             namePath,
             form,
@@ -82,7 +82,7 @@ const ToolbarButton = props => {
     }
     if (item?.type === 'add' && data) {
       // 如果有 addIndex 配置，使用它计算插入位置
-      if (item.addIndex) {
+      if (item.addIndex !== undefined) {
         const insertIndex = typeof item.addIndex === 'function' ? item.addIndex(value, {
           namePath,
           form,

package/es/ProForm/components/combination/FormList/style/index.less

@@ -158,6 +158,12 @@
     }
   }
 
+  .pro-form-list-left-action-right {
+    .@{ant-prefix}-collapse-extra {
+      margin-inline-start: auto;
+    }
+  }
+
   // 移动端响应式
   @media (max-width: 768px) {
     .pro-form-list-left-title-wrapper {