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

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.js

@@ -35,7 +35,7 @@ const ProDownload = props => {
     ...headers,
     ...defaultProps.headers
   };
-  const handDownload = async () => {
+  const handDownload = async (_params = params) => {
     if (source === 'url') {
       try {
         fetch(url || action).then(response => {
@@ -58,13 +58,8 @@ const ProDownload = props => {
     setState({
       loading: true
     });
-    let _params = params;
-    if (_isFunction(params)) {
-      _params = params.constructor.name === 'AsyncFunction' ? await params() : params();
-    }
-
-    // 发起请求
     try {
+      // 发起请求
       await DownloadRequest({
         url: url || action,
         method,
@@ -75,11 +70,6 @@ const ProDownload = props => {
         onFinish,
         onError: onError || onErrorConfig
       });
-    } catch (error) {
-      setState({
-        loading: false
-      });
-      return Promise.reject();
     } finally {
       setState({
         loading: false
@@ -92,16 +82,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.js

@@ -105,7 +105,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 +124,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 +150,19 @@ 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);
+  onFinish?.(_isFunction(transformResponse) ? res : response, params);
   BlobMakeFile({
     blob: fileBlob,
     fileName: fileName || contentFileName
   });
-  return Promise.resolve(res);
+  return Promise.resolve(_isFunction(transformResponse) ? res : response);
 };

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/ProTreeModal/index.js

@@ -277,7 +277,7 @@ const ProTreeModal = props => {
     if (draggable && span) {
       // 开启 draggable 使用拖拽后的顺序
       const checkedList = listRef.current?.onChange();
-      onChange(checkedList);
+      onChange?.(checkedList);
     } else {
       let values = checkedValues;
       if (labelInValue) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.5.9-beta.1",
+  "version": "4.5.9",
   "license": "MIT",
   "publishConfig": {
     "access": "public",
@@ -88,6 +88,9 @@
     "start": "cross-env NODE_OPTIONS=\"--openssl-legacy-provider\" dumi dev",
     "test": "umi-test",
     "test:coverage": "umi-test --coverage",
+    "test:coverage:focused": "jest --config=jest.coverage.focused.js --coverage",
+    "coverage:report": "node ./scripts/coverage-gap-report.mjs --target=90 --scope=full",
+    "coverage:gate": "node ./scripts/coverage-directory-gate.mjs",
     "tsc": "tsc --noEmit"
   },
   "lint-staged": {