@ant-design/pro-components 3.0.2-0 → 3.1.1-0

package/lib/utils/conversionMomentValue/index.js

@@ -6,13 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.dateFormatterMap = exports.convertMoment = exports.conversionMomentValue = void 0;
 exports.isPlainObject = isPlainObject;
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _util = require("@rc-component/util");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _quarterOfYear = _interopRequireDefault(require("dayjs/plugin/quarterOfYear"));
 var _isNil = require("../isNil");
 _dayjs.default.extend(_quarterOfYear.default);
-var dateFormatterMap = exports.dateFormatterMap = {
+const dateFormatterMap = exports.dateFormatterMap = {
   time: 'HH:mm:ss',
   timeRange: 'HH:mm:ss',
   date: 'YYYY-MM-DD',
@@ -41,11 +40,11 @@ function isPlainObject(o) {
   if (isObject(o) === false) return false;
 
   // If has modified constructor
-  var ctor = o.constructor;
+  const ctor = o.constructor;
   if (ctor === undefined) return true;
 
   // If has modified prototype
-  var prot = ctor.prototype;
+  const prot = ctor.prototype;
   if (isObject(prot) === false) return false;
 
   // If constructor does not have an Object-specific method
@@ -62,9 +61,7 @@ function isPlainObject(o) {
  * @param  {any} value
  * @returns boolean
  */
-var isMoment = function isMoment(value) {
-  return !!(value !== null && value !== void 0 && value._isAMomentObject);
-};
+const isMoment = value => !!value?._isAMomentObject;
 
 /**
  * 根据不同的格式转化 dayjs
@@ -72,7 +69,7 @@ var isMoment = function isMoment(value) {
  * @param  {string|((value:dayjs.Dayjs} dateFormatter
  * @param  {string} valueType
  */
-var convertMoment = exports.convertMoment = function convertMoment(value, dateFormatter, valueType) {
+const convertMoment = (value, dateFormatter, valueType) => {
   if (!dateFormatter) {
     return value;
   }
@@ -102,26 +99,27 @@ var convertMoment = exports.convertMoment = function convertMoment(value, dateFo
  * @param  {boolean} omitNil?
  * @param  {NamePath} parentKey?
  */
-var conversionMomentValue = exports.conversionMomentValue = function conversionMomentValue(value, dateFormatter, valueTypeMap, omitNil, parentKey) {
-  var tmpValue = {};
+exports.convertMoment = convertMoment;
+const conversionMomentValue = (value, dateFormatter, valueTypeMap, omitNil, parentKey) => {
+  const tmpValue = {};
   if (typeof window === 'undefined') return value;
   // 如果 value 是 string | null | Blob类型 其中之一，直接返回
   // 形如 {key: [File, File]} 的表单字段当进行第二次递归时会导致其直接越过 typeof value !== 'object' 这一判断 https://github.com/ant-design/pro-components/issues/2071
-  if ((0, _typeof2.default)(value) !== 'object' || (0, _isNil.isNil)(value) || value instanceof Blob || Array.isArray(value)) {
+  if (typeof value !== 'object' || (0, _isNil.isNil)(value) || value instanceof Blob || Array.isArray(value)) {
     return value;
   }
-  Object.keys(value).forEach(function (valueKey) {
-    var namePath = parentKey ? [parentKey, valueKey].flat(1) : [valueKey];
-    var valueFormatMap = (0, _util.get)(valueTypeMap, namePath) || 'text';
-    var valueType = 'text';
-    var dateFormat;
+  Object.keys(value).forEach(valueKey => {
+    const namePath = parentKey ? [parentKey, valueKey].flat(1) : [valueKey];
+    const valueFormatMap = (0, _util.get)(valueTypeMap, namePath) || 'text';
+    let valueType = 'text';
+    let dateFormat;
     if (typeof valueFormatMap === 'string') {
       valueType = valueFormatMap;
     } else if (valueFormatMap) {
       valueType = valueFormatMap.valueType;
       dateFormat = valueFormatMap.dateFormat;
     }
-    var itemValue = value[valueKey];
+    const itemValue = value[valueKey];
     if ((0, _isNil.isNil)(itemValue) && omitNil) {
       return;
     }
@@ -140,8 +138,8 @@ var conversionMomentValue = exports.conversionMomentValue = function conversionM
       tmpValue[valueKey] = conversionMomentValue(itemValue, dateFormatter, valueTypeMap, omitNil, namePath);
       return;
     }
-    var currentDateFormatter = dateFormatter !== null && dateFormatter !== void 0 ? dateFormatter : 'string';
-    var finalDateFormatter;
+    const currentDateFormatter = dateFormatter ?? 'string';
+    let finalDateFormatter;
     if (currentDateFormatter === 'number' || currentDateFormatter === false || typeof currentDateFormatter === 'function') {
       finalDateFormatter = currentDateFormatter;
     } else if (currentDateFormatter === 'string') {
@@ -152,17 +150,18 @@ var conversionMomentValue = exports.conversionMomentValue = function conversionM
     }
     // 处理 FormList 的 value
     if (Array.isArray(itemValue)) {
-      tmpValue[valueKey] = itemValue.map(function (arrayValue, index) {
+      tmpValue[valueKey] = itemValue.map((arrayValue, index) => {
         if (_dayjs.default.isDayjs(arrayValue) || isMoment(arrayValue)) {
           // For arrays, if no format is defined and dateFormatter is 'string', use 'string' with default format
-          var arrayDateFormatter = finalDateFormatter === undefined && currentDateFormatter === 'string' ? 'string' : finalDateFormatter;
+          const arrayDateFormatter = finalDateFormatter === undefined && currentDateFormatter === 'string' ? 'string' : finalDateFormatter;
           return convertMoment(arrayValue, arrayDateFormatter, valueType);
         }
-        return conversionMomentValue(arrayValue, dateFormatter, valueTypeMap, omitNil, [valueKey, "".concat(index)].flat(1));
+        return conversionMomentValue(arrayValue, dateFormatter, valueTypeMap, omitNil, [valueKey, `${index}`].flat(1));
       });
       return;
     }
     tmpValue[valueKey] = convertMoment(itemValue, finalDateFormatter, valueType);
   });
   return tmpValue;
-};
+};
+exports.conversionMomentValue = conversionMomentValue;

package/lib/utils/dateArrayFormatter/index.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.dateArrayFormatter = void 0;
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
 /**
  * 通过 format 来格式化日期，因为支持了function 所以需要单独的方法来处理
@@ -14,7 +12,7 @@ var _dayjs = _interopRequireDefault(require("dayjs"));
  * @param  {FormatType} format
  * @return string
  */
-var formatString = function formatString(endText, format) {
+const formatString = (endText, format) => {
   if (typeof format === 'function') {
     return format((0, _dayjs.default)(endText));
   }
@@ -26,17 +24,14 @@ var formatString = function formatString(endText, format) {
  * @param  {FormatType | FormatType[]} format
  * returns string
  */
-var dateArrayFormatter = exports.dateArrayFormatter = function dateArrayFormatter(value, format) {
-  var _ref = Array.isArray(value) ? value : [],
-    _ref2 = (0, _slicedToArray2.default)(_ref, 2),
-    startText = _ref2[0],
-    endText = _ref2[1];
-  var formatFirst;
-  var formatEnd;
+const dateArrayFormatter = (value, format) => {
+  const [startText, endText] = Array.isArray(value) ? value : [];
+  let formatFirst;
+  let formatEnd;
   if (Array.isArray(format)) {
     formatFirst = format[0];
     formatEnd = format[1];
-  } else if ((0, _typeof2.default)(format) === 'object' && format.type === 'mask') {
+  } else if (typeof format === 'object' && format.type === 'mask') {
     formatFirst = format.format;
     formatEnd = format.format;
   } else {
@@ -45,8 +40,9 @@ var dateArrayFormatter = exports.dateArrayFormatter = function dateArrayFormatte
   }
 
   // activePickerIndex for https://github.com/ant-design/ant-design/issues/22158
-  var parsedStartText = startText ? formatString(startText, formatFirst) : '';
-  var parsedEndText = endText ? formatString(endText, formatEnd) : '';
-  var valueStr = parsedStartText && parsedEndText ? "".concat(parsedStartText, " ~ ").concat(parsedEndText) : '';
+  const parsedStartText = startText ? formatString(startText, formatFirst) : '';
+  const parsedEndText = endText ? formatString(endText, formatEnd) : '';
+  const valueStr = parsedStartText && parsedEndText ? `${parsedStartText} ~ ${parsedEndText}` : '';
   return valueStr;
-};
+};
+exports.dateArrayFormatter = dateArrayFormatter;

package/lib/utils/genCopyable/index.js

@@ -8,23 +8,38 @@ exports.genCopyable = void 0;
 var _antd = require("antd");
 var _react = _interopRequireDefault(require("react"));
 var _jsxRuntime = require("react/jsx-runtime");
-var isNeedTranText = function isNeedTranText(item) {
-  var _item$valueType;
-  if (item !== null && item !== void 0 && (_item$valueType = item.valueType) !== null && _item$valueType !== void 0 && _item$valueType.toString().startsWith('date')) {
+const isNeedTranText = item => {
+  if (item?.valueType?.toString().startsWith('date')) {
     return true;
   }
-  if ((item === null || item === void 0 ? void 0 : item.valueType) === 'select' || item !== null && item !== void 0 && item.valueEnum) {
+  if (item?.valueType === 'select' || item?.valueEnum) {
     return true;
   }
   return false;
 };
-var getEllipsis = function getEllipsis(item) {
-  var _item$ellipsis;
-  if (((_item$ellipsis = item.ellipsis) === null || _item$ellipsis === void 0 ? void 0 : _item$ellipsis.showTitle) === false) {
+const getEllipsis = item => {
+  if (item.ellipsis?.showTitle === false) {
     return false;
   }
   return item.ellipsis;
 };
+const normalizeCopyText = text => {
+  // Avoid copying non-string values and trim end to prevent trailing spaces.
+  // (e.g. some browsers may include Typography's copy separator whitespace)
+  return text === null || text === undefined ? '' : String(text).trimEnd();
+};
+const genEllipsis = (dom, item, text) => {
+  /** 有些 valueType 需要设置copy的为string */
+  const needTranText = isNeedTranText(item);
+  return getEllipsis(item) && text ? {
+    tooltip:
+    // 支持一下 tooltip 的关闭
+    item?.tooltip !== false && needTranText ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "pro-table-tooltip-text",
+      children: dom
+    }) : text
+  } : false;
+};
 
 /**
  * 生成 Copyable 或 Ellipsis 的 dom
@@ -33,34 +48,61 @@ var getEllipsis = function getEllipsis(item) {
  * @param item
  * @param text
  */
-var genCopyable = exports.genCopyable = function genCopyable(dom, item, text) {
-  if (item.copyable || item.ellipsis) {
-    var copyable = item.copyable && text ? {
-      text: text,
-      tooltips: ['', '']
-    } : undefined;
+const genCopyable = (dom, item, text) => {
+  if (!item.copyable && !item.ellipsis) return dom;
+  const normalizedText = normalizeCopyText(text);
+  const ellipsis = genEllipsis(dom, item, normalizedText);
 
-    /** 有些 valueType 需要设置copy的为string */
-    var needTranText = isNeedTranText(item);
-    var ellipsis = getEllipsis(item) && text ? {
-      tooltip:
-      // 支持一下 tooltip 的关闭
-      (item === null || item === void 0 ? void 0 : item.tooltip) !== false && needTranText ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "pro-table-tooltip-text",
-        children: dom
-      }) : text
-    } : false;
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Typography.Text, {
+  // `Typography.Text` with `copyable` will render an internal separator whitespace
+  // between text and icon. When users "multi-click to select all" in a table cell,
+  // that whitespace can be selected and copied, causing pasted text to end with spaces.
+  // Render the copy icon in a separate node to keep the selectable text clean.
+  if (item.copyable) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
       style: {
-        width: '100%',
-        margin: 0,
-        padding: 0
+        display: 'inline-flex',
+        alignItems: 'center',
+        maxWidth: '100%'
       },
-      title: "",
-      copyable: copyable,
-      ellipsis: ellipsis,
-      children: dom
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Typography.Text, {
+        style: {
+          flex: 1,
+          minWidth: 0,
+          margin: 0,
+          padding: 0
+        },
+        title: "",
+        ellipsis: ellipsis,
+        children: dom
+      }), normalizedText ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        style: {
+          flex: 'none',
+          userSelect: 'none'
+        },
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Typography.Text, {
+          style: {
+            margin: 0,
+            padding: 0
+          }
+          // Render icon only; no extra selectable separator text nodes.
+          ,
+          copyable: {
+            text: normalizedText,
+            tooltips: ['', '']
+          }
+        })
+      }) : null]
     });
   }
-  return dom;
-};
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Typography.Text, {
+    style: {
+      width: '100%',
+      margin: 0,
+      padding: 0
+    },
+    title: "",
+    ellipsis: ellipsis,
+    children: dom
+  });
+};
+exports.genCopyable = genCopyable;

package/lib/utils/getFieldPropsOrFormItemProps/index.js

@@ -11,9 +11,10 @@ var _runFunction = require("../runFunction");
  * @param fieldProps
  * @param form
  */
-var getFieldPropsOrFormItemProps = exports.getFieldPropsOrFormItemProps = function getFieldPropsOrFormItemProps(fieldProps, form, extraProps) {
+const getFieldPropsOrFormItemProps = (fieldProps, form, extraProps) => {
   if (form === undefined) {
     return fieldProps;
   }
   return (0, _runFunction.runFunction)(fieldProps, form, extraProps);
-};
+};
+exports.getFieldPropsOrFormItemProps = getFieldPropsOrFormItemProps;

package/lib/utils/hooks/useDebounceFn/index.js

@@ -1,12 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useDebounceFn = useDebounceFn;
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _react = require("react");
 var _useRefFunction = require("../useRefFunction");
 /**
@@ -15,62 +12,31 @@ var _useRefFunction = require("../useRefFunction");
  * @param  {number} wait?
  */
 function useDebounceFn(fn, wait) {
-  var callback = (0, _useRefFunction.useRefFunction)(fn);
-  var timer = (0, _react.useRef)();
-  var cancel = (0, _react.useCallback)(function () {
+  const callback = (0, _useRefFunction.useRefFunction)(fn);
+  const timer = (0, _react.useRef)();
+  const cancel = (0, _react.useCallback)(() => {
     if (timer.current) {
       clearTimeout(timer.current);
       timer.current = null;
     }
   }, []);
-  var run = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
-    var _len,
-      args,
-      _key,
-      _args2 = arguments;
-    return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          for (_len = _args2.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-            args[_key] = _args2[_key];
-          }
-          if (!(wait === 0 || wait === undefined)) {
-            _context2.next = 3;
-            break;
-          }
-          return _context2.abrupt("return", callback.apply(void 0, args));
-        case 3:
-          cancel();
-          return _context2.abrupt("return", new Promise(function (resolve) {
-            timer.current = setTimeout( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-              return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-                while (1) switch (_context.prev = _context.next) {
-                  case 0:
-                    _context.t0 = resolve;
-                    _context.next = 3;
-                    return callback.apply(void 0, args);
-                  case 3:
-                    _context.t1 = _context.sent;
-                    (0, _context.t0)(_context.t1);
-                    return _context.abrupt("return");
-                  case 6:
-                  case "end":
-                    return _context.stop();
-                }
-              }, _callee);
-            })), wait);
-          }));
-        case 5:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  })), [callback, cancel, wait]);
-  (0, _react.useEffect)(function () {
+  const run = (0, _react.useCallback)(async (...args) => {
+    if (wait === 0 || wait === undefined) {
+      return callback(...args);
+    }
+    cancel();
+    return new Promise(resolve => {
+      timer.current = setTimeout(async () => {
+        resolve(await callback(...args));
+        return;
+      }, wait);
+    });
+  }, [callback, cancel, wait]);
+  (0, _react.useEffect)(() => {
     return cancel;
   }, [cancel]);
   return {
-    run: run,
-    cancel: cancel
+    run,
+    cancel
   };
 }

package/lib/utils/hooks/useDebounceValue/index.js

@@ -1,12 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useDebounceValue = useDebounceValue;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _useLatest = require("../useLatest");
 /**
@@ -16,23 +13,16 @@ var _useLatest = require("../useLatest");
  * @param  {DependencyList} deps?
  * @returns T
  */
-function useDebounceValue(value) {
-  var delay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 100;
-  var deps = arguments.length > 2 ? arguments[2] : undefined;
-  var _useState = (0, _react.useState)(value),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    debouncedValue = _useState2[0],
-    setDebouncedValue = _useState2[1];
-  var valueRef = (0, _useLatest.useLatest)(value);
-  (0, _react.useEffect)(function () {
-    var handler = setTimeout(function () {
+function useDebounceValue(value, delay = 100, deps) {
+  const [debouncedValue, setDebouncedValue] = (0, _react.useState)(value);
+  const valueRef = (0, _useLatest.useLatest)(value);
+  (0, _react.useEffect)(() => {
+    const handler = setTimeout(() => {
       setDebouncedValue(valueRef.current);
     }, delay);
-    return function () {
-      return clearTimeout(handler);
-    };
+    return () => clearTimeout(handler);
   },
   // eslint-disable-next-line react-hooks/exhaustive-deps
-  deps ? [delay].concat((0, _toConsumableArray2.default)(deps)) : undefined);
+  deps ? [delay, ...deps] : undefined);
   return debouncedValue;
 }

package/lib/utils/hooks/useDeepCompareEffect/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,16 +7,13 @@ exports.isDeepEqual = void 0;
 exports.useDeepCompareEffect = useDeepCompareEffect;
 exports.useDeepCompareEffectDebounce = useDeepCompareEffectDebounce;
 exports.useDeepCompareMemoize = useDeepCompareMemoize;
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _react = require("react");
 var _isDeepEqualReact = require("../../isDeepEqualReact");
 var _useDebounceFn = require("../useDebounceFn");
-var isDeepEqual = exports.isDeepEqual = function isDeepEqual(a, b, ignoreKeys) {
-  return (0, _isDeepEqualReact.isDeepEqualReact)(a, b, ignoreKeys);
-};
+const isDeepEqual = (a, b, ignoreKeys) => (0, _isDeepEqualReact.isDeepEqualReact)(a, b, ignoreKeys);
+exports.isDeepEqual = isDeepEqual;
 function useDeepCompareMemoize(value, ignoreKeys) {
-  var ref = (0, _react.useRef)();
+  const ref = (0, _react.useRef)();
   // it can be done by using useMemo as well
   // but useRef is rather cleaner and easier
   if (!isDeepEqual(value, ref.current, ignoreKeys)) {
@@ -30,18 +26,10 @@ function useDeepCompareEffect(effect, dependencies, ignoreKeys) {
   (0, _react.useEffect)(effect, useDeepCompareMemoize(dependencies || [], ignoreKeys));
 }
 function useDeepCompareEffectDebounce(effect, dependencies, ignoreKeys, waitTime) {
-  var effectDn = (0, _useDebounceFn.useDebounceFn)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-    return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          effect();
-        case 1:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  })), waitTime || 16);
-  (0, _react.useEffect)(function () {
+  const effectDn = (0, _useDebounceFn.useDebounceFn)(async () => {
+    effect();
+  }, waitTime || 16);
+  (0, _react.useEffect)(() => {
     effectDn.run();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, useDeepCompareMemoize(dependencies || [], ignoreKeys));

package/lib/utils/hooks/useDocumentTitle/index.js

@@ -7,8 +7,8 @@ exports.useDocumentTitle = useDocumentTitle;
 var _react = require("react");
 var _isBrowser = require("../../isBrowser");
 function useDocumentTitle(titleInfo, appDefaultTitle) {
-  var titleText = typeof titleInfo.title === 'string' ? titleInfo.title : appDefaultTitle;
-  (0, _react.useEffect)(function () {
+  const titleText = typeof titleInfo.title === 'string' ? titleInfo.title : appDefaultTitle;
+  (0, _react.useEffect)(() => {
     if ((0, _isBrowser.isBrowser)() && titleText) {
       document.title = titleText;
     }

package/lib/utils/hooks/useFetchData/index.js

@@ -5,77 +5,48 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useFetchData = useFetchData;
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _swr = _interopRequireDefault(require("swr"));
-var testId = 0;
+let testId = 0;
 function useFetchData(props) {
-  var abortRef = (0, _react.useRef)(null);
+  const abortRef = (0, _react.useRef)(null);
   /** Key 是用来缓存请求的，如果不在是有问题 */
-  var _useState = (0, _react.useState)(function () {
-      if (props.proFieldKey) {
-        return props.proFieldKey.toString();
+  const [cacheKey] = (0, _react.useState)(() => {
+    if (props.proFieldKey) {
+      return props.proFieldKey.toString();
+    }
+    testId += 1;
+    return testId.toString();
+  });
+  const proFieldKeyRef = (0, _react.useRef)(cacheKey);
+  const fetchData = async () => {
+    abortRef.current?.abort();
+    const abort = new AbortController();
+    abortRef.current = abort;
+    try {
+      if (!props.request) {
+        return undefined;
       }
-      testId += 1;
-      return testId.toString();
-    }),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 1),
-    cacheKey = _useState2[0];
-  var proFieldKeyRef = (0, _react.useRef)(cacheKey);
-  var fetchData = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-      var _abortRef$current;
-      var abort, response;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            (_abortRef$current = abortRef.current) === null || _abortRef$current === void 0 || _abortRef$current.abort();
-            abort = new AbortController();
-            abortRef.current = abort;
-            _context.prev = 3;
-            if (props.request) {
-              _context.next = 6;
-              break;
-            }
-            return _context.abrupt("return", undefined);
-          case 6:
-            _context.next = 8;
-            return props.request(props.params, abort.signal);
-          case 8:
-            response = _context.sent;
-            return _context.abrupt("return", response);
-          case 12:
-            _context.prev = 12;
-            _context.t0 = _context["catch"](3);
-            if (!(_context.t0.name === 'AbortError')) {
-              _context.next = 16;
-              break;
-            }
-            return _context.abrupt("return", undefined);
-          case 16:
-            throw _context.t0;
-          case 17:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[3, 12]]);
-    }));
-    return function fetchData() {
-      return _ref.apply(this, arguments);
-    };
-  }();
-  var _useSWR = (0, _swr.default)(props.request ? [cacheKey, props.params] : null, fetchData, {
-      revalidateOnFocus: false,
-      shouldRetryOnError: false,
-      onError: function onError() {
-        // 这里可以添加错误处理逻辑
+      const response = await props.request(props.params, abort.signal);
+      return response;
+    } catch (error) {
+      if (error.name === 'AbortError') {
+        return undefined;
       }
-    }),
-    data = _useSWR.data,
-    error = _useSWR.error,
-    isValidating = _useSWR.isValidating;
+      throw error;
+    }
+  };
+  const {
+    data,
+    error,
+    isValidating
+  } = (0, _swr.default)(props.request ? [cacheKey, props.params] : null, fetchData, {
+    revalidateOnFocus: false,
+    shouldRetryOnError: false,
+    onError: () => {
+      // 这里可以添加错误处理逻辑
+    }
+  });
 
   // 如果没有请求，返回 [undefined, false]
   if (!props.request) {

package/lib/utils/hooks/useForceRender/index.js

@@ -1,20 +1,12 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = useForceRender;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 function useForceRender() {
-  var _useState = (0, _react.useState)(true),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    setValue = _useState2[1];
-  var updateValue = (0, _react.useCallback)(function () {
-    return setValue(function (oldValue) {
-      return !oldValue;
-    });
-  }, []);
+  const [, setValue] = (0, _react.useState)(true);
+  const updateValue = (0, _react.useCallback)(() => setValue(oldValue => !oldValue), []);
   return updateValue;
 }