@aloudata/aloudata-design 2.5.1 → 2.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. package/dist/DataPreviewTable/components/Body/Error.d.ts +1 -2
  2. package/dist/DataPreviewTable/components/Body/Error.js +5 -7
  3. package/dist/DataPreviewTable/components/Header/index.d.ts +1 -0
  4. package/dist/DataPreviewTable/components/Header/index.js +3 -4
  5. package/dist/DataPreviewTable/index.js +16 -15
  6. package/dist/DataPreviewTable/interface.d.ts +2 -2
  7. package/dist/DataPreviewTable/style/index.less +6 -0
  8. package/dist/Icon/components/CancelledCircleFill.d.ts +11 -0
  9. package/dist/Icon/components/CancelledCircleFill.js +35 -0
  10. package/dist/Icon/components/InProgressFill.d.ts +11 -0
  11. package/dist/Icon/components/InProgressFill.js +38 -0
  12. package/dist/Icon/index.d.ts +2 -0
  13. package/dist/Icon/index.js +2 -0
  14. package/dist/Icon/svg/Cancelled-Circle-fill.svg +5 -0
  15. package/dist/Icon/svg/In-Progress-fill.svg +8 -0
  16. package/dist/Radio/components/Radio/index.js +45 -9
  17. package/dist/Radio/interface/radio.d.ts +3 -0
  18. package/dist/Radio/style/index.less +32 -2
  19. package/dist/Spin/CustomIcon/index.js +4 -1
  20. package/dist/StatusLight/index.d.ts +12 -0
  21. package/dist/StatusLight/index.js +74 -0
  22. package/dist/StatusLight/style/index.d.ts +2 -0
  23. package/dist/StatusLight/style/index.js +2 -0
  24. package/dist/StatusLight/style/index.less +47 -0
  25. package/dist/Table/helper.d.ts +6 -4
  26. package/dist/Table/helper.js +20 -5
  27. package/dist/Table/hooks/useFixed.d.ts +10 -0
  28. package/dist/Table/hooks/useFixed.js +56 -0
  29. package/dist/Table/hooks/useScroll.d.ts +5 -1
  30. package/dist/Table/hooks/useScroll.js +79 -11
  31. package/dist/Table/index.js +56 -51
  32. package/dist/Table/style/index.less +70 -4
  33. package/dist/Table/types.d.ts +4 -0
  34. package/dist/ald.min.css +1 -1
  35. package/dist/index.d.ts +1 -0
  36. package/dist/index.js +1 -0
  37. package/dist/index.less +1 -0
  38. package/package.json +2 -1
@@ -1,8 +1,7 @@
1
1
  /// <reference types="react" />
2
2
  import { ITableColumn, ITableProps } from './types';
