@ant-design/pro-components 3.1.4-0 → 3.1.6-0

package/lib/table/components/Alert/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _antd = require("antd");
+var _clsx = require("clsx");
 var _react = _interopRequireWildcard(require("react"));
 var _provider = require("../../../provider");
 var _style = require("./style");
@@ -60,16 +61,16 @@ function TableAlert({
     return null;
   }
   return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    className: `${className} ${hashId}`.trim(),
+    className: (0, _clsx.clsx)(className, hashId),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: `${className}-container ${hashId}`.trim(),
+      className: (0, _clsx.clsx)(`${className}-container`, hashId),
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: `${className}-info ${hashId}`.trim(),
+        className: (0, _clsx.clsx)(`${className}-info`, hashId),
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: `${className}-info-content ${hashId}`.trim(),
+          className: (0, _clsx.clsx)(`${className}-info-content`, hashId),
           children: dom
         }), option ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: `${className}-info-option ${hashId}`.trim(),
+          className: (0, _clsx.clsx)(`${className}-info-option`, hashId),
           children: option
         }) : null]
       })

package/lib/table/components/ColumnSetting/index.js

@@ -63,7 +63,7 @@ const CheckboxListItem = ({
     hashId
   } = (0, _react.useContext)(_provider.ProProvider);
   const dom = /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
-    className: `${className}-list-item-option ${hashId}`.trim(),
+    className: (0, _clsx.clsx)(`${className}-list-item-option`, hashId),
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(ToolTipIcon, {
       columnKey: columnKey,
       fixed: "left",
@@ -85,9 +85,9 @@ const CheckboxListItem = ({
     })]
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
-    className: `${className}-list-item ${hashId}`.trim(),
+    className: (0, _clsx.clsx)(`${className}-list-item`, hashId),
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: `${className}-list-item-title ${hashId}`.trim(),
+      className: (0, _clsx.clsx)(`${className}-list-item-title`, hashId),
       children: title
     }), showListItemOption && !isLeaf ? dom : null]
   }, columnKey);
@@ -118,7 +118,7 @@ const CheckboxList = ({
     const treeMap = new Map();
     const loopData = (data, parentConfig) => data.map(({
       key,
-      dataIndex,
+      dataIndex: _dataIndex,
       children,
       ...rest
     }) => {
@@ -266,13 +266,13 @@ const CheckboxList = ({
     },
     height: listHeight,
     treeData: treeDataConfig.list?.map(({
-      disabled /* 不透传 disabled，使子节点禁用时也可以拖动调整顺序 */,
+      disabled: _disabled /* 不透传 disabled，使子节点禁用时也可以拖动调整顺序 */,
       ...config
     }) => config)
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [showTitle && /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-      className: `${className}-list-title ${hashId}`.trim(),
+      className: (0, _clsx.clsx)(`${className}-list-title`, hashId),
       children: listTitle
     }), listDom]
   });
@@ -429,7 +429,7 @@ function ColumnSetting(props) {
   return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Popover, {
     arrow: false,
     title: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      className: `${className}-title ${hashId}`.trim(),
+      className: (0, _clsx.clsx)(`${className}-title`, hashId),
       children: [props.checkable === false ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {}) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Checkbox, {
         indeterminate: indeterminate,
         checked: unCheckedKeys.length === 0 && unCheckedKeys.length !== localColumns.length,
@@ -439,7 +439,7 @@ function ColumnSetting(props) {
         children: intl.getMessage('tableToolBar.columnDisplay', '列展示')
       }), checkedReset ? /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
         onClick: clearClick,
-        className: `${className}-action-rest-button ${hashId}`.trim(),
+        className: (0, _clsx.clsx)(`${className}-action-rest-button`, hashId),
         children: intl.getMessage('tableToolBar.reset', '重置')
       }) : null, props?.extra ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
         size: 12,
@@ -448,7 +448,7 @@ function ColumnSetting(props) {
       }) : null]
     }),
     classNames: {
-      root: `${className}-overlay ${hashId}`.trim()
+      root: (0, _clsx.clsx)(`${className}-overlay`, hashId)
     },
     trigger: "click",
     placement: "bottomRight",

package/lib/table/components/DragSortTable/index.js

@@ -9,6 +9,7 @@ exports.default = void 0;
 var _icons = require("@ant-design/icons");
 var _util = require("@rc-component/util");
 var _antd = require("antd");
