@arim-aisdc/public-components 2.3.25 → 2.3.26

package/dist/components/ConfigProvider/context.d.ts

@@ -25,6 +25,11 @@ export interface ConfigConsumerProps {
     locale?: Locale;
     /**tablemax dateFormat */
     dateFormat?: string;
+    /**tablemax pageSizeOptions */
+    tableMax?: {
+        pageSizeOptions?: number[];
+        cacheMaxAge?: number;
+    };
 }
 export declare const DEFAULT_CONTEXT: {
     theme: string;

package/dist/components/TableMax/TableMax.js

@@ -187,7 +187,8 @@ var TableMax = function TableMax(_ref) {
     request = _ref.request,
     onEditValueChange = _ref.onEditValueChange,
     hasTotalRow = _ref.hasTotalRow,
-    totalDatas = _ref.totalDatas;
+    totalDatas = _ref.totalDatas,
+    pageSizeOptions = _ref.pageSizeOptions;
   var tableMaxRef = useRef(null);
   // 表格元素
   var tableContentRef = useRef(null);
@@ -204,7 +205,11 @@ var TableMax = function TableMax(_ref) {
     userId = _useConfig.userId,
     theme = _useConfig.theme,
     tableKeyPrefixCls = _useConfig.tableKeyPrefixCls,
-    tableMaxNewPagination = _useConfig.tableMaxNewPagination;
+    tableMaxNewPagination = _useConfig.tableMaxNewPagination,
+    tableMax = _useConfig.tableMax;
+  var _ref2 = tableMax || {},
+    globalPageSizeOptions = _ref2.pageSizeOptions,
+    cacheMaxAge = _ref2.cacheMaxAge;
   // 多选场景下，点击行时是否选中改行。在不展示多选框(selectionWithoutChecked=true)时，会一直为true
   var selectRowWhenClick = useMemo(function () {
     return originSelectRowWhenClick || selectionWithoutChecked;
@@ -293,7 +298,8 @@ var TableMax = function TableMax(_ref) {
       tableId: tableId,
       tableKeyPrefixCls: tableKeyPrefixCls,
       columnVisibleConfig: columnVisibleConfig,
-      tableKey: tableKey
+      tableKey: tableKey,
+      cacheMaxAge: cacheMaxAge
     }),
     columnSizing = _useColumnWidth.columnSizing,
     initializeColumnSizing = _useColumnWidth.initializeColumnSizing,
@@ -478,7 +484,8 @@ var TableMax = function TableMax(_ref) {
   var setColumnInfoFromCache = function setColumnInfoFromCache(tableColumns) {
     var _localStorage$getItem;
     var cache = JSON.parse((_localStorage$getItem = localStorage.getItem(tableKey)) !== null && _localStorage$getItem !== void 0 ? _localStorage$getItem : '{}');
-    if (cache && cache !== null && cache !== void 0 && cache.editTime && +new Date() - cache.editTime > CACHE_MAX_AGE) {
+    console.log(+cache.editTime, 'cache.editTime');
+    if (cache && cache !== null && cache !== void 0 && cache.editTime && +new Date() - cache.editTime > (cacheMaxAge !== null && cacheMaxAge !== void 0 ? cacheMaxAge : CACHE_MAX_AGE)) {
       return;
     }
     var cacheColumnVisibility = cache.columnVisibility,
@@ -545,8 +552,8 @@ var TableMax = function TableMax(_ref) {
         size: 40,
         tooltip: false,
         enableResizing: false,
-        cell: function cell(_ref2) {
-          var row = _ref2.row;
+        cell: function cell(_ref3) {
+          var row = _ref3.row;
           return row.getCanExpand() ? /*#__PURE__*/_jsx("div", {
             onClick: function onClick(evt) {
               evt.stopPropagation();
@@ -567,8 +574,8 @@ var TableMax = function TableMax(_ref) {
         id: ColumnType.Selection,
         tooltip: false,
         enableResizing: false,
-        header: function header(_ref3) {
-          var table = _ref3.table;
+        header: function header(_ref4) {
+          var table = _ref4.table;
           return /*#__PURE__*/_jsx(Checkbox, {
             checked: table.getIsAllRowsSelected(),
             indeterminate: table.getIsSomePageRowsSelected(),
@@ -579,9 +586,9 @@ var TableMax = function TableMax(_ref) {
             }
           });
         },
-        cell: function cell(_ref4) {
-          var row = _ref4.row,
-            table = _ref4.table;
+        cell: function cell(_ref5) {
+          var row = _ref5.row,
+            table = _ref5.table;
           return /*#__PURE__*/_jsx(Checkbox, {
             checked: row.getIsSelected(),
             disabled: !row.getCanSelect(),
@@ -715,6 +722,7 @@ var TableMax = function TableMax(_ref) {
   /**缓存table数据 */
   useUpdateEffect(function () {
     var tableState = table.getState();
+    console.log(new Date(), 'new Date()');
     localStorage.setItem(tableKey, JSON.stringify({
       enableFilters: enableFilters,
       headerRowNum: headerRowNum,
@@ -725,7 +733,8 @@ var TableMax = function TableMax(_ref) {
       columnFilters: tableState.columnFilters,
       columnSorting: tableState.sorting,
       columnSizing: columnSizing,
-      editTime: new Date()
+      editTime: +new Date(),
+      editTimeCh: dayjs().format('YYYY-MM-DD HH:mm:ss')
     }));
   }, [table.getState().columnVisibility, table.getState().columnPinning, table.getState().columnOrder, table.getState().columnFilters, table.getState().sorting, enableFilters, headerRowNum, compactMode, columnSizing]);
   var reorderRow = useCallback(function (fromDatas, toDatas) {
@@ -872,7 +881,7 @@ var TableMax = function TableMax(_ref) {
 
   // 保存编辑内容
   var save = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _tableRows$find2;
       var newRow, _table$getRowModel3, tableRows, originRow;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -895,7 +904,7 @@ var TableMax = function TableMax(_ref) {
       }, _callee);
     }));
     return function save() {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   var triggerSave = function triggerSave(e) {
@@ -1206,6 +1215,7 @@ var TableMax = function TableMax(_ref) {
         children: tableMaxNewPagination ? /*#__PURE__*/_jsx(PaginationV2, {
           total: totalCount,
           pageSize: pageSize,
+          pageSizeOptions: pageSizeOptions !== null && pageSizeOptions !== void 0 ? pageSizeOptions : globalPageSizeOptions,
           showLessItems: showLessItems,
           showSizeChanger: showSizeChanger,
           curPageDataNum: tableDatas.length,
@@ -1224,6 +1234,7 @@ var TableMax = function TableMax(_ref) {
           }
         }) : /*#__PURE__*/_jsx(Pagination, {
           pageSize: pageSize,
+          pageSizeOptions: pageSizeOptions !== null && pageSizeOptions !== void 0 ? pageSizeOptions : globalPageSizeOptions,
           total: totalCount,
           defaultPageSize: pageSize,
           current: (skipCount || skipCount === 0) && pageSize ? skipCount / pageSize + 1 : 0,

package/dist/components/TableMax/components/ColumnFilterV2/index.less

@@ -10,7 +10,7 @@
 
 .filter-panel-wrapper {
   position: fixed;
-  // z-index: 9999;
+  z-index: 9999;
   border-radius: 2px;
   width: fit-content;
   height: fit-content;

package/dist/components/TableMax/components/ColumnSort/customSortFns.d.ts

@@ -1,13 +1,13 @@
 import { TableMaxColumnType } from "../../type";
-export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
-export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
-export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
-export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
+export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
 declare const customSortFns: {
-    numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
-    stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
-    timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
-    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
+    numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

package/dist/components/TableMax/components/PaginationV2/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["showSizeChanger", "curPageDataNum"];
+var _excluded = ["showSizeChanger", "curPageDataNum", "pageSizeOptions"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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; }
@@ -16,26 +16,35 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Pagination, Select } from 'antd';
 import "./index.less";
 import { useTranslation } from "../../../../hooks/useTranslation";
+import { useMemo } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var defaultPageSizeOptions = [10, 20, 50, 100];
-var pageSizeOptions = defaultPageSizeOptions.map(function (size) {
-  return {
-    value: size,
-    label: size
-  };
-});
+// const pageSizeOptions = defaultPageSizeOptions.map(size => ({
+//   value: size,
+//   label: size,
+// }));
+
 var PaginationV2 = function PaginationV2(props) {
   var _useTranslation = useTranslation(),
     _useTranslation2 = _slicedToArray(_useTranslation, 1),
     t = _useTranslation2[0];
   var showSizeChanger = props.showSizeChanger,
     curPageDataNum = props.curPageDataNum,
+    globalPageSizeOptions = props.pageSizeOptions,
     rest = _objectWithoutProperties(props, _excluded);
   var handleChangePageSize = function handleChangePageSize(size) {
     // console.log('object :>> ', size, rest.current);
     rest.onChange(rest.current, size);
   };
+  var pageSizeOptions = useMemo(function () {
+    return (globalPageSizeOptions !== null && globalPageSizeOptions !== void 0 ? globalPageSizeOptions : defaultPageSizeOptions).map(function (size) {
+      return {
+        value: size,
+        label: size
+      };
+    });
+  }, [globalPageSizeOptions, defaultPageSizeOptions]);
   return /*#__PURE__*/_jsxs("div", {
     className: "table-max-pagination-wrapper",
     children: [/*#__PURE__*/_jsx("div", {

package/dist/components/TableMax/hooks/useColumnWidth.js

@@ -202,7 +202,7 @@ export var useColumnWidth = function useColumnWidth(_ref) {
       allCount = _getSizeInfo.allCount,
       columnSizeMap = _getSizeInfo.columnSizeMap;
     var cache = JSON.parse((_localStorage$getItem = localStorage.getItem(tableKey)) !== null && _localStorage$getItem !== void 0 ? _localStorage$getItem : '{}');
-    var now = Date.now();
+    var now = +Date.now();
     setState(produce(function (prevState) {
       // 初始化列宽映射
       var initColumnsSizeMap = _objectSpread({}, columnSizeMap);

package/dist/components/TableMax/type.d.ts

@@ -316,6 +316,8 @@ export type TableMaxProps = {
     hasTotalRow?: boolean;
     /**总计行数据 { '列id': '数据' }*/
     totalDatas?: any[];
+    /**分页，每页多少条可选值 */
+    pageSizeOptions?: number[];
 };
 export interface TableMaxColumnType {
     /**每一列的id是唯一的 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.3.25",
+  "version": "2.3.26",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",
@@ -94,7 +94,7 @@
     "stylelint": "^14.9.1"
   },
   "peerDependencies": {
-    "antd": "^5.21.0",
+    "antd": "^5.27.3",
     "react": ">=17.0.1",
     "react-dom": ">=17.0.1",
     "umi-request": "^1.4.0"