@arim-aisdc/public-components 2.3.77 → 2.3.79

package/dist/components/CustomForm/CustomForm.js

@@ -213,20 +213,22 @@ var CustomForm = function CustomForm(_ref, ref) {
   }, [data, spanSize.span, span]);
   useEffect(function () {
     var myObserver = new ResizeObserver(function (entries) {
-      var _iterator = _createForOfIteratorHelper(entries),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var entrie = _step.value;
-          //@ts-ignore
-          var offsetWidth = entrie.target.offsetWidth;
-          setWidth(offsetWidth);
+      requestAnimationFrame(function () {
+        var _iterator = _createForOfIteratorHelper(entries),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var entrie = _step.value;
+            //@ts-ignore
+            var offsetWidth = entrie.target.offsetWidth;
+            setWidth(offsetWidth);
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
         }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
+      });
     });
     // 监听
     var dom = document.getElementById('CustomForm');

package/dist/components/TableMax/TableHeader/OriginalTableHeader.js

@@ -7,7 +7,6 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import Cell from "./Cell";
 import "./index.less";
 import { getPinningStyle } from "./utils";
-import { useWhyDidYouUpdate } from 'ahooks';
 import { jsx as _jsx } from "react/jsx-runtime";
 var OriginalTableHeader = function OriginalTableHeader(_ref) {
   var _headerGroups;
@@ -27,21 +26,6 @@ var OriginalTableHeader = function OriginalTableHeader(_ref) {
     openNullValueFilter = _ref.openNullValueFilter;
   var headerGroups = table.getHeaderGroups();
   var headers = (headerGroups === null || headerGroups === void 0 || (_headerGroups = headerGroups[headerGroups.length - 1]) === null || _headerGroups === void 0 ? void 0 : _headerGroups.headers) || [];
-  useWhyDidYouUpdate('useWhyDidYouUpdate', {
-    tableContentRef: tableContentRef,
-    table: table,
-    canFilter: canFilter,
-    enableFilters: enableFilters,
-    canSorting: canSorting,
-    hasGroup: hasGroup,
-    getHeaderCellProps: getHeaderCellProps,
-    columnResizeMode: columnResizeMode,
-    disableColumnDrag: disableColumnDrag,
-    rowHeight: rowHeight,
-    headerRowNum: headerRowNum,
-    manualFiltering: manualFiltering
-  });
-  console.log(openNullValueFilter, 'openNullValueFilter');
   return (
     /*#__PURE__*/
     // <table>

package/dist/components/TableMax/components/ColumnFilterV2/DateRange/index.js

@@ -40,7 +40,7 @@ export var DateRange = function DateRange(_ref) {
   var _useTranslation = useTranslation(),
     _useTranslation2 = _slicedToArray(_useTranslation, 1),
     t = _useTranslation2[0];
-  var _ref2 = columnDef.filterComProps || {},
+  var _ref2 = (columnDef === null || columnDef === void 0 ? void 0 : columnDef.filterComProps) || {},
     _ref2$format = _ref2.format,
     format = _ref2$format === void 0 ? defaultDateFormat : _ref2$format,
     _ref2$rangePresets = _ref2.rangePresets,

package/dist/components/TableMax/components/ColumnFilterV2/Filter.js

@@ -273,12 +273,12 @@ var Filter = function Filter(_ref) {
           className: "single-com-wrapper",
           children: /*#__PURE__*/_jsx(DatePicker, {
             value: columnFilterValue ? dayjs(columnFilterValue) : undefined,
-            showTime: (_columnDef$filterComP = columnDef.filterComProps) === null || _columnDef$filterComP === void 0 ? void 0 : _columnDef$filterComP.showTime,
-            format: ((_columnDef$filterComP2 = columnDef.filterComProps) === null || _columnDef$filterComP2 === void 0 ? void 0 : _columnDef$filterComP2.format) || defaultDateFormat,
-            picker: ((_columnDef$filterComP3 = columnDef.filterComProps) === null || _columnDef$filterComP3 === void 0 ? void 0 : _columnDef$filterComP3.picker) || 'date',
+            showTime: columnDef === null || columnDef === void 0 || (_columnDef$filterComP = columnDef.filterComProps) === null || _columnDef$filterComP === void 0 ? void 0 : _columnDef$filterComP.showTime,
+            format: (columnDef === null || columnDef === void 0 || (_columnDef$filterComP2 = columnDef.filterComProps) === null || _columnDef$filterComP2 === void 0 ? void 0 : _columnDef$filterComP2.format) || defaultDateFormat,
+            picker: (columnDef === null || columnDef === void 0 || (_columnDef$filterComP3 = columnDef.filterComProps) === null || _columnDef$filterComP3 === void 0 ? void 0 : _columnDef$filterComP3.picker) || 'date',
             onChange: function onChange(date) {
               var _columnDef$filterComP4;
-              return handleChangeFilterValue(date ? date.format(((_columnDef$filterComP4 = columnDef.filterComProps) === null || _columnDef$filterComP4 === void 0 ? void 0 : _columnDef$filterComP4.format) || defaultDateFormat) : undefined);
+              return handleChangeFilterValue(date ? date.format((columnDef === null || columnDef === void 0 || (_columnDef$filterComP4 = columnDef.filterComProps) === null || _columnDef$filterComP4 === void 0 ? void 0 : _columnDef$filterComP4.format) || defaultDateFormat) : undefined);
             },
             style: {
               width: 188

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) => 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;
+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;
 declare const customSortFns: {
-    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;
+    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;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

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

@@ -322,15 +322,17 @@ export var useColumnWidth = function useColumnWidth(_ref) {
   useEffect(function () {
     if (!tableContentRef.current) return;
     var observer = new ResizeObserver(function (entries) {
-      var _entries$, _entries$2;
-      var newWidth = (_entries$ = entries[0]) === null || _entries$ === void 0 ? void 0 : _entries$.contentRect.width;
-      var height = (_entries$2 = entries[0]) === null || _entries$2 === void 0 ? void 0 : _entries$2.contentRect.height;
-      if (newWidth || height) {
-        var _tableContentRef$curr, _tableContentRef$curr2;
-        debouncedHandleResizeRef.current(newWidth);
-        (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 || (_tableContentRef$curr = _tableContentRef$curr.style) === null || _tableContentRef$curr === void 0 || _tableContentRef$curr.setProperty('--table-body-width', "".concat(newWidth - 12, "px"));
-        (_tableContentRef$curr2 = tableContentRef.current) === null || _tableContentRef$curr2 === void 0 || (_tableContentRef$curr2 = _tableContentRef$curr2.style) === null || _tableContentRef$curr2 === void 0 || _tableContentRef$curr2.setProperty('--table-body-height', "".concat(height - 54, "px"));
-      }
+      requestAnimationFrame(function () {
+        var _entries$, _entries$2;
+        var newWidth = (_entries$ = entries[0]) === null || _entries$ === void 0 ? void 0 : _entries$.contentRect.width;
+        var height = (_entries$2 = entries[0]) === null || _entries$2 === void 0 ? void 0 : _entries$2.contentRect.height;
+        if (newWidth || height) {
+          var _tableContentRef$curr, _tableContentRef$curr2;
+          debouncedHandleResizeRef.current(newWidth);
+          (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 || (_tableContentRef$curr = _tableContentRef$curr.style) === null || _tableContentRef$curr === void 0 || _tableContentRef$curr.setProperty('--table-body-width', "".concat(newWidth - 12, "px"));
+          (_tableContentRef$curr2 = tableContentRef.current) === null || _tableContentRef$curr2 === void 0 || (_tableContentRef$curr2 = _tableContentRef$curr2.style) === null || _tableContentRef$curr2 === void 0 || _tableContentRef$curr2.setProperty('--table-body-height', "".concat(height - 54, "px"));
+        }
+      });
     });
     observer.observe(tableContentRef.current);
     return function () {

package/dist/components/TableMax/utils.js

@@ -111,7 +111,7 @@ export var getFormatFilters = function getFormatFilters(columns, originFilters)
     var _ref4 = curColumn || {},
       filterType = _ref4.filterType,
       filterKey = _ref4.filterKey;
-    var _ref5 = curColumn.filterComProps || {},
+    var _ref5 = (curColumn === null || curColumn === void 0 ? void 0 : curColumn.filterComProps) || {},
       _ref5$format = _ref5.format,
       format = _ref5$format === void 0 ? defaultDateFormat : _ref5$format;
     // 优先取formattedFilterKey作为key
@@ -163,7 +163,7 @@ export var getFormatFiltersV2 = function getFormatFiltersV2(columns, originFilte
     var _ref6 = curColumn || {},
       filterType = _ref6.filterType,
       filterKey = _ref6.filterKey;
-    // const { format = defaultDateFormat } = curColumn.filterComProps || {};
+    // const { format = defaultDateFormat } = curColumn?.filterComProps || {};
     // 优先取formattedFilterKey作为key
     var formatKey = filterKey || id;
     var res = {

package/package.json

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