+var _clsx = require("clsx");
 var _react = _interopRequireWildcard(require("react"));
 var _Table = _interopRequireDefault(require("../../Table"));
 var _useDragSort = require("../../utils/useDragSort");
@@ -33,7 +34,10 @@ function DragSortTable(props) {
   const setDataSource = (0, _react.useCallback)(updater => {
     setDataSourceInner(prev => {
       const next = typeof updater === 'function' ? updater(prev) : updater;
-      onDataSourceChange?.(next);
+      // 使用 queueMicrotask 延迟回调，避免在渲染期间更新其他组件状态
+      queueMicrotask(() => {
+        onDataSourceChange?.(next);
+      });
       return next;
     });
   }, [onDataSourceChange]);
@@ -46,14 +50,14 @@ function DragSortTable(props) {
   const DragHandle = (0, _react.useMemo)(() => {
     return dragHandleProps => {
       const {
-        rowData,
-        index,
+        rowData: _rowData,
+        index: _index,
         className,
         ...rest
       } = dragHandleProps;
       const defaultDom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.HolderOutlined, {
         ...rest,
-        className: `${getPrefixCls('pro-table-drag-icon')} ${className || ''} ${hashId || ''}`.trim()
+        className: (0, _clsx.clsx)(getPrefixCls('pro-table-drag-icon'), className, hashId)
       });
       const handel = dragSortHandlerRender ? dragSortHandlerRender(dragHandleProps?.rowData, dragHandleProps?.index) : defaultDom;
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

package/lib/table/components/EditableTable/index.d.ts

@@ -86,7 +86,7 @@ export type EditableProTableProps<T, U extends ParamsType, ValueType = 'text'> =
 declare function FieldEditableTable<DataType extends Record<string, any>, Params extends ParamsType = ParamsType, ValueType = 'text'>(props: EditableProTableProps<DataType, Params, ValueType>): import("react/jsx-runtime").JSX.Element;
 declare namespace FieldEditableTable {
     var RecordCreator: <T = Record<string, any>>(props: RecordCreatorProps<T> & {
-        children: JSX.Element;
+        children: React.JSX.Element;
     }) => React.FunctionComponentElement<any>;
 }
 export default FieldEditableTable;

package/lib/table/components/EditableTable/index.js

@@ -13,7 +13,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _form = _interopRequireWildcard(require("../../../form"));
 var _provider = require("../../../provider");
 var _utils = require("../../../utils");
-var _useEditableArray = require("../../../utils/useEditableArray");
 var _Table = _interopRequireDefault(require("../../Table"));
 var _jsxRuntime = require("react/jsx-runtime");
 const EditableTableActionContext = /*#__PURE__*/_react.default.createContext(undefined);
@@ -45,69 +44,6 @@ function RecordCreator(props) {
   });
 }
 
-/**
- * 处理嵌套行的新增
- */
-function handleNestedRowInsert(baseData, defaultValue, newLineOptions, getRowKey, childrenColumnName) {
-  if (!newLineOptions.recordKey) {
-    return baseData;
-  }
-  const actionProps = {
-    data: baseData,
-    getRowKey,
-    row: {
-      ...defaultValue,
-      map_row_parentKey: (0, _useEditableArray.recordKeyToString)(newLineOptions.parentKey)?.toString()
-    },
-    key: newLineOptions.recordKey,
-    childrenColumnName
-  };
-  return (0, _useEditableArray.editableRowByKey)(actionProps, newLineOptions.position === 'top' ? 'top' : 'update');
-}
-
-/**
- * 处理分页场景下的新增
- */
-function handlePaginationInsert(baseData, defaultValue, pageConfig) {
-  if (pageConfig.pageSize > baseData.length) {
-    return [...baseData, defaultValue];
-  }
-  const insertIndex = pageConfig.current * pageConfig.pageSize - 1;
-  const result = [...baseData];
-  result.splice(insertIndex, 0, defaultValue);
-  return result;
-}
-function useEditableDataSource({
-  actionDataSource,
-  editableUtils,
-  pagination,
-  getRowKey,
-  childrenColumnName
-}) {
-  return (0, _react.useMemo)(() => {
-    const newLineConfig = editableUtils?.newLineRecord;
-    const baseData = Array.isArray(actionDataSource) ? [...actionDataSource] : [];
-    if (!newLineConfig?.defaultValue) {
-      return baseData;
-    }
-    const {
-      options: newLineOptions,
-      defaultValue
-    } = newLineConfig;
-    if (newLineOptions?.parentKey) {
-      return handleNestedRowInsert(baseData, defaultValue, newLineOptions, getRowKey, childrenColumnName || 'children');
-    }
-    if (newLineOptions?.position === 'top') {
-      return [defaultValue, ...baseData];
-    }
-    const pageConfig = pagination && typeof pagination === 'object' ? pagination : undefined;
-    if (pageConfig?.current && pageConfig?.pageSize) {
-      return handlePaginationInsert(baseData, defaultValue, pageConfig);
-    }
-    return [...baseData, defaultValue];
-  }, [actionDataSource, childrenColumnName, editableUtils?.newLineRecord, getRowKey, pagination]);
-}
-
 /**
  * 检查是否应该显示创建按钮
  */
@@ -239,15 +175,15 @@ function EditableTable(props) {
   const {
     onTableChange,
     maxLength,
-    formItemProps,
+    formItemProps: _formItemProps,
     recordCreatorProps,
     rowKey,
-    controlled,
+    controlled: _controlled,
     defaultValue,
-    onChange,
+    onChange: _onChange,
     editableFormRef,
     // @ts-ignore
-    autoFocus,
+    autoFocus: _autoFocus,
     ...rest
   } = props;
   const preData = (0, _react.useRef)(undefined);
@@ -539,7 +475,6 @@ function EditableTable(props) {
   } = recordCreatorProps || {};
   const isTop = position === 'top';
   const {
-    creatorButtonDom,
     buttonRenderProps
   } = useCreatorButton({
     recordCreatorProps,
@@ -688,7 +623,7 @@ function FieldEditableTable(props) {
       const name = [props.name].flat(1);
       try {
         return JSON.stringify((0, _util.get)(prev, name)) !== JSON.stringify((0, _util.get)(next, name));
-      } catch (error) {
+      } catch (_error) {
         return true;
       }
     },

package/lib/table/components/ListToolBar/HeaderMenu.d.ts

@@ -11,6 +11,7 @@ export type ListToolBarHeaderMenuProps = {
     items?: ListToolBarMenuItem[];
     onChange?: (activeKey?: React.Key) => void;
     prefixCls?: string;
+    hashId?: string;
 };
 declare const HeaderMenu: React.FC<ListToolBarHeaderMenuProps>;
 export default HeaderMenu;

package/lib/table/components/ListToolBar/HeaderMenu.js

@@ -14,8 +14,9 @@ var _provider = require("../../../provider");
 var _jsxRuntime = require("react/jsx-runtime");
 const HeaderMenu = props => {
   const {
-    hashId
+    hashId: contextHashId
   } = (0, _react.useContext)(_provider.ProProvider);
+  const hashId = props.hashId ?? contextHashId;
   const {
     items = [],
     type = 'inline',
@@ -60,7 +61,7 @@ const HeaderMenu = props => {
     });
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    className: (0, _clsx.clsx)(`${prefixCls}-menu`, `${prefixCls}-dropdownmenu`),
+    className: (0, _clsx.clsx)(`${prefixCls}-menu`, `${prefixCls}-dropdownmenu`, hashId),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Dropdown, {
       trigger: ['click'],
       menu: {
@@ -75,7 +76,7 @@ const HeaderMenu = props => {
         }))
       },
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
-        className: `${prefixCls}-dropdownmenu-label`,
+        className: (0, _clsx.clsx)(`${prefixCls}-dropdownmenu-label`, hashId),
         children: [activeItem.label, /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.DownOutlined, {})]
       })
     })