3
- export declare function getTableColumns<TDataItem extends object>({ columns, columnSizing, totalWidth, onError, }: {
3
+ export declare function getTableColumns<TDataItem extends object>({ columns, totalWidth, onError, }: {
4
4
  columns: ITableColumn<TDataItem>[];
5
- columnSizing: boolean;
6
5
  totalWidth: number;
7
6
  onError: ITableProps<TDataItem>['onError'];
8
7
  }): {
@@ -12,13 +11,16 @@ export declare function getTableColumns<TDataItem extends object>({ columns, col
12
11
  size: number;
13
12
  meta: {
14
13
  onError: ((errorInfo: import("./types").ITableCellErrorInfo) => void) | undefined;
14
+ columnWidths: number[];
15
+ index: number;
15
16
  title: import("react").ReactNode;
16
17
  dataIndex?: string | undefined;
17
18
  width?: string | number | undefined;
18
19
  render?: ((text: any, record: TDataItem, rowIndex: number) => import("react").ReactNode) | undefined;
19
20
  ellipsis?: boolean | undefined;
20
21
  noPadding?: boolean | undefined;
21
- align?: "center" | "left" | "right" | undefined;
22
+ align?: "left" | "center" | "right" | undefined;
23
+ fixed?: "left" | "right" | undefined;
22
24
  };
23
25
  }[];
24
26
  /**
@@ -28,7 +30,7 @@ export declare function getTableColumns<TDataItem extends object>({ columns, col
28
30
  * @param totalWidth
29
31
  * @returns
30
32
  */
31
- export declare function getColumnWidths(columns: ITableColumn<unknown>[], columnSizing: boolean, totalWidth: number): number[];
33
+ export declare function getColumnWidths(columns: ITableColumn<unknown>[], totalWidth: number): number[];
32
34
  export declare function getNumberFromPercentageStr(str: string): number;
33
35
  /**
34
36
  * 判断是否百分比字符串
@@ -9,11 +9,24 @@ import Cell from "./components/Cell";
9
9
  import Header from "./components/Header";
10
10
  export function getTableColumns(_ref) {
11
11
  var columns = _ref.columns,
12
- columnSizing = _ref.columnSizing,
13
12
  totalWidth = _ref.totalWidth,
14
13
  onError = _ref.onError;
15
- var columnWidths = getColumnWidths(columns, columnSizing, totalWidth);
16
- return _.map(columns, function (col, index) {
14
+ var columnWidths = getColumnWidths(columns, totalWidth);
15
+ // 根据固定列的位置重排列顺序,将 left 的列放到最前面,right 的列放到最后面
16
+ var leftColumns = [];
17
+ var rightColumns = [];
18
+ var unFixedColumns = [];
19
+ columns.forEach(function (col) {
20
+ if (col.fixed === 'left') {
21
+ leftColumns.push(col);
22
+ } else if (col.fixed === 'right') {
23
+ rightColumns.push(col);
24
+ } else {
25
+ unFixedColumns.push(col);
26
+ }
27
+ });
28
+ var sortedColumns = [].concat(leftColumns, unFixedColumns, rightColumns);
29
+ return _.map(sortedColumns, function (col, index) {
17
30
  return {
18
31
  // 这里还需要排除掉空字符串的情况,id 不能为 ''
19
32
  accessorKey: col.dataIndex || "column-".concat(index),
@@ -21,7 +34,9 @@ export function getTableColumns(_ref) {
21
34
  cell: Cell,
22
35
  size: columnWidths[index],
23
36
  meta: _objectSpread(_objectSpread({}, col), {}, {
24
- onError: onError
37
+ onError: onError,
38
+ columnWidths: columnWidths,
39
+ index: index
25
40
  })
26
41
  };
27
42
  });
@@ -34,7 +49,7 @@ export function getTableColumns(_ref) {
34
49
  * @param totalWidth
35
50
  * @returns
36
51
  */
37
- export function getColumnWidths(columns, columnSizing, totalWidth) {
52
+ export function getColumnWidths(columns, totalWidth) {
38
53
  // 可改变列宽情况,react-table 可拖动列宽要求列宽值必须是数字,因为将百分比列宽转换为数字
39
54
  var DEFAULT_WIDTH = 150;
40
55
  // 计算出每个列的具体宽度值
@@ -0,0 +1,10 @@
1
+ /// <reference types="react" />
2
+ import { ColumnDef } from '@tanstack/react-table';
3
+ export default function useFixed<TDataItem>({ tableColumns, y, scrollbarWidth, }: {
4
+ tableColumns: Array<ColumnDef<TDataItem, unknown>>;
5
+ y?: string | number;
6
+ scrollbarWidth: number;
7
+ }): (index: number, isHeader?: boolean) => {
8
+ className: string;
9
+ style: import("react").CSSProperties;
10
+ };
@@ -0,0 +1,56 @@
1
+ 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); }
2
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
3
+ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
4
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
5
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
6
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
7
+ 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; }
8
+ 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; }
9
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
10
+ 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); }
11
+ import classnames from 'classnames';
12
+ import { useCallback } from 'react';
13
+ import { prefixCls } from "../helper";
14
+ export default function useFixed(_ref) {
15
+ var tableColumns = _ref.tableColumns,
16
+ y = _ref.y,
17
+ scrollbarWidth = _ref.scrollbarWidth;
18
+ return useCallback(function (index) {
19
+ var _classnames;
20
+ var isHeader = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
21
+ var column = tableColumns[index];
22
+ var _ref2 = column.meta,
23
+ fixed = _ref2.fixed,
24
+ columnWidths = _ref2.columnWidths;
25
+ var style = {};
26
+ if (fixed === 'left') {
27
+ style.left = getFixedColumnOffset(columnWidths, index, true);
28
+ } else if (fixed === 'right') {
29
+ style.right = getFixedColumnOffset(columnWidths, index, false) + (isHeader && y !== undefined ? scrollbarWidth : 0);
30
+ }
31
+ return {
32
+ className: classnames((_classnames = {}, _defineProperty(_classnames, prefixCls('fixed-left'), fixed === 'left'), _defineProperty(_classnames, prefixCls('fixed-right'), fixed === 'right'), _classnames)),
33
+ style: style
34
+ };
35
+ }, [tableColumns, y, scrollbarWidth]);
36
+ }
37
+
38
+ /**
39
+ * 获取固定列相对边缘的偏移量
40
+ * @param columns 所有列
41
+ * @param index 当前列的索引
42
+ */
43
+ function getFixedColumnOffset(columnWidths, index, isLeft) {
44
+ var offset = 0;
45
+ var relativeIndex = index;
46
+ var list = _toConsumableArray(columnWidths);
47
+ if (!isLeft) {
48
+ list.reverse();
49
+ relativeIndex = list.length - index - 1;
50
+ }
51
+ for (var i = 0; i < relativeIndex; i++) {
52
+ var colWidth = columnWidths[i];
53
+ offset += colWidth;
54
+ }
55
+ return offset;
56
+ }
@@ -5,10 +5,14 @@ import { IScroll } from '../types';
5
5
  * @param props
