@arim-aisdc/public-components 2.3.79 → 2.3.81

package/dist/components/TableMax/TableMax.js

@@ -524,9 +524,22 @@ var TableMax = function TableMax(_ref) {
   /**根据缓存数据设置一些状态 */
   var setColumnInfoFromCache = function setColumnInfoFromCache(tableColumns) {
     var _localStorage$getItem, _tableMaxConfig$cache, _cache$columnVisibili, _cache$columnPinning$, _cache$columnPinning, _cache$columnPinning$2, _cache$columnPinning2;
+    var newColumnOrder = tableColumns === null || tableColumns === void 0 ? void 0 : tableColumns.map(function (column) {
+      return column.id;
+    });
+    var arr = newColumnOrder;
+    if (!tableId) {
+      setColumnOrder(arr);
+      return;
+    }
     var cache = JSON.parse((_localStorage$getItem = localStorage.getItem(tableKey)) !== null && _localStorage$getItem !== void 0 ? _localStorage$getItem : '{}');
-    if (version && version !== (cache === null || cache === void 0 ? void 0 : cache.version)) return;
+    if (version && version !== (cache === null || cache === void 0 ? void 0 : cache.version)) {
+      setColumnOrder(arr);
+      return;
+    }
+    ;
     if (cache && cache !== null && cache !== void 0 && cache.editTime && +new Date() - cache.editTime > ((_tableMaxConfig$cache = tableMaxConfig.cacheMaxAge) !== null && _tableMaxConfig$cache !== void 0 ? _tableMaxConfig$cache : CACHE_MAX_AGE)) {
+      setColumnOrder(arr);
       return;
     }
     var columnsIdSet = new Set(tableColumns.map(function (column) {
@@ -592,10 +605,6 @@ var TableMax = function TableMax(_ref) {
         right: Array.from(new Set(_toConsumableArray(cacheColumnPinning.right)))
       });
     }
-    var newColumnOrder = tableColumns === null || tableColumns === void 0 ? void 0 : tableColumns.map(function (column) {
-      return column.id;
-    });
-    var arr = newColumnOrder;
     if (cacheColumnOrder && tableColumns.length === cacheColumnOrder.length && cacheColumnOrder.filter(function (columnId) {
       return !newColumnOrder.includes(columnId);
     }).length === 0) {
@@ -762,7 +771,7 @@ var TableMax = function TableMax(_ref) {
       var _column$columns;
       return (column === null || column === void 0 ? void 0 : column.columns) && ((_column$columns = column.columns) === null || _column$columns === void 0 ? void 0 : _column$columns.length) > 0;
     }) > -1);
-  }, [columns]);
+  }, [columns, tableId]);
   var _rowSelectionChange = useCallback(debounce(function (rowOriginal, row) {
     if (rowSelectionChange) {
       // console.log(rowOriginal, row, 'rowSelectionChange1')
@@ -837,7 +846,9 @@ var TableMax = function TableMax(_ref) {
 
   /**缓存table数据 */
   useUpdateEffect(function () {
+    if (!tableId) return;
     var tableState = table.getState();
+    debugger;
     localStorage.setItem(tableKey, JSON.stringify({
       enableFilters: enableFilters,
       headerRowNum: headerRowNum,
@@ -852,7 +863,7 @@ var TableMax = function TableMax(_ref) {
       editTimeCh: dayjs().format('YYYY-MM-DD HH:mm:ss'),
       version: version
     }));
-  }, [table.getState().columnVisibility, table.getState().columnPinning, table.getState().columnOrder, table.getState().columnFilters, table.getState().sorting, enableFilters, headerRowNum, compactMode, columnSizing]);
+  }, [table.getState().columnVisibility, table.getState().columnPinning, table.getState().columnOrder, table.getState().columnFilters, table.getState().sorting, enableFilters, headerRowNum, compactMode, columnSizing, tableId]);
   var reorderRow = useCallback(function (fromDatas, toDatas) {
     var draggedRow = fromDatas.draggedRow,
       isMultipleDrag = fromDatas.isMultipleDrag,

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) => 0 | 1 | -1;
+export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -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) => 0 | 1 | -1;
+    stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.3.79",
+  "version": "2.3.81",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",