zmdms-webui 3.4.5 → 3.4.7

package/dist/es/canvastable/hooks/useTableState.js

@@ -1,15 +1,164 @@
-import { __assign, __spreadArray } from '../../_virtual/_tslib.js';
-import { useState, useEffect, useMemo } from 'react';
+import { __spreadArray, __assign } from '../../_virtual/_tslib.js';
+import { useState, useEffect } from 'react';
 import { useMemoizedFn } from 'ahooks';
 import 'zmdms-utils';
 import 'dayjs';
 import { getAllLeafColumns, findColumnByKey } from '../utils/columnHelpers.js';
+import { IS_SUMMARY } from '../../table/constant.js';
+import 'lodash/isEqual';
+import '../../node_modules/immutability-helper/index.js';
+import 'react/jsx-runtime';
+import '../../node_modules/exceljs/dist/exceljs.min.js';
 
 /**
  * 表格状态管理 Hook
  */
+/**
+ * 根据数据源和列配置，自动生成筛选选项（基于数据的唯一值）
+ * 提取为独立函数，以便在含合计行的最终数据源上调用
+ */
+var generateAutoFilters = function (dataSource, columns) {
+    var filtersMap = {};
+    if (dataSource.length === 0) {
+        return filtersMap;
+    }
+    var leafColumns = getAllLeafColumns(columns);
+    leafColumns.forEach(function (column) {
+        if ((column.filters && column.filters.length > 0) ||
+            column.isFilter === false ||
+            column.key === "__selection__") {
+            return;
+        }
+        var dataIndex = column.dataIndex || column.key;
+        var uniqueValues = new Set();
+        dataSource.forEach(function (record) {
+            var value = record[dataIndex];
+            if (value !== null && value !== undefined && value !== "") {
+                uniqueValues.add(value);
+            }
+        });
+        if (uniqueValues.size > 0) {
+            filtersMap[column.key] = Array.from(uniqueValues)
+                .map(function (value) { return ({
+                text: String(value),
+                value: value,
+            }); })
+                .slice(0, 50);
+        }
+    });
+    return filtersMap;
+};
+/** 判断是否为数值筛选 */
+var isNumberFilter = function (value) {
+    return (value &&
+        typeof value === "object" &&
+        "operator" in value &&
+        "value" in value);
+};
+/** 判断是否为模糊查询 */
+var isFuzzyFilter = function (value) {
+    return value && typeof value === "object" && "__fuzzy__" in value;
+};
+/** 应用数值筛选 */
+var applyNumberFilter = function (recordValue, filterValue) {
+    var numValue = parseFloat(recordValue);
+    if (isNaN(numValue))
+        return false;
+    var operator = filterValue.operator, value = filterValue.value;
+    switch (operator) {
+        case "=":
+            return numValue === value;
+        case "!=":
+            return numValue !== value;
+        case ">":
+            return numValue > value;
+        case "<":
+            return numValue < value;
+        case ">=":
+            return numValue >= value;
+        case "<=":
+            return numValue <= value;
+        default:
+            return false;
+    }
+};
+/**
+ * 对数据应用筛选和排序
+ * 提取为独立函数，以便在含合计行的最终数据源上调用，
+ * 使合计行也能参与筛选
+ */
+var processData = function (dataSource, filters, columns, sortField, sortOrder, isAutoMerge) {
+    var data = __spreadArray([], dataSource, true);
+    // 应用过滤
+    Object.keys(filters).forEach(function (key) {
+        var filterValues = filters[key];
+        if (filterValues && filterValues.length > 0) {
+            var column_1 = findColumnByKey(columns, key);
+            var dataIndex_1 = (column_1 === null || column_1 === void 0 ? void 0 : column_1.dataIndex) || key;
+            if (column_1 === null || column_1 === void 0 ? void 0 : column_1.onFilter) {
+                data = data.filter(function (record) {
+                    return filterValues.some(function (value) { return column_1.onFilter(value, record); });
+                });
+            }
+            else {
+                var firstValue = filterValues[0];
+                if (isNumberFilter(firstValue)) {
+                    data = data.filter(function (record) {
+                        return filterValues.every(function (filterValue) {
+                            return applyNumberFilter(record[dataIndex_1], filterValue);
+                        });
+                    });
+                }
+                else if (isFuzzyFilter(firstValue)) {
+                    var searchText_1 = firstValue.text.toLowerCase();
+                    data = data.filter(function (record) {
+                        var recordValue = String(record[dataIndex_1] || "");
+                        return recordValue.toLowerCase().includes(searchText_1);
+                    });
+                }
+                else {
+                    data = data.filter(function (record) {
+                        return filterValues.includes(record[dataIndex_1]);
+                    });
+                }
+            }
+        }
+    });
+    // 应用排序（isAutoMerge 时排序由 useAutoMerge 内部处理）
+    if (sortField && sortOrder && !isAutoMerge) {
+        // 合计行始终保持在末尾，不参与排序
+        var summaryRows = data.filter(function (r) { return r[IS_SUMMARY]; });
+        var normalRows = data.filter(function (r) { return !r[IS_SUMMARY]; });
+        var column_2 = findColumnByKey(columns, sortField);
+        if (column_2 && column_2.isOrder !== false) {
+            var sortFn_1 = typeof column_2.sorter === "function"
+                ? column_2.sorter
+                : function (a, b) {
+                    var dataIndex = column_2.dataIndex || column_2.key;
+                    var aVal = a[dataIndex];
+                    var bVal = b[dataIndex];
+                    if (aVal === bVal)
+                        return 0;
+                    if (aVal === null || aVal === undefined)
+                        return 1;
+                    if (bVal === null || bVal === undefined)
+                        return -1;
+                    if (typeof aVal === "number" && typeof bVal === "number") {
+                        return aVal - bVal;
+                    }
+                    return String(aVal).localeCompare(String(bVal));
+                };
+            normalRows.sort(function (a, b) {
+                var result = sortFn_1(a, b);
+                return sortOrder === "ascend" ? result : -result;
+            });
+        }
+        data = __spreadArray(__spreadArray([], normalRows, true), summaryRows, true);
+    }
+    return data;
+};
 var useTableState = function (params) {
-    var dataSource = params.dataSource, columns = params.columns, rowSelection = params.rowSelection, onFilterChange = params.onFilterChange, isAutoMerge = params.isAutoMerge;
+    var rowSelection = params.rowSelection, onFilterChange = params.onFilterChange;
     // 表格状态
     var _a = useState({
         sortField: null,
@@ -42,159 +191,6 @@ var useTableState = function (params) {
             setState(function (prev) { return (__assign(__assign({}, prev), { selectedRowKeys: rowSelection.selectedRowKeys || [] })); });
         }
     }, [rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys]);
-    // 自动生成筛选选项（基于数据的唯一值）
-    var autoGeneratedFilters = useMemo(function () {
-        var filtersMap = {};
-        // 如果没有数据，直接返回空对象
-        if (dataSource.length === 0) {
-            return filtersMap;
-        }
-        // 获取所有叶子列（包括多级表头中的嵌套列）
-        var leafColumns = getAllLeafColumns(columns);
-        leafColumns.forEach(function (column) {
-            // 如果列已经有有效的filters或未开启filter，跳过
-            if ((column.filters && column.filters.length > 0) ||
-                column.isFilter === false ||
-                column.key === "__selection__") {
-                return;
-            }
-            var dataIndex = column.dataIndex || column.key;
-            var uniqueValues = new Set();
-            dataSource.forEach(function (record) {
-                var value = record[dataIndex];
-                if (value !== null && value !== undefined && value !== "") {
-                    uniqueValues.add(value);
-                }
-            });
-            if (uniqueValues.size > 0) {
-                filtersMap[column.key] = Array.from(uniqueValues)
-                    .map(function (value) { return ({
-                    text: String(value),
-                    value: value,
-                }); })
-                    .slice(0, 50);
-            }
-        });
-        return filtersMap;
-    }, [dataSource, columns]);
-    // 判断是否为数值筛选
-    var isNumberFilter = function (value) {
-        return (value &&
-            typeof value === "object" &&
-            "operator" in value &&
-            "value" in value);
-    };
-    // 判断是否为模糊查询
-    var isFuzzyFilter = function (value) {
-        return value && typeof value === "object" && "__fuzzy__" in value;
-    };
-    // 应用数值筛选
-    var applyNumberFilter = function (recordValue, filterValue) {
-        var numValue = parseFloat(recordValue);
-        if (isNaN(numValue))
-            return false;
-        var operator = filterValue.operator, value = filterValue.value;
-        switch (operator) {
-            case "=":
-                return numValue === value;
-            case "!=":
-                return numValue !== value;
-            case ">":
-                return numValue > value;
-            case "<":
-                return numValue < value;
-            case ">=":
-                return numValue >= value;
-            case "<=":
-                return numValue <= value;
-            default:
-                return false;
-        }
-    };
-    // 过滤和排序后的数据
-    var processedDataSource = useMemo(function () {
-        var data = __spreadArray([], dataSource, true);
-        // 应用过滤
-        Object.keys(state.filters).forEach(function (key) {
-            var filterValues = state.filters[key];
-            if (filterValues && filterValues.length > 0) {
-                var column_1 = findColumnByKey(columns, key);
-                var dataIndex_1 = (column_1 === null || column_1 === void 0 ? void 0 : column_1.dataIndex) || key;
-                if (column_1 === null || column_1 === void 0 ? void 0 : column_1.onFilter) {
-                    // 使用自定义过滤方法
-                    data = data.filter(function (record) {
-                        return filterValues.some(function (value) { return column_1.onFilter(value, record); });
-                    });
-                }
-                else {
-                    // 检查是否为数值筛选
-                    var firstValue = filterValues[0];
-                    if (isNumberFilter(firstValue)) {
-                        // 数值筛选逻辑
-                        // 如果有多个条件（区间筛选），需要同时满足所有条件（且关系）
-                        // 如果只有一个条件（单值筛选），满足该条件即可
-                        data = data.filter(function (record) {
-                            return filterValues.every(function (filterValue) {
-                                return applyNumberFilter(record[dataIndex_1], filterValue);
-                            });
-                        });
-                    }
-                    else if (isFuzzyFilter(firstValue)) {
-                        // 模糊查询逻辑
-                        var searchText_1 = firstValue.text.toLowerCase();
-                        data = data.filter(function (record) {
-                            var recordValue = String(record[dataIndex_1] || "");
-                            return recordValue.toLowerCase().includes(searchText_1);
-                        });
-                    }
-                    else {
-                        // 使用默认过滤方法（精确匹配）
-                        data = data.filter(function (record) {
-                            return filterValues.includes(record[dataIndex_1]);
-                        });
-                    }
-                }
-            }
-        });
-        // 应用排序
-        if (state.sortField && state.sortOrder && !isAutoMerge) {
-            var column_2 = findColumnByKey(columns, state.sortField);
-            if (column_2 && column_2.isOrder !== false) {
-                var sortFn_1 = typeof column_2.sorter === "function"
-                    ? column_2.sorter
-                    : function (a, b) {
-                        var dataIndex = column_2.dataIndex || column_2.key;
-                        var aVal = a[dataIndex];
-                        var bVal = b[dataIndex];
-                        // 默认排序逻辑
-                        if (aVal === bVal)
-                            return 0;
-                        if (aVal === null || aVal === undefined)
-                            return 1;
-                        if (bVal === null || bVal === undefined)
-                            return -1;
-                        // 数字排序
-                        if (typeof aVal === "number" && typeof bVal === "number") {
-                            return aVal - bVal;
-                        }
-                        // 字符串排序
-                        return String(aVal).localeCompare(String(bVal));
-                    };
-                data.sort(function (a, b) {
-                    var result = sortFn_1(a, b);
-                    return state.sortOrder === "ascend" ? result : -result;
-                });
-            }
-        }
-        return data;
-    }, [
-        dataSource,
-        columns,
-        state.filters,
-        state.sortField,
-        state.sortOrder,
-        isAutoMerge,
-    ]);
     // 处理过滤变化
     var handleFilterChange = useMemoizedFn(function (columnKey, values) {
         var _a;
@@ -216,11 +212,9 @@ var useTableState = function (params) {
     return {
         state: state,
         setState: setState,
-        processedDataSource: processedDataSource,
         handleFilterChange: handleFilterChange,
         closeFilterPopover: closeFilterPopover,
-        autoGeneratedFilters: autoGeneratedFilters,
     };
 };
 
-export { useTableState };
+export { generateAutoFilters, processData, useTableState };

package/dist/es/table/hooks.js

@@ -4,7 +4,7 @@ import { useMemoizedFn, useLatest } 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 { IS_SUMMARY, MERGE_ROW_SPANS, MERGE_INDEX } from './constant.js';
 import { filterHandle } from './components/FilterDropdown.js';
 
 /**
@@ -596,61 +596,115 @@ function useMergeAddAndDel(_a) {
     return [newRowSelection, newAddAndDelProps];
 }
 /**
- * 自定义处理过滤逻辑
+ * 对数据应用自定义筛选
+ * 提取为独立函数，以便在含合计行的数据上调用
  */
-function useCustomFilter(dataSource, _newColumns) {
-    var _a = useState(), filterConfig = _a[0], setFilterConfig = _a[1];
-    var columnsRef = useLatest(_newColumns);
-    var newDataSource = useMemo(function () {
-        if (!filterConfig)
-            return dataSource;
-        return dataSource.filter(function (item, index) {
-            var _a, _b;
-            var keys = Object.keys(filterConfig);
-            var _loop_1 = function (i) {
-                var key = keys[i];
-                var column = (_b = (_a = columnsRef.current) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, function (col) { return (col === null || col === void 0 ? void 0 : col.key) === key || (col === null || col === void 0 ? void 0 : col.dataIndex) === key; });
-                var filter = filterConfig[key];
-                if (filter.input) {
-                    if (!filterHandle(filter.input, item, key, {
+function applyCustomFilter(dataSource, filterConfig, columns) {
+    if (!filterConfig)
+        return dataSource;
+    return dataSource.filter(function (item, index) {
+        var _a;
+        var keys = Object.keys(filterConfig);
+        var _loop_1 = function (i) {
+            var key = keys[i];
+            var column = (_a = columns === null || columns === void 0 ? void 0 : columns.find) === null || _a === void 0 ? void 0 : _a.call(columns, function (col) { return (col === null || col === void 0 ? void 0 : col.key) === key || (col === null || col === void 0 ? void 0 : col.dataIndex) === key; });
+            var filter = filterConfig[key];
+            if (filter.input) {
+                if (!filterHandle(filter.input, item, key, {
+                    column: column,
+                    recordIndex: index,
+                })) {
+                    return { value: false };
+                }
+            }
+            if (filter.checkbox && filter.checkbox.length > 0) {
+                var flag = false;
+                for (var _b = 0, _c = filter.checkbox; _b < _c.length; _b++) {
+                    var value = _c[_b];
+                    if (filterHandle(value, item, key, {
                         column: column,
                         recordIndex: index,
+                        checkbox: filter.checkbox,
                     })) {
-                        return { value: false };
+                        flag = true;
+                        break;
                     }
                 }
-                if (filter.checkbox && filter.checkbox.length > 0) {
-                    var flag = false;
-                    for (var _c = 0, _d = filter.checkbox; _c < _d.length; _c++) {
-                        var value = _d[_c];
-                        if (filterHandle(value, item, key, {
-                            column: column,
-                            recordIndex: index,
-                            checkbox: filter.checkbox,
-                        })) {
-                            flag = true;
-                            break;
-                        }
-                    }
-                    if (!flag) {
-                        return { value: false };
-                    }
+                if (!flag) {
+                    return { value: false };
                 }
-            };
-            for (var i = 0; i < keys.length; i++) {
-                var state_1 = _loop_1(i);
-                if (typeof state_1 === "object")
-                    return state_1.value;
             }
-            return true;
-        });
-    }, [dataSource, filterConfig, columnsRef]);
+        };
+        for (var i = 0; i < keys.length; i++) {
+            var state_1 = _loop_1(i);
+            if (typeof state_1 === "object")
+                return state_1.value;
+        }
+        return true;
+    });
+}
+/**
+ * 自定义处理过滤逻辑
+ */
+function useCustomFilter(dataSource, _newColumns) {
+    var _a = useState(), filterConfig = _a[0], setFilterConfig = _a[1];
+    var columnsRef = useLatest(_newColumns);
+    var newDataSource = useMemo(function () { return applyCustomFilter(dataSource, filterConfig, columnsRef.current); }, [dataSource, filterConfig, columnsRef]);
     var handleFilterConfigChange = useMemoizedFn(function (value) {
         setFilterConfig(function (oldValue) {
             return __assign(__assign({}, oldValue), value);
         });
     });
-    return [newDataSource, handleFilterConfigChange];
+    return [newDataSource, handleFilterConfigChange, filterConfig];
+}
+/**
+ * 筛选/排序后重新计算合并行的 rowSpan
+ * 原始 MERGE_ROW_SPANS 基于全量数据计算，
+ * 筛选后行数和顺序变化，需要基于实际数据重新计算
+ */
+function recalcMergeRowSpans(data) {
+    var _a;
+    if (!data || data.length === 0)
+        return data;
+    // 浅拷贝，避免修改原数据
+    var result = data.map(function (item) {
+        var _a;
+        return (__assign(__assign({}, item), (_a = {}, _a[MERGE_ROW_SPANS] = __assign({}, ((item === null || item === void 0 ? void 0 : item[MERGE_ROW_SPANS]) || {})), _a)));
+    });
+    // 从第一行获取所有需要合并的 key
+    var firstSpans = (_a = result[0]) === null || _a === void 0 ? void 0 : _a[MERGE_ROW_SPANS];
+    if (!firstSpans || typeof firstSpans !== "object")
+        return result;
+    var mergeKeys = Object.keys(firstSpans);
+    for (var _b = 0, mergeKeys_1 = mergeKeys; _b < mergeKeys_1.length; _b++) {
+        var key = mergeKeys_1[_b];
+        var i = 0;
+        while (i < result.length) {
+            // 合计行独立，rowSpan=1，且打断合并连续性
+            if (result[i][IS_SUMMARY]) {
+                result[i][MERGE_ROW_SPANS][key] = 1;
+                i++;
+                continue;
+            }
+            // 找连续相同值（跳过合计行）
+            var span = 1;
+            while (i + span < result.length) {
+                var next = result[i + span];
+                if (next[IS_SUMMARY])
+                    break;
+                if (next[key] !== result[i][key])
+                    break;
+                span++;
+            }
+            // 设置 rowSpan
+            result[i][MERGE_ROW_SPANS][key] = span;
+            for (var j = 1; j < span; j++) {
+                result[i + j][MERGE_ROW_SPANS][key] = 0;
+            }
+            i += span;
+        }
+    }
+    return result;
 }
 
-export { useAddAndDelChange, useAutoMerge, useCalcScrollY, useCustomFilter, useCustomSort, useDateKeys, useEditChange, useMergeAddAndDel, useMergeKeys, useMoveRowChange, useNumKeys, useScuRfresh };
+export { applyCustomFilter, recalcMergeRowSpans, useAddAndDelChange, useAutoMerge, useCalcScrollY, useCustomFilter, useCustomSort, useDateKeys, useEditChange, useMergeAddAndDel, useMergeKeys, useMoveRowChange, useNumKeys, useScuRfresh };

package/dist/es/table/table.js

@@ -18,7 +18,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, useCustomFilter, useAutoMerge } from './hooks.js';
+import { useScuRfresh, useCustomSort, useCalcScrollY, useEditChange, useMoveRowChange, useAddAndDelChange, useCustomFilter, applyCustomFilter, useAutoMerge, recalcMergeRowSpans } from './hooks.js';
 import { HTML5Backend } from '../node_modules/react-dnd-html5-backend/dist/index.js';
 import { scrollTo, VList } from '../node_modules/virtuallist-antd/dist/index.es.js';
 import useTableValidate, { tableValidate } from './useTableValidate.js';
@@ -103,6 +103,8 @@ var Table = function (props) {
     var currentTableDataSource = sortDataSource ? sortDataSource : dataSource;
     // 将表格数据 在 Ref中 存储一份
     var dataSourceRef = useLatest(currentTableDataSource);
+    // 筛选候选值数据源 ref：跟踪含维度合计行的最终数据，供 FilterDropdown 使用
+    var mergedDataForFilterRef = useRef(currentTableDataSource);
     var hiddenDelBtnHandleRef = useLatest(hiddenDelBtnHandle);
     var hiddenAddBtnHandleRef = useLatest(hiddenAddBtnHandle);
     var scrolly = useCalcScrollY(isAutoScrollY, autoScrollYMarginBottom, tableId);
@@ -156,7 +158,7 @@ var Table = function (props) {
         filterConfigRef: filterConfigRef,
     });
     // 表格内部自定义处理过滤，不走antd内部
-    var _y = useCustomFilter(currentTableDataSource, columns), filterDataSource = _y[0], handleFilterConfigChange = _y[1];
+    var _y = useCustomFilter(currentTableDataSource, columns), handleFilterConfigChange = _y[1], filterConfig = _y[2];
     // 处理列配置信息 得到新的列配置信息
     var _z = useColumns(columns, {
         // 动态列配置相关信息
@@ -168,6 +170,7 @@ var Table = function (props) {
         onCurrentListChange: onCurrentListChange,
         dataSource: currentTableDataSource,
         dataSourceRef: dataSourceRef,
+        mergedDataForFilterRef: mergedDataForFilterRef,
         onEditableSave: onEditableSave,
         isEdit: isEdit,
         isAdd: isAdd,
@@ -204,13 +207,30 @@ var Table = function (props) {
         isDynamicColumnTextEnable: isDynamicColumnTextEnable,
     }), _newColumns = _z.newColumns, newRowSelection = _z.rowSelection;
     // 处理表格合并和维度
-    var _0 = useAutoMerge(filterDataSource, _newColumns, {
+    // isAutoMerge 时维度合计基于全量数据（合计值不随筛选变化），筛选在合计之后执行
+    var autoMergeInput = isAutoMerge
+        ? currentTableDataSource
+        : applyCustomFilter(currentTableDataSource, filterConfig, _newColumns);
+    var _0 = useAutoMerge(autoMergeInput, _newColumns, {
         isAutoMerge: isAutoMerge,
         isDimensionDynamic: isDimensionDynamic,
         isDimensionMergeChildren: isDimensionMergeChildren,
         order: order,
         dimensionCustomSumKeys: dimensionCustomSumKeys,
     }), newDataSource = _0[0], newColumns = _0[1];
+    // isAutoMerge 时在含合计行的全量数据上应用筛选，使合计行也参与筛选
+    var finalDataSource = useMemo(function () {
+        var result = isAutoMerge
+            ? applyCustomFilter(newDataSource, filterConfig, _newColumns)
+            : newDataSource;
+        // 仅在筛选后行数减少时重新计算合并 rowSpan（筛选前保持原始逻辑）
+        if (isAutoMerge && result.length < newDataSource.length) {
+            result = recalcMergeRowSpans(result);
+        }
+        return result;
+    }, [isAutoMerge, newDataSource, filterConfig, _newColumns]);
+    // 更新筛选候选值数据源为含合计行的全量数据（不随筛选变化）
+    mergedDataForFilterRef.current = newDataSource;
     // 表格验证
     var _1 = useTableValidate(), tableRef = _1.tableRef, getCurrentTable = _1.getCurrentTable, clearErrorClass = _1.clearErrorClass;
     // 内部表格总结栏
@@ -464,7 +484,7 @@ var Table = function (props) {
         scroll: proxyScroll,
     }).tipRef;
     // 表格
-    var SingleTable = (jsx(Table$1, __assign({ className: classes, bordered: bordered, dataSource: newDataSource, columns: newColumns, components: componentsMemo, onRow: onRow, summary: getSummaryHandle, rowSelection: newRowSelection, pagination: isInnerPagination
+    var SingleTable = (jsx(Table$1, __assign({ className: classes, bordered: bordered, dataSource: finalDataSource, columns: newColumns, components: componentsMemo, onRow: onRow, summary: getSummaryHandle, rowSelection: newRowSelection, pagination: isInnerPagination
             ? pagination
                 ? pagination
                 : paginationConfig

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, handleFilterConfigChange = options.handleFilterConfigChange, _c = options.isAutoMergeAddAndDel, isAutoMergeAddAndDel = _c === void 0 ? true : _c, isDynamicColumnTextEnable = options.isDynamicColumnTextEnable;
+    var dynamicKey = options.dynamicKey, isRemeberFilter = options.isRemeberFilter, hiddenDynamicIcon = options.hiddenDynamicIcon, currentDynamicList = options.currentDynamicList, dataSource = options.dataSource, dataSourceRef = options.dataSourceRef, mergedDataForFilterRef = options.mergedDataForFilterRef, 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, _c = options.isAutoMergeAddAndDel, isAutoMergeAddAndDel = _c === void 0 ? true : _c, isDynamicColumnTextEnable = options.isDynamicColumnTextEnable;
     var newColumns = getTableColumns(columns, currentDynamicList).columns;
     // 处理自动合并的加减和选择框
     var _d = useMergeAddAndDel({
@@ -108,8 +108,9 @@ function useColumns(columns, options) {
              * @returns
              */
             _column.filterDropdown = function (_a) {
+                var _b;
                 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) {
+                return (jsx(FilterDropdown, { dataSource: (_b = mergedDataForFilterRef === null || mergedDataForFilterRef === void 0 ? void 0 : mergedDataForFilterRef.current) !== null && _b !== void 0 ? _b : 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, _b;
                         var _c;
                         // 实时记录下当前的值