6
6
  * @returns
7
7
  */
8
- export default function useScrollX(props: IProps): {
8
+ export default function useScroll(props: IProps): {
9
9
  realWidth: number | undefined;
10
10
  headerRef: import("react").RefObject<HTMLDivElement>;
11
+ bodyRef: import("react").RefObject<HTMLDivElement>;
11
12
  onBodyScroll: (e: React.UIEvent<HTMLDivElement>) => void;
13
+ isPingLeft: boolean;
14
+ isPingRight: boolean;
15
+ scrollbarWidth: any;
12
16
  };
13
17
  interface IProps {
14
18
  scroll: IScroll;
@@ -1,41 +1,109 @@
1
- import { useCallback, useMemo, useRef } from 'react';
1
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
2
+ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
3
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
4
+ 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; }
5
+ 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; } }
6
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
7
+ import { scrollbarWidth as getScrollbarWidth } from '@xobotyi/scrollbar-width';
8
+ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
2
9
  import { getNumberFromPercentageStr } from "../helper";
10
+ var scrollbarWidth = function () {
11
+ var barWidth = getScrollbarWidth();
12
+ if (typeof barWidth === 'undefined') {
13
+ return 0;
14
+ }
15
+ return barWidth;
16
+ }();
17
+
3
18
  /**
4
19
  * 横向滚动条相关逻辑
5
20
  * @param props
6
21
  * @returns
7
22
  */
