@aloudata/aloudata-design 0.3.3 → 0.3.4

package/lib/Table/hooks/useTableColumn.js

@@ -0,0 +1,66 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = require("react");
+
+var _utils = require("../utils");
+
+var _message = _interopRequireDefault(require("../../message"));
+
+require("react-table/node_modules/@types/react");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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; }
+
+function useTableColumn(props) {
+  var columnsWidthMapRef = props.columnsWidthMapRef,
+      columnsTotalWidthRef = props.columnsTotalWidthRef,
+      columnsRef = props.columnsRef,
+      tableClientWidth = props.tableClientWidth,
+      sortable = props.sortable; // 转换外部传入的columns
+
+  var newColumns = (0, _react.useMemo)(function () {
+    var _getColumnsWidthMap = (0, _utils.getColumnsWidthMap)(columnsRef.current, tableClientWidth, columnsWidthMapRef.current),
+        columnsWidthMap = _getColumnsWidthMap.columnsWidthMap,
+        totalColumnWidth = _getColumnsWidthMap.totalColumnWidth;
+
+    columnsWidthMapRef.current = columnsWidthMap;
+    columnsTotalWidthRef.current = totalColumnWidth;
+    return columnsRef.current.map(function (column, index) {
+      var _columnsWidthMapRef$c, _columnsWidthMapRef$c2;
+
+      var key = index.toString(); // 不设置dataIndex同时进行排序 则报错
+
+      if (!column.dataIndex === undefined && sortable) {
+        _message.default.error('不支持未设置dataIndex时进行排序设置');
+      }
+
+      return _objectSpread(_objectSpread({}, column), {}, {
+        width: (_columnsWidthMapRef$c = columnsWidthMapRef.current) === null || _columnsWidthMapRef$c === void 0 ? void 0 : (_columnsWidthMapRef$c2 = _columnsWidthMapRef$c.get(key)) === null || _columnsWidthMapRef$c2 === void 0 ? void 0 : _columnsWidthMapRef$c2.width,
+        Header: column.title ? column.title : function () {
+          return null;
+        },
+        disableSortBy: !sortable || typeof column.sorter === 'boolean',
+        accessor: column.dataIndex,
+        Cell: function Cell(_ref) {
+          var row = _ref.row,
+              value = _ref.value;
+          return typeof column.render === 'function' ? column.render(value, row.original, row.index) : value;
+        }
+      });
+    });
+  }, [columnsRef, columnsTotalWidthRef, columnsWidthMapRef, sortable, tableClientWidth]);
+  return newColumns;
+}
+
+var _default = useTableColumn;
+exports.default = _default;

package/lib/Table/interface.d.ts

