@arim-aisdc/public-components 2.2.9 → 2.3.0

package/dist/assets/iconfont/table/iconfont.css

@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont-table"; /* Project id 4453758 */
-  src: url('./iconfont.ttf?t=1730099737796') format('truetype');
+  src: url('iconfont.ttf?t=1740568199599') format('truetype');
 }
 
 .iconfont-table {
@@ -11,12 +11,36 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-table-a-xinzeng21:before {
-  content: "\e62e";
+.icon-table-sort:before {
+  content: "\e890";
 }
 
-.icon-table-a-download11:before {
-  content: "\e62f";
+.icon-table-filter:before {
+  content: "\e88e";
+}
+
+.icon-table-shengji:before {
+  content: "\e64a";
+}
+
+.icon-table-calendar:before {
+  content: "\e888";
+}
+
+.icon-table-edit:before {
+  content: "\e887";
+}
+
+.icon-table-pin:before {
+  content: "\e889";
+}
+
+.icon-table-drag:before {
+  content: "\e88d";
+}
+
+.icon-table-down:before {
+  content: "\e88f";
 }
 
 .icon-table-tight:before {
@@ -27,10 +51,6 @@
   content: "\e87f";
 }
 
-.icon-table-shenglvehao:before {
-  content: "\e62d";
-}
-
 .icon-table-delete:before {
   content: "\e87c";
 }

package/dist/components/BaseInfo/BaseInfo.d.ts

@@ -17,7 +17,7 @@ export declare const foramtBaseInfoField: (data: any, dataField: BaseInfoFieldTy
     value: any;
     field: string;
     label?: string;
-    text: string | Element | JSX.Element;
+    text: string | JSX.Element | Element;
     units?: string;
     width?: string;
     labelWidth?: string;

package/dist/components/TableMax/TableBody/Row.js

@@ -280,16 +280,26 @@ var Row = function Row(_ref) {
     }
   };
 
-  // 当前行是否高亮
-  var isHighLight = useMemo(function () {
-    return !canSelection && String(row.id) === String(rowSelectedId) ||
-    // 单选选中
-    canSelection && selectRowWhenClick && row.getIsSelected() ||
-    // 多选并且点击行时也选中
-    canSelection && !selectRowWhenClick && String(row.id) === String(rowHighLightId) // 多选并且点击行时不选中，高亮状态单独管理
-    ;
+  // 高亮色
+  var highLightClassName = useMemo(function () {
+    if (!canSelection && String(row.id) === String(rowSelectedId)) {
+      // 单选，选中用高亮色显示
+      return 'tbody-tr-highlight';
+    } else if (canSelection) {
+      // 多选
+      if (row.getIsSelected()) {
+        // checked选中用选中色
+        return 'tbody-tr-selected';
+      } else if (String(row.id) === String(rowHighLightId)) {
+        // 高亮状态
+        return 'tbody-tr-highlight';
+      }
+    }
+    return '';
   }, [row.id, row.getIsSelected(), rowSelectedId, selectRowWhenClick, rowHighLightId, canSelection]);
-  console.log('row render');
+
+  // console.log('row render');
+
   var rowCom = function rowCom() {
     var _row;
     return /*#__PURE__*/_jsx("tr", {
@@ -305,7 +315,7 @@ var Row = function Row(_ref) {
       onClick: rowClickOrDoubleClick,
       onMouseEnter: rowMouseEnter,
       onMouseLeave: rowMouseLeave,
-      className: "tbody-tr ".concat(isHighLight ? 'tbody-tr-selected' : '', " ").concat(dropPreviewLineClassName, " ").concat((rowClassName === null || rowClassName === void 0 ? void 0 : rowClassName(row).map(function (item) {
+      className: "tbody-tr ".concat(highLightClassName, " ").concat(dropPreviewLineClassName, " ").concat((rowClassName === null || rowClassName === void 0 ? void 0 : rowClassName(row).map(function (item) {
         return "".concat(item, "-").concat(theme);
       }).join(' ')) || ''),
       children: (_row = row["getVisibleCells"]) === null || _row === void 0 ? void 0 : _row.call(row).map(function (cell) {
@@ -360,9 +370,7 @@ var Row = function Row(_ref) {
         },
         children: !!(tableBodyRef !== null && tableBodyRef !== void 0 && (_tableBodyRef$current = tableBodyRef.current) !== null && _tableBodyRef$current !== void 0 && _tableBodyRef$current.clientWidth) && /*#__PURE__*/_jsx("div", {
           id: "".concat(tableId, "_expand-table"),
-          className: "subRowWrapper"
-          // 减去10，避免被父表滚动条覆盖
-          ,
+          className: "subRowWrapper",
           style: {
             width: "".concat(tableBodyRef === null || tableBodyRef === void 0 || (_tableBodyRef$current2 = tableBodyRef.current) === null || _tableBodyRef$current2 === void 0 ? void 0 : _tableBodyRef$current2.clientWidth, "px")
           },

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

@@ -18,6 +18,13 @@ table {
   background-color: @globalColor0;
   border-bottom: 1px solid @tableColor2;
 }
+.tbody-tr-highlight {
+  // display: flex;
+  transition: left, top;
+  transition-duration: 0.6s;
+  background-color: @rowHoverBackgroundColor;
+  border-bottom: 1px solid @tableColor2;
+}
 
 .tbody-tr-td-editting {
   // height: auto !important;
@@ -28,6 +35,8 @@ table {
 
 .tbody-tr-td,
 .tbody-tr-td-drag,
+.tbody-tr-highlight > .tbody-tr-td,
+.tbody-tr-highlight > .tbody-tr-td-drag,
 .tbody-tr-selected > .tbody-tr-td,
 .tbody-tr-selected > .tbody-tr-td-drag {
   background-color: @globalColor0;
@@ -45,6 +54,11 @@ table {
   background: @selectTableRow;
 }
 
+.tbody-tr-highlight > .tbody-tr-td,
+.tbody-tr-highlight > .tbody-tr-td-drag {
+  background: @rowHoverBackgroundColor;
+}
+
 .tbody-tr:not(.tbody-tr-selected) {
   &:hover {
     .tbody-tr-td {

package/dist/components/TableMax/TableHeader/Cell.d.ts

@@ -12,6 +12,8 @@ type ICellType = {
     columnResizeMode: ColumnResizeMode;
     disableColumnDrag?: boolean;
     headerRowNum: number;
+    canFilter?: boolean;
+    manualFiltering: boolean;
 };
-declare const Cell: ({ tableContentRef, header, table, hasGroup, canSorting, getHeaderCellProps, disableColumnDrag, headerRowNum, }: ICellType) => import("react/jsx-runtime").JSX.Element;
+declare const Cell: ({ tableContentRef, header, table, hasGroup, canSorting, getHeaderCellProps, disableColumnDrag, headerRowNum, canFilter, manualFiltering, }: ICellType) => import("react/jsx-runtime").JSX.Element;
 export default Cell;

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

@@ -22,6 +22,7 @@ import { useDrag, useDrop } from 'react-dnd';
 import { createPortal } from 'react-dom';
 import { useConfig } from "../../ConfigProvider";
 import { ColumnType } from "../TableMax";
+import { ColumnFilter } from "../components/ColumnFilterV2";
 import Sort from "../components/ColumnSort";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -39,7 +40,9 @@ var Cell = function Cell(_ref) {
     canSorting = _ref.canSorting,
     getHeaderCellProps = _ref.getHeaderCellProps,
     disableColumnDrag = _ref.disableColumnDrag,
-    headerRowNum = _ref.headerRowNum;
+    headerRowNum = _ref.headerRowNum,
+    canFilter = _ref.canFilter,
+    manualFiltering = _ref.manualFiltering;
   var _useConfig = useConfig(),
     root = _useConfig.root;
   var cannotDragColumn = [ColumnType.Darg, ColumnType.Selection, ColumnType.Expander, ColumnType.PlaceHolder];
@@ -86,7 +89,10 @@ var Cell = function Cell(_ref) {
     initPosition = _useState2[0],
     setInitPosition = _useState2[1];
   return /*#__PURE__*/_jsxs("div", {
-    ref: dropRef,
+    ref: function ref(node) {
+      dropRef(node);
+      dragRef(disableColumnDrag || cannotDragColumn.includes(header.column.id) || header.column.getIsPinned() ? null : node);
+    },
     children: [/*#__PURE__*/_jsxs("div", {
       className: "cell-wapper ".concat(columns ? 'wapper-top-parent' : '', " table-max-header-cell-wrapper"),
       ref: previewRef,
@@ -102,13 +108,13 @@ var Cell = function Cell(_ref) {
           y: y
         });
       },
-      children: [/*#__PURE__*/_jsxs("div", {
+      children: [/*#__PURE__*/_jsx("div", {
         className: "cell-left",
         onClick: header.column.getToggleSortingHandler(),
         style: {
           textAlign: columns ? 'center' : 'left'
         },
-        children: [!cannotDragColumn.includes(header.column.id) ? /*#__PURE__*/_jsx(Tooltip, {
+        children: !cannotDragColumn.includes(header.column.id) ? /*#__PURE__*/_jsx(Tooltip, {
           placement: "topLeft"
           // @ts-ignore
           ,
@@ -125,17 +131,16 @@ var Cell = function Cell(_ref) {
           })
         }) :
         // @ts-ignore
-        flexRender(columnDef.header, header.getContext()), canSorting ? /*#__PURE__*/_jsx(Sort, {
+        flexRender(columnDef.header, header.getContext())
+      }), !cannotDragColumn.includes(header.column.id) ? /*#__PURE__*/_jsxs("div", {
+        className: "cell-right",
+        children: [canSorting && header.column.getCanSort() ? /*#__PURE__*/_jsx(Sort, {
           sort: header.column.getIsSorted()
+        }) : null, canFilter && columnDef.enableColumnFilter !== false ? /*#__PURE__*/_jsx(ColumnFilter, {
+          column: header.column,
+          manualFiltering: manualFiltering
         }) : null]
-      }), /*#__PURE__*/_jsx("div", {
-        className: "cell-right",
-        onClick: header.column.getToggleSortingHandler(),
-        children: disableColumnDrag || cannotDragColumn.includes(header.column.id) || header.column.getIsPinned() ? null : /*#__PURE__*/_jsx("i", {
-          ref: dragRef,
-          className: "icon iconfont-other icon-other-drag drag-handler"
-        })
-      }), /*#__PURE__*/_jsx("div", {
+      }) : null, /*#__PURE__*/_jsx("div", {
         className: "cell-resize-handler ".concat(header.column.getIsResizing() ? 'column-is-resizing' : ''),
         onMouseDown: header.getResizeHandler(),
         onTouchStart: header.getResizeHandler()
@@ -148,9 +153,7 @@ var Cell = function Cell(_ref) {
         height: (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.clientHeight,
         transform: "translateX(".concat(table.getState().columnSizingInfo.deltaOffset || 0, "px)")
       }
-    }),
-    // document.body,
-    root ? document.querySelector(root) : document.body) : null]
+    }), root ? document.querySelector(root) : document.body) : null]
   });
 };
 export default Cell;

package/dist/components/TableMax/TableHeader/index.d.ts

@@ -18,6 +18,7 @@ type TableHeaderProps = {
     };
     disableColumnDrag?: boolean;
     headerRowNum: number;
+    manualFiltering: boolean;
 };
-declare const TableHeader: ({ tableContentRef, table, canFilter, enableFilters, canSorting, hasGroup, getHeaderCellProps, columnResizeMode, shadowColumnInfo, disableColumnDrag, rowHeight, headerRowNum, }: TableHeaderProps) => import("react/jsx-runtime").JSX.Element;
+declare const TableHeader: ({ tableContentRef, table, canFilter, enableFilters, canSorting, hasGroup, getHeaderCellProps, columnResizeMode, shadowColumnInfo, disableColumnDrag, rowHeight, headerRowNum, manualFiltering, }: TableHeaderProps) => import("react/jsx-runtime").JSX.Element;
 export default TableHeader;

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

@@ -7,14 +7,15 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 // import { Column, flexRender } from '@tanstack/react-table';
 // import { useDrag, useDrop } from 'ahooks';
 
-import { Filter } from "../components/ColumnFilter";
+// import { Filter } from '../components/ColumnFilter';
+
 import Cell from "./Cell";
 import "./index.less";
 import { getPinningStyle } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var TableHeader = function TableHeader(_ref) {
-  var _headerGroups, _headerGroups2;
+  var _headerGroups;
   var tableContentRef = _ref.tableContentRef,
     table = _ref.table,
     canFilter = _ref.canFilter,
@@ -26,7 +27,8 @@ var TableHeader = function TableHeader(_ref) {
     shadowColumnInfo = _ref.shadowColumnInfo,
     disableColumnDrag = _ref.disableColumnDrag,
     rowHeight = _ref.rowHeight,
-    headerRowNum = _ref.headerRowNum;
+    headerRowNum = _ref.headerRowNum,
+    manualFiltering = _ref.manualFiltering;
   var headerGroups = table.getHeaderGroups();
   var headers = (headerGroups === null || headerGroups === void 0 || (_headerGroups = headerGroups[headerGroups.length - 1]) === null || _headerGroups === void 0 ? void 0 : _headerGroups.headers) || [];
   var leftLastColumnId = shadowColumnInfo.leftLastColumnId,
@@ -40,8 +42,8 @@ var TableHeader = function TableHeader(_ref) {
           width: size
         }, header.id);
       })
-    }), /*#__PURE__*/_jsxs("thead", {
-      children: [headerGroups === null || headerGroups === void 0 ? void 0 : headerGroups.map(function (headerGroup) {
+    }), /*#__PURE__*/_jsx("thead", {
+      children: headerGroups === null || headerGroups === void 0 ? void 0 : headerGroups.map(function (headerGroup) {
         return /*#__PURE__*/_jsx("tr", {
           className: "table-thead-tr cus-table-thead-tr",
           style: {
@@ -62,25 +64,14 @@ var TableHeader = function TableHeader(_ref) {
                 getHeaderCellProps: getHeaderCellProps,
                 columnResizeMode: columnResizeMode,
                 disableColumnDrag: disableColumnDrag,
-                headerRowNum: headerRowNum
+                headerRowNum: headerRowNum,
+                canFilter: canFilter,
+                manualFiltering: manualFiltering
               }, header.id)
             }, header.id);
           })
         }, headerGroup.id);
-      }), canFilter && enableFilters ? /*#__PURE__*/_jsx("tr", {
-        className: "table-filter-tr",
-        children: headerGroups === null || headerGroups === void 0 || (_headerGroups2 = headerGroups[headerGroups.length - 1]) === null || _headerGroups2 === void 0 || (_headerGroups2 = _headerGroups2.headers) === null || _headerGroups2 === void 0 ? void 0 : _headerGroups2.map(function (header) {
-          return /*#__PURE__*/_jsx("th", {
-            style: _objectSpread({}, getPinningStyle(header, table)),
-            className: "table-filter-th ".concat(header.id === leftLastColumnId ? 'thead-tr-th-cell-fix-left-last' : '', " ").concat(header.id === rightFirstColumnId ? 'thead-tr-th-cell-fix-right-first' : ''),
-            children: header.column.getCanFilter() ? /*#__PURE__*/_jsx("div", {
-              children: /*#__PURE__*/_jsx(Filter, {
-                column: header.column
-              })
-            }) : null
-          }, header.id + '1');
-        })
-      }, "table-filter-tr") : null]
+      })
     })]
   });
 };

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

@@ -41,6 +41,7 @@ table {
     white-space: nowrap;
     display: flex;
     align-items: center;
+    justify-content: space-between;
 
     .cell-left-header {
       display: -webkit-box;
@@ -56,6 +57,12 @@ table {
     }
   }
 
+  .cell-right {
+    display: flex;
+    gap: 4px;
+    align-items: center;
+  }
+
   .drag-handler {
     color: @tableColor3;
     display: none;

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

@@ -1,7 +1,7 @@
 import { RowData } from '@tanstack/react-table';
 import React from 'react';
 import './tableMax.less';
-import { type TableContextType, type TableMaxProps } from './type';
+import { type TableMaxProps } from './type';
 declare module '@tanstack/react-table' {
     interface TableMeta<TData extends RowData> {
         updateData: (rowIndex: number, columnId: string, value: unknown) => void;
@@ -14,7 +14,6 @@ export declare enum ColumnType {
     Expander = "expander"
 }
 export type ColumnSizing = Record<string, number>;
-export declare const TableContext: React.Context<TableContextType>;
 export declare const CACHE_MAX_AGE: number;
 declare const _default: React.ForwardRefExoticComponent<TableMaxProps & React.RefAttributes<unknown>>;
 export default _default;

package/dist/components/TableMax/TableMax.js

@@ -24,19 +24,19 @@ import { useUpdateEffect } from 'ahooks';
 import { Button, Checkbox, Form, Pagination, Upload } from 'antd';
 import dayjs from 'dayjs';
 import { cloneDeep, debounce } from 'lodash';
-import React, { createContext, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { useConfig } from "../ConfigProvider";
 import TableBody from "./TableBody";
 import TableHeader from "./TableHeader";
 import { InputType } from "./components/ColumnEdit";
-import { setDefaultFilterFn } from "./components/ColumnFilter";
-import customFilterFns from "./components/ColumnFilter/customFilterFns";
+import { setDefaultFilterFn } from "./components/ColumnFilterV2";
+import customFilterFns from "./components/ColumnFilterV2/customFilterFns";
 import ColumnSetting from "./components/ColumnSetting";
 import customSortFns, { setDefaultSortFn } from "./components/ColumnSort/customSortFns";
 import PaginationV2 from "./components/PaginationV2";
 import { useColumnWidth } from "./hooks/useColumnWidth";
 import "./tableMax.less";
-import { downloadExcel, getFormatFilters, getFormatSorting, operationColumnNoTooltips } from "./utils";
+import { downloadExcel, getFormatFilters, getFormatFiltersV2, getFormatSorting, operationColumnNoTooltips } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var ColumnType = /*#__PURE__*/function (ColumnType) {
@@ -46,7 +46,8 @@ export var ColumnType = /*#__PURE__*/function (ColumnType) {
   ColumnType["Expander"] = "expander";
   return ColumnType;
 }({});
-export var TableContext = /*#__PURE__*/createContext({});
+// export const TableContext = createContext<TableContextType>({} as TableContextType);
+
 export var CACHE_MAX_AGE = 1 * 60 * 60 * 1000;
 var getCurrentRouterName = function getCurrentRouterName() {
   return window.location.pathname.slice(1);
@@ -646,6 +647,7 @@ var TableMax = function TableMax(_ref) {
 
   // 筛选回调
   useEffect(function () {
+    console.log('columnFilters :>> ', tableId, columnFilters);
     var filteredRowModel = table.getRowModel();
     var filteredData = filteredRowModel.rows.map(function (item) {
       return item.original;
@@ -660,7 +662,8 @@ var TableMax = function TableMax(_ref) {
         filteredData: filteredData,
         filteredRowModel: filteredRowModel,
         filters: columnFilters,
-        formatFilters: getFormatFilters(columns, columnFilters)
+        formatFilters: getFormatFilters(columns, columnFilters),
+        formatFiltersV2: getFormatFiltersV2(columns, columnFilters) // 动态化查询格式：https://arim-jyzx.coding.net/p/infra/wiki/3252
       });
     }
   }, [JSON.stringify(columnFilters), manualFiltering, tableId]);
@@ -980,7 +983,8 @@ var TableMax = function TableMax(_ref) {
     columnResizeMode: columnResizeMode,
     shadowColumnInfo: shadowColumnInfo,
     disableColumnDrag: disableColumnDrag,
-    compactMode: compactMode
+    compactMode: compactMode,
+    manualFiltering: manualFiltering
   };
   var tableBodyProps = {
     tableContentRef: tableContentRef,

package/dist/components/TableMax/components/{ColumnFilter/FilterDateRange → ColumnFilterV2/DateRange}/index.d.ts

@@ -10,7 +10,8 @@ interface IProps {
         endDate: number | null;
     } | undefined;
     columnDef: TableMaxColumnType;
+    manualFiltering: boolean;
 }
-export declare const FilterDateRange: ({ onChange, value, columnDef }: IProps) => import("react/jsx-runtime").JSX.Element;
+export declare const DateRange: ({ onChange, value, columnDef, manualFiltering }: IProps) => import("react/jsx-runtime").JSX.Element;
 export declare const timeRangeFilter: (row: any, columnId: any, filterValue: any) => boolean;
 export {};

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

@@ -0,0 +1,135 @@
+import { DatePicker } from 'antd';
+import dayjs from 'dayjs';
+import { defaultDateFormat } from "../index";
+import "./index.less";
+import { jsx as _jsx } from "react/jsx-runtime";
+var defaultRangePresets = [{
+  label: '最近7天',
+  value: [dayjs().add(-7, 'd'), dayjs()]
+}, {
+  label: '最近一个月',
+  value: [dayjs().add(-1, 'M'), dayjs()]
+}, {
+  label: '最近三个月',
+  value: [dayjs().add(-3, 'M'), dayjs()]
+}, {
+  label: '最近半年',
+  value: [dayjs().add(-6, 'M'), dayjs()]
+}, {
+  label: '最近一年',
+  value: [dayjs().add(-1, 'y'), dayjs()]
+}];
+var defaultTimeRange = [dayjs('00:00:00', 'HH:mm:ss'), dayjs('23:59:59', 'HH:mm:ss')];
+export var DateRange = function DateRange(_ref) {
+  var onChange = _ref.onChange,
+    value = _ref.value,
+    columnDef = _ref.columnDef,
+    manualFiltering = _ref.manualFiltering;
+  var _columnDef$filterComP = columnDef.filterComProps,
+    _columnDef$filterComP2 = _columnDef$filterComP.format,
+    format = _columnDef$filterComP2 === void 0 ? defaultDateFormat : _columnDef$filterComP2,
+    _columnDef$filterComP3 = _columnDef$filterComP.rangePresets,
+    rangePresets = _columnDef$filterComP3 === void 0 ? defaultRangePresets : _columnDef$filterComP3,
+    showTime = _columnDef$filterComP.showTime,
+    _columnDef$filterComP4 = _columnDef$filterComP.picker,
+    picker = _columnDef$filterComP4 === void 0 ? 'date' : _columnDef$filterComP4;
+
+  // 后端筛选-开始时间
+  var calManualStartTime = function calManualStartTime(startTime, dateStrings) {
+    if (picker === 'date') {
+      if (format.endsWith('YY')) {
+        return startTime.startOf('year').format('YYYY-MM-DD HH:mm:ss');
+      } else if (format.endsWith('MM')) {
+        return startTime.startOf('month').format('YYYY-MM-DD HH:mm:ss');
+      } else if (format.endsWith('DD')) {
+        return startTime.startOf('day').format('YYYY-MM-DD HH:mm:ss');
+      } else if (format.endsWith('HH')) {
+        return startTime.startOf('hour').format('YYYY-MM-DD HH:mm:ss');
+      } else if (format.endsWith('mm')) {
+        return startTime.startOf('minute').format('YYYY-MM-DD HH:mm:ss');
+      } else if (format.endsWith('ss')) {
+        return startTime.startOf('second').format('YYYY-MM-DD HH:mm:ss');
+      }
+    } else {
+      return dateStrings[0];
+    }
+  };
+
+  // 后端筛选-结束时间
+  var calManualEndTime = function calManualEndTime(endTime, dateStrings) {
+    if (picker === 'date') {
+      if (format.endsWith('YY')) {
+        return endTime.endOf('year').format('YYYY-MM-DD HH:mm:ss');
+      } else if (format.endsWith('MM')) {
+        return endTime.endOf('month').format('YYYY-MM-DD HH:mm:ss');
+      } else if (format.endsWith('DD')) {
+        return endTime.endOf('day').format('YYYY-MM-DD HH:mm:ss');
+      } else if (format.endsWith('HH')) {
+        return endTime.endOf('hour').format('YYYY-MM-DD HH:mm:ss');
+      } else if (format.endsWith('mm')) {
+        return endTime.endOf('minute').format('YYYY-MM-DD HH:mm:ss');
+      } else if (format.endsWith('ss')) {
+        return endTime.endOf('second').format('YYYY-MM-DD HH:mm:ss');
+      }
+    } else {
+      return dateStrings[1];
+    }
+  };
+
+  // 前端筛选-计算结束时间，精确度时间后的时间取结束时间，比如精确到小时，那么分钟取59分，秒取59秒，毫秒取999毫秒
+  var calEndTime = function calEndTime(endTime) {
+    if (format.endsWith('YY')) {
+      return endTime.endOf('year');
+    } else if (format.endsWith('MM')) {
+      return endTime.endOf('month');
+    } else if (format.endsWith('DD')) {
+      return endTime.endOf('day');
+    } else if (format.endsWith('HH')) {
+      return endTime.endOf('hour');
+    } else if (format.endsWith('mm')) {
+      return endTime.endOf('minute');
+    } else if (format.endsWith('ss')) {
+      return endTime.endOf('second');
+    }
+  };
+  var onChangeDateRange = function onChangeDateRange(dates, dateStrings) {
+    console.log('dates :>> ', dates, dateStrings);
+    var newRange = {
+      startDate: dates && dates[0] ? manualFiltering ? calManualStartTime(dates[0], dateStrings) // 后端筛选：向外传递字符串格式的时间
+      : dayjs(dateStrings[0]).valueOf() // 前端筛选需要时间戳格式：去掉精确度后面的时间：把字符串转为dayjs、再转为时间戳，
+      : null,
+      endDate: dates && dates[1] ? manualFiltering ? calManualEndTime(dates[1], dateStrings) // 后端筛选：向外传递字符串格式的时间
+      : calEndTime(dates[1]).valueOf() // 前端筛选需要时间戳格式
+      : null
+    };
+    if (newRange.startDate === null && newRange.endDate === null) {
+      onChange(undefined);
+    } else {
+      onChange(newRange);
+    }
+  };
+  return /*#__PURE__*/_jsx("div", {
+    className: "date-range-filter-wrapper",
+    children: /*#__PURE__*/_jsx(DatePicker.RangePicker, {
+      presets: rangePresets && rangePresets.length > 0 ? rangePresets : undefined,
+      defaultValue: [value !== null && value !== void 0 && value.startDate ? dayjs(value === null || value === void 0 ? void 0 : value.startDate) : undefined, value !== null && value !== void 0 && value.endDate ? dayjs(value === null || value === void 0 ? void 0 : value.endDate) : undefined],
+      showTime: showTime === true ? {
+        defaultValue: defaultTimeRange
+      } : showTime,
+      format: format,
+      placeholder: ['开始时间', '结束时间'],
+      picker: picker,
+      onChange: onChangeDateRange,
+      allowEmpty: [true, true],
+      style: {
+        width: 330
+      }
+    })
+  });
+};
+
+// 前端筛选时的过滤函数
+export var timeRangeFilter = function timeRangeFilter(row, columnId, filterValue) {
+  var timeMs = new Date(row.getValue(columnId)).getTime() || 0;
+  return !(filterValue.startDate && timeMs < filterValue.startDate || filterValue.endDate && timeMs > filterValue.endDate);
+};

package/dist/components/TableMax/components/{ColumnFilter/FilterDateRange → ColumnFilterV2/DateRange}/index.less

@@ -1,4 +1,5 @@
-.date-range-filter-wapper {
+.date-range-filter-wrapper {
+  padding: 8px 12px;
   .split-wapper {
     margin: 5px 0px 0px;
     height: 2px;
@@ -17,8 +18,7 @@
     margin: 5px 0px 0px;
   }
 
-  >div {
-    width: 100%
+  > div {
+    width: 100%;
   }
-
-}
+}

package/dist/components/TableMax/components/ColumnFilterV2/Filter.d.ts

@@ -0,0 +1,9 @@
+import { Column } from '@tanstack/react-table';
+import React from 'react';
+type IProps = {
+    column: Column<any, unknown>;
+    onCloseFilterPanel: () => void;
+    manualFiltering: boolean;
+};
+declare const Filter: React.FC<IProps>;
+export default Filter;