@aloudata/aloudata-design 2.12.4-beta.1 → 2.12.4

package/dist/Avatar/component/Avatar/index.js

@@ -2,10 +2,10 @@ var _excluded = ["size", "showFullValue", "children", "src"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import { User } from "../../../Icon";
 import InternalAvatar from 'antd/lib/avatar/avatar';
 import classNames from 'classnames';
 import * as React from 'react';
-import { User } from "../../../Icon";
 var ZERO = 0;
 var Avatar = function Avatar(props) {
   var _props$size = props.size,

package/dist/MemberPicker/components/MultipleOption.js

@@ -2,12 +2,12 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import { LocaleContext, getTranslator } from "../../locale/default";
 import classnames from 'classnames';
 import React, { useContext } from 'react';
 import Checkbox from "../../Checkbox";
 import { EUserType } from "../../ConfigProvider/getUserList";
 import TextLink from "../../TextLink/index";
-import { LocaleContext, getTranslator } from "../../locale/default";
 import { getAccount, getId, getPhoto } from "../utils";
 import { isUserGroup } from "../utils/getUsersWithUserId";
 import NickLabel from "./NickLabel";

package/dist/MemberPicker/components/NickLabel.d.ts

@@ -1,5 +1,5 @@
+import { EUserType } from "../../ConfigProvider/getUserList";
 import React, { ReactNode } from 'react';
-import { EUserType } from '../../ConfigProvider/getUserList';
 interface INickLabelProps {
     name?: string;
     id: string;

package/dist/MemberPicker/components/NickLabel.js

@@ -1,7 +1,7 @@
-import React, { memo } from 'react';
-import Avatar from "../../Avatar";
 import { EUserType } from "../../ConfigProvider/getUserList";
 import { UserGroup } from "../../Icon";
+import React, { memo } from 'react';
+import Avatar from "../../Avatar";
 var NickLabel = function NickLabel(_ref) {
   var photo = _ref.photo,
     name = _ref.name,

package/dist/MemberPicker/components/Panel.d.ts

@@ -1,5 +1,5 @@
+import { IUserGroup, TUser, TUserGroupValue, TUserValue } from "../../ConfigProvider/getUserList";
 import React from 'react';
-import { IUserGroup, TUser, TUserGroupValue, TUserValue } from '../../ConfigProvider/getUserList';
 import { EMemberPicker, IUser } from '../interface';
 interface IPanelProps {
     type: EMemberPicker;

package/dist/MemberPicker/components/Panel.js

@@ -13,8 +13,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import classNames from 'classnames';
-import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { EUserType } from "../../ConfigProvider/getUserList";
+import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import Tabs from "../../Tabs";
 import { LocaleContext, getTranslator } from "../../locale/default";
 import { EMemberPicker } from "../interface";
@@ -71,7 +71,7 @@ export default function Panel(props) {
       return getId(item) !== getId(user);
     }));
   }, [selectedUsers]);
-  var panelwidth = useMemo(function () {
+  var panelWidth = useMemo(function () {
     if (dropdownWidth) {
       return dropdownWidth;
     } else if (multiple) {
@@ -96,7 +96,7 @@ export default function Panel(props) {
     var userSelection = /*#__PURE__*/React.createElement(MemberSelection, {
       className: 'ald-member-picker-member-selection-multiple',
       userList: dataList.filter(isUser),
-      width: (panelwidth - 6) / 2,
+      width: (panelWidth - 6) / 2,
       selectedUsers: selectedUsers.filter(isUser),
       onChange: onSelectionChange,
       onSearchValueChange: onSearchValueChange,
@@ -107,7 +107,7 @@ export default function Panel(props) {
     var userGroupSelection = /*#__PURE__*/React.createElement(UserGroupSelection, {
       className: 'ald-member-picker-member-selection-multiple',
       userGroupList: dataList.filter(isUserGroup),
-      width: (panelwidth - 6) / 2,
+      width: (panelWidth - 6) / 2,
       selectedUsersGroup: selectedUsers.filter(isUserGroup),
       onChange: onSelectionChange,
       onSearchValueChange: onSearchValueChange,
@@ -137,18 +137,18 @@ export default function Panel(props) {
         className: "ald-member-tabs"
       });
     }
-  }, [t, dataList, panelwidth, selectedUsers, onSelectionChange, onSearchValueChange, lockedIds, props.loading, type]);
+  }, [t, dataList, panelWidth, selectedUsers, onSelectionChange, onSearchValueChange, lockedIds, props.loading, type]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames(className, 'ald-member-picker-wrapper', (_classNames = {}, _defineProperty(_classNames, 'ald-member-picker-multiple', multiple), _defineProperty(_classNames, 'ald-member-picker-single', !multiple), _classNames)),
     style: {
-      width: panelwidth
+      width: panelWidth
     }
   }, multiple ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "ald-member-picker-member-selection-wrapper"
   }, renderDropdown()), /*#__PURE__*/React.createElement(SelectedMemberTags, {
     className: 'ald-member-picker-selected-member-tags',
     selectedUsers: selectedUsers,
-    width: (panelwidth - 3) / 2,
+    width: (panelWidth - 3) / 2,
     onRemove: onRemove,
     lockedIds: lockedIds,
     userList: dataList
@@ -159,7 +159,7 @@ export default function Panel(props) {
   })) : /*#__PURE__*/React.createElement(React.Fragment, null, type === EMemberPicker.USER && /*#__PURE__*/React.createElement(MemberSelection, {
     className: 'ald-member-picker-member-selection-single',
     userList: dataList.filter(isUser),
-    width: panelwidth - 2,
+    width: panelWidth - 2,
     onChange: onSelectionChange,
     selectedUsers: selectedUsers.filter(isUser),
     onSearchValueChange: onSearchValueChange,
@@ -169,7 +169,7 @@ export default function Panel(props) {
   }), type === EMemberPicker.GROUP && /*#__PURE__*/React.createElement(UserGroupSelection, {
     className: 'ald-member-picker-member-selection-multiple',
     userGroupList: dataList.filter(isUserGroup),
-    width: (panelwidth - 3) / 2,
+    width: (panelWidth - 3) / 2,
     selectedUsersGroup: selectedUsers.filter(isUserGroup),
     onChange: onSelectionChange,
     onSearchValueChange: onSearchValueChange,

package/dist/MemberPicker/components/PanelWrapper.d.ts

@@ -1,12 +1,12 @@
 import React from 'react';
 import { IUserGroup, TUser, TUserGroupValue, TUserValue } from '../../ConfigProvider/getUserList';
-import { EMemberPicker, IUser, TMemberPickerValue } from '../interface';
+import { EMemberPicker, IUser, MemberPickerValue } from '../interface';
 interface IProps {
     type: EMemberPicker;
     multiple?: boolean;
     onChange?(v: TUser | (IUser | IUserGroup)): void;
     dropdownWidth?: number;
-    value?: TMemberPickerValue;
+    value?: MemberPickerValue;
     className?: string;
     onCancel?: () => void;
     lockedIds?: Array<TUserValue | TUserGroupValue>;

package/dist/MemberPicker/components/PanelWrapper.js

@@ -5,11 +5,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { message } from "../..";
+import ConfigProvider from "../../ConfigProvider";
 import { useRequest } from 'ahooks';
 import _ from 'lodash';
 import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
-import { message } from "../../";
-import ConfigProvider from "../../ConfigProvider";
 import { EUserType } from "../../ConfigProvider/getUserList";
 import { LocaleContext, getTranslator } from "../../locale/default";
 import { isUser, isUserGroup } from "../utils/getUsersWithUserId";
@@ -101,7 +101,20 @@ export var PanelWrapper = function PanelWrapper(_ref) {
     } else if (isUser(value) || isUserGroup(value)) {
       setSelectedUserList([value]);
     } else {
-      console.error('props error');
+      var id = [];
+      if (!value) return;
+      if (Array.isArray(value) && value.length === 0) {
+        setSelectedUserList([]);
+        return;
+      }
+      if (!Array.isArray(value)) {
+        id = [value];
+      } else {
+        id = value;
+      }
+      queryByIds(id).then(function (result) {
+        setSelectedUserList(result);
+      });
     }
   }, [value, queryByIds]);
   var onSelectedChange = useCallback(function (users) {

package/dist/MemberPicker/components/SelectedMemberTags.js

@@ -1,9 +1,9 @@
+import { LocaleContext, getTranslator } from "../../locale/default";
 import classNames from 'classnames';
 import _ from 'lodash';
 import React, { useContext } from 'react';
 import { CloseMLine } from "../../Icon";
 import ScrollArea from "../../ScrollArea";
-import { LocaleContext, getTranslator } from "../../locale/default";
 import { getAccount, getId, getPhoto } from "../utils";
 import NickLabel from "./NickLabel";
 import { userDisplayNameIsRepeated } from "./Panel";

package/dist/MemberPicker/components/SingleOption.js

@@ -2,11 +2,11 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import { LocaleContext, getTranslator } from "../../locale/default";
 import classnames from 'classnames';
 import React, { useContext } from 'react';
 import { EUserType } from "../../ConfigProvider/getUserList";
 import TextLink from "../../TextLink/index";
-import { LocaleContext, getTranslator } from "../../locale/default";
 import { getAccount, getId, getPhoto } from "../utils";
 import { isUserGroup } from "../utils/getUsersWithUserId";
 import NickLabel from "./NickLabel";

package/dist/MemberPicker/utils/getUsersWithUserId.d.ts

@@ -1,4 +1,4 @@
-import { IUserGroup } from '../../ConfigProvider/getUserList';
+import { IUserGroup } from "../../ConfigProvider/getUserList";
 import { IUser } from '../interface';
 export declare function isUser(value: any): value is IUser;
 export declare function isUserGroup(value: any): value is IUserGroup;

package/dist/MemberPicker/utils/getUsersWithUserId.js

@@ -1,10 +1,10 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 import { EUserType } from "../../ConfigProvider/getUserList";
 export function isUser(value) {
-  return value && _typeof(value) === 'object' && value.type === EUserType.USER && (value.nickname || value.name || value.userId);
+  return value && _typeof(value) === 'object' && value.type === EUserType.USER && (value.nickname || value.name);
 }
 export function isUserGroup(value) {
-  return value && _typeof(value) === 'object' && value.type === EUserType.USER_GROUP && (value.name || value.groupId);
+  return value && _typeof(value) === 'object' && value.type === EUserType.USER_GROUP && value.name;
 }
 function getUsersWithUserId(obj) {
   var users = [];

package/dist/MemberPicker/utils/index.d.ts

@@ -1,5 +1,5 @@
+import { IUserGroup } from "../../ConfigProvider/getUserList";
 import React from 'react';
-import { IUserGroup } from '../../ConfigProvider/getUserList';
 import { IUser } from '../interface';
 export declare const getId: (user: IUser | IUserGroup) => string;
 export declare const getPhoto: (user: IUser | IUserGroup) => React.JSX.Element | null;

package/dist/MemberPicker/utils/index.js

@@ -1,5 +1,5 @@
-import React from 'react';
 import { EUserType } from "../../ConfigProvider/getUserList";
+import React from 'react';
 export var getId = function getId(user) {
   if (user.type === EUserType.USER) return user.userId;
   return user.groupId;

package/dist/Table/helper.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import { ITableColumn, ITableProps } from './types';
-export declare function getTableColumns<TDataItem extends object>({ columns, containerWidth, onError, onSort, }: {
+export declare function getTableColumns<TDataItem extends object>({ columns, totalWidth, onError, onSort, }: {
     columns: ITableColumn<TDataItem>[];
-    containerWidth: number;
+    totalWidth: number;
     onError: ITableProps<TDataItem>['onError'];
     onSort: ITableProps<TDataItem>['onSort'];
 }): {
@@ -10,7 +10,6 @@ export declare function getTableColumns<TDataItem extends object>({ columns, con
     header: (props: import("./components/Header").IProps<TDataItem>) => import("react").JSX.Element;
     cell: (props: import("./components/Cell").IProps<TDataItem>) => import("react").JSX.Element;
     size: number;
-    minSize: number;
     meta: {
         onError: ((errorInfo: import("./types").ITableCellErrorInfo) => void) | undefined;
         columnWidths: number[];
@@ -19,7 +18,6 @@ export declare function getTableColumns<TDataItem extends object>({ columns, con
         title: import("react").ReactNode;
         dataIndex?: string | undefined;
         width?: string | number | undefined;
-        minWidth?: number | undefined;
         render?: ((text: any, record: TDataItem, rowIndex: number) => import("react").ReactNode) | undefined;
         ellipsis?: boolean | undefined;
         noPadding?: boolean | undefined;
@@ -30,8 +28,12 @@ export declare function getTableColumns<TDataItem extends object>({ columns, con
 }[];
 /**
  * 计算列宽
+ * @param columns
+ * @param columnSizing
+ * @param totalWidth
+ * @returns
  */
-export declare function getColumnWidths(columns: ITableColumn<unknown>[], scrollWidth: number): number[];
+export declare function getColumnWidths(columns: ITableColumn<unknown>[], totalWidth: number): number[];
 export declare function getNumberFromPercentageStr(str: string): number;
 /**
  * 判断是否百分比字符串

package/dist/Table/helper.js

@@ -10,10 +10,10 @@ import Cell from "./components/Cell";
 import Header from "./components/Header";
 export function getTableColumns(_ref) {
   var columns = _ref.columns,
-    containerWidth = _ref.containerWidth,
+    totalWidth = _ref.totalWidth,
     onError = _ref.onError,
     onSort = _ref.onSort;
-  var columnWidths = getColumnWidths(columns, containerWidth);
+  var columnWidths = getColumnWidths(columns, totalWidth);
   // 根据固定列的位置重排列顺序，将 left 的列放到最前面，right 的列放到最后面
   var leftColumns = [];
   var rightColumns = [];
@@ -29,15 +29,12 @@ export function getTableColumns(_ref) {
   });
   var sortedColumns = [].concat(leftColumns, unFixedColumns, rightColumns);
   return _.map(sortedColumns, function (col, index) {
-    // 最小宽度不能小于 40px，因为每个 cell 存在左右 padding，太小的宽度会导致 resize 列后看不出这个列的标题
-    var minSize = Math.max(col.minWidth || 0, 40);
     return {
       // 这里还需要排除掉空字符串的情况，id 不能为 ''
       accessorKey: col.dataIndex || "column-".concat(index),
       header: Header,
       cell: Cell,
       size: columnWidths[index],
-      minSize: minSize,
       meta: _objectSpread(_objectSpread({}, col), {}, {
         onError: onError,
         columnWidths: columnWidths,
@@ -50,11 +47,12 @@ export function getTableColumns(_ref) {
 
 /**
  * 计算列宽
+ * @param columns
+ * @param columnSizing
+ * @param totalWidth
+ * @returns
  */
-export function getColumnWidths(columns, scrollWidth) {
-  if (columns.length === 0) {
-    return [];
-  }
+export function getColumnWidths(columns, totalWidth) {
   // 可改变列宽情况，react-table 可拖动列宽要求列宽值必须是数字，因为将百分比列宽转换为数字
   var DEFAULT_WIDTH = 150;
   // 计算出每个列的具体宽度值
@@ -69,19 +67,20 @@ export function getColumnWidths(columns, scrollWidth) {
     if (typeof width === 'string' && isPercentage(width)) {
       var widthNum = getNumberFromPercentageStr(width);
       return {
-        width: widthNum * scrollWidth / 100,
+        width: widthNum * totalWidth / 100,
         isSpecific: false
       };
     }
     return {
       width: DEFAULT_WIDTH,
-      isSpecific: false
+      isSpecific: false,
+      radio: 0
     };
   });
   var totalColumnWidth = _.sum(columnWidthInfos.map(function (col) {
     return col.width;
   }));
-  if (scrollWidth !== totalColumnWidth) {
+  if (totalWidth !== totalColumnWidth) {
     // 如果实际宽度不等于列总宽度之和，则将差额的宽度按列宽的比例分配给各个没有设置具体宽度值的列
 
     // 指定了具体值的列的总宽度
@@ -90,7 +89,7 @@ export function getColumnWidths(columns, scrollWidth) {
     }).map(function (col) {
       return col.width;
     }));
-    var offset = scrollWidth - totalColumnWidth;
+    var offset = totalWidth - totalColumnWidth;
 
     // 计算每个没有设置具体宽度值的列应该分到的差值的占比
     var totalOffsetWidth = totalColumnWidth - specificWidth;
@@ -110,7 +109,7 @@ export function getColumnWidths(columns, scrollWidth) {
     var newTotalColumnWidth = _.sum(newColumnWidths);
 
     // 计算并处理可能存在的误差
-    var errorWidth = scrollWidth - newTotalColumnWidth;
+    var errorWidth = totalWidth - newTotalColumnWidth;
 
     // 将误差加到最后一个没有指定具体值的列上
     var colIndex = _.findLastIndex(columnWidthInfos, function (columnWidthInfo) {

package/dist/Table/hooks/useFixed.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="react" />
 import { ColumnDef } from '@tanstack/react-table';
-export default function useFixed<TDataItem>({ columnWidths, tableColumns, y, scrollbarWidth, }: {
-    columnWidths: number[];
+export default function useFixed<TDataItem>({ tableColumns, y, scrollbarWidth, }: {
     tableColumns: Array<ColumnDef<TDataItem, unknown>>;
     y?: string | number;
     scrollbarWidth: number;

package/dist/Table/hooks/useFixed.js

@@ -12,8 +12,7 @@ import classnames from 'classnames';
 import { useCallback } from 'react';
 import { prefixCls } from "../helper";
 export default function useFixed(_ref) {
-  var columnWidths = _ref.columnWidths,
-    tableColumns = _ref.tableColumns,
+  var tableColumns = _ref.tableColumns,
     y = _ref.y,
     scrollbarWidth = _ref.scrollbarWidth;
   return useCallback(function (index) {
@@ -21,7 +20,8 @@ export default function useFixed(_ref) {
     var isHeader = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var column = tableColumns[index];
     var _ref2 = column.meta,
-      fixed = _ref2.fixed;
+      fixed = _ref2.fixed,
+      columnWidths = _ref2.columnWidths;
     var style = {};
     if (fixed === 'left') {
       style.left = getFixedColumnOffset(columnWidths, index, true);
@@ -32,7 +32,7 @@ export default function useFixed(_ref) {
       className: classnames((_classnames = {}, _defineProperty(_classnames, prefixCls('fixed-left'), fixed === 'left'), _defineProperty(_classnames, prefixCls('fixed-right'), fixed === 'right'), _classnames)),
       style: style
     };
-  }, [tableColumns, y, scrollbarWidth, columnWidths]);
+  }, [tableColumns, y, scrollbarWidth]);
 }
 
 /**

package/dist/Table/hooks/useRowSelection.js

@@ -99,9 +99,7 @@ export default function useRowSelection(props) {
   }
   var rowSelectionColumn = {
     dataIndex: '',
-    title: /*#__PURE__*/React.createElement("div", {
-      className: prefixCls('row-selection-all-header-wrap')
-    }, getCheckboxAllNode()),
+    title: getCheckboxAllNode(),
     width: 48,
     render: function render(text, record) {
       var _rowSelection$getChec;
@@ -115,8 +113,7 @@ export default function useRowSelection(props) {
         checked: isChecked
       }, checkboxProps)));
     },
-    fixed: rowSelection.fixed ? 'left' : undefined,
-    align: 'left'
+    fixed: rowSelection.fixed ? 'left' : undefined
   };
   var selectedRowKeysInCurrPage = getDataWithoutDisabled(data, rowSelection.getCheckboxProps).map(function (record) {
     return getRowKey(record, rowKey);

package/dist/Table/hooks/useScroll.d.ts

@@ -6,14 +6,13 @@ import { IScroll } from '../types';
  * @returns
  */
 export default function useScroll(props: IProps): {
-    containerWidth: number | undefined;
+    realWidth: number | undefined;
     headerRef: import("react").RefObject<HTMLDivElement>;
     bodyRef: import("react").RefObject<HTMLDivElement>;
     onBodyScroll: (e: React.UIEvent<HTMLDivElement>) => void;
     isPingLeft: boolean;
     isPingRight: boolean;
     scrollbarWidth: number;
-    changeIsPing: () => void;
 };
 interface IProps {
     scroll: IScroll;
@@ -27,5 +26,5 @@ interface IProps {
  * @param scrollX 横向宽度值
  * @param width 容器的宽度
  */
-export declare function getContainerWidth(scrollX: IScroll['x'], width: number): number;
+export declare function getRealWidth(scrollX: IScroll['x'], width: number): number;
 export {};

package/dist/Table/hooks/useScroll.js

@@ -36,21 +36,17 @@ export default function useScroll(props) {
     setIsPingRight = _useState4[1];
   var x = scroll.x,
     y = scroll.y;
-  var containerWidth = useMemo(function () {
+  var realWidth = useMemo(function () {
     if (!totalSize) {
       return;
     }
-    var width = getContainerWidth(x, totalSize.width);
+    var width = getRealWidth(x, totalSize.width);
     if (y !== undefined) {
-      return Math.max(width - scrollbarWidth, 0);
+      return width - scrollbarWidth;
     }
     return width;
   }, [x, y, totalSize]);
-  var changeIsPing = useCallback(function () {
-    var elem = bodyRef.current;
-    if (!elem) {
-      return;
-    }
+  var changeIsPing = useCallback(function (elem) {
     var scrollLeft = elem.scrollLeft;
     if (scrollLeft <= 0) {
       setIsPingLeft(false);
@@ -64,11 +60,11 @@ export default function useScroll(props) {
     }
   }, [y]);
   useEffect(function () {
-    if (containerWidth && bodyRef.current) {
+    if (realWidth && bodyRef.current) {
       // 待表格渲染完成，宽度稳定后，初始化 ping 状态
-      changeIsPing();
+      changeIsPing(bodyRef.current);
     }
-  }, [containerWidth, changeIsPing]);
+  }, [realWidth, changeIsPing]);
   var requestAnimationFrame = useCallback(function (callback) {
     // animationFrame 可以保证滚动时，header 和 body 不会出现不同步的情况
     if (animationFrameId.current !== null) {
@@ -84,31 +80,28 @@ export default function useScroll(props) {
       (_headerRef$current = headerRef.current) === null || _headerRef$current === void 0 ? void 0 : _headerRef$current.scrollTo({
         left: scrollLeft
       });
-      changeIsPing();
+      changeIsPing(target);
     });
   }, [requestAnimationFrame, changeIsPing]);
   return {
-    containerWidth: containerWidth,
+    realWidth: realWidth,
     headerRef: headerRef,
     bodyRef: bodyRef,
     onBodyScroll: onBodyScroll,
     isPingLeft: isPingLeft,
     isPingRight: isPingRight,
-    scrollbarWidth: scrollbarWidth,
-    changeIsPing: changeIsPing
+    scrollbarWidth: scrollbarWidth
   };
 }
-// 计算最大可滚动值
-function getMaxScrollLeft(element, offsetRight) {
+function isScrolledToRight(element, offsetRight) {
+  // 计算最大可滚动值
   var maxScrollLeft = element.scrollWidth - element.clientWidth - offsetRight;
+
   // 允许一些误差，避免因为浮点数计算导致的问题
   var DEVIATION = 2;
-  return maxScrollLeft + DEVIATION;
-}
 
-// 判断是否滚动到最右侧
-function isScrolledToRight(element, offsetRight) {
-  return element.scrollLeft >= getMaxScrollLeft(element, offsetRight);
+  // 判断是否滚动到最右侧
+  return element.scrollLeft >= maxScrollLeft - DEVIATION;
 }
 
 /**
@@ -116,7 +109,7 @@ function isScrolledToRight(element, offsetRight) {
  * @param scrollX 横向宽度值
  * @param width 容器的宽度
  */
-export function getContainerWidth(scrollX, width) {
+export function getRealWidth(scrollX, width) {
   if (typeof scrollX === 'string') {
     var percent = getNumberFromPercentageStr(scrollX);
     if (isNaN(percent)) {

package/dist/Table/index.js

@@ -14,7 +14,7 @@ import { flexRender, getCoreRowModel, useReactTable } from '@tanstack/react-tabl
 import classnames from 'classnames';
 import _ from 'lodash';
 import ResizeObserver from 'rc-resize-observer';
-import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useState } from 'react';
+import React, { forwardRef, useCallback, useImperativeHandle, useMemo, useState } from 'react';
 import { Empty, Spin } from '..';
 import ExpandCell from "./components/ExpandCell";
 import Footer from "./components/Footer";
@@ -54,14 +54,13 @@ function Table(props, ref) {
       totalSize: totalSize,
       scroll: scroll
     }),
-    containerWidth = _useScroll.containerWidth,
+    realWidth = _useScroll.realWidth,
     onBodyScroll = _useScroll.onBodyScroll,
     headerRef = _useScroll.headerRef,
     bodyRef = _useScroll.bodyRef,
     isPingLeft = _useScroll.isPingLeft,
     isPingRight = _useScroll.isPingRight,
-    scrollbarWidth = _useScroll.scrollbarWidth,
-    changeIsPing = _useScroll.changeIsPing;
+    scrollbarWidth = _useScroll.scrollbarWidth;
   var scrollToFirstRow = useCallback(function () {
     if (!bodyRef.current) {
       return;
@@ -81,13 +80,21 @@ function Table(props, ref) {
   var expandableConfig = getExpandableConfig(expandable);
   var rowSelectionInfo = useRowSelection(props);
   var tableColumns = useMemo(function () {
+    if (!totalSize || !realWidth) {
+      return [];
+    }
     return getTableColumns({
       columns: rowSelectionInfo.columns,
-      containerWidth: containerWidth || 0,
+      totalWidth: realWidth,
       onError: onError,
       onSort: onSort
     });
-  }, [containerWidth, onError, onSort, rowSelectionInfo.columns]);
+  }, [totalSize, realWidth, onError, onSort, rowSelectionInfo.columns]);
+  var getColumnFixedInfo = useFixed({
+    tableColumns: tableColumns,
+    y: y,
+    scrollbarWidth: scrollbarWidth
+  });
   var tableInstance = useReactTable({
     columns: tableColumns,
     // 排除掉被折叠的行
@@ -98,18 +105,9 @@ function Table(props, ref) {
     },
     columnResizeMode: 'onChange'
   });
-  var headerGroups = tableInstance.getHeaderGroups();
-  var columnWidths = headerGroups[0].headers.map(function (header) {
-    return header.getSize();
-  });
-  var getColumnFixedInfo = useFixed({
-    columnWidths: columnWidths,
-    tableColumns: tableColumns,
-    y: y,
-    scrollbarWidth: scrollbarWidth
-  });
 
   // 渲染 header
+  var headerGroups = tableInstance.getHeaderGroups();
   var _tableInstance$getRow = tableInstance.getRowModel(),
     rows = _tableInstance$getRow.rows;
   var isStickyWork = !!sticky && y === undefined;
@@ -117,11 +115,6 @@ function Table(props, ref) {
   if (isStickyWork && _.get(sticky, 'offsetHeader')) {
     headerStyle.top = _.get(sticky, 'offsetHeader', 0);
   }
-  var totalColumnsWidth = _.sum(columnWidths);
-  useEffect(function () {
-    // 总列宽改变时，重新计算是否需要显示固定列的阴影
-    changeIsPing();
-  }, [changeIsPing, totalColumnsWidth]);
   var headerContent = /*#__PURE__*/React.createElement("div", {
     className: classnames(prefixCls('header'), (_classnames = {}, _defineProperty(_classnames, prefixCls('overflow-x'), true), _defineProperty(_classnames, prefixCls('sticky'), isStickyWork), _classnames)),
     ref: headerRef,
@@ -131,7 +124,7 @@ function Table(props, ref) {
       className: prefixCls('tr'),
       key: headerGroup.id,
       style: {
-        width: totalColumnsWidth
+        width: realWidth
       }
     }, _.map(headerGroup.headers, function (header, index) {
       var _classnames2;
@@ -184,7 +177,7 @@ function Table(props, ref) {
   var bodyContent = /*#__PURE__*/React.createElement("div", {
     className: prefixCls('body'),
     style: {
-      width: totalColumnsWidth
+      width: realWidth
     }
   }, isEmpty ? /*#__PURE__*/React.createElement("div", {
     style: {