package/lib/table/components/ListToolBar/index.js

@@ -60,13 +60,14 @@ function getSettingItem(setting) {
 }
 const ListToolBarTabBar = ({
   prefixCls,
+  hashId,
   tabs,
   multipleLine,
   filtersNode
 }) => {
   if (!multipleLine) return null;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    className: `${prefixCls}-extra-line`,
+    className: (0, _clsx.clsx)(`${prefixCls}-extra-line`, hashId),
     children: tabs?.items && tabs?.items.length ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tabs, {
       style: {
         width: '100%'
@@ -144,7 +145,7 @@ const ListToolBar = ({
   /** 轻量筛选组件 */
   const filtersNode = (0, _react.useMemo)(() => {
     if (filter) return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: `${prefixCls}-filter ${hashId}`.trim(),
+      className: (0, _clsx.clsx)(`${prefixCls}-filter`, hashId),
       children: filter
     });
     return null;
@@ -188,16 +189,16 @@ const ListToolBar = ({
     // 保留dom是为了占位，不然 right 就变到左边了
     if (!hasLeft && hasRight) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: `${prefixCls}-left ${hashId}`.trim()
+        className: (0, _clsx.clsx)(`${prefixCls}-left`, hashId)
       });
     }
 
     // 减少 space 的dom，渲染的时候能节省点性能
     if (!menu && (hasTitle || !searchNode)) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: `${prefixCls}-left ${hashId}`.trim(),
+        className: (0, _clsx.clsx)(`${prefixCls}-left`, hashId),
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: `${prefixCls}-title ${hashId}`.trim(),
+          className: (0, _clsx.clsx)(`${prefixCls}-title`, hashId),
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.LabelIconTip, {
             tooltip: tooltip,
             label: title,
@@ -213,7 +214,7 @@ const ListToolBar = ({
         [`${prefixCls}-left-has-inline-menu`]: menu?.type === 'inline'
       }),
       children: [hasTitle && !menu && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: `${prefixCls}-title ${hashId}`.trim(),
+        className: (0, _clsx.clsx)(`${prefixCls}-title`, hashId),
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.LabelIconTip, {
           tooltip: tooltip,
           label: title,
@@ -224,9 +225,10 @@ const ListToolBar = ({
       // 这里面实现了 tabs 的逻辑
       (0, _jsxRuntime.jsx)(_HeaderMenu.default, {
         ...menu,
-        prefixCls: prefixCls
+        prefixCls: prefixCls,
+        hashId: hashId
       }), !hasTitle && searchNode ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: `${prefixCls}-search ${hashId}`.trim(),
+        className: (0, _clsx.clsx)(`${prefixCls}-search`, hashId),
         children: searchNode
       }) : null]
     });
@@ -234,19 +236,19 @@ const ListToolBar = ({
   const rightTitleDom = (0, _react.useMemo)(() => {
     if (!hasRight) return null;
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      className: `${prefixCls}-right ${hashId}`.trim(),
+      className: (0, _clsx.clsx)(`${prefixCls}-right`, hashId),
       style: isMobile ? {} : {
         alignItems: 'center'
       },
       children: [!multipleLine ? filtersNode : null, hasTitle && searchNode ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: `${prefixCls}-search ${hashId}`.trim(),
+        className: (0, _clsx.clsx)(`${prefixCls}-search`, hashId),
         children: searchNode
       }) : null, actionDom, settings?.length ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: `${prefixCls}-setting-items ${hashId}`.trim(),
+        className: (0, _clsx.clsx)(`${prefixCls}-setting-items`, hashId),
         children: settings.map((setting, index) => {
           const settingItem = getSettingItem(setting);
           return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-            className: `${prefixCls}-setting-item ${hashId}`.trim(),
+            className: (0, _clsx.clsx)(`${prefixCls}-setting-item`, hashId),
             children: settingItem
           }, index);
         })
@@ -275,6 +277,7 @@ const ListToolBar = ({
       className: (0, _clsx.clsx)(prefixCls, hashId, className),
       children: [titleNode, /*#__PURE__*/(0, _jsxRuntime.jsx)(ListToolBarTabBar, {
         filtersNode: filtersNode,
+        hashId: hashId,
         prefixCls: prefixCls,
         tabs: tabs,
         multipleLine: multipleLine

package/lib/table/components/ListToolBar/style.js

@@ -24,7 +24,7 @@ const genProListStyle = token => {
         alignItems: 'center',
         justifyContent: 'flex-start',
         color: token.colorTextHeading,
-        fontWeight: '500',
+        fontWeight: token.fontWeightStrong,
         fontSize: token.fontSizeLG
       },
       '&-search:not(:last-child)': {
@@ -107,7 +107,7 @@ const genProListStyle = token => {
         },
         [`${token.antCls}-tabs-nav-list`]: {
           marginBlockStart: 0,
-          '${token.antCls}-tabs-tab': {
+          [`${token.antCls}-tabs-tab`]: {
             paddingBlockStart: 0
           }
         }

package/lib/table/components/ToolBar/DensityIcon.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 export type DensitySize = 'middle' | 'small' | 'large' | undefined;
-declare const _default: React.MemoExoticComponent<(props: {
+declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<{
     icon?: React.ReactNode;
-}) => import("react/jsx-runtime").JSX.Element>;
+} & React.RefAttributes<HTMLSpanElement>>>;
 export default _default;

package/lib/table/components/ToolBar/DensityIcon.js

@@ -11,7 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _provider = require("../../../provider");
 var _Provide = require("../../Store/Provide");
 var _jsxRuntime = require("react/jsx-runtime");
-const DensityIcon = props => {
+const DensityIcon = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
   const {
     icon = /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.ColumnHeightOutlined, {})
   } = props;
@@ -42,8 +42,11 @@ const DensityIcon = props => {
     trigger: ['click'],
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: intl.getMessage('tableToolBar.density', '表格密度'),
-      children: icon
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        ref: ref,
+        children: icon
+      })
     })
   });
-};
+});
 var _default = exports.default = /*#__PURE__*/_react.default.memo(DensityIcon);

package/lib/table/components/ToolBar/FullscreenIcon.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const _default: React.MemoExoticComponent<() => import("react/jsx-runtime").JSX.Element>;
+declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<React.RefAttributes<HTMLSpanElement>>>;
 export default _default;

package/lib/table/components/ToolBar/FullscreenIcon.js

@@ -11,7 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _provider = require("../../../provider");
 var _utils = require("../../../utils");
 var _jsxRuntime = require("react/jsx-runtime");
-const FullScreenIcon = () => {
+const FullScreenIcon = /*#__PURE__*/_react.default.forwardRef((_, ref) => {
   const intl = (0, _provider.useIntl)();
   const [fullscreen, setFullscreen] = (0, _react.useState)(false);
   (0, _react.useEffect)(() => {
@@ -23,11 +23,17 @@ const FullScreenIcon = () => {
     };
   }, []);
   return fullscreen ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
-    title: intl.getMessage('tableToolBar.exitFullScreen', '全屏'),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.FullscreenExitOutlined, {})
+    title: intl.getMessage('tableToolBar.exitFullScreen', '退出全屏'),
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      ref: ref,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.FullscreenExitOutlined, {})
+    })
   }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
     title: intl.getMessage('tableToolBar.fullScreen', '全屏'),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.FullscreenOutlined, {})
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      ref: ref,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.FullscreenOutlined, {})
+    })
   });
