@aloudata/aloudata-design 2.5.0 → 2.5.2

package/dist/DataPreviewTable/components/Body/Error.d.ts

@@ -1,8 +1,7 @@
 import React from 'react';
 interface IErrorProps {
-    contentWidth: number;
     wrapWidth: number;
-    errorMsg?: string;
+    errorMsg?: string | React.ReactNode;
 }
 declare function ErrorBody(props: IErrorProps): React.JSX.Element;
 declare const _default: React.MemoExoticComponent<typeof ErrorBody>;

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

@@ -1,19 +1,17 @@
 import React, { memo } from 'react';
 import Result from "../../../Result";
 function ErrorBody(props) {
-  var contentWidth = props.contentWidth,
-    wrapWidth = props.wrapWidth,
+  var wrapWidth = props.wrapWidth,
     _props$errorMsg = props.errorMsg,
     errorMsg = _props$errorMsg === void 0 ? '加载失败' : _props$errorMsg;
-  var width = contentWidth > wrapWidth ? wrapWidth : contentWidth;
   return /*#__PURE__*/React.createElement("div", {
     className: "ald-data-preview-table-error",
     style: {
-      width: width
+      width: wrapWidth
     }
-  }, /*#__PURE__*/React.createElement(Result, {
+  }, typeof errorMsg === 'string' ? /*#__PURE__*/React.createElement(Result, {
     status: "warning",
-    title: errorMsg
-  }));
+    subTitle: errorMsg
+  }) : errorMsg);
 }
 export default /*#__PURE__*/memo(ErrorBody);

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

