zmdms-webui 2.0.5 → 2.0.7

package/dist/es/dynamicsetting/dynamicDrawer.js

@@ -68,9 +68,9 @@ var DynamicDrawer = function (props, ref) {
         if (oldGroup !== dragGroup) {
             return true;
         }
-        if ((oldItem === null || oldItem === void 0 ? void 0 : oldItem.dimensionPriority) !== undefined) {
-            if ((dragItem === null || dragItem === void 0 ? void 0 : dragItem.dimensionPriority) === undefined ||
-                (oldItem === null || oldItem === void 0 ? void 0 : oldItem.dimensionPriority) < (dragItem === null || dragItem === void 0 ? void 0 : dragItem.dimensionPriority)) {
+        if ((oldItem === null || oldItem === void 0 ? void 0 : oldItem.dimensionPriority) !== undefined &&
+            (dragItem === null || dragItem === void 0 ? void 0 : dragItem.dimensionPriority) !== undefined) {
+            if ((oldItem === null || oldItem === void 0 ? void 0 : oldItem.dimensionPriority) < (dragItem === null || dragItem === void 0 ? void 0 : dragItem.dimensionPriority)) {
                 myMessage.warning("".concat(dragItem === null || dragItem === void 0 ? void 0 : dragItem.label, "\u4E0D\u80FD\u6392\u5E8F\u5230").concat(oldItem === null || oldItem === void 0 ? void 0 : oldItem.label).concat(isUp ? "前面" : "后面"));
                 return false;
             }

package/dist/es/table/components/FilterDropdown.js

@@ -2,9 +2,9 @@ import { __assign } from '../../_virtual/_tslib.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { useMemo, useEffect, useState } from 'react';
 import { useLatest } from 'ahooks';
+import myMessage from '../../message/index.js';
 import MemoInput from '../../input/input.js';
 import ButtonCom from '../../button/button.js';
-import myMessage from '../../message/index.js';
 import { Checkbox, Tooltip } from 'antd';
 import QuestionCircleOutlined from '../../node_modules/@ant-design/icons/es/icons/QuestionCircleOutlined.js';
 

package/dist/es/table/excel.js

@@ -502,7 +502,6 @@ function applyExcelStyles(worksheet, data, numKeys, columns, headerRowCount, has
         var isSubtotal = rowData.__is_summary__;
         for (var c = 1; c <= totalCols; c++) {
             var cell = worksheet.getCell(headerRowCount + rowIndex + 1, c);
-            var currentColumn = columns && Array.isArray(columns) ? columns[c - 1] : undefined;
             var base = isSubtotal ? summaryStyle : normalStyle;
             var columnAlign = columns && Array.isArray(columns)
                 ? (_c = columns[c - 1]) === null || _c === void 0 ? void 0 : _c.align
@@ -562,8 +561,8 @@ function useExcelExport(records, config) {
     var columns = config.columns, isAutoMerge = config.isAutoMerge, columnHeaders = config.columnHeaders, summaryConfig = config.summaryConfig;
     var mergeKeys = useMergeKeys(columns, isAutoMerge);
     var numKeys = useNumKeys(columns);
-    var exportFunction = useMemoizedFn(function (fileName, _a) {
-        var topDescription = _a.topDescription, topDescriptionRowHeight = _a.topDescriptionRowHeight, time = _a.time;
+    var exportFunction = useMemoizedFn(function (fileName, options) {
+        var _a = options || {}, topDescription = _a.topDescription, topDescriptionRowHeight = _a.topDescriptionRowHeight, time = _a.time;
         if (!fileName.includes(".xlsx")) {
             fileName = fileName + ".xlsx";
         }

package/dist/es/table/hooks.js

@@ -1,10 +1,11 @@
 import { __assign, __spreadArray } from '../_virtual/_tslib.js';
 import { useCallback, useRef, useState, useEffect, useMemo } from 'react';
+import { useMemoizedFn } from 'ahooks';
 import update from '../node_modules/immutability-helper/index.js';
 import { getInnerIndex } from './useInnerPagination.js';
 import { flattenRecordsOptimized } from './utils.js';
 import { IS_SUMMARY, MERGE_INDEX, MERGE_ROW_SPANS } from './constant.js';
-import { useMemoizedFn } from 'ahooks';
+import { filterHandle } from './components/FilterDropdown.js';
 
 /**
  * @param dataSourceRef 数据引用
@@ -398,7 +399,7 @@ var useNumKeys = function (columns) {
  * 自动合并的一些处理
  */
 function useAutoMerge(dataSource, columns, _a) {
-    var isAutoMerge = _a.isAutoMerge, isDimensionDynamic = _a.isDimensionDynamic;
+    var isAutoMerge = _a.isAutoMerge, isDimensionDynamic = _a.isDimensionDynamic, order = _a.order, dimensionCustomSumKeys = _a.dimensionCustomSumKeys;
     // 计算需要合并的字段key集合
     var mergeKeys = useMergeKeys(columns, isAutoMerge);
     var firstMergeKey = mergeKeys === null || mergeKeys === void 0 ? void 0 : mergeKeys[0];
@@ -422,7 +423,7 @@ function useAutoMerge(dataSource, columns, _a) {
             if (!mergeKeys)
                 return dataSource;
             else {
-                var newDataSource_2 = flattenRecordsOptimized(__spreadArray([], (dataSource || []), true), mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic);
+                var newDataSource_2 = flattenRecordsOptimized(__spreadArray([], (dataSource || []), true), mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic, order, dimensionCustomSumKeys);
                 return newDataSource_2;
             }
         }
@@ -433,6 +434,8 @@ function useAutoMerge(dataSource, columns, _a) {
         dimensionSummaryKeys,
         summaryKeys,
         isDimensionDynamic,
+        order,
+        dimensionCustomSumKeys,
     ]);
     var newColumns = useMemo(function () {
         var _columns = columns;
@@ -517,6 +520,48 @@ function useMergeAddAndDel(_a) {
         return addAndDelProps;
     }, [addAndDelProps, isAutoMerge, firstMergeKey]);
     return [newRowSelection, newAddAndDelProps];
+}
+/**
+ * 自定义处理过滤逻辑
+ */
+function useCustomFilter(dataSource) {
+    var _a = useState(), filterConfig = _a[0], setFilterConfig = _a[1];
+    var newDataSource = useMemo(function () {
+        if (!filterConfig)
+            return dataSource;
+        return dataSource.filter(function (item) {
+            var keys = Object.keys(filterConfig);
+            for (var i = 0; i < keys.length; i++) {
+                var key = keys[i];
+                var filter = filterConfig[key];
+                if (filter.input) {
+                    if (!filterHandle(filter.input, item, key)) {
+                        return false;
+                    }
+                }
+                if (filter.checkbox && filter.checkbox.length > 0) {
+                    var flag = false;
+                    for (var _a = 0, _b = filter.checkbox; _a < _b.length; _a++) {
+                        var value = _b[_a];
+                        if (filterHandle(value, item, key)) {
+                            flag = true;
+                            break;
+                        }
+                    }
+                    if (!flag) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        });
+    }, [dataSource, filterConfig]);
+    var handleFilterConfigChange = useMemoizedFn(function (value) {
+        setFilterConfig(function (oldValue) {
+            return __assign(__assign({}, oldValue), value);
+        });
+    });
+    return [newDataSource, handleFilterConfigChange];
 }
 
-export { useAddAndDelChange, useAutoMerge, useCalcScrollY, useCustomSort, useEditChange, useMergeAddAndDel, useMergeKeys, useMoveRowChange, useNumKeys, useScuRfresh };
+export { useAddAndDelChange, useAutoMerge, useCalcScrollY, useCustomFilter, useCustomSort, useEditChange, useMergeAddAndDel, useMergeKeys, useMoveRowChange, useNumKeys, useScuRfresh };

package/dist/es/table/interface.d.ts

@@ -512,6 +512,19 @@ interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"
      * 开启维度自定义。开启后，会根据columns中的isDimension属性来是否开启维度自定义，需要合并行时，需要开启这个属性isAutoMerge
      */
     isDimensionDynamic?: boolean;
+    /**
+     * 开启维度自定义后，开启维度合计的字段，与column中的isSummary相同，主要用于自定义合计字段
+     */
+    dimensionCustomSumKeys?: (string | {
+        /** 自定义合计的key */
+        key: string;
+        /** 自定义合计的值 */
+        value: (record: any) => string | number;
+        /** 合计方式 */
+        summaryType?: "sum" | "first" | "computed";
+        /** 当summaryType为computed时，用于计算合计值的函数 */
+        computedSummary?: (items: any[], summaryRow: any) => string | number;
+    })[];
     /**
      * 开启自动合并行
      */

package/dist/es/table/table.js

@@ -17,7 +17,7 @@ import { useColumns } from './useColumns.js';
 import { useDynamicListByColumns } from './useDynamicListByColumns.js';
 import useSummary from './useSummary.js';
 import useInnerPagination, { getInnerIndex } from './useInnerPagination.js';
-import { useScuRfresh, useCustomSort, useCalcScrollY, useEditChange, useMoveRowChange, useAddAndDelChange, useAutoMerge } from './hooks.js';
+import { useScuRfresh, useCustomSort, useCalcScrollY, useEditChange, useMoveRowChange, useAddAndDelChange, useCustomFilter, useAutoMerge } from './hooks.js';
 import { HTML5Backend } from '../node_modules/react-dnd-html5-backend/dist/index.js';
 import { VList, scrollTo } from '../node_modules/virtuallist-antd/dist/index.es.js';
 import useTableValidate, { tableValidate } from './useTableValidate.js';
@@ -41,7 +41,7 @@ import { DndProvider } from '../node_modules/react-dnd/dist/core/DndProvider.js'
 // completed: 实现从execl复制到表格中的功能
 var Table = function (props) {
     // console.log("表格渲染");
-    var className = props.className, _a = props.bordered, bordered = _a === void 0 ? true : _a, _b = props.pagination, pagination = _b === void 0 ? false : _b, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isRemeberFilter = props.isRemeberFilter, _c = props.isOrderUpdateData, isOrderUpdateData = _c === void 0 ? true : _c, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _d = props.isTheadTitleAdd, isTheadTitleAdd = _d === void 0 ? true : _d, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _e = props.isDelAll, isDelAll = _e === void 0 ? true : _e, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _f = props.summaryFixed, summaryFixed = _f === void 0 ? true : _f, isInnerPagination = props.isInnerPagination, _g = props.innerPaginationPageSize, innerPaginationPageSize = _g === void 0 ? 30 : _g, _h = props.innerPaginationPosition, innerPaginationPosition = _h === void 0 ? INNER_TABLE_PAGINATION_POSITION : _h, _j = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _j === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _j, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _k = props.isResizableColumn, isResizableColumn = _k === void 0 ? true : _k, _l = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _l === void 0 ? true : _l, _m = props.isRealTimeValidate, isRealTimeValidate = _m === void 0 ? true : _m, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, scroll = props.scroll, addAndDelProps = props.addAndDelProps, _o = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _o === void 0 ? 65 : _o, _p = props.isAutoScrollY, isAutoScrollY = _p === void 0 ? false : _p, tableId = props.tableId, extraOnRow = props.onRow, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, headerAlign = props.headerAlign, isDimensionDynamic = props.isDimensionDynamic, isAutoMerge = props.isAutoMerge, mode = props.mode, rowSelection = props.rowSelection, isContextMenu = props.isContextMenu, isFullscreenHandle = props.isFullscreenHandle, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "customDynamicListHandle", "isRemeberFilter", "isOrderUpdateData", "hiddenDynamicIcon", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "hiddenAddBtnHandle", "isTheadTitleAdd", "addMode", "addCallback", "isDel", "delPopTitle", "hiddenDelBtnHandle", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "innerPaginationConfig", "tableRefHandle", "tableName", "serviceOrder", "differences", "virtualKey", "isResizableColumn", "isResizableTitleEllipsis", "isRealTimeValidate", "isMarginTop", "isMarginBottom", "scroll", "addAndDelProps", "autoScrollYMarginBottom", "isAutoScrollY", "tableId", "onRow", "fixedRowsCount", "fixedRowsConfig", "headerAlign", "isDimensionDynamic", "isAutoMerge", "mode", "rowSelection", "isContextMenu", "isFullscreenHandle"]);
+    var className = props.className, _a = props.bordered, bordered = _a === void 0 ? true : _a, _b = props.pagination, pagination = _b === void 0 ? false : _b, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isRemeberFilter = props.isRemeberFilter, _c = props.isOrderUpdateData, isOrderUpdateData = _c === void 0 ? true : _c, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _d = props.isTheadTitleAdd, isTheadTitleAdd = _d === void 0 ? true : _d, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _e = props.isDelAll, isDelAll = _e === void 0 ? true : _e, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _f = props.summaryFixed, summaryFixed = _f === void 0 ? true : _f, isInnerPagination = props.isInnerPagination, _g = props.innerPaginationPageSize, innerPaginationPageSize = _g === void 0 ? 30 : _g, _h = props.innerPaginationPosition, innerPaginationPosition = _h === void 0 ? INNER_TABLE_PAGINATION_POSITION : _h, _j = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _j === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _j, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _k = props.isResizableColumn, isResizableColumn = _k === void 0 ? true : _k, _l = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _l === void 0 ? true : _l, _m = props.isRealTimeValidate, isRealTimeValidate = _m === void 0 ? true : _m, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, scroll = props.scroll, addAndDelProps = props.addAndDelProps, _o = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _o === void 0 ? 65 : _o, _p = props.isAutoScrollY, isAutoScrollY = _p === void 0 ? false : _p, tableId = props.tableId, extraOnRow = props.onRow, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, headerAlign = props.headerAlign, isDimensionDynamic = props.isDimensionDynamic, dimensionCustomSumKeys = props.dimensionCustomSumKeys, isAutoMerge = props.isAutoMerge, mode = props.mode, rowSelection = props.rowSelection, isContextMenu = props.isContextMenu, isFullscreenHandle = props.isFullscreenHandle, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "customDynamicListHandle", "isRemeberFilter", "isOrderUpdateData", "hiddenDynamicIcon", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "hiddenAddBtnHandle", "isTheadTitleAdd", "addMode", "addCallback", "isDel", "delPopTitle", "hiddenDelBtnHandle", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "innerPaginationConfig", "tableRefHandle", "tableName", "serviceOrder", "differences", "virtualKey", "isResizableColumn", "isResizableTitleEllipsis", "isRealTimeValidate", "isMarginTop", "isMarginBottom", "scroll", "addAndDelProps", "autoScrollYMarginBottom", "isAutoScrollY", "tableId", "onRow", "fixedRowsCount", "fixedRowsConfig", "headerAlign", "isDimensionDynamic", "dimensionCustomSumKeys", "isAutoMerge", "mode", "rowSelection", "isContextMenu", "isFullscreenHandle"]);
     var classes = classNames("ztxk-table", className, {
         "ztxk-table--flex": isFlex,
     });
@@ -129,8 +129,10 @@ var Table = function (props) {
         currentPage: currentPage,
         filterConfigRef: filterConfigRef,
     });
+    // 表格内部自定义处理过滤，不走antd内部
+    var _u = useCustomFilter(currentTableDataSource), filterDataSource = _u[0], handleFilterConfigChange = _u[1];
     // 处理列配置信息 得到新的列配置信息
-    var _u = useColumns(columns, {
+    var _v = useColumns(columns, {
         // 动态列配置相关信息
         dynamicKey: dynamicKey,
         isRemeberFilter: isRemeberFilter,
@@ -171,12 +173,15 @@ var Table = function (props) {
         headerAlign: headerAlign,
         mode: mode,
         isAutoMerge: isAutoMerge,
-    }), _newColumns = _u.newColumns, newRowSelection = _u.rowSelection;
+        handleFilterConfigChange: handleFilterConfigChange,
+    }), _newColumns = _v.newColumns, newRowSelection = _v.rowSelection;
     // 处理表格合并和维度
-    var _v = useAutoMerge(currentTableDataSource, _newColumns, {
+    var _w = useAutoMerge(filterDataSource, _newColumns, {
         isAutoMerge: isAutoMerge,
         isDimensionDynamic: isDimensionDynamic,
-    }), newDataSource = _v[0], newColumns = _v[1];
+        order: order,
+        dimensionCustomSumKeys: dimensionCustomSumKeys,
+    }), newDataSource = _w[0], newColumns = _w[1];
     // 内部表格总结栏
     var getSummaryHandle = useSummary(summaryConfig, newColumns, {
         summaryFixed: summaryFixed,
@@ -186,7 +191,7 @@ var Table = function (props) {
         isDel: isDel,
     });
     // 表格验证
-    var _w = useTableValidate(), tableRef = _w.tableRef, getCurrentTable = _w.getCurrentTable, clearErrorClass = _w.clearErrorClass;
+    var _x = useTableValidate(), tableRef = _x.tableRef, getCurrentTable = _x.getCurrentTable, clearErrorClass = _x.clearErrorClass;
     // 虚拟滚动选项
     var vComponents = useMemo(function () {
         if (virtualKey) {

package/dist/es/table/useColumns.js

@@ -26,7 +26,7 @@ import ModalComponent from '../modal/modal.js';
 function useColumns(columns, options) {
     var _this = this;
     var _a, _b;
-    var dynamicKey = options.dynamicKey, isRemeberFilter = options.isRemeberFilter, hiddenDynamicIcon = options.hiddenDynamicIcon, currentDynamicList = options.currentDynamicList, dataSource = options.dataSource, dataSourceRef = options.dataSourceRef, onEditableSave = options.onEditableSave, isEdit = options.isEdit, isAdd = options.isAdd, isTheadTitleAdd = options.isTheadTitleAdd, isDel = options.isDel, delPopTitle = options.delPopTitle, dynamicSettingRef = options.dynamicSettingRef, onCurrentListChange = options.onCurrentListChange, onAddAndDel = options.onAddAndDel, getRefreshScuCell = options.getRefreshScuCell, isDelAll = options.isDelAll, currentPage = options.currentPage, onTableChange = options.onTableChange, order = options.order, setOrder = options.setOrder, customSortHandle = options.customSortHandle, isResizableColumn = options.isResizableColumn, isResizableTitleEllipsis = options.isResizableTitleEllipsis, isRealTimeValidate = options.isRealTimeValidate, hiddenDelBtnHandleRef = options.hiddenDelBtnHandleRef, hiddenAddBtnHandleRef = options.hiddenAddBtnHandleRef, rowKey = options.rowKey, filterConfigRef = options.filterConfigRef, rowSelection = options.rowSelection, addAndDelProps = options.addAndDelProps, headerAlign = options.headerAlign, mode = options.mode, isAutoMerge = options.isAutoMerge;
+    var dynamicKey = options.dynamicKey, isRemeberFilter = options.isRemeberFilter, hiddenDynamicIcon = options.hiddenDynamicIcon, currentDynamicList = options.currentDynamicList, dataSource = options.dataSource, dataSourceRef = options.dataSourceRef, onEditableSave = options.onEditableSave, isEdit = options.isEdit, isAdd = options.isAdd, isTheadTitleAdd = options.isTheadTitleAdd, isDel = options.isDel, delPopTitle = options.delPopTitle, dynamicSettingRef = options.dynamicSettingRef, onCurrentListChange = options.onCurrentListChange, onAddAndDel = options.onAddAndDel, getRefreshScuCell = options.getRefreshScuCell, isDelAll = options.isDelAll, currentPage = options.currentPage, onTableChange = options.onTableChange, order = options.order, setOrder = options.setOrder, customSortHandle = options.customSortHandle, isResizableColumn = options.isResizableColumn, isResizableTitleEllipsis = options.isResizableTitleEllipsis, isRealTimeValidate = options.isRealTimeValidate, hiddenDelBtnHandleRef = options.hiddenDelBtnHandleRef, hiddenAddBtnHandleRef = options.hiddenAddBtnHandleRef, rowKey = options.rowKey, filterConfigRef = options.filterConfigRef, rowSelection = options.rowSelection, addAndDelProps = options.addAndDelProps, headerAlign = options.headerAlign, mode = options.mode, isAutoMerge = options.isAutoMerge, handleFilterConfigChange = options.handleFilterConfigChange;
     var newColumns = getTableColumns(columns, currentDynamicList).columns;
     // 处理自动合并的加减和选择框
     var _c = useMergeAddAndDel({
@@ -109,27 +109,30 @@ function useColumns(columns, options) {
             _column.filterDropdown = function (_a) {
                 var selectedKeys = _a.selectedKeys, setSelectedKeys = _a.setSelectedKeys, confirm = _a.confirm, clearFilters = _a.clearFilters;
                 return (jsx(FilterDropdown, { dataSource: dataSource, dataSourceRef: dataSourceRef, filterKey: _key, selectedKeys: selectedKeys, setSelectedKeys: setSelectedKeys, confirm: confirm, clearFilters: clearFilters, searchValueInputRef: searchValueInputRef, defaultFilterSearchValue: isRemeberFilter ? input_1 : undefined, defaultFilterSearchCheckboxValue: isRemeberFilter ? checkbox_1 : undefined, onFilterChange: function (filter) {
-                        var _a;
-                        var _b;
+                        var _a, _b;
+                        var _c;
                         // 实时记录下当前的值
                         var filteredValue = createFilterValue(filter === null || filter === void 0 ? void 0 : filter.input, filter === null || filter === void 0 ? void 0 : filter.checkbox);
                         filterConfigRef.current = (_a = {},
                             _a[_key] = filteredValue,
                             _a);
+                        handleFilterConfigChange === null || handleFilterConfigChange === void 0 ? void 0 : handleFilterConfigChange((_b = {},
+                            _b[_key] = filter,
+                            _b));
                         if (!isRemeberFilter) {
                             return;
                         }
                         // 如果有持久化 那么更新持久化数据
-                        var _c = getColumnsItem({
+                        var _d = getColumnsItem({
                             currentDynamicList: currentDynamicList,
                             currentKey: _key,
                             keyIndex: keyIndex,
-                        }), result = _c.result, newList = _c.newList;
+                        }), result = _d.result, newList = _d.newList;
                         if (result) {
                             result.filter = filter;
                         }
                         if (dynamicKey) {
-                            (_b = dynamicSettingRef === null || dynamicSettingRef === void 0 ? void 0 : dynamicSettingRef.current) === null || _b === void 0 ? void 0 : _b.updateList(newList);
+                            (_c = dynamicSettingRef === null || dynamicSettingRef === void 0 ? void 0 : dynamicSettingRef.current) === null || _c === void 0 ? void 0 : _c.updateList(newList);
                         }
                         else {
                             onCurrentListChange === null || onCurrentListChange === void 0 ? void 0 : onCurrentListChange(newList);
@@ -145,9 +148,12 @@ function useColumns(columns, options) {
                 _column.filteredValue = filteredValue;
             }
             _column.filterIcon = function () { return jsx(SearchOutlined, {}); };
-            _column.onFilter = function (value, record) {
-                return filterHandle(value, record, _key);
-            };
+            // 自动合并单元格的情况下，不进行内部过滤
+            if (!isAutoMerge) {
+                _column.onFilter = function (value, record) {
+                    return filterHandle(value, record, _key);
+                };
+            }
             _column.onFilterDropdownOpenChange = function (visible) {
                 if (visible) {
                     setTimeout(function () {
@@ -337,7 +343,11 @@ function useColumns(columns, options) {
             };
             var __render__1 = _column.render;
             // 代理render方法，像外部传入一些事件给外部调用
+            // 自定义合计行，不需要render属性
             _column.render = function (text, record, index) {
+                if (record[IS_SUMMARY]) {
+                    return text;
+                }
                 return __render__1(text, record, index, options_1);
             };
         }

package/dist/es/table/utils.js

@@ -449,7 +449,7 @@ function startColumnInsertTableData(options) {
  * @param summaryKeys 合计字段
  * @param isDimensionDynamic 维度合并
  */
-function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic) {
+function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic, order, dimensionCustomSumKeys) {
     var _a;
     if (!records ||
         records.length === 0 ||
@@ -458,14 +458,27 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
         return records;
     }
     // 0. 首先根据维度字段对数据进行排序
-    var result = isDimensionDynamic
-        ? sortByDimensions(__spreadArray([], records, true), mergeKeys)
-        : __spreadArray([], records, true);
+    var result = [];
+    // 如果order没有排序方向，但isDimensionDynamic为true，则按维度字段排序
+    if (isDimensionDynamic) {
+        result = sortByDimensions(__spreadArray([], records, true), mergeKeys);
+    }
+    // 否则保持原样
+    else {
+        result = __spreadArray([], records, true);
+    }
     // 1. 如果开启了维度合并，按所有 mergeKeys 的组合来计算合计值
     if (isDimensionDynamic && mergeKeys.length > 0) {
-        var groupedResult = groupByLastMergeKey(result, mergeKeys, summaryKeys);
+        var groupedResult = groupByLastMergeKey(result, mergeKeys, summaryKeys, dimensionCustomSumKeys);
         result = groupedResult;
     }
+    // 如果order有排序方向，则按order排序
+    result = sortRecords({
+        records: result,
+        // 开启自定义维度后因为最后一个维度字段会合并为一行，所以可以不排序最后一个维度字段
+        mergeKeys: isDimensionDynamic ? mergeKeys.slice(0, -1) : mergeKeys,
+        order: order,
+    });
     // 2. 首先插入维度合计行
     if (dimensionSummaryKeys &&
         dimensionSummaryKeys.length > 0 &&
@@ -565,22 +578,108 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
     }
     return result;
 }
+function sortRecords(_a) {
+    var records = _a.records, mergeKeys = _a.mergeKeys, order = _a.order;
+    var result = [];
+    if (order && order.order) {
+        result = sortByDimensions(__spreadArray([], records, true), mergeKeys, order);
+    }
+    // 否则保持原样
+    else {
+        result = __spreadArray([], records, true);
+    }
+    return result;
+}
 /**
  * 根据维度字段对数据进行排序
  * 确保相同维度值的记录连续排列，以便正确进行合并处理
+ * @param records 数据记录
+ * @param dimensionKeys 维度字段
+ * @param order 排序配置
  */
-function sortByDimensions(records, dimensionKeys) {
+function sortByDimensions(records, dimensionKeys, order) {
     return records.sort(function (a, b) {
-        for (var i = 0; i < dimensionKeys.length; i++) {
-            var key = dimensionKeys[i];
-            var valueA = a[key] || "";
-            var valueB = b[key] || "";
-            // 字符串比较
-            if (valueA < valueB)
-                return -1;
-            if (valueA > valueB)
-                return 1;
-            // 如果当前字段相等，继续比较下一个字段
+        // 如果有排序配置且有排序方向
+        if (order && order.order && order.field) {
+            var field = order.field, sortOrder = order.order;
+            // 找到排序字段在维度字段中的位置
+            var sortFieldIndex = dimensionKeys.indexOf(field);
+            if (sortFieldIndex !== -1) {
+                // 先按维度字段排序到排序字段之前的字段
+                for (var i = 0; i < sortFieldIndex; i++) {
+                    var key = dimensionKeys[i];
+                    var valueA_1 = a[key] || "";
+                    var valueB_1 = b[key] || "";
+                    // 字符串比较
+                    if (valueA_1 < valueB_1)
+                        return -1;
+                    if (valueA_1 > valueB_1)
+                        return 1;
+                    // 如果当前字段相等，继续比较下一个字段
+                }
+                // 按排序字段进行排序
+                var valueA = a[field] || "";
+                var valueB = b[field] || "";
+                var compareResult = 0;
+                if (valueA < valueB)
+                    compareResult = -1;
+                else if (valueA > valueB)
+                    compareResult = 1;
+                if (compareResult !== 0) {
+                    return sortOrder === "ascend" ? compareResult : -compareResult;
+                }
+                // 如果排序字段相等，继续按后面的维度字段排序
+                for (var i = sortFieldIndex + 1; i < dimensionKeys.length; i++) {
+                    var key = dimensionKeys[i];
+                    var valueA_2 = a[key] || "";
+                    var valueB_2 = b[key] || "";
+                    // 字符串比较
+                    if (valueA_2 < valueB_2)
+                        return -1;
+                    if (valueA_2 > valueB_2)
+                        return 1;
+                    // 如果当前字段相等，继续比较下一个字段
+                }
+            }
+            else {
+                // 如果排序字段不在维度字段中，按原逻辑排序维度字段
+                for (var i = 0; i < dimensionKeys.length; i++) {
+                    var key = dimensionKeys[i];
+                    var valueA_3 = a[key] || "";
+                    var valueB_3 = b[key] || "";
+                    // 字符串比较
+                    if (valueA_3 < valueB_3)
+                        return -1;
+                    if (valueA_3 > valueB_3)
+                        return 1;
+                    // 如果当前字段相等，继续比较下一个字段
+                }
+                // 最后按排序字段排序
+                var valueA = a[field] || "";
+                var valueB = b[field] || "";
+                var compareResult = 0;
+                if (valueA < valueB)
+                    compareResult = -1;
+                else if (valueA > valueB)
+                    compareResult = 1;
+                if (compareResult !== 0) {
+                    return sortOrder === "ascend" ? compareResult : -compareResult;
+                }
+            }
+        }
+        else {
+            // 没有排序配置，按原逻辑排序
+            for (var i = 0; i < dimensionKeys.length; i++) {
+                var key = dimensionKeys[i];
+                var valueA = a[key] || "";
+                var valueB = b[key] || "";
+                // 字符串比较
+                if (valueA < valueB)
+                    return -1;
+                if (valueA > valueB)
+                    return 1;
+                // 如果当前字段相等，继续比较下一个字段
+            }
         }
         return 0; // 所有字段都相等
     });
@@ -591,7 +690,8 @@ function sortByDimensions(records, dimensionKeys) {
  */
 function insertDimensionSummaryRows(records, allDimensionKeys, // 完整的维度字段列表
 dimensionSummaryKeys, // 需要合计的维度字段
-summaryKeys) {
+summaryKeys, order // 排序配置
+) {
     var result = __spreadArray([], records, true);
     // 按维度层级从深到浅处理
     for (var i = dimensionSummaryKeys.length - 1; i >= 0; i--) {
@@ -616,8 +716,7 @@ summaryKeys) {
             summaryKeys, currentDimensionIndex);
             newResult.push(summaryRow);
         }
-        // 对插入合计行后的结果重新排序，确保数据顺序正确
-        result = sortByDimensions(newResult, allDimensionKeys);
+        result = newResult;
     }
     return result;
 }
@@ -714,7 +813,7 @@ function hasParentGroupChanged(records, currentIndex, mergeKeys, currentKeyIndex
  * 确保相同维度组合的记录被正确分组
  */
 function groupByLastMergeKey(records, mergeKeys, // 改为传入所有合并键
-summaryKeys) {
+summaryKeys, dimensionCustomSumKeys) {
     var groups = new Map();
     var _loop_6 = function (record) {
         var key = mergeKeys.map(function (k) { return record[k]; });
@@ -756,6 +855,83 @@ summaryKeys) {
             var summaryKey = summaryKeys_2[_d];
             _loop_7(summaryKey);
         }
+        // 处理dimensionCustomSumKeys的额外合并计算逻辑
+        if (dimensionCustomSumKeys && Array.isArray(dimensionCustomSumKeys)) {
+            var _loop_8 = function (customSumKey) {
+                if (typeof customSumKey === "string") {
+                    // 如果是字符串，对指定字段进行合计
+                    summaryRow[customSumKey] = items
+                        .filter(function (item) { return !isSummaryRow(item); }) // 排除已有的合计行
+                        .reduce(function (sum, item) {
+                        var value = parseFloat(item[customSumKey]) || 0;
+                        return plus(sum, value);
+                    }, 0);
+                }
+                else if (typeof customSumKey === "object" &&
+                    customSumKey.key &&
+                    typeof customSumKey.value === "function") {
+                    // 如果是对象，使用自定义的key和value函数
+                    var key = customSumKey.key, valueFn_1 = customSumKey.value, _f = customSumKey.summaryType, summaryType = _f === void 0 ? "sum" : _f, computedSummary = customSumKey.computedSummary;
+                    var filteredItems = items.filter(function (item) { return !isSummaryRow(item); }); // 排除已有的合计行
+                    switch (summaryType) {
+                        case "sum":
+                            // 默认累加方式
+                            var customValues = filteredItems.map(function (item) {
+                                var result = valueFn_1(item);
+                                return typeof result === "number"
+                                    ? result
+                                    : parseFloat(result) || 0;
+                            });
+                            var customSum = customValues.reduce(function (sum, value) {
+                                return plus(sum, value);
+                            }, 0);
+                            summaryRow[key] = customSum;
+                            break;
+                        case "first":
+                            // 使用第一条记录的值
+                            if (filteredItems.length > 0) {
+                                var result_1 = valueFn_1(filteredItems[0]);
+                                summaryRow[key] =
+                                    typeof result_1 === "number" ? result_1 : parseFloat(result_1) || 0;
+                            }
+                            else {
+                                summaryRow[key] = 0;
+                            }
+                            break;
+                        case "computed":
+                            // 使用自定义计算函数
+                            if (typeof computedSummary === "function") {
+                                var result_2 = computedSummary(filteredItems, summaryRow);
+                                summaryRow[key] =
+                                    typeof result_2 === "number" ? result_2 : parseFloat(result_2) || 0;
+                            }
+                            else {
+                                console.warn("\u5B57\u6BB5 ".concat(key, " \u8BBE\u7F6E\u4E86 summaryType: 'computed' \u4F46\u6CA1\u6709\u63D0\u4F9B computedSummary \u51FD\u6570"));
+                                summaryRow[key] = 0;
+                            }
+                            break;
+                        default:
+                            console.warn("\u672A\u77E5\u7684 summaryType: ".concat(summaryType, "\uFF0C\u4F7F\u7528\u9ED8\u8BA4\u7684 sum \u65B9\u5F0F"));
+                            // 回退到默认的 sum 方式
+                            var defaultValues = filteredItems.map(function (item) {
+                                var result = valueFn_1(item);
+                                return typeof result === "number"
+                                    ? result
+                                    : parseFloat(result) || 0;
+                            });
+                            var defaultSum = defaultValues.reduce(function (sum, value) {
+                                return plus(sum, value);
+                            }, 0);
+                            summaryRow[key] = defaultSum;
+                            break;
+                    }
+                }
+            };
+            for (var _e = 0, dimensionCustomSumKeys_1 = dimensionCustomSumKeys; _e < dimensionCustomSumKeys_1.length; _e++) {
+                var customSumKey = dimensionCustomSumKeys_1[_e];
+                _loop_8(customSumKey);
+            }
+        }
         result.push(summaryRow);
     }
     return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",