@aloudata/aloudata-design 1.6.0 → 1.6.1

package/dist/DataPreviewTable/components/Body/SkeletonBody.js

@@ -35,10 +35,10 @@ function SkeletonBody(props) {
   }, [rows, row]);
   return /*#__PURE__*/React.createElement("div", {
     className: "ald-data-preview-table-body"
-  }, datasource.slice(startRowIndex, endRowIndex).map(function (x, rowIndex) {
+  }, datasource.slice(startRowIndex, endRowIndex + 1).map(function (x, rowIndex) {
     return /*#__PURE__*/React.createElement(React.Fragment, {
       key: rowIndex
-    }, row.slice(startIndex, endIndex).map(function (cell, index) {
+    }, row.slice(startIndex, endIndex + 1).map(function (cell, index) {
       var columnIndex = startIndex + index;
       var style = {
         height: CELL_HEIGHT,

package/dist/DataPreviewTable/components/Body/index.js

@@ -24,13 +24,14 @@ function Body(props) {
       startRowIndex = _props$rowRange[0],
       endRowIndex = _props$rowRange[1];
 
+  console.log(columnLayout, columns, 'columnLayout---body');
   return /*#__PURE__*/React.createElement("div", {
     className: "ald-data-preview-table-body"
   }, datasource.slice(startRowIndex, endRowIndex).map(function (row, rowIndex) {
     var currentRowIndex = startRowIndex + rowIndex;
     return /*#__PURE__*/React.createElement(React.Fragment, {
       key: currentRowIndex
-    }, row.slice(startIndex, endIndex).map(function (cell, index) {
+    }, row.slice(startIndex, endIndex + 1).map(function (cell, index) {
       var columnIndex = startIndex + index;
       var style = {
         height: CELL_HEIGHT,

package/dist/DataPreviewTable/components/Header/index.d.ts

@@ -1,9 +1,9 @@
-import React from 'react';
+/// <reference types="react" />
 import { IColumnLayout, PreviewColumn } from '../../interface';
 interface IHeader {
     columns: PreviewColumn[];
     columnLayout: IColumnLayout;
-    setWidth: React.Dispatch<React.SetStateAction<number[]>>;
+    setWidth: (columnId: string, width: number) => void;
     columnRange: [number, number];
 }
 export default function Header(props: IHeader): JSX.Element;

package/dist/DataPreviewTable/components/Header/index.js

@@ -1,34 +1,26 @@
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
-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."); }
+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."); }
 
 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); }
 
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+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 _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 
-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 _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useCallback } from 'react';
+import React from 'react';
 import { HEADER_HEIGHT } from "../../constant";
 import DragBar from "../DragBar";
 export default function Header(props) {
   var columns = props.columns,
       columnLayout = props.columnLayout,
       setWidth = props.setWidth,
-      columnRange = props.columnRange;
-  var dragBarOnChange = useCallback(function (columnId, width) {
-    var index = columns.findIndex(function (item) {
-      return item.id === columnId;
-    });
-    setWidth(function (prev) {
-      var next = _toConsumableArray(prev);
+      _props$columnRange = _slicedToArray(props.columnRange, 2),
+      startIndex = _props$columnRange[0],
+      endIndex = _props$columnRange[1];
 
-      next[index] = width;
-      return next;
-    });
-  }, [columns, setWidth]);
   return /*#__PURE__*/React.createElement("div", {
     className: "ald-data-preview-header",
     style: {
@@ -36,7 +28,7 @@ export default function Header(props) {
       top: 0,
       left: 0
     }
-  }, columns.slice(columnRange[0], columnRange[1]).map(function (column) {
+  }, columns.slice(startIndex, endIndex + 1).map(function (column) {
     var _column$renderHeader;
 
     var innerCell = (_column$renderHeader = column.renderHeader) === null || _column$renderHeader === void 0 ? void 0 : _column$renderHeader.call(column, column);
@@ -62,7 +54,7 @@ export default function Header(props) {
     })), /*#__PURE__*/React.createElement(DragBar, {
       columnId: column.id,
       wrapWidth: columnLayout[column.id].width,
-      onChange: dragBarOnChange
+      onChange: setWidth
     }));
   }));
 }

package/dist/DataPreviewTable/hooks/useDirection.d.ts

@@ -1,28 +1,11 @@
 import { RefObject } from 'react';
 import { IColumnLayout, PreviewColumn } from '../interface';
-export interface IScrollData {
-    scrollLeft: number;
-    scrollTop: number;
-    direction: IScrollDirection;
-}
-export interface IScrollDirection {
-    horizontal: EScrollHorizontalDirection;
-    vertical: EScrollVerticalDirection;
-    current: EScrollHorizontalDirection | EScrollVerticalDirection | 'init';
-}
-export declare enum EScrollHorizontalDirection {
-    SCROLL_TO_LEFT = "toLeft",
-    SCROLL_TO_RIGHT = "toRight"
-}
-export declare enum EScrollVerticalDirection {
-    SCROLL_TO_TOP = "toTop",
-    SCROLL_TO_BOTTOM = "toBottom"
-}
 export default function useDirection(columns: PreviewColumn[], wrapRef: RefObject<HTMLDivElement>): {
-    setRange: (scrollTop: number, scrollLeft: number) => void;
     columnRange: [number, number];
     rowRange: [number, number];
-    setColumnsWidth: import("react").Dispatch<import("react").SetStateAction<number[]>>;
+    setColumnsWidth: (columnId: string, width: number) => void;
     columnLayout: IColumnLayout;
-    columnsWidth: number[];
+    contentWidth: number;
+    tableColumns: PreviewColumn[];
+    onScroll: () => void;
 };

package/dist/DataPreviewTable/hooks/useDirection.js

@@ -12,23 +12,13 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { CELL_HEIGHT, DEFAULT_COLUMN_WIDTH, PRE_RENDER_RANGE } from "../constant";
-import { findFirstIndex } from "../utils/findRange";
-export var EScrollHorizontalDirection;
-
-(function (EScrollHorizontalDirection) {
-  EScrollHorizontalDirection["SCROLL_TO_LEFT"] = "toLeft";
-  EScrollHorizontalDirection["SCROLL_TO_RIGHT"] = "toRight";
-})(EScrollHorizontalDirection || (EScrollHorizontalDirection = {}));
-
-export var EScrollVerticalDirection;
-
-(function (EScrollVerticalDirection) {
-  EScrollVerticalDirection["SCROLL_TO_TOP"] = "toTop";
-  EScrollVerticalDirection["SCROLL_TO_BOTTOM"] = "toBottom";
-})(EScrollVerticalDirection || (EScrollVerticalDirection = {}));
-
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { DEFAULT_COLUMN_WIDTH } from "../constant";
+import { EScrollHorizontalDirection, EScrollVerticalDirection } from "../interface";
+import getColumnOffsetsFromWidths from "../utils/getColumnOffsetsFromWidths";
+import getColumnRange from "../utils/getColumnRange";
+import getRowRange from "../utils/getRowRange";
+import getTableLayout from "../utils/getTableLayout";
 export default function useDirection(columns, wrapRef) {
   var prevScrollData = useRef({
     scrollTop: 0,
@@ -40,21 +30,27 @@ export default function useDirection(columns, wrapRef) {
     }
   });
 
-  var _useState = useState([]),
+  var _useState = useState([0, 0]),
       _useState2 = _slicedToArray(_useState, 2),
-      columnsWidth = _useState2[0],
-      setColumnsWidth = _useState2[1];
+      columnRange = _useState2[0],
+      setColumnRange = _useState2[1];
 
   var _useState3 = useState([0, 0]),
       _useState4 = _slicedToArray(_useState3, 2),
-      columnRange = _useState4[0],
-      setColumnRange = _useState4[1];
+      rowRange = _useState4[0],
+      setRowRange = _useState4[1];
 
-  var _useState5 = useState([0, 0]),
+  var _useState5 = useState([]),
       _useState6 = _slicedToArray(_useState5, 2),
-      rowRange = _useState6[0],
-      setRowRange = _useState6[1];
+      tableColumns = _useState6[0],
+      setTableColumns = _useState6[1];
+
+  var _useState7 = useState(0),
+      _useState8 = _slicedToArray(_useState7, 2),
+      contentWidth = _useState8[0],
+      setContentWidth = _useState8[1];
 
+  var columnWidthRef = useRef({});
   var getScrollDirection = useCallback(function (currentScrollTop, currentScrollLeft) {
     var _prevScrollData$curre = prevScrollData.current,
         preScrollTop = _prevScrollData$curre.scrollTop,
@@ -112,136 +108,101 @@ export default function useDirection(columns, wrapRef) {
       return prevScrollData.current.direction;
     }
   }, []);
-  var columnsOffsets = useMemo(function () {
-    var offset = 0;
-    return columnsWidth.map(function (width) {
-      var currentOffset = offset;
-      offset += width;
-      return currentOffset;
-    });
-  }, [columnsWidth]);
-  var setRange = useCallback(function (scrollTop, scrollLeft) {
-    var direction = getScrollDirection(scrollTop, scrollLeft);
-    var current = direction.current;
-
-    if (current === EScrollHorizontalDirection.SCROLL_TO_LEFT) {
-      var _wrapRef$current;
 
-      // 往左滚动
-      var wrapWidth = ((_wrapRef$current = wrapRef.current) === null || _wrapRef$current === void 0 ? void 0 : _wrapRef$current.clientWidth) || 0;
-      setColumnRange(function (prev) {
-        var _prev = _slicedToArray(prev, 2),
-            start = _prev[0],
-            end = _prev[1];
+  var _useState9 = useState([]),
+      _useState10 = _slicedToArray(_useState9, 2),
+      columnsOffsets = _useState10[0],
+      setColumnsOffsets = _useState10[1];
 
-        var firstIndex = findFirstIndex(columnsOffsets, scrollLeft - PRE_RENDER_RANGE);
-        var lastIndex = findFirstIndex(columnsOffsets, scrollLeft + wrapWidth);
-
-        if (firstIndex === start && lastIndex === end) {
-          return prev;
-        }
+  var setRange = useCallback(function (columnsOffsets) {
+    var _wrapRef$current, _wrapRef$current2, _wrapRef$current3, _wrapRef$current4;
 
-        return [firstIndex, lastIndex + 1];
-      });
-    }
-
-    if (current === EScrollHorizontalDirection.SCROLL_TO_RIGHT || current === 'init') {
-      var _wrapRef$current2;
-
-      // 往右滚动
-      var _wrapWidth = ((_wrapRef$current2 = wrapRef.current) === null || _wrapRef$current2 === void 0 ? void 0 : _wrapRef$current2.clientWidth) || 0;
-
-      setColumnRange(function (prev) {
-        var _prev2 = _slicedToArray(prev, 2),
-            start = _prev2[0],
-            end = _prev2[1];
-
-        var firstIndex = findFirstIndex(columnsOffsets, scrollLeft);
-        var lastIndex = findFirstIndex(columnsOffsets, scrollLeft + PRE_RENDER_RANGE + _wrapWidth);
-
-        if (firstIndex === start && lastIndex === end) {
-          return prev;
-        }
+    console.log(columnsOffsets, 'columnsOffsets');
+    var scrollTop = ((_wrapRef$current = wrapRef.current) === null || _wrapRef$current === void 0 ? void 0 : _wrapRef$current.scrollTop) || 0;
+    var scrollLeft = ((_wrapRef$current2 = wrapRef.current) === null || _wrapRef$current2 === void 0 ? void 0 : _wrapRef$current2.scrollLeft) || 0;
+    var direction = getScrollDirection(scrollTop, scrollLeft);
+    var columnRange = getColumnRange({
+      direction: direction.horizontal,
+      wrapWidth: ((_wrapRef$current3 = wrapRef.current) === null || _wrapRef$current3 === void 0 ? void 0 : _wrapRef$current3.clientWidth) || 0,
+      scrollLeft: scrollLeft,
+      columnsOffsets: columnsOffsets
+    });
 
-        return [firstIndex, lastIndex + 1];
-      });
+    if (columnRange) {
+      setColumnRange(columnRange);
     }
 
-    if (current === EScrollVerticalDirection.SCROLL_TO_TOP) {
-      var _wrapRef$current3;
-
-      // 往上滚动
-      var wrapHeight = ((_wrapRef$current3 = wrapRef.current) === null || _wrapRef$current3 === void 0 ? void 0 : _wrapRef$current3.clientHeight) || 0;
-      var firstIndex = Math.floor((scrollTop - PRE_RENDER_RANGE) / CELL_HEIGHT);
-
-      if (firstIndex < 0) {
-        firstIndex = 0;
-      }
-
-      var lastIndex = Math.ceil((scrollTop + wrapHeight) / CELL_HEIGHT) + 1;
-      setRowRange(function (prev) {
-        var _prev3 = _slicedToArray(prev, 2),
-            start = _prev3[0],
-            end = _prev3[1];
-
-        if (firstIndex === start && lastIndex === end) {
-          return prev;
-        }
+    var rowRange = getRowRange({
+      direction: direction.vertical,
+      wrapHeight: ((_wrapRef$current4 = wrapRef.current) === null || _wrapRef$current4 === void 0 ? void 0 : _wrapRef$current4.clientHeight) || 0,
+      scrollTop: scrollTop
+    });
 
-        return [firstIndex, lastIndex + 1];
-      });
+    if (rowRange) {
+      setRowRange(rowRange);
     }
+  }, [getScrollDirection, wrapRef]);
 
-    if (current === EScrollVerticalDirection.SCROLL_TO_BOTTOM || current === 'init') {
-      var _wrapRef$current4;
-
-      // 往下滚动
-      var _wrapHeight = ((_wrapRef$current4 = wrapRef.current) === null || _wrapRef$current4 === void 0 ? void 0 : _wrapRef$current4.clientHeight) || 0;
-
-      var _firstIndex = Math.floor(scrollTop / CELL_HEIGHT);
-
-      var _lastIndex = Math.ceil((scrollTop + _wrapHeight + PRE_RENDER_RANGE) / CELL_HEIGHT) + 1;
+  var _useState11 = useState({}),
+      _useState12 = _slicedToArray(_useState11, 2),
+      columnLayout = _useState12[0],
+      setColumnLayout = _useState12[1];
 
-      setRowRange(function (prev) {
-        var _prev4 = _slicedToArray(prev, 2),
-            start = _prev4[0],
-            end = _prev4[1];
+  var onScroll = function onScroll() {
+    console.log(111);
+    setRange(columnsOffsets);
+  };
 
-        if (_firstIndex === start && _lastIndex === end) {
-          return prev;
-        }
+  useEffect(function () {
+    if (columns.length > 0) {
+      // 存在有效的列
+      // 计算列宽
+      var columnWidths = columns.map(function (_ref) {
+        var defaultWidth = _ref.defaultWidth,
+            id = _ref.id;
+        var width = columnWidthRef.current[id] || defaultWidth || DEFAULT_COLUMN_WIDTH;
+        columnWidthRef.current[id] = width;
+        return width;
+      }); // 计算contentWidth
+
+      var _contentWidth = columnWidths.reduce(function (sum, width) {
+        return sum + width;
+      }, 0); // 计算columnsOffsets
+
+
+      var offsets = getColumnOffsetsFromWidths(columnWidths); // 计算columnLayout
+
+      var _columnLayout = getTableLayout(columns, columnWidths);
+
+      setContentWidth(_contentWidth);
+      setColumnsOffsets(offsets);
+      setColumnLayout(_columnLayout);
+      setRange(offsets);
+      setTableColumns(columns);
+    } else {
+      // 没有有效的列
+      setContentWidth(0);
+      setColumnsOffsets([]);
+      setColumnLayout({}); // setRange();
 
-        return [_firstIndex, _lastIndex + 1];
-      });
+      setTableColumns([]);
     }
-  }, [columnsOffsets, getScrollDirection, wrapRef]);
-  var columnLayout = useMemo(function () {
-    var columnLayout = {};
-    var left = 0;
-    columns.forEach(function (column, index) {
-      var columnWidth = columnsWidth[index] || column.defaultWidth || DEFAULT_COLUMN_WIDTH;
-      columnLayout[column.id] = {
-        width: columnWidth,
-        left: left
-      };
-      left += columnWidth;
+  }, [columns, setRange]);
+  var setColumnsWidth = useCallback(function (columnId, width) {
+    columnWidthRef.current[columnId] = width;
+    var columnWidths = columns.map(function (_ref2) {
+      var id = _ref2.id;
+      return columnWidthRef.current[id];
     });
-    return columnLayout;
-  }, [columns, columnsWidth]);
-  useEffect(function () {
-    if (columnsWidth.length === 0 && columns.length > 0) {
-      var widths = columns.map(function (_ref) {
-        var defaultWidth = _ref.defaultWidth;
-        return defaultWidth || 100;
-      });
-      setColumnsWidth(widths);
-    }
-  }, [columns, columnsWidth]);
-  useEffect(function () {
-    var _wrapRef$current5, _wrapRef$current6;
-
-    setRange(((_wrapRef$current5 = wrapRef.current) === null || _wrapRef$current5 === void 0 ? void 0 : _wrapRef$current5.scrollTop) || 0, ((_wrapRef$current6 = wrapRef.current) === null || _wrapRef$current6 === void 0 ? void 0 : _wrapRef$current6.scrollLeft) || 0); // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [columnLayout, wrapRef]);
+    var offsets = getColumnOffsetsFromWidths(columnWidths);
+    var columnLayout = getTableLayout(columns, columnWidths);
+    setContentWidth(columnWidths.reduce(function (sum, width) {
+      return sum + width;
+    }, 0));
+    setColumnsOffsets(offsets);
+    setColumnLayout(columnLayout);
+    setRange(offsets);
+  }, [columns, setRange]);
   useEffect(function () {
     var wrap = wrapRef.current;
     var resizeObserver = new ResizeObserver(function (entries) {
@@ -253,9 +214,9 @@ export default function useDirection(columns, wrapRef) {
           var entry = _step.value;
 
           if (entry.contentRect) {
-            setRange((wrap === null || wrap === void 0 ? void 0 : wrap.scrollTop) || 0, (wrap === null || wrap === void 0 ? void 0 : wrap.scrollLeft) || 0);
+            setRange(columnsOffsets);
           } else if (entry.contentBoxSize) {
-            setRange((wrap === null || wrap === void 0 ? void 0 : wrap.scrollTop) || 0, (wrap === null || wrap === void 0 ? void 0 : wrap.scrollLeft) || 0);
+            setRange(columnsOffsets);
           }
         }
       } catch (err) {
@@ -269,13 +230,15 @@ export default function useDirection(columns, wrapRef) {
       resizeObserver.unobserve(wrap);
       resizeObserver.disconnect();
     };
-  }, [wrapRef, setRange]);
+  }, [wrapRef, setRange, columnsOffsets]);
+  console.log(columnLayout, 'columnLayout,useDirection', columnRange);
   return {
-    setRange: setRange,
     columnRange: columnRange,
     rowRange: rowRange,
     setColumnsWidth: setColumnsWidth,
     columnLayout: columnLayout,
-    columnsWidth: columnsWidth
+    contentWidth: contentWidth,
+    tableColumns: tableColumns,
+    onScroll: onScroll
   };
 }

package/dist/DataPreviewTable/index.js

@@ -1,3 +1,10 @@
+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; }
+
+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; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+import { useWhyDidYouUpdate } from 'ahooks';
 import classNames from 'classnames';
 import React, { forwardRef, memo, useEffect, useMemo, useRef } from 'react';
 import Progress from "../Progress";
@@ -30,16 +37,19 @@ function DataPreviewTable(props, ref) {
   var _useDirection = useDirection(columns, wrapRef),
       columnRange = _useDirection.columnRange,
       rowRange = _useDirection.rowRange,
-      columnsWidth = _useDirection.columnsWidth,
-      setRange = _useDirection.setRange,
+      onScroll = _useDirection.onScroll,
       columnLayout = _useDirection.columnLayout,
-      setColumnsWidth = _useDirection.setColumnsWidth;
+      setColumnsWidth = _useDirection.setColumnsWidth,
+      contentWidth = _useDirection.contentWidth,
+      tableColumns = _useDirection.tableColumns;
 
-  var contentWidth = useMemo(function () {
-    return columnsWidth.reduce(function (sum, width) {
-      return sum + width;
-    }, 0);
-  }, [columnsWidth]);
+  useWhyDidYouUpdate('DataPreviewTable', _objectSpread({
+    columnRange: columnRange,
+    rowRange: rowRange,
+    onScroll: onScroll,
+    columnLayout: columnLayout,
+    setColumnsWidth: setColumnsWidth
+  }, props));
   useEffect(function () {
     if (ref) {
       if (typeof ref === 'function') {
@@ -53,6 +63,7 @@ function DataPreviewTable(props, ref) {
     var rows = Math.ceil((((_wrapRef$current = wrapRef.current) === null || _wrapRef$current === void 0 ? void 0 : _wrapRef$current.clientHeight) || 0 - HEADER_HEIGHT) / CELL_HEIGHT);
     return rows - 1 < 0 ? 0 : rows - 1; // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [wrapRef.current]);
+  console.log(columnLayout, 'columnLayout');
   return /*#__PURE__*/React.createElement(ScrollArea, {
     ref: wrapRef,
     style: {
@@ -60,11 +71,9 @@ function DataPreviewTable(props, ref) {
       height: height,
       willChange: 'transform'
     },
-    onViewportScroll: function onViewportScroll(e) {
-      var _ref = e.target,
-          scrollTop = _ref.scrollTop,
-          scrollLeft = _ref.scrollLeft;
-      setRange(scrollTop, scrollLeft);
+    onViewportScroll: function onViewportScroll() {
+      // const { scrollTop, scrollLeft } = e.target as HTMLDivElement;
+      onScroll();
     },
     className: classNames(props.className, 'ald-data-preview-table', {
       'ald-data-preview-table-show-skeleton': dataStatus === 'pending'
@@ -79,18 +88,18 @@ function DataPreviewTable(props, ref) {
       position: 'relative'
     }
   }, /*#__PURE__*/React.createElement(Header, {
-    columns: columns,
+    columns: tableColumns,
     columnLayout: columnLayout,
     setWidth: setColumnsWidth,
     columnRange: columnRange
   }), dataStatus === 'pending' && /*#__PURE__*/React.createElement(SkeletonBody, {
-    columns: columns,
+    columns: tableColumns,
     columnRange: columnRange,
     columnLayout: columnLayout,
     rowRange: rowRange,
     rows: skeletonRows
   }), dataStatus === 'success' && /*#__PURE__*/React.createElement(Body, {
-    columns: columns,
+    columns: tableColumns,
     columnRange: columnRange,
     columnLayout: columnLayout,
     datasource: datasource,

package/dist/DataPreviewTable/interface.d.ts

@@ -25,3 +25,21 @@ export interface IColumnLayout {
         left: number;
     };
 }
+export interface IScrollData {
+    scrollLeft: number;
+    scrollTop: number;
+    direction: IScrollDirection;
+}
+export interface IScrollDirection {
+    horizontal: EScrollHorizontalDirection;
+    vertical: EScrollVerticalDirection;
+    current: EScrollHorizontalDirection | EScrollVerticalDirection | 'init';
+}
+export declare enum EScrollHorizontalDirection {
+    SCROLL_TO_LEFT = "toLeft",
+    SCROLL_TO_RIGHT = "toRight"
+}
+export declare enum EScrollVerticalDirection {
+    SCROLL_TO_TOP = "toTop",
+    SCROLL_TO_BOTTOM = "toBottom"
+}

package/dist/DataPreviewTable/interface.js

@@ -1 +1,13 @@
-export {};
+export var EScrollHorizontalDirection;
+
+(function (EScrollHorizontalDirection) {
+  EScrollHorizontalDirection["SCROLL_TO_LEFT"] = "toLeft";
+  EScrollHorizontalDirection["SCROLL_TO_RIGHT"] = "toRight";
+})(EScrollHorizontalDirection || (EScrollHorizontalDirection = {}));
+
+export var EScrollVerticalDirection;
+
+(function (EScrollVerticalDirection) {
+  EScrollVerticalDirection["SCROLL_TO_TOP"] = "toTop";
+  EScrollVerticalDirection["SCROLL_TO_BOTTOM"] = "toBottom";
+})(EScrollVerticalDirection || (EScrollVerticalDirection = {}));

package/dist/DataPreviewTable/utils/getColumnOffsetsFromWidths.d.ts

@@ -0,0 +1 @@
+export default function (columnsWidth: number[]): number[];

package/dist/DataPreviewTable/utils/getColumnOffsetsFromWidths.js

@@ -0,0 +1,8 @@
+export default function (columnsWidth) {
+  var offset = 0;
+  return columnsWidth.map(function (width) {
+    var currentOffset = offset;
+    offset += width;
+    return currentOffset;
+  });
+}

package/dist/DataPreviewTable/utils/getColumnRange.d.ts

@@ -0,0 +1,8 @@
+import { IScrollDirection } from '../interface';
+declare const _default: ({ direction, wrapWidth, scrollLeft, columnsOffsets, }: {
+    direction: IScrollDirection['current'];
+    wrapWidth: number;
+    scrollLeft: number;
+    columnsOffsets: number[];
+}) => [number, number] | undefined;
+export default _default;

package/dist/DataPreviewTable/utils/getColumnRange.js

@@ -0,0 +1,25 @@
+import { PRE_RENDER_RANGE } from "../constant";
+import { EScrollHorizontalDirection } from "../interface";
+import { findFirstIndex, findLastIndex } from "./findRange";
+export default (function (_ref) {
+  var direction = _ref.direction,
+      wrapWidth = _ref.wrapWidth,
+      scrollLeft = _ref.scrollLeft,
+      columnsOffsets = _ref.columnsOffsets;
+
+  if (direction === EScrollHorizontalDirection.SCROLL_TO_LEFT) {
+    // 往左滚动
+    var firstIndex = findFirstIndex(columnsOffsets, scrollLeft - PRE_RENDER_RANGE);
+    var lastIndex = findLastIndex(columnsOffsets, scrollLeft + wrapWidth);
+    return [firstIndex, lastIndex];
+  }
+
+  if (direction === EScrollHorizontalDirection.SCROLL_TO_RIGHT || direction === 'init') {
+    // 往右滚动
+    var _firstIndex = findFirstIndex(columnsOffsets, scrollLeft);
+
+    var _lastIndex = findLastIndex(columnsOffsets, scrollLeft + PRE_RENDER_RANGE + wrapWidth);
+
+    return [_firstIndex, _lastIndex];
+  }
+});

package/dist/DataPreviewTable/utils/getRowRange.d.ts

@@ -0,0 +1,7 @@
+import { IScrollDirection } from '../interface';
+declare const _default: ({ direction, wrapHeight, scrollTop, }: {
+    direction: IScrollDirection['current'];
+    wrapHeight: number;
+    scrollTop: number;
+}) => [number, number] | undefined;
+export default _default;

package/dist/DataPreviewTable/utils/getRowRange.js

@@ -0,0 +1,28 @@
+import { CELL_HEIGHT, PRE_RENDER_RANGE } from "../constant";
+import { EScrollVerticalDirection } from "../interface";
+export default (function (_ref) {
+  var direction = _ref.direction,
+      wrapHeight = _ref.wrapHeight,
+      scrollTop = _ref.scrollTop;
+
+  if (direction === EScrollVerticalDirection.SCROLL_TO_TOP) {
+    // 往上滚动
+    var firstIndex = Math.floor((scrollTop - PRE_RENDER_RANGE) / CELL_HEIGHT);
+
+    if (firstIndex < 0) {
+      firstIndex = 0;
+    }
+
+    var lastIndex = Math.ceil((scrollTop + wrapHeight) / CELL_HEIGHT) + 1;
+    return [firstIndex, lastIndex];
+  }
+
+  if (direction === EScrollVerticalDirection.SCROLL_TO_BOTTOM || direction === 'init') {
+    // 往下滚动
+    var _firstIndex = Math.floor(scrollTop / CELL_HEIGHT);
+
+    var _lastIndex = Math.ceil((scrollTop + wrapHeight + PRE_RENDER_RANGE) / CELL_HEIGHT) + 1;
+
+    return [_firstIndex, _lastIndex];
+  }
+});

package/dist/DataPreviewTable/utils/getTableLayout.d.ts

@@ -0,0 +1,3 @@
+import { IColumnLayout, PreviewColumn } from '../interface';
+declare const _default: (tableColumns: PreviewColumn[], columnsWidth: number[]) => IColumnLayout;
+export default _default;

package/dist/DataPreviewTable/utils/getTableLayout.js

@@ -0,0 +1,18 @@
+import { DEFAULT_COLUMN_WIDTH } from "../constant";
+export default (function (tableColumns, columnsWidth) {
+  if (columnsWidth.length !== tableColumns.length) {
+    throw new Error('columnsWidth.length !== tableColumns.length');
+  }
+
+  var columnLayout = {};
+  var left = 0;
+  tableColumns.forEach(function (column, index) {
+    var columnWidth = columnsWidth[index] || column.defaultWidth || DEFAULT_COLUMN_WIDTH;
+    columnLayout[column.id] = {
+      width: columnWidth,
+      left: left
+    };
+    left += columnWidth;
+  });
+  return columnLayout;
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloudata/aloudata-design",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "",
   "license": "MIT",
   "module": "dist/index.js",