8
- export default function useScrollX(props) {
23
+ export default function useScroll(props) {
9
24
  var scroll = props.scroll,
10
25
  totalSize = props.totalSize;
11
26
  var headerRef = useRef(null);
27
+ var bodyRef = useRef(null);
12
28
  var animationFrameId = useRef(null);
13
- var x = scroll.x;
29
+ var _useState = useState(false),
30
+ _useState2 = _slicedToArray(_useState, 2),
31
+ isPingLeft = _useState2[0],
32
+ setIsPingLeft = _useState2[1];
33
+ var _useState3 = useState(false),
34
+ _useState4 = _slicedToArray(_useState3, 2),
35
+ isPingRight = _useState4[0],
36
+ setIsPingRight = _useState4[1];
37
+ var x = scroll.x,
38
+ y = scroll.y;
14
39
  var realWidth = useMemo(function () {
15
40
  if (!totalSize) {
16
41
  return;
17
42
  }
18
- return getRealWidth(x, totalSize.width);
19
- }, [x, totalSize]);
20
- var onBodyScroll = useCallback(function (e) {
21
- // animationFrame 可以保证横向滚动时,header 和 body 不会出现不同步的情况
43
+ var width = getRealWidth(x, totalSize.width);
44
+ if (y !== undefined) {
45
+ return width - scrollbarWidth;
46
+ }
47
+ return width;
48
+ }, [x, y, totalSize]);
49
+ var changeIsPing = useCallback(function (elem) {
50
+ var scrollLeft = elem.scrollLeft;
51
+ if (scrollLeft <= 0) {
52
+ setIsPingLeft(false);
53
+ } else {
54
+ setIsPingLeft(true);
55
+ }
56
+ if (isScrolledToRight(elem, y !== undefined ? scrollbarWidth : 0)) {
57
+ setIsPingRight(false);
58
+ } else {
59
+ setIsPingRight(true);
60
+ }
61
+ }, [y]);
62
+ useEffect(function () {
63
+ if (realWidth && bodyRef.current) {
64
+ // 待表格渲染完成,宽度稳定后,初始化 ping 状态
65
+ changeIsPing(bodyRef.current);
66
+ }
67
+ }, [realWidth, changeIsPing]);
68
+ var requestAnimationFrame = useCallback(function (callback) {
69
+ // animationFrame 可以保证滚动时,header 和 body 不会出现不同步的情况
22
70
  if (animationFrameId.current !== null) {
23
71
  window.cancelAnimationFrame(animationFrameId.current);
24
72
  }
25
- var scrollLeft = e.target.scrollLeft;
26
- animationFrameId.current = window.requestAnimationFrame(function () {
73
+ animationFrameId.current = window.requestAnimationFrame(callback);
74
+ }, []);
75
+ var onBodyScroll = useCallback(function (e) {
76
+ var target = e.target;
77
+ var scrollLeft = target.scrollLeft;
78
+ requestAnimationFrame(function () {
27
79
  var _headerRef$current;
28
80
  (_headerRef$current = headerRef.current) === null || _headerRef$current === void 0 ? void 0 : _headerRef$current.scrollTo({
29
81
  left: scrollLeft
30
82
  });
83
+ changeIsPing(target);
31
84
  });
32
- }, []);
85
+ }, [requestAnimationFrame, changeIsPing]);
33
86
  return {
34
87
  realWidth: realWidth,
35
88
  headerRef: headerRef,
36
- onBodyScroll: onBodyScroll
89
+ bodyRef: bodyRef,
90
+ onBodyScroll: onBodyScroll,
91
+ isPingLeft: isPingLeft,
92
+ isPingRight: isPingRight,
93
+ scrollbarWidth: scrollbarWidth
37
94
  };
38
95
  }
96
+ function isScrolledToRight(element, offsetRight) {
97
+ // 计算最大可滚动值
98
+ var maxScrollLeft = element.scrollWidth - element.clientWidth - offsetRight;
99
+
100
+ // 允许一些误差,避免因为浮点数计算导致的问题
101
+ var DEVIATION = 2;
102
+
103
+ // 判断是否滚动到最右侧
104
+ return element.scrollLeft >= maxScrollLeft - DEVIATION;
105
+ }
106
+
39
107
  /**
40
108
  * 获取可用实际宽度
41
109
  * @param scrollX 横向宽度值
@@ -1,4 +1,6 @@
1
1
  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); }
2
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
3
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
2
4
  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; }
3
5
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
4
6
  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); }
@@ -12,15 +14,15 @@ import { flexRender, getCoreRowModel, useReactTable } from '@tanstack/react-tabl
12
14
  import classnames from 'classnames';
13
15
  import _ from 'lodash';
14
16
  import ResizeObserver from 'rc-resize-observer';
15
- import React, { forwardRef, useCallback, useImperativeHandle, useMemo, useRef, useState } from 'react';
16
- import { Empty, ScrollArea, Spin } from '..';
17
+ import React, { forwardRef, useCallback, useImperativeHandle, useMemo, useState } from 'react';
18
+ import { Empty, Spin } from '..';
17
19
  import Pagination from "./components/Pagination";
18
20
  import { getTableColumns, prefixCls } from "./helper";
19
- import useScrollX from "./hooks/useScroll";
20
- // 32 行高 + 1 底线高度
21
+ import useFixed from "./hooks/useFixed";
22
+ import useScroll from "./hooks/useScroll";
21
23
  var HEADER_HEIGHT = 41;
22
24
  function Table(props, ref) {
23
- var _classnames;
25
+ var _classnames, _classnames5;
24
26
  var columns = props.columns,
25
27
  data = props.data,
26
28
  rowKey = props.rowKey,
@@ -41,21 +43,24 @@ function Table(props, ref) {
41
43
  _useState2 = _slicedToArray(_useState, 2),
42
44
  totalSize = _useState2[0],
43
45
  setTotalSize = _useState2[1];
44
- var tableBodyRef = useRef(null);
45
46
  var y = scroll.y;
46
- var _useScrollX = useScrollX({
47
+ var _useScroll = useScroll({
47
48
  totalSize: totalSize,
48
49
  scroll: scroll
49
50
  }),
50
- realWidth = _useScrollX.realWidth,
51
- onBodyScroll = _useScrollX.onBodyScroll,
52
- headerRef = _useScrollX.headerRef;
51
+ realWidth = _useScroll.realWidth,
52
+ onBodyScroll = _useScroll.onBodyScroll,
53
+ headerRef = _useScroll.headerRef,
54
+ bodyRef = _useScroll.bodyRef,
55
+ isPingLeft = _useScroll.isPingLeft,
56
+ isPingRight = _useScroll.isPingRight,
57
+ scrollbarWidth = _useScroll.scrollbarWidth;
53
58
  var scrollToFirstRow = useCallback(function () {
54
- if (!tableBodyRef.current) {
59
+ if (!bodyRef.current) {
55
60
  return;
56
61
  }
57
- tableBodyRef.current.scrollTop = 0;
58
- }, []);
62
+ bodyRef.current.scrollTop = 0;
63
+ }, [bodyRef]);
59
64
  useImperativeHandle(ref, function () {
60
65
  return {
61
66
  scrollToFirstRow: scrollToFirstRow
@@ -67,11 +72,15 @@ function Table(props, ref) {
67
72
  }
68
73
  return getTableColumns({
69
74
  columns: columns,
70
- columnSizing: !!columnSizing,
71
75
  totalWidth: realWidth,
72
76
  onError: onError
73
77
  });
74
- }, [columns, totalSize, columnSizing, realWidth, onError]);
78
+ }, [columns, totalSize, realWidth, onError]);
79
+ var getColumnFixedInfo = useFixed({
80
+ tableColumns: tableColumns,
81
+ y: y,
82
+ scrollbarWidth: scrollbarWidth
83
+ });
75
84
  var tableInstance = useReactTable({
76
85
  columns: tableColumns,
77
86
  data: data,
@@ -98,26 +107,37 @@ function Table(props, ref) {
98
107
  headerStyle.top = _.get(sticky, 'offsetHeader', 0);
99
108
  }
100
109
  var headerContent = /*#__PURE__*/React.createElement("div", {
101
- className: classnames(prefixCls('header'), (_classnames = {}, _defineProperty(_classnames, prefixCls('sticky'), isStickyWork), _defineProperty(_classnames, prefixCls('overflow-x'), true), _classnames)),
110
+ className: classnames(prefixCls('header'), (_classnames = {}, _defineProperty(_classnames, prefixCls('overflow-x'), true), _defineProperty(_classnames, prefixCls('sticky'), isStickyWork), _classnames)),
102
111
  ref: headerRef,
103
112
  style: headerStyle
104
113
  }, _.map(headerGroups, function (headerGroup) {
105
114
  return /*#__PURE__*/React.createElement("div", {
106
115
  className: prefixCls('tr'),
107
- key: headerGroup.id
108
- }, _.map(headerGroup.headers, function (header) {
116
+ key: headerGroup.id,
117
+ style: {
118
+ width: realWidth
119
+ }
120
+ }, _.map(headerGroup.headers, function (header, index) {
109
121
  var _classnames2;
122
+ var _getColumnFixedInfo = getColumnFixedInfo(index, true),
123
+ fixedClassName = _getColumnFixedInfo.className,
124
+ fixedStyle = _getColumnFixedInfo.style;
110
125
  return /*#__PURE__*/React.createElement("div", {
111
- className: prefixCls('th'),
112
- style: {
126
+ className: classnames(prefixCls('th'), fixedClassName),
127
+ style: _objectSpread({
113
128
  width: header.getSize()
114
- },
129
+ }, fixedStyle),
115
130
  key: header.id
116
131
  }, flexRender(header.column.columnDef.header, header.getContext()), columnSizing && /*#__PURE__*/React.createElement("div", {
117
132
  onMouseDown: header.getResizeHandler(),
118
133
  onTouchStart: header.getResizeHandler(),
119
134
  className: classnames(prefixCls('resizer'), (_classnames2 = {}, _defineProperty(_classnames2, prefixCls('self-resizing'), header.column.getIsResizing()), _defineProperty(_classnames2, prefixCls('resizing'), tableInstance.getState().columnSizingInfo.isResizingColumn), _classnames2))
120
135
  }));
136
+ }), y !== undefined && /*#__PURE__*/React.createElement("div", {
137
+ className: prefixCls('header-scroll-placeholder'),
138
+ style: {
139
+ flexBasis: scrollbarWidth
140
+ }
121
141
  }));
122
142
  }));
123
143
  var onClickRow = useCallback(function (rowData, rowIndex) {
@@ -138,7 +158,7 @@ function Table(props, ref) {
138
158
  var bodyContent = /*#__PURE__*/React.createElement("div", {
139
159
  className: prefixCls('body'),
140
160
  style: {
141
- width: tableInstance.getTotalSize()
161
+ width: realWidth
142
162
  }
143
163
  }, rows.length === 0 && !loading ? emptyComponent || /*#__PURE__*/React.createElement("div", {
144
164
  className: prefixCls('empty')
@@ -149,45 +169,30 @@ function Table(props, ref) {
149
169
  key: row.id,
150
170
  className: classnames(prefixCls('tr'), _defineProperty({}, prefixCls('row-hover'), typeof onRowClick === 'function'), rowClassName(row.original, rowIndex)),
151
171
  onClick: onClickRow(row.original, rowIndex)
152
- }, _.map(row.getVisibleCells(), function (cell) {
172
+ }, _.map(row.getVisibleCells(), function (cell, colIndex) {
173
+ var _getColumnFixedInfo2 = getColumnFixedInfo(colIndex),
174
+ fixedClassName = _getColumnFixedInfo2.className,
175
+ fixedStyle = _getColumnFixedInfo2.style;
153
176
  return /*#__PURE__*/React.createElement("div", {
154
- className: prefixCls('td'),
177
+ className: classnames(prefixCls('td'), fixedClassName),
155
178
  key: cell.id,
156
- style: {
179
+ style: _objectSpread({
157
180
  width: cell.column.getSize()
158
- }
181
+ }, fixedStyle)
159
182
  }, flexRender(cell.column.columnDef.cell, cell.getContext()));
160
183
  }));
161
184
  }));
162
- var tableContent = y && totalSize ? /*#__PURE__*/React.createElement(Spin, {
185
+ var tableContent = /*#__PURE__*/React.createElement(Spin, {
163
186
  spinning: !!loading
164
187
  }, /*#__PURE__*/React.createElement("div", {
165
188
  className: prefixCls('content')
166
- }, /*#__PURE__*/React.createElement("div", {
167
- className: prefixCls('header'),
189
+ }, headerContent, /*#__PURE__*/React.createElement("div", {
168
190
  style: {
169
- height: HEADER_HEIGHT
170
- }
171
- }, headerContent), /*#__PURE__*/React.createElement("div", {
172
- style: {
173
- height: totalSize.height - HEADER_HEIGHT
191
+ height: y && totalSize ? totalSize.height - HEADER_HEIGHT : 'auto'
174
192
  },
175
- className: prefixCls('body-scroll')
176
- }, /*#__PURE__*/React.createElement(ScrollArea, {
177
- onViewportScroll: onBodyScroll,
178
- ref: tableBodyRef
179
- }, bodyContent)))) : /*#__PURE__*/React.createElement("div", {
180
- className: prefixCls('content')
181
- }, !!loading && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
182
- className: prefixCls('spin-mask')
183
- }), /*#__PURE__*/React.createElement(Spin, null, /*#__PURE__*/React.createElement("div", {
184
- className: prefixCls('spin'),
185
- style: {
186
- position: 'absolute'
187
- }
188
- }))), headerContent, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(ScrollArea, {
189
- onViewportScroll: onBodyScroll,
190
- ref: tableBodyRef
193
+ className: classnames(prefixCls('body-scroll'), _defineProperty({}, prefixCls('scroll-y'), y !== undefined)),
194
+ ref: bodyRef,
195
+ onScroll: onBodyScroll
191
196
  }, bodyContent)));
192
197
  var tableStyle = {};
193
198
  if (y) {
@@ -206,7 +211,7 @@ function Table(props, ref) {
206
211
  });
207
212
  }
208
213
  }, /*#__PURE__*/React.createElement("div", {
209
- className: classnames(prefixCls('main'), _defineProperty({}, prefixCls('overflow-hidden'), !!y))
214
+ className: classnames(prefixCls('main'), (_classnames5 = {}, _defineProperty(_classnames5, prefixCls('overflow-hidden'), !!y), _defineProperty(_classnames5, prefixCls('ping-left'), isPingLeft), _defineProperty(_classnames5, prefixCls('ping-right'), isPingRight), _classnames5))
210
215
  }, tableContent)), /*#__PURE__*/React.createElement(Pagination, {
211
216
  pagination: pagination,
212
217
  scroll: scroll,
@@ -4,8 +4,9 @@
4
4
  @import '../../ScrollArea/style/index.less';
5
5
  @import '../../Empty/style/index.less';
6
6
 
7
+ @header-height: 40px;
8
+
7
9
  .ald-table-container {
8
- position: relative;
9
10
  display: flex;
10
11
  flex-direction: column;
11
12
  width: 100%;
@@ -22,7 +23,6 @@
22
23
  display: flex;
23
24
  flex-direction: column;
24
25
  border-spacing: 0;
25
- position: relative;
26
26
 
27
27
  .ald-table-spin {
28
28
  position: absolute;
@@ -86,6 +86,55 @@
86
86
  position: relative;
87
87
  border-bottom: 1px solid var(--alias-colors-border-subtle, #f3f4f6);
88
88
  flex: 0 0 auto;
89
+
90
+ &.ald-table-fixed-left,
91
+ &.ald-table-fixed-right {
92
+ position: sticky;
93
+ background-color: #fff;
94
+ z-index: 2;
95
+ }
96
+ }
97
+
98
+ .fixed-left-shadow {
99
+ &::after {
100
+ position: absolute;
101
+ right: 0;
102
+ transform: translateX(100%);
103
+ top: 0;
104
+ bottom: 0;
105
+ width: 30px;
106
+ transition: box-shadow 0.2s;
107
+ content: '';
108
+ pointer-events: none;
109
+ box-shadow: inset 10px 0 8px -8px rgba(5, 5, 5, 0.06);
110
+ }
111
+ }
112
+
113
+ .fixed-right-shadow {
114
+ &::after {
115
+ position: absolute;
116
+ left: 0;
117
+ transform: translateX(-100%);
118
+ top: 0;
119
+ bottom: 0;
120
+ width: 30px;
121
+ transition: box-shadow 0.2s;
122
+ content: '';
123
+ pointer-events: none;
124
+ box-shadow: inset -10px 0 8px -8px rgba(5, 5, 5, 0.06);
125
+ }
126
+ }
127
+
128
+ &.ald-table-ping-left {
129
+ .ald-table-fixed-left {
130
+ .fixed-left-shadow();
131
+ }
132
+ }
133
+
134
+ &.ald-table-ping-right {
135
+ .ald-table-fixed-right {
136
+ .fixed-right-shadow();
137
+ }
89
138
  }
90
139
 
91
140
  .ald-table-th {
@@ -99,7 +148,7 @@
99
148
  padding-left: var(--alias-spacing-200, 16px);
100
149
  font-size: 12px;
101
150
  overflow: hidden;
102
- height: 40px;
151
+ height: @header-height;
103
152
  display: flex;
104
153
  align-items: center;
105
154
  }
@@ -130,7 +179,6 @@
130
179
 
131
180
  .ald-table-body {
132
181
  min-height: 96px;
133
- overflow: auto;
134
182
 
135
183
  .ald-table-tr {
136
184
  &.ald-table-row-hover:hover {
@@ -186,8 +234,26 @@
186
234
  height: 100%;
187
235
  }
188
236
 
237
+ .ald-table-header {
238
+ background-color: #fff;
239
+ }
240
+
241
+ .ald-table-header-scroll-placeholder {
242
+ height: @header-height;
243
+ position: sticky;
244
+ right: 0;
245
+ background-color: #fff;
246
+ z-index: 2;
247
+ flex: 0 0 auto;
248
+ }
249
+
189
250
  .ald-table-body-scroll {
190
251
  overflow: auto;
252
+ height: 100%;
253
+
254
+ &.ald-table-scroll-y {
255
+ overflow-y: scroll;
256
+ }
191
257
  }
192
258
 
193
259
  .ald-table-empty {
@@ -39,4 +39,8 @@ export interface ITableColumn<TDataItem = unknown> {
39
39
  ellipsis?: boolean;
40
40
  noPadding?: boolean;
41
41
  align?: 'left' | 'center' | 'right';
42
+ fixed?: 'left' | 'right';
43
+ }
44
+ export interface IInnerTableColumn<TDataItem = unknown> extends ITableColumn<TDataItem> {
45
+ columnWidths: number[];
42
46
  }