zmdms-webui 2.0.6 → 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/hooks.js

@@ -399,7 +399,7 @@ var useNumKeys = function (columns) {
  * 自动合并的一些处理
  */
 function useAutoMerge(dataSource, columns, _a) {
-    var isAutoMerge = _a.isAutoMerge, isDimensionDynamic = _a.isDimensionDynamic, order = _a.order;
+    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];
@@ -423,7 +423,7 @@ function useAutoMerge(dataSource, columns, _a) {
             if (!mergeKeys)
                 return dataSource;
             else {
-                var newDataSource_2 = flattenRecordsOptimized(__spreadArray([], (dataSource || []), true), mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic, order);
+                var newDataSource_2 = flattenRecordsOptimized(__spreadArray([], (dataSource || []), true), mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic, order, dimensionCustomSumKeys);
                 return newDataSource_2;
             }
         }
@@ -435,6 +435,7 @@ function useAutoMerge(dataSource, columns, _a) {
         summaryKeys,
         isDimensionDynamic,
         order,
+        dimensionCustomSumKeys,
     ]);
     var newColumns = useMemo(function () {
         var _columns = columns;

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

@@ -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,
     });
@@ -180,6 +180,7 @@ var Table = function (props) {
         isAutoMerge: isAutoMerge,
         isDimensionDynamic: isDimensionDynamic,
         order: order,
+        dimensionCustomSumKeys: dimensionCustomSumKeys,
     }), newDataSource = _w[0], newColumns = _w[1];
     // 内部表格总结栏
     var getSummaryHandle = useSummary(summaryConfig, newColumns, {

package/dist/es/table/useColumns.js

@@ -343,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, order) {
+function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic, order, dimensionCustomSumKeys) {
     var _a;
     if (!records ||
         records.length === 0 ||
@@ -469,7 +469,7 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
     }
     // 1. 如果开启了维度合并，按所有 mergeKeys 的组合来计算合计值
     if (isDimensionDynamic && mergeKeys.length > 0) {
-        var groupedResult = groupByLastMergeKey(result, mergeKeys, summaryKeys);
+        var groupedResult = groupByLastMergeKey(result, mergeKeys, summaryKeys, dimensionCustomSumKeys);
         result = groupedResult;
     }
     // 如果order有排序方向，则按order排序
@@ -813,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]; });
@@ -855,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.6",
+  "version": "2.0.7",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",