-};
+});
 var _default = exports.default = /*#__PURE__*/_react.default.memo(FullScreenIcon);

package/lib/table/useFetchData.js

@@ -56,7 +56,10 @@ const useFetchData = (getData, defaultData, options) => {
   const setTableDataList = (0, _react.useCallback)(updater => {
     setTableDataListInner(prev => {
       const next = typeof updater === 'function' ? updater(prev) : updater;
-      options?.onDataSourceChange?.(next);
+      // 使用 queueMicrotask 延迟回调，避免在渲染期间更新其他组件状态
+      queueMicrotask(() => {
+        options?.onDataSourceChange?.(next);
+      });
       return next;
     });
   }, [options?.onDataSourceChange]);

package/lib/table/utils/cellRenderToFromItem.js

@@ -126,7 +126,7 @@ const CellRenderFromItem = props => {
         const shouldName = [rowName].flat(1);
         try {
           return JSON.stringify((0, _util.get)(pre, shouldName)) !== JSON.stringify((0, _util.get)(next, shouldName));
-        } catch (error) {
+        } catch (_error) {
           return true;
         }
       },

package/lib/table/utils/useDragSort.js

@@ -83,7 +83,7 @@ const SortableRow = props => {
  */
 const SortableItemCell = /*#__PURE__*/_react.default.memo(props => {
   const {
-    dragSortKey,
+    dragSortKey: _dragSortKey,
     ...rest
   } = props;
   const {

package/lib/utils/components/DropdownFooter/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-type LightFilterFooterRender = ((onConfirm?: (e?: React.MouseEvent) => void, onClear?: (e?: React.MouseEvent) => void) => JSX.Element | false) | false;
+type LightFilterFooterRender = ((onConfirm?: (e?: React.MouseEvent) => void, onClear?: (e?: React.MouseEvent) => void) => React.JSX.Element | false) | false;
 type OnClick = (e?: React.MouseEvent) => void;
 export type DropdownFooterProps = {
     onClear?: OnClick;

package/lib/utils/components/FieldLabel/index.js

@@ -78,7 +78,7 @@ const FieldLabelFunction = (props, ref) => {
         onClick: () => {
           onLabelClick?.();
         },
-        className: `${prefixCls}-text`,
+        className: (0, _clsx.clsx)(`${prefixCls}-text`, hashId),
         children: [aLabel, ': ']
       }) : '';
       const str = formatterText(aValue);

package/lib/utils/components/FilterDropdown/index.d.ts

@@ -2,7 +2,7 @@ import type { PopoverProps } from 'antd';
 import type { TooltipPlacement } from 'antd/lib/tooltip';
 import React from 'react';
 import type { DropdownFooterProps } from '../DropdownFooter';
-export type FooterRender = ((onConfirm?: (e?: React.MouseEvent) => void, onClear?: (e?: React.MouseEvent) => void) => JSX.Element | false) | false;
+export type FooterRender = ((onConfirm?: (e?: React.MouseEvent) => void, onClear?: (e?: React.MouseEvent) => void) => React.JSX.Element | false) | false;
 export type DropdownProps = {
     label?: React.ReactNode;
     footer?: DropdownFooterProps;

package/lib/utils/components/FilterDropdown/index.js

@@ -57,7 +57,7 @@ const FilterDropdown = props => {
           return htmlRef.current || document.body;
         },
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: `${prefixCls}-content ${hashId}`.trim(),
+          className: (0, _clsx.clsx)(`${prefixCls}-content`, hashId),
           children: children
         })
       }), footer && /*#__PURE__*/(0, _jsxRuntime.jsx)(_DropdownFooter.DropdownFooter, {

package/lib/utils/components/InlineErrorFormItem/index.js

@@ -8,6 +8,7 @@ exports.InlineErrorFormItem = void 0;
 var _icons = require("@ant-design/icons");
 var _util = require("@rc-component/util");
 var _antd = require("antd");
+var _clsx = require("clsx");
 var _react = _interopRequireWildcard(require("react"));
 var _style = require("./style");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -52,13 +53,13 @@ const InlineErrorFormItemPopover = ({
     getPopupContainer: popoverProps?.getPopupContainer,
     getTooltipContainer: popoverProps?.getTooltipContainer,
     content: wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: `${prefixCls}-form-item ${hashId} ${token.hashId}`.trim(),
+      className: (0, _clsx.clsx)(`${prefixCls}-form-item`, hashId, token.hashId),
       style: {
         margin: 0,
         padding: 0
       },
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: `${prefixCls}-form-item-with-help ${hashId} ${token.hashId}`.trim(),
+        className: (0, _clsx.clsx)(`${prefixCls}-form-item-with-help`, hashId, token.hashId),
         children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.LoadingOutlined, {}) : null, errorList]
       })
     })),