@@ -9,7 +9,7 @@ export interface IColumn<RecordType> {
     title: string | null;
     dataIndex: string;
     render?: (value: any, row: RecordType, index: number) => React.ReactNode;
-    width?: number;
+    width?: number | string;
     minWidth?: number;
     sorter?: boolean | 'string' | 'number' | 'basic' | 'datetime' | 'alphanumeric';
     sortOrder?: TSortOrder;
@@ -20,7 +20,7 @@ export interface ITableProps<RecordType> {
     columns: IColumn<RecordType>[];
     data: RecordType[];
     onRowSelected?: (row: RecordType) => void;
-    loadMore?: () => void | Promise<void>;
+    loadMore?: () => Promise<void>;
     hasNextPage?: boolean;
     loading?: boolean;
     sortable?: boolean;
@@ -29,6 +29,7 @@ export interface ITableProps<RecordType> {
     sortDirections?: Array<'ascend' | 'descend'>;
     resizeColumn?: boolean;
     showHeader?: boolean;
+    height?: string | number;
     innerScroll?: boolean;
     ref?: React.RefObject<unknown>;
     scrollThreshold?: string | number;

package/lib/Table/style/index.less

@@ -1,14 +1,17 @@
 @import '../../style/index.less';
 @import '../../Empty/style/index.less';
+@import '../../message/style/index.less';
+
 @ald-iconfont-css-prefix: anticon;
-@table-row-height: 48px;
+@table-head-row-height: 48px;
+@table-body-row-height: 68px;
 
 .ald-table {
   display: flex;
   flex-direction: column;
   width: 100%;
-  height: 100%;
   overflow: hidden;
+  user-select: none;
 
   &-page-loading {
     opacity: 0;
@@ -21,6 +24,16 @@
     overflow: hidden;
   }
 
+  &-inner-wrap {
+    width: 100%;
+    overflow-x: overlay;
+  }
+
+  &-tableHeadScrollWrap {
+    width: 100%;
+    overflow-x: hidden;
+  }
+
   &-cell {
     flex-grow: 1;
     height: unset;
@@ -35,8 +48,7 @@
   }
 
   &-row {
-    max-width: 100%;
-    height: 48px;
+    height: @table-head-row-height;
 
     &-ellipsis {
       .ald-table-cell {
@@ -48,8 +60,12 @@
   }
 
   &-thead {
+    flex: 1;
+    overflow: hidden;
+
     .ald-table-row {
-      height: 48px;
+      min-width: 9999px; // 防止拖动时的闪动
+      height: @table-head-row-height;
     }
 
     .ald-table-cell {
@@ -103,7 +119,7 @@
     }
 
     .ald-table-row {
-      height: 68px;
+      height: @table-body-row-height;
 
       .ald-table-cell {
         padding: 24px;
@@ -124,10 +140,18 @@
     }
   }
 
+  &-tbody&-tbody-innerScroll {
+    overflow: hidden;
+  }
+
+  &-row-list-wrap {
+    overflow: unset;
+  }
+
   &-loading {
-    height: 48px;
+    height: @table-body-row-height;
     color: @NL80;
-    line-height: @table-row-height;
+    line-height: @table-body-row-height;
     text-align: center;
 
     &-icon {
@@ -145,6 +169,7 @@
       align-items: center;
       justify-content: center;
       padding-top: 84px;
+      padding-bottom: 84px;
     }
   }
 
@@ -170,33 +195,11 @@
     }
   }
 
-  /* stylelint-disable-next-line selector-class-pattern */
-  &-list&-innerScroll {
-    height: 100%;
-    overflow: overlay !important;
-  }
-
   // 当出现多行的时候 会顶出一个滚动条 通过复写三方库的样式覆盖
   &-list&-canNotInnerScroll {
     overflow: hidden !important;
   }
 
-  &-list {
-    &::-webkit-scrollbar-thumb {
-      background: @NL90;
-      background-clip: padding-box;
-      border: 3px solid transparent;
-      border-radius: 6px;
-    }
-
-    &::-webkit-scrollbar {
-      width: 12px;
-      height: 12px;
-      min-height: 12px;
-      background-color: transparent;
-    }
-  }
-
   &-sortIcon {
     margin-top: -2px;
     margin-left: 4px;

package/lib/Table/utils.d.ts

@@ -0,0 +1,15 @@
+import { IColumn } from './interface';
+export interface IWidthDetail {
+    width: number;
+    isSpecific: boolean;
+}
+export declare function getColumnsWidthMap<T>(columns: IColumn<T>[], clientWidth: number, lastWidthMap?: Map<string, IWidthDetail>): {
+    columnsWidthMap: Map<string, IWidthDetail>;
+    totalColumnWidth: number;
+};
+export declare function isPercentageWidth(width: string): boolean;
+export declare function isSpecificPxWidth(width: string): boolean;
+export declare function getValidWidthByNumber(width: number): number;
+export declare function getValidScrollThreshold(height: string | number, clientHeight: number): number;
+export declare function getPercentageValue(percentage: string, containerNum: number): number;
+export declare function getPxValue(px: string): number;

package/lib/Table/utils.js

@@ -0,0 +1,147 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getColumnsWidthMap = getColumnsWidthMap;
+exports.getPercentageValue = getPercentageValue;
+exports.getPxValue = getPxValue;
+exports.getValidScrollThreshold = getValidScrollThreshold;
+exports.getValidWidthByNumber = getValidWidthByNumber;
+exports.isPercentageWidth = isPercentageWidth;
+exports.isSpecificPxWidth = isSpecificPxWidth;
+var ZERO = 0;
+var NOT_SET = -1;
+var COLUMN_MIN_WIDTH = 72;
+var HUNDRED = 100; // TODO: 添加单侧
+
+function getColumnsWidthMap(columns, clientWidth, lastWidthMap) {
+  var settedTotalWidth = ZERO;
+  var unsetWidthIndex = [];
+  var widthMap = new Map();
+  var totalColumnWidth = ZERO;
+  columns.forEach(function (item, index) {
+    var _lastWidthMap$get;
+
+    var key = index.toString();
+    var width = getWidthByColumnsWidth(clientWidth, item.width); // 首先判断是否是否是容器宽度的变化
+
+    var isSpecific = lastWidthMap ? (_lastWidthMap$get = lastWidthMap.get(key)) === null || _lastWidthMap$get === void 0 ? void 0 : _lastWidthMap$get.isSpecific : isSpecificWidth(item.width);
+
+    if (lastWidthMap && isSpecific) {
+      var _lastWidthMap$get2;
+
+      width = (_lastWidthMap$get2 = lastWidthMap.get(key)) === null || _lastWidthMap$get2 === void 0 ? void 0 : _lastWidthMap$get2.width;
+    }
+
+    if (width === NOT_SET) {
+      unsetWidthIndex.push(key);
+    } else {
+      settedTotalWidth += width;
+    }
+
+    widthMap.set(key, {
+      width: width,
+      isSpecific: isSpecific
+    });
+  }); // 设定宽度大于容器宽度时
+
+  if (settedTotalWidth < clientWidth) {
+    unsetWidthIndex.map(function (item) {
+      var _widthMap$get;
+
+      return widthMap.set(item, {
+        isSpecific: (_widthMap$get = widthMap.get(item)) === null || _widthMap$get === void 0 ? void 0 : _widthMap$get.isSpecific,
+        width: 72
+      });
+    });
+  } // 设定宽度小于容器宽度时
+
+
+  if (unsetWidthIndex.length > ZERO) {
+    var leftWidth = clientWidth - settedTotalWidth;
+    var average = getValidWidthByNumber(leftWidth / unsetWidthIndex.length);
+    unsetWidthIndex.map(function (item) {
+      var _widthMap$get2;
+
+      return widthMap.set(item, {
+        isSpecific: (_widthMap$get2 = widthMap.get(item)) === null || _widthMap$get2 === void 0 ? void 0 : _widthMap$get2.isSpecific,
+        width: average
+      });
+    });
+  }
+
+  columns.forEach(function (item, index) {
+    var _widthMap$get3;
+
+    var key = index.toString();
+    var width = (_widthMap$get3 = widthMap.get(key)) === null || _widthMap$get3 === void 0 ? void 0 : _widthMap$get3.width;
+    totalColumnWidth += width;
+  });
+  return {
+    columnsWidthMap: widthMap,
+    totalColumnWidth: totalColumnWidth
+  };
+}
+
+function getWidthByColumnsWidth(clientWidth, width) {
+  if (width === undefined) {
+    return NOT_SET;
+  }
+
+  if (typeof width === 'number') {
+    return getValidWidthByNumber(width);
+  }
+
+  if (isPercentageWidth(width)) {
+    return getPercentageValue(width, clientWidth);
+  }
+
+  if (isSpecificPxWidth(width)) {
+    var specificNum = getPxValue(width);
+    return getValidWidthByNumber(specificNum);
+  }
+
+  return NOT_SET;
+}
+
+function isPercentageWidth(width) {
+  return /[0-9]{1,}%$/.test(width);
+}
+
+function isSpecificPxWidth(width) {
+  return /[0-9]{1,}(px)$/.test(width);
+}
+
+function isSpecificWidth(width) {
+  return typeof width === 'number' || !!(width && isSpecificPxWidth(width));
+}
+
+function getValidWidthByNumber(width) {
+  return width < COLUMN_MIN_WIDTH ? COLUMN_MIN_WIDTH : width;
+}
+
+function getValidScrollThreshold(height, clientHeight) {
+  var scrollThreshold = ZERO;
+
+  if (typeof height === 'string') {
+    if (isPercentageWidth(height)) {
+      scrollThreshold = getPercentageValue(height, clientHeight);
+    } else {
+      scrollThreshold = getPxValue(height);
+    }
+  } else {
+    scrollThreshold = height;
+  }
+
+  return scrollThreshold;
+}
+
+function getPercentageValue(percentage, containerNum) {
+  var percent = Math.floor(Number(percentage.replace('%', '')) / HUNDRED);
+  return getValidWidthByNumber(containerNum * percent);
+}
+
+function getPxValue(px) {
+  return Number(px.replace('px', ''));
+}

package/lib/_utils/hooks/useId.d.ts

@@ -0,0 +1,4 @@
+/** Is client side and not jsdom */
+export declare const isBrowserClient: boolean;
+/** Get unique id for accessibility usage */
+export declare function getUUID(): number | string;

package/lib/_utils/hooks/useId.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getUUID = getUUID;
+exports.isBrowserClient = void 0;
+
+var _canUseDom = _interopRequireDefault(require("rc-util/lib/Dom/canUseDom"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// @ts-nocheck
+var uuid = 0;
+/** Is client side and not jsdom */
+// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+
+var isBrowserClient = process.env.NODE_ENV !== 'test' && (0, _canUseDom.default)();
+/** Get unique id for accessibility usage */
+
+exports.isBrowserClient = isBrowserClient;
+
+function getUUID() {
+  var retId; // Test never reach
+
+  /* istanbul ignore if */
+
+  if (isBrowserClient) {
+    retId = uuid;
+    uuid += 1;
+  } else {
+    retId = 'TEST_OR_SSR';
+  }
+
+  return retId;
+}

package/lib/index.d.ts

@@ -57,7 +57,7 @@ export type { DividerProps } from './Divider';
 export { default as Drawer } from './Drawer';
 export type { DrawerProps } from './Drawer';
 export { default as Radio } from './Radio';
-export type { RadioProps, RadioChangeEvent, RadioGroupProps } from './Radio';
+export type { RadioProps, RadioGroupProps } from './Radio';
 export { default as Checkbox } from './Checkbox';
 export type { CheckboxProps, CheckboxOptionType } from './Checkbox';
 export { default as Modal } from './Modal';

package/lib/locale-provider/index.d.ts

@@ -4,10 +4,13 @@ import type { PickerLocale as DatePickerLocale } from 'antd/es/date-picker/gener
 import type { TransferLocale as TransferLocaleForEmpty } from 'antd/es/empty';
 import type { ModalLocale } from 'antd/es/modal/locale';
 import type { PaginationLocale } from 'antd/es/pagination/Pagination';
-import type { PopconfirmLocale } from 'antd/es/popconfirm';
 import type { TableLocale } from 'antd/es/table/interface';
 import type { TransferLocale } from 'antd/es/transfer';
 import type { UploadLocale } from 'antd/es/upload/interface';
+interface PopconfirmLocale {
+    okText: string;
+    cancelText: string;
+}
 export declare const ANT_MARK = "internalMark";
 export interface Locale {
     locale: string;
@@ -59,3 +62,4 @@ export default class LocaleProvider extends React.Component<LocaleProviderProps,
     };
     render(): JSX.Element;
 }
+export {};

package/lib/style/index.d.ts

@@ -1,2 +1 @@
-import 'antd/dist/antd.compact.css';
 import './index.less';

package/lib/style/index.js

@@ -1,5 +1,3 @@
 "use strict";
 
-require("antd/dist/antd.compact.css");
-
 require("./index.less");

package/lib/style/index.less

@@ -1,5 +1,5 @@
 @root-entry-name: default;
+@import '~antd/dist/antd.compact.css';
 @import './mixins/index.less';
 @import './themes/default/scrollBar.less';
-@import './themes/default/index.less';
-@import './mixins/index.less';
+@import './themes/default/index.less';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloudata/aloudata-design",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",