@@ -1,6 +1,7 @@
 import React from 'react';
 import { IColumnLayout, PreviewColumn } from '../../interface';
 interface IHeader {
+    contentWidth: number;
     columns: PreviewColumn[];
     columnLayout: IColumnLayout;
     setWidth: (columnId: string, width: number) => void;

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

@@ -8,7 +8,8 @@ import React from 'react';
 import { HEADER_HEIGHT } from "../../constant";
 import DragBar from "../DragBar";
 export default function Header(props) {
-  var columns = props.columns,
+  var contentWidth = props.contentWidth,
+    columns = props.columns,
     columnLayout = props.columnLayout,
     setWidth = props.setWidth,
     _props$columnRange = _slicedToArray(props.columnRange, 2),
@@ -17,9 +18,7 @@ export default function Header(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: "ald-data-preview-header",
     style: {
-      position: 'sticky',
-      top: 0,
-      left: 0
+      width: contentWidth
     }
   }, columns.slice(startIndex, endIndex + 1).map(function (column) {
     var _column$renderHeader;

package/dist/DataPreviewTable/index.js

@@ -31,8 +31,8 @@ var DataPreviewTable = /*#__PURE__*/forwardRef(function (props, ref) {
     onScroll = _useDirection.onScroll,
     columnLayout = _useDirection.columnLayout,
     setColumnsWidth = _useDirection.setColumnsWidth,
-    contentWidth = _useDirection.contentWidth,
-    tableColumns = _useDirection.tableColumns;
+    tableColumns = _useDirection.tableColumns,
+    contentWidth = _useDirection.contentWidth;
   useImperativeHandle(ref, function () {
     return {
       scrollToColumnInView: function scrollToColumnInView(columnId) {
@@ -70,10 +70,10 @@ var DataPreviewTable = /*#__PURE__*/forwardRef(function (props, ref) {
   });
   var skeletonRows = useMemo(function () {
     var _wrapRef$current4;
-    var rows = Math.ceil((((_wrapRef$current4 = wrapRef.current) === null || _wrapRef$current4 === void 0 ? void 0 : _wrapRef$current4.clientHeight) || 0 - HEADER_HEIGHT) / CELL_HEIGHT);
+    if (!wrapRef.current) return 0;
+    var rows = Math.ceil(((((_wrapRef$current4 = wrapRef.current) === null || _wrapRef$current4 === void 0 ? void 0 : _wrapRef$current4.clientHeight) || 0) - HEADER_HEIGHT) / CELL_HEIGHT);
     return rows - 1 < 0 ? 0 : rows - 1;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [wrapRef.current]);
+  }, []);
   return /*#__PURE__*/React.createElement(ScrollArea, {
     ref: wrapRef,
     style: {
@@ -88,22 +88,24 @@ var DataPreviewTable = /*#__PURE__*/forwardRef(function (props, ref) {
     className: classNames(props.className, 'ald-data-preview-table', {
       'ald-data-preview-table-show-skeleton': dataStatus === 'pending'
     })
-  }, /*#__PURE__*/React.createElement(Progress, {
-    className: "ald-data-preview-progress",
-    loading: !!loading,
-    ref: progressRef
-  }), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
     style: {
       height: dataStatus === 'pending' ? skeletonRows * CELL_HEIGHT + HEADER_HEIGHT : contentHeight,
-      width: contentWidth,
       position: 'relative'
     }
-  }, /*#__PURE__*/React.createElement(Header, {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "ald-data-preview-sticky"
+  }, /*#__PURE__*/React.createElement(Progress, {
+    className: "ald-data-preview-progress",
+    loading: !!loading,
+    ref: progressRef
+  }), /*#__PURE__*/React.createElement(Header, {
+    contentWidth: contentWidth,
     columns: tableColumns,
     columnLayout: columnLayout,
     setWidth: setColumnsWidth,
     columnRange: columnRange
-  }), dataStatus === 'pending' && tableColumns.length > 0 && /*#__PURE__*/React.createElement("div", {
+  })), dataStatus === 'pending' && tableColumns.length > 0 && /*#__PURE__*/React.createElement("div", {
     className: "ald-data-preview-loading"
   }, /*#__PURE__*/React.createElement(Spin, null)), dataStatus === 'success' && /*#__PURE__*/React.createElement(Body, {
     columns: tableColumns,
@@ -113,8 +115,7 @@ var DataPreviewTable = /*#__PURE__*/forwardRef(function (props, ref) {
     rowRange: rowRange
   }), dataStatus === 'error' && /*#__PURE__*/React.createElement(Error, {
     errorMsg: errorMsg,
-    wrapWidth: ((_wrapRef$current5 = wrapRef.current) === null || _wrapRef$current5 === void 0 ? void 0 : _wrapRef$current5.clientWidth) || 0,
-    contentWidth: contentWidth
+    wrapWidth: ((_wrapRef$current5 = wrapRef.current) === null || _wrapRef$current5 === void 0 ? void 0 : _wrapRef$current5.clientWidth) || 0
   })));
 });
 export default /*#__PURE__*/memo(DataPreviewTable);

package/dist/DataPreviewTable/interface.d.ts

@@ -1,4 +1,4 @@
-import { CSSProperties } from 'react';
+import React, { CSSProperties } from 'react';
 export interface ITableProps {
     columns?: PreviewColumn[];
     datasource?: TValue[][];
@@ -6,7 +6,7 @@ export interface ITableProps {
     height?: CSSProperties['height'];
     dataStatus?: 'pending' | 'success' | 'error';
     loading?: boolean;
-    errorMsg?: string;
+    errorMsg?: string | React.ReactNode;
     className?: string;
 }
 export interface DataPreviewTableRef {

package/dist/DataPreviewTable/style/index.less

@@ -15,6 +15,12 @@
   }
 }
 
+.ald-data-preview-sticky {
+  position: sticky;
+  top: 0;
+  z-index: 1;
+}
+
 .ald-data-preview-header {
   height: 32px;
   z-index: 2;

package/dist/Dropdown/index.js

@@ -58,6 +58,9 @@ export default function Dropdown(props) {
     if (menu !== null && menu !== void 0 && menu.onClick) {
       menu.onClick(info);
     }
+    if (info.keepOpen) {
+      return;
+    }
     if (!isOpenControlled) {
       setDropdownOpen(false);
     }

package/dist/Menu/index.d.ts

@@ -37,4 +37,5 @@ export interface MenuInfo {
     key: string;
     keyPath: string[];
     domEvent: MouseEvent | KeyboardEvent;
+    keepOpen?: boolean;
 }

package/dist/Table/helper.d.ts

@@ -1,8 +1,7 @@
 /// <reference types="react" />
 import { ITableColumn, ITableProps } from './types';
-export declare function getTableColumns<TDataItem extends object>({ columns, columnSizing, totalWidth, onError, }: {
+export declare function getTableColumns<TDataItem extends object>({ columns, totalWidth, onError, }: {
     columns: ITableColumn<TDataItem>[];
-    columnSizing: boolean;
     totalWidth: number;
     onError: ITableProps<TDataItem>['onError'];
 }): {
@@ -12,13 +11,16 @@ export declare function getTableColumns<TDataItem extends object>({ columns, col
     size: number;
     meta: {
         onError: ((errorInfo: import("./types").ITableCellErrorInfo) => void) | undefined;
+        columnWidths: number[];
+        index: number;
         title: import("react").ReactNode;
         dataIndex?: string | undefined;
         width?: string | number | undefined;
         render?: ((text: any, record: TDataItem, rowIndex: number) => import("react").ReactNode) | undefined;
         ellipsis?: boolean | undefined;
         noPadding?: boolean | undefined;
-        align?: "center" | "left" | "right" | undefined;
+        align?: "left" | "center" | "right" | undefined;
+        fixed?: "left" | "right" | undefined;
     };
 }[];
 /**
@@ -28,7 +30,7 @@ export declare function getTableColumns<TDataItem extends object>({ columns, col
  * @param totalWidth
  * @returns
  */
-export declare function getColumnWidths(columns: ITableColumn<unknown>[], columnSizing: boolean, totalWidth: number): number[];
+export declare function getColumnWidths(columns: ITableColumn<unknown>[], totalWidth: number): number[];
 export declare function getNumberFromPercentageStr(str: string): number;
 /**
  * 判断是否百分比字符串

package/dist/Table/helper.js

@@ -9,11 +9,24 @@ import Cell from "./components/Cell";
 import Header from "./components/Header";
 export function getTableColumns(_ref) {
   var columns = _ref.columns,
-    columnSizing = _ref.columnSizing,
     totalWidth = _ref.totalWidth,
     onError = _ref.onError;
-  var columnWidths = getColumnWidths(columns, columnSizing, totalWidth);
-  return _.map(columns, function (col, index) {
+  var columnWidths = getColumnWidths(columns, totalWidth);
+  // 根据固定列的位置重排列顺序，将 left 的列放到最前面，right 的列放到最后面
+  var leftColumns = [];
+  var rightColumns = [];
+  var unFixedColumns = [];
+  columns.forEach(function (col) {
+    if (col.fixed === 'left') {
+      leftColumns.push(col);
+    } else if (col.fixed === 'right') {
+      rightColumns.push(col);
+    } else {
+      unFixedColumns.push(col);
+    }
+  });
+  var sortedColumns = [].concat(leftColumns, unFixedColumns, rightColumns);
+  return _.map(sortedColumns, function (col, index) {
     return {
       // 这里还需要排除掉空字符串的情况，id 不能为 ''
       accessorKey: col.dataIndex || "column-".concat(index),
@@ -21,7 +34,9 @@ export function getTableColumns(_ref) {
       cell: Cell,
       size: columnWidths[index],
       meta: _objectSpread(_objectSpread({}, col), {}, {
-        onError: onError
+        onError: onError,
+        columnWidths: columnWidths,
+        index: index
       })
     };
   });
@@ -34,7 +49,7 @@ export function getTableColumns(_ref) {
  * @param totalWidth
  * @returns
  */
-export function getColumnWidths(columns, columnSizing, totalWidth) {
+export function getColumnWidths(columns, totalWidth) {
   // 可改变列宽情况，react-table 可拖动列宽要求列宽值必须是数字，因为将百分比列宽转换为数字
   var DEFAULT_WIDTH = 150;
   // 计算出每个列的具体宽度值

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

@@ -0,0 +1,10 @@
+/// <reference types="react" />
+import { ColumnDef } from '@tanstack/react-table';
+export default function useFixed<TDataItem>({ tableColumns, y, scrollbarWidth, }: {
+    tableColumns: Array<ColumnDef<TDataItem, unknown>>;
+    y?: string | number;
+    scrollbarWidth: number;
+}): (index: number, isHeader?: boolean) => {
+    className: string;
+    style: import("react").CSSProperties;
+};

package/dist/Table/hooks/useFixed.js

@@ -0,0 +1,56 @@
+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); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+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 _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 _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(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 _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 classnames from 'classnames';
+import { useCallback } from 'react';
+import { prefixCls } from "../helper";
+export default function useFixed(_ref) {
+  var tableColumns = _ref.tableColumns,
+    y = _ref.y,
+    scrollbarWidth = _ref.scrollbarWidth;
+  return useCallback(function (index) {
+    var _classnames;
+    var isHeader = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var column = tableColumns[index];
+    var _ref2 = column.meta,
+      fixed = _ref2.fixed,
+      columnWidths = _ref2.columnWidths;
+    var style = {};
+    if (fixed === 'left') {
+      style.left = getFixedColumnOffset(columnWidths, index, true);
+    } else if (fixed === 'right') {
+      style.right = getFixedColumnOffset(columnWidths, index, false) + (isHeader && y !== undefined ? scrollbarWidth : 0);
+    }
+    return {
+      className: classnames((_classnames = {}, _defineProperty(_classnames, prefixCls('fixed-left'), fixed === 'left'), _defineProperty(_classnames, prefixCls('fixed-right'), fixed === 'right'), _classnames)),
+      style: style
+    };
+  }, [tableColumns, y, scrollbarWidth]);
+}
+
+/**
+ * 获取固定列相对边缘的偏移量
+ * @param columns 所有列
+ * @param index 当前列的索引
+ */
+function getFixedColumnOffset(columnWidths, index, isLeft) {
+  var offset = 0;
+  var relativeIndex = index;
+  var list = _toConsumableArray(columnWidths);
+  if (!isLeft) {
+    list.reverse();
+    relativeIndex = list.length - index - 1;
+  }
+  for (var i = 0; i < relativeIndex; i++) {
+    var colWidth = columnWidths[i];
+    offset += colWidth;
+  }
+  return offset;
+}

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

@@ -5,10 +5,14 @@ import { IScroll } from '../types';
  * @param props
  * @returns
  */
-export default function useScrollX(props: IProps): {
+export default function useScroll(props: IProps): {
     realWidth: number | undefined;
     headerRef: import("react").RefObject<HTMLDivElement>;
+    bodyRef: import("react").RefObject<HTMLDivElement>;
     onBodyScroll: (e: React.UIEvent<HTMLDivElement>) => void;
+    isPingLeft: boolean;
+    isPingRight: boolean;
+    scrollbarWidth: any;
 };
 interface IProps {
     scroll: IScroll;

package/dist/Table/hooks/useScroll.js

@@ -1,41 +1,109 @@
-import { useCallback, useMemo, useRef } from 'react';
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+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 _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 { scrollbarWidth as getScrollbarWidth } from '@xobotyi/scrollbar-width';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { getNumberFromPercentageStr } from "../helper";
+var scrollbarWidth = function () {
+  var barWidth = getScrollbarWidth();
+  if (typeof barWidth === 'undefined') {
+    return 0;
+  }
+  return barWidth;
+}();
+
 /**
  * 横向滚动条相关逻辑
  * @param props
  * @returns
  */
-export default function useScrollX(props) {
+export default function useScroll(props) {
   var scroll = props.scroll,
     totalSize = props.totalSize;
   var headerRef = useRef(null);
+  var bodyRef = useRef(null);
   var animationFrameId = useRef(null);
-  var x = scroll.x;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isPingLeft = _useState2[0],
+    setIsPingLeft = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isPingRight = _useState4[0],
+    setIsPingRight = _useState4[1];
+  var x = scroll.x,
+    y = scroll.y;
   var realWidth = useMemo(function () {
     if (!totalSize) {
       return;
     }
-    return getRealWidth(x, totalSize.width);
-  }, [x, totalSize]);
-  var onBodyScroll = useCallback(function (e) {
-    // animationFrame 可以保证横向滚动时，header 和 body 不会出现不同步的情况
+    var width = getRealWidth(x, totalSize.width);
+    if (y !== undefined) {
+      return width - scrollbarWidth;
+    }
+    return width;
+  }, [x, y, totalSize]);
+  var changeIsPing = useCallback(function (elem) {
+    var scrollLeft = elem.scrollLeft;
+    if (scrollLeft <= 0) {
+      setIsPingLeft(false);
+    } else {
+      setIsPingLeft(true);
+    }
+    if (isScrolledToRight(elem, y !== undefined ? scrollbarWidth : 0)) {
+      setIsPingRight(false);
+    } else {
+      setIsPingRight(true);
+    }
+  }, [y]);
+  useEffect(function () {
+    if (realWidth && bodyRef.current) {
+      // 待表格渲染完成，宽度稳定后，初始化 ping 状态
+      changeIsPing(bodyRef.current);
+    }
+  }, [realWidth, changeIsPing]);
+  var requestAnimationFrame = useCallback(function (callback) {
+    // animationFrame 可以保证滚动时，header 和 body 不会出现不同步的情况
     if (animationFrameId.current !== null) {
       window.cancelAnimationFrame(animationFrameId.current);
     }
-    var scrollLeft = e.target.scrollLeft;
-    animationFrameId.current = window.requestAnimationFrame(function () {
+    animationFrameId.current = window.requestAnimationFrame(callback);
+  }, []);
+  var onBodyScroll = useCallback(function (e) {
+    var target = e.target;
+    var scrollLeft = target.scrollLeft;
+    requestAnimationFrame(function () {
       var _headerRef$current;
       (_headerRef$current = headerRef.current) === null || _headerRef$current === void 0 ? void 0 : _headerRef$current.scrollTo({
         left: scrollLeft
       });
+      changeIsPing(target);
     });
-  }, []);
+  }, [requestAnimationFrame, changeIsPing]);
   return {
     realWidth: realWidth,
     headerRef: headerRef,
-    onBodyScroll: onBodyScroll
+    bodyRef: bodyRef,
+    onBodyScroll: onBodyScroll,
+    isPingLeft: isPingLeft,
+    isPingRight: isPingRight,
+    scrollbarWidth: scrollbarWidth
   };
 }
+function isScrolledToRight(element, offsetRight) {
+  // 计算最大可滚动值
+  var maxScrollLeft = element.scrollWidth - element.clientWidth - offsetRight;
+
+  // 允许一些误差，避免因为浮点数计算导致的问题
+  var DEVIATION = 2;
+
+  // 判断是否滚动到最右侧
+  return element.scrollLeft >= maxScrollLeft - DEVIATION;
+}
+
 /**
  * 获取可用实际宽度
  * @param scrollX 横向宽度值