@@ -87,7 +88,7 @@ const InternalFormItemFunction = ({
       }
       try {
         return JSON.stringify((0, _util.get)(prev, shouldName)) !== JSON.stringify((0, _util.get)(next, shouldName));
-      } catch (error) {
+      } catch (_error) {
         return true;
       }
     }
@@ -137,7 +138,7 @@ const InlineErrorFormItem = props => {
       }
       try {
         return JSON.stringify((0, _util.get)(prev, shouldName)) !== JSON.stringify((0, _util.get)(next, shouldName));
-      } catch (error) {
+      } catch (_error) {
         return true;
       }
     } : undefined,

package/lib/utils/components/LabelIconTip/index.js

@@ -51,12 +51,12 @@ const LabelIconTip = exports.LabelIconTip = /*#__PURE__*/_react.default.memo(pro
       }),
       children: label
     }), subTitle && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: `${className}-subtitle ${hashId}`.trim(),
+      className: (0, _clsx.clsx)(`${className}-subtitle`, hashId),
       children: subTitle
     }), tooltip && /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
       ...tooltipProps,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-        className: `${className}-icon ${hashId}`.trim(),
+        className: (0, _clsx.clsx)(`${className}-icon`, hashId),
         children: icon
       })
     })]

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

@@ -18,7 +18,6 @@ function useFetchData(props) {
     testId += 1;
     return testId.toString();
   });
-  const proFieldKeyRef = (0, _react.useRef)(cacheKey);
   const fetchData = async () => {
     abortRef.current?.abort();
     const abort = new AbortController();
@@ -38,7 +37,6 @@ function useFetchData(props) {
   };
   const {
     data,
-    error,
     isValidating
   } = (0, _swr.default)(props.request ? [cacheKey, props.params] : null, fetchData, {
     revalidateOnFocus: false,

package/lib/utils/isUrl/index.js

@@ -17,7 +17,7 @@ const isUrl = path => {
   try {
     const url = new URL(path);
     return !!url;
-  } catch (error) {
+  } catch (_error) {
     return false;
   }
 };