zmdms-webui 1.7.4 → 1.7.6

package/dist/es/dynamicsetting/dynamicDrawer.js

@@ -1,4 +1,4 @@
-import { __spreadArray, __assign } from '../_virtual/_tslib.js';
+import { __assign, __spreadArray } from '../_virtual/_tslib.js';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { memo, forwardRef, useImperativeHandle, useMemo, useCallback } from 'react';
 import { HTML5Backend } from '../node_modules/react-dnd-html5-backend/dist/index.js';
@@ -10,15 +10,25 @@ import MoreConfig from './moreConfig.js';
 import SettingOutlined from '../node_modules/@ant-design/icons/es/icons/SettingOutlined.js';
 import { DndProvider } from '../node_modules/react-dnd/dist/core/DndProvider.js';
 import ButtonCom from '../button/button.js';
-import { Drawer, Checkbox } from 'antd';
+import { message, Drawer, Checkbox } from 'antd';
 
+// 工具函数，排序分区
+var sortDynamicListByType = function (list) {
+    var dimensionList = list.filter(function (item) { return item.isDimension; });
+    var fieldList = list.filter(function (item) { return !item.isDimension; });
+    var leftList = fieldList.filter(function (item) { return item.fixed === "left"; });
+    var middleList = fieldList.filter(function (item) { return !item.fixed; });
+    var rightList = fieldList.filter(function (item) { return item.fixed === "right"; });
+    return __spreadArray(__spreadArray(__spreadArray(__spreadArray([], dimensionList, true), leftList, true), middleList, true), rightList, true);
+};
 // 这里操作的一直都是内部设置的list
 var DynamicDrawer = function (props, ref) {
-    var list = props.list, dynamicKey = props.dynamicKey, parentDynamicKey = props.parentDynamicKey, _a = props.title, title = _a === void 0 ? "自定义配置" : _a, onCurrentListChange = props.onCurrentListChange, isMore = props.isMore, isFixed = props.isFixed;
+    var list = props.list, dynamicKey = props.dynamicKey, parentDynamicKey = props.parentDynamicKey, _a = props.title, title = _a === void 0 ? "自定义配置" : _a, onCurrentListChange = props.onCurrentListChange, isMore = props.isMore, isFixed = props.isFixed, isDimensionDynamic = props.isDimensionDynamic;
     // 根据外部传入的list 和本地存储信息 生成一个内部的currentDynamicList
     // 这个currentDynamicList 是可以是负责显示最终结果的
     // tempDynamicList 是操作时的临时变量 可能操作后不点击确认 直接点击取消 那么需要重置到之前的状态
     var _b = useDynamic(dynamicKey, parentDynamicKey, list), currentDynamicList = _b.currentDynamicList, setCurrentDynamicList = _b.setCurrentDynamicList, tempDynamicList = _b.tempDynamicList, setTempDynamicList = _b.setTempDynamicList;
+    console.log("tempDynamicList", tempDynamicList);
     var _c = useDrawer(currentDynamicList, setCurrentDynamicList, dynamicKey, parentDynamicKey, setTempDynamicList, list, onCurrentListChange), visible = _c.visible, setVisible = _c.setVisible, onClose = _c.onClose, onReset = _c.onReset, onSure = _c.onSure;
     // 像外部暴露方法
     useImperativeHandle(ref, function () {
@@ -38,8 +48,34 @@ var DynamicDrawer = function (props, ref) {
         });
         return _checkedValues;
     }, [tempDynamicList]);
+    // 根据isDimension分区
+    var _d = useMemo(function () {
+        var dimensionList = tempDynamicList.filter(function (item) { return item.isDimension; });
+        var fieldList = tempDynamicList.filter(function (item) { return !item.isDimension; });
+        return { dimensionList: dimensionList, fieldList: fieldList };
+    }, [tempDynamicList]), dimensionList = _d.dimensionList, fieldList = _d.fieldList;
+    // 排序优先级判断
+    var isDimensionPriority = useCallback(function (dragIndex, hoverIndex) {
+        // 从上到下还是从下到上拖动
+        var isUp = dragIndex < hoverIndex;
+        var startIndex = isUp ? dragIndex : hoverIndex;
+        var endIndex = isUp ? hoverIndex : dragIndex;
+        var oldItem = tempDynamicList[startIndex];
+        var dragItem = tempDynamicList[endIndex];
+        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)) {
+                message.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;
+            }
+        }
+        return true;
+    }, [tempDynamicList]);
     // 拖拽
     var onMoveItem = useCallback(function (dragIndex, hoverIndex) {
+        if (!isDimensionPriority(dragIndex, hoverIndex)) {
+            return;
+        }
         // 由于对于固定列，不能进行拖拽排序，所以需要找出所有包含固定列的属性出来
         setTempDynamicList(function (preDynamicList) {
             var dragCard = preDynamicList[dragIndex];
@@ -50,15 +86,15 @@ var DynamicDrawer = function (props, ref) {
                 ],
             });
             // 处理左浮动 右浮动数据。需要重新排序
-            var leftList = currentList.filter(function (item) { return item.fixed === "left"; });
-            var middleList = currentList.filter(function (item) { return !item.fixed; });
-            var rightList = currentList.filter(function (item) { return item.fixed === "right"; });
-            return __spreadArray(__spreadArray(__spreadArray([], leftList, true), middleList, true), rightList, true);
+            return sortDynamicListByType(currentList);
         });
-    }, [setTempDynamicList]);
+    }, [setTempDynamicList, isDimensionPriority]);
     // 子元素拖拽
     var onChildMoveItem = useCallback(function (pIndex, pKey) {
         return function (dragIndex, hoverIndex) {
+            if (!isDimensionPriority(dragIndex, hoverIndex)) {
+                return;
+            }
             // 由于对于固定列，不能进行拖拽排序，所以需要找出所有包含固定列的属性出来
             setTempDynamicList(function (preDynamicList) {
                 var newDynamicList = preDynamicList.map(function (item) { return (__assign({}, item)); }) || [];
@@ -79,21 +115,42 @@ var DynamicDrawer = function (props, ref) {
                 return __spreadArray(__spreadArray(__spreadArray([], leftList, true), middleList, true), rightList, true);
             });
         };
-    }, [setTempDynamicList]);
+    }, [setTempDynamicList, isDimensionPriority]);
     // 确认
     var onSureHandle = function () {
         onSure && onSure(tempDynamicList);
     };
     var onCheckboxChange = function (checkedValues) {
-        var newDynamicList = tempDynamicList.map(function (item) { return (__assign({}, item)); }) || [];
-        newDynamicList.forEach(function (item) {
-            if (!checkedValues.find(function (value) { return value === item.key; })) {
-                item.checked = false;
-            }
-            else {
-                item.checked = true;
-            }
+        // 1. 构建互斥关系映射
+        var exclusiveMap = {};
+        tempDynamicList.forEach(function (item) {
+            var key = item.key;
+            var exclusiveKeys = (item.dimensionExclusive || "")
+                .split(",")
+                .map(function (k) { return k.trim(); })
+                .filter(Boolean);
+            exclusiveMap[key] = new Set(__spreadArray([key], exclusiveKeys, true));
         });
+        // 2. 检查本次勾选是否有互斥
+        var hasConflict = false;
+        for (var i = 0; i < checkedValues.length; i++) {
+            for (var j = i + 1; j < checkedValues.length; j++) {
+                var keyA = checkedValues[i];
+                var keyB = checkedValues[j];
+                if (exclusiveMap[keyA] && exclusiveMap[keyA].has(keyB)) {
+                    hasConflict = true;
+                    break;
+                }
+            }
+            if (hasConflict)
+                break;
+        }
+        if (hasConflict) {
+            message.warning("所选项存在互斥关系，不能同时勾选！");
+            return; // 拦截本次勾选
+        }
+        // 3. 正常更新
+        var newDynamicList = tempDynamicList.map(function (item) { return (__assign(__assign({}, item), { checked: checkedValues.includes(item.key) })); });
         setTempDynamicList(newDynamicList);
     };
     var onChildCheckboxChange = function (checkedValues, pIndex) {
@@ -112,7 +169,7 @@ var DynamicDrawer = function (props, ref) {
             }
         });
         newDynamicList[pIndex].children = changeCList;
-        setTempDynamicList(newDynamicList);
+        setTempDynamicList(sortDynamicListByType(newDynamicList));
     };
     // 后期可能需要拓展功能
     var onMoreChange = function (key, result) {
@@ -120,22 +177,22 @@ var DynamicDrawer = function (props, ref) {
         var currentIndex = newDynamicList.findIndex(function (item) { return key === item.key; });
         var currentItem = newDynamicList[currentIndex];
         // 如果什么都没改
-        if (currentItem.fixed === result.fixed) {
+        if (currentItem.fixed === result.fixed &&
+            currentItem.isDimensionSum === result.isDimensionSum) {
             return;
         }
         // 可固定的列 只能是首尾的列
         currentItem.fixed = result.fixed;
-        var leftList = newDynamicList.filter(function (item) { return item.fixed === "left"; });
-        var middleList = newDynamicList.filter(function (item) { return !item.fixed; });
-        var rightList = newDynamicList.filter(function (item) { return item.fixed === "right"; });
-        setTempDynamicList(__spreadArray(__spreadArray(__spreadArray([], leftList, true), middleList, true), rightList, true));
+        currentItem.isDimensionSum = result.isDimensionSum;
+        setTempDynamicList(sortDynamicListByType(newDynamicList));
     };
-    /**底部按钮 */
-    var renderFooter = function () { return (jsxs(Fragment, { children: [jsx(ButtonCom, __assign({ type: "default", onClick: onClose }, { children: "\u53D6\u6D88" })), jsx(ButtonCom, __assign({ type: "default", onClick: onReset }, { children: "\u91CD\u7F6E" })), jsx(ButtonCom, __assign({ type: "primary", onClick: onSureHandle }, { children: "\u786E\u5B9A" }))] })); };
-    return (jsx(Drawer, __assign({ className: "dynamic-drawer", title: jsxs("div", { children: [jsx(SettingOutlined, { style: { fontSize: 16 } }), jsxs("span", __assign({ className: "search-drawer--title-text" }, { children: [title, jsx("span", { children: "\uFF08\u62D6\u62FD\u6392\u5E8F\uFF09" })] }))] }), width: 300, placement: "right", open: visible, closable: false, maskClosable: false, footer: renderFooter() }, { children: jsx(Checkbox.Group, __assign({ value: checkedValues, onChange: onCheckboxChange }, { children: jsx(DndProvider, __assign({ backend: HTML5Backend, context: window }, { children: tempDynamicList.map(function (item, index) {
-                    var key = item.key, disabled = item.disabled, label = item.label, fixed = item.fixed, children = item.children;
-                    // 得到当前选项下的子元素选中项
-                    // TODO: 这里可以继续用递归的模式创造无限下层
+    // 渲染区块
+    var renderSection = function (list, indexOffset, title) {
+        if (indexOffset === void 0) { indexOffset = 0; }
+        if (!list.length)
+            return null;
+        return (jsxs("div", { children: [title && jsx("div", __assign({ className: "dynamic-drawer-section-title" }, { children: title })), list.map(function (item, index) {
+                    var key = item.key, disabled = item.disabled, label = item.label, fixed = item.fixed, children = item.children, isDimensionSum = item.isDimensionSum, isDimension = item.isDimension;
                     var childrenCheckedValues = [];
                     if (Array.isArray(children)) {
                         children.forEach(function (item) {
@@ -144,15 +201,19 @@ var DynamicDrawer = function (props, ref) {
                             }
                         });
                     }
-                    return (jsxs(Sortable, __assign({ type: "search-drawer", index: index, onMoveItem: onMoveItem }, { children: [jsxs("div", __assign({ className: "zt-sortable--item" }, { children: [jsx(Checkbox, __assign({ value: key, disabled: disabled }, { children: label || key })), isMore && (!children || children.length === 0) && (jsx(MoreConfig, { fixed: fixed || "", onChange: function (result) {
+                    return (jsxs(Sortable, __assign({ type: "search-drawer", index: indexOffset + index, onMoveItem: onMoveItem }, { children: [jsxs("div", __assign({ className: "zt-sortable--item dynamic-drawer-card" }, { children: [jsx(Checkbox, __assign({ value: key, disabled: disabled }, { children: label || key })), isMore && (!children || children.length === 0) && (jsx(MoreConfig, { fixed: fixed || "", isDimensionSum: isDimensionSum, onChange: function (result) {
                                             onMoreChange(key, result);
-                                        }, isFixed: isFixed }))] })), Array.isArray(children) && children.length > 0 ? (jsx("div", __assign({ className: "zt-sortable--children" }, { children: jsx(Checkbox.Group, __assign({ value: childrenCheckedValues, onChange: function (checkedValues) {
-                                        onChildCheckboxChange(checkedValues, index);
+                                        }, isSum: isDimension, isFixed: isFixed }))] })), Array.isArray(children) && children.length > 0 ? (jsx("div", __assign({ className: "zt-sortable--children dynamic-drawer-children", style: { marginLeft: 32, marginBottom: 8 } }, { children: jsx(Checkbox.Group, __assign({ value: childrenCheckedValues, onChange: function (checkedValues) {
+                                        onChildCheckboxChange(checkedValues, tempDynamicList.indexOf(item));
                                     } }, { children: children.map(function (cItem, cIndex) {
                                         var cKey = cItem.key, cLabel = cItem.label, cDisabled = cItem.disabled;
-                                        return (jsx(Sortable, __assign({ type: "search-drawer-".concat(key), index: cIndex, onMoveItem: onChildMoveItem(index, key) }, { children: jsx(Checkbox, __assign({ value: cKey, disabled: cDisabled }, { children: cLabel || cKey })) }), cKey));
+                                        return (jsx(Sortable, __assign({ type: "search-drawer-".concat(key), index: cIndex, onMoveItem: onChildMoveItem(tempDynamicList.indexOf(item), key) }, { children: jsx("div", __assign({ className: "dynamic-drawer-card dynamic-drawer-child-card" }, { children: jsx(Checkbox, __assign({ value: cKey, disabled: cDisabled }, { children: cLabel || cKey })) })) }), cKey));
                                     }) })) }))) : null] }), key));
-                }) })) })) })));
+                })] }));
+    };
+    /**底部按钮 */
+    var renderFooter = function () { return (jsxs(Fragment, { children: [jsx(ButtonCom, __assign({ type: "default", onClick: onClose }, { children: "\u53D6\u6D88" })), jsx(ButtonCom, __assign({ type: "default", onClick: onReset }, { children: "\u91CD\u7F6E" })), jsx(ButtonCom, __assign({ type: "primary", onClick: onSureHandle }, { children: "\u786E\u5B9A" }))] })); };
+    return (jsx(Drawer, __assign({ className: "dynamic-drawer", title: jsxs("div", { children: [jsx(SettingOutlined, { style: { fontSize: 16 } }), jsxs("span", __assign({ className: "search-drawer--title-text" }, { children: [title, jsx("span", { children: "\uFF08\u62D6\u62FD\u6392\u5E8F\uFF09" })] }))] }), width: 300, placement: "right", open: visible, closable: false, maskClosable: false, footer: renderFooter() }, { children: jsx(Checkbox.Group, __assign({ value: checkedValues, onChange: onCheckboxChange }, { children: jsxs(DndProvider, __assign({ backend: HTML5Backend, context: window }, { children: [isDimensionDynamic && renderSection(dimensionList, 0, "维度配置"), renderSection(fieldList, dimensionList.length, isDimensionDynamic ? "字段配置" : undefined)] })) })) })));
 };
 DynamicDrawer.displayName = "ZTXK_WEBUI_DynamicDrawer";
 var DynamicDrawer$1 = memo(forwardRef(DynamicDrawer));

package/dist/es/dynamicsetting/dynamicSetting.js

@@ -11,7 +11,7 @@ import SettingOutlined from '../node_modules/@ant-design/icons/es/icons/SettingO
 // 内部根据这个list初始值，生成一个内部的currentDynamicList 作为操作 显示的数据
 // 当内部的currentDynamicList 发生改变的时候 触发currentDynamicListChange事件 通知外部，数据发生改变了
 var DynamicSetting = function (props, ref) {
-    var dynamicKey = props.dynamicKey, parentDynamicKey = props.parentDynamicKey, defaultList = props.defaultList, children = props.children, title = props.title, onCurrentListChange = props.onCurrentListChange, hiddenOperationIcon = props.hiddenOperationIcon, isMore = props.isMore, isFixed = props.isFixed;
+    var dynamicKey = props.dynamicKey, parentDynamicKey = props.parentDynamicKey, defaultList = props.defaultList, children = props.children, title = props.title, onCurrentListChange = props.onCurrentListChange, hiddenOperationIcon = props.hiddenOperationIcon, isMore = props.isMore, isFixed = props.isFixed, isDimensionDynamic = props.isDimensionDynamic;
     // 内部初始list
     var _a = useState(defaultList), list = _a[0], setList = _a[1];
     var drawerRef = useRef({});
@@ -40,7 +40,7 @@ var DynamicSetting = function (props, ref) {
             },
         };
     });
-    return Array.isArray(list) && list.length > 0 ? (jsxs("div", __assign({ className: "ztxk-dynamic-setting" }, { children: [hiddenOperationIcon ? null : (jsx("div", __assign({ onClick: function () { var _a; return (_a = drawerRef.current) === null || _a === void 0 ? void 0 : _a.setVisible(true); } }, { children: children ? (children) : (jsx(SettingOutlined, { style: { fontSize: 18, color: "#768696" } })) }))), jsx(DynamicDrawer, { list: list, dynamicKey: dynamicKey, parentDynamicKey: parentDynamicKey, ref: drawerRef, title: title, onCurrentListChange: onCurrentListChange, isFixed: isFixed, isMore: isMore })] }))) : null;
+    return Array.isArray(list) && list.length > 0 ? (jsxs("div", __assign({ className: "ztxk-dynamic-setting" }, { children: [hiddenOperationIcon ? null : (jsx("div", __assign({ onClick: function () { var _a; return (_a = drawerRef.current) === null || _a === void 0 ? void 0 : _a.setVisible(true); } }, { children: children ? (children) : (jsx(SettingOutlined, { style: { fontSize: 18, color: "#768696" } })) }))), jsx(DynamicDrawer, { list: list, dynamicKey: dynamicKey, parentDynamicKey: parentDynamicKey, ref: drawerRef, title: title, onCurrentListChange: onCurrentListChange, isFixed: isFixed, isMore: isMore, isDimensionDynamic: isDimensionDynamic })] }))) : null;
 };
 DynamicSetting.displayName = "ZTXK_WEBUI_DynamicSetting";
 var DynamicSetting$1 = memo(forwardRef(DynamicSetting));

package/dist/es/dynamicsetting/moreConfig.js

@@ -3,16 +3,20 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import { memo, useState } from 'react';
 import { useLatest } from 'ahooks';
 import MenuOutlined from '../node_modules/@ant-design/icons/es/icons/MenuOutlined.js';
-import { Radio, Dropdown } from 'antd';
+import { Radio, Switch, Dropdown } from 'antd';
 
 var MoreConfig = function (_a) {
-    var fixed = _a.fixed, onChange = _a.onChange, isFixed = _a.isFixed;
+    var fixed = _a.fixed, onChange = _a.onChange, isFixed = _a.isFixed, isSum = _a.isSum, isDimensionSum = _a.isDimensionSum;
+    var onChangeLastestRef = useLatest(onChange);
     var _b = useState(false), open = _b[0], setOpen = _b[1];
     var _c = useState(fixed), fixedValue = _c[0], setFixedValue = _c[1];
-    var onChangeLastestRef = useLatest(onChange);
     var onFixedChange = function (e) {
         setFixedValue(e.target.value);
     };
+    var _d = useState(isDimensionSum || false), sumChecked = _d[0], setSumChecked = _d[1];
+    var onSumChange = function (checked) {
+        setSumChecked(checked);
+    };
     var fixedItem = {
         label: (jsxs("div", { children: ["\u56FA\u5B9A\uFF1A", jsxs(Radio.Group, __assign({ name: "dynamic-fixed", value: fixedValue, onChange: onFixedChange, optionType: "button", buttonStyle: "solid" }, { children: [jsx(Radio, __assign({ value: "left" }, { children: "\u5DE6" })), jsx(Radio, __assign({ value: "right" }, { children: "\u53F3" })), jsx(Radio, __assign({ value: "" }, { children: "\u65E0" }))] }))] })),
         key: "0",
@@ -21,12 +25,19 @@ var MoreConfig = function (_a) {
     if (isFixed) {
         items.push(fixedItem);
     }
+    if (isSum) {
+        items.push({
+            label: (jsxs("div", { children: ["\u5408\u8BA1\uFF1A", jsx(Switch, { checked: sumChecked, onChange: onSumChange })] })),
+            key: "1",
+        });
+    }
     return (jsx(Dropdown, __assign({ menu: { items: items }, trigger: ["click"], open: open, onOpenChange: function (open) {
             setOpen(open);
             if (!open) {
                 onChangeLastestRef.current &&
                     onChangeLastestRef.current({
                         fixed: fixedValue,
+                        isDimensionSum: sumChecked,
                     });
             }
         }, placement: "bottomLeft", arrow: true, overlayClassName: "ztxk-dynamic--more--drop" }, { children: jsx(MenuOutlined, { className: "ztxk-dynamic--more" }) })));

package/dist/es/dynamicsetting/useDynamic.js

@@ -15,6 +15,9 @@ function recursionDynamicItems(list, currentDynamicList) {
             currentData.label = result.label;
             currentData.isFind = true; // 代表当前这个字段被找到
             currentData.disabled = result.disabled;
+            currentData.isDimension = result.isDimension;
+            currentData.dimensionPriority = result.dimensionPriority;
+            currentData.dimensionExclusive = result.dimensionExclusive;
             // 判断是否是多级表头，这里的逻辑处理是为了兼容
             // 后面改造成多级表头的情况
             if (item.children) {

package/dist/es/table/constant.js

@@ -4,6 +4,10 @@ var INNER_TABLE_PAGINATION_POSITION = ["bottomLeft"];
 var INNER_TABLE_PAGINATION_PAGESIZEOPTIONS = ["10", "20", "30", "40"];
 var ERROR_TD_CLASSNAME = "error-td";
 var ASCEND = "ascend"; // 升序
-var DESCEND = "descend"; // 降序
+var DESCEND = "descend"; // 降序
+// 合并后数据标识
+var MERGE_KEY = "__row_id";
+var MERGE_ROW_SPANS = "__row_spans";
+var MERGE_INDEX = "__row_index";
 
-export { ASCEND, DESCEND, ERROR_TD_CLASSNAME, INNER_TABLE_PAGINATION_PAGESIZEOPTIONS, INNER_TABLE_PAGINATION_POSITION, TABLE_DRAG_ROW_TYPE, TABLE_DYNAMIC_KEY };
+export { ASCEND, DESCEND, ERROR_TD_CLASSNAME, INNER_TABLE_PAGINATION_PAGESIZEOPTIONS, INNER_TABLE_PAGINATION_POSITION, MERGE_INDEX, MERGE_KEY, MERGE_ROW_SPANS, TABLE_DRAG_ROW_TYPE, TABLE_DYNAMIC_KEY };

package/dist/es/table/hooks.js

@@ -1,7 +1,9 @@
-import { __assign } from '../_virtual/_tslib.js';
-import { useCallback, useRef, useState, useEffect } from 'react';
+import { __assign, __spreadArray } from '../_virtual/_tslib.js';
+import { useCallback, useRef, useState, useEffect, useMemo } from 'react';
 import update from '../node_modules/immutability-helper/index.js';
 import { getInnerIndex } from './useInnerPagination.js';
+import { flattenRecordsOptimized } from './utils.js';
+import { MERGE_INDEX, MERGE_ROW_SPANS } from './constant.js';
 
 /**
  * @param dataSourceRef 数据引用
@@ -326,6 +328,156 @@ function useCalcScrollY(isAutoScrollY, subHeight, id) {
         }
     }, [isAutoScrollY, subHeight, id]);
     return tableHeight;
+}
+/**
+ * 获取合并key值
+ */
+var useMergeKeys = function (columns, isAutoMerge) {
+    var mergeKeys = useMemo(function () {
+        if (isAutoMerge) {
+            return columns
+                .filter(function (item) { return item.isMerge && item.key !== MERGE_INDEX; })
+                .map(function (item) { return item.key; });
+        }
+        return undefined;
+    }, [isAutoMerge, columns]);
+    return mergeKeys;
+};
+/**
+ * 自动合并的一些处理
+ */
+function useAutoMerge(dataSource, columns, _a) {
+    var mode = _a.mode, isAutoMerge = _a.isAutoMerge;
+    // 计算需要合并的字段key集合
+    var mergeKeys = useMergeKeys(columns, isAutoMerge);
+    var firstMergeKey = mergeKeys === null || mergeKeys === void 0 ? void 0 : mergeKeys[0];
+    // 需要合计的字段
+    var summaryKeys = useMemo(function () {
+        return columns.filter(function (item) { return item.isSummary; }).map(function (item) { return item.key; });
+    }, [columns]);
+    // 开启维度合并的维度字段
+    var dimensionSummaryKeys = useMemo(function () {
+        return columns
+            .filter(function (item) { return item.isDimensionSum; })
+            .map(function (item) { return item.key; });
+    }, [columns]);
+    var newDataSource = useMemo(function () {
+        if (!isAutoMerge)
+            return dataSource;
+        else {
+            // 多字段合并
+            if (!mergeKeys)
+                return dataSource;
+            else {
+                var newDataSource_2 = flattenRecordsOptimized(__spreadArray([], (dataSource || []), true), mergeKeys, dimensionSummaryKeys, summaryKeys);
+                return newDataSource_2;
+            }
+        }
+    }, [dataSource, isAutoMerge, mergeKeys, dimensionSummaryKeys, summaryKeys]);
+    var newColumns = useMemo(function () {
+        var _columns = columns;
+        if (mode === "index") {
+            // 自动添加序号列，支持合并不参与自定义配置
+            _columns = __spreadArray([
+                {
+                    title: "序号",
+                    width: 60,
+                    key: "index",
+                    fixed: "left",
+                    align: "center",
+                    isMerge: isAutoMerge,
+                    isFilter: false,
+                    render: function (value, record, index) {
+                        if (isAutoMerge) {
+                            return record[MERGE_INDEX] + 1;
+                        }
+                        return "".concat(index + 1);
+                    },
+                }
+            ], _columns, true);
+        }
+        // 递归处理多级表头，自动补充render/合并/编辑等逻辑
+        var newColumns = _columns.map(function (item) {
+            return getColumnItem(item);
+        });
+        return newColumns;
+        // 处理单个列配置
+        function getItem(item) {
+            // 合并单元格处理
+            if (isAutoMerge && item.isMerge) {
+                item.onCell = function (record) {
+                    var _a;
+                    var key = item.key;
+                    if (item.key === MERGE_INDEX) {
+                        key = firstMergeKey;
+                    }
+                    return {
+                        rowSpan: (_a = record === null || record === void 0 ? void 0 : record[MERGE_ROW_SPANS]) === null || _a === void 0 ? void 0 : _a[key],
+                    };
+                };
+            }
+            return item;
+        }
+        // 递归处理多级表头
+        function getColumnItem(item) {
+            if (item.children) {
+                return __assign(__assign({}, item), { children: item.children.map(function (item) {
+                        return getItem(item);
+                    }) });
+            }
+            else {
+                return getItem(item);
+            }
+        }
+    }, [columns, mode, isAutoMerge, firstMergeKey]);
+    return [newDataSource, newColumns];
+}
+/**
+ * 处理合并后的加减和选择框
+ */
+function useMergeAddAndDel(_a) {
+    var addAndDelProps = _a.addAndDelProps, rowSelection = _a.rowSelection, columns = _a.columns, isAutoMerge = _a.isAutoMerge;
+    // 计算需要合并的字段key集合
+    var mergeKeys = useMergeKeys(columns, isAutoMerge);
+    var firstMergeKey = mergeKeys === null || mergeKeys === void 0 ? void 0 : mergeKeys[0];
+    /**
+     * 选中行配置优化
+     * - 合并行时，自动处理rowSpan，保证勾选框只显示在合并单元格的首行
+     * - 兼容原生rowSelection所有配置
+     */
+    var newRowSelection = useMemo(function () {
+        if (isAutoMerge && rowSelection) {
+            return __assign(__assign({}, rowSelection), { 
+                // 关键：合并行时，勾选框只显示在rowSpan>0的单元格
+                renderCell: function (_v, record, _i, originNode) {
+                    var _a;
+                    return {
+                        props: {
+                            rowSpan: (_a = record === null || record === void 0 ? void 0 : record[MERGE_ROW_SPANS]) === null || _a === void 0 ? void 0 : _a[firstMergeKey],
+                        },
+                        children: originNode,
+                    };
+                } });
+        }
+        return rowSelection;
+    }, [rowSelection, isAutoMerge, firstMergeKey]);
+    /**
+     * 增删行按钮配置优化
+     * - 合并行时，按钮只显示在rowSpan>0的单元格
+     */
+    var newAddAndDelProps = useMemo(function () {
+        if (isAutoMerge) {
+            return __assign(__assign({}, addAndDelProps), { onCell: function (record) {
+                    var _a;
+                    console.log(record, firstMergeKey, "record");
+                    return {
+                        rowSpan: (_a = record === null || record === void 0 ? void 0 : record[MERGE_ROW_SPANS]) === null || _a === void 0 ? void 0 : _a[firstMergeKey],
+                    };
+                } });
+        }
+        return addAndDelProps;
+    }, [addAndDelProps, isAutoMerge, firstMergeKey]);
+    return [newRowSelection, newAddAndDelProps];
 }
 
-export { useAddAndDelChange, useCalcScrollY, useCustomSort, useEditChange, useMoveRowChange, useScuRfresh };
+export { useAddAndDelChange, useAutoMerge, useCalcScrollY, useCustomSort, useEditChange, useMergeAddAndDel, useMoveRowChange, useScuRfresh };

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 } from './hooks.js';
+import { useScuRfresh, useCustomSort, useCalcScrollY, useEditChange, useMoveRowChange, useAddAndDelChange, useMergeAddAndDel, 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';
@@ -38,7 +38,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, 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, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "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"]);
+    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, 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, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "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"]);
     var classes = classNames("ztxk-table", className, {
         "ztxk-table--flex": isFlex,
     });
@@ -114,8 +114,15 @@ var Table = function (props) {
         currentPage: currentPage,
         filterConfigRef: filterConfigRef,
     });
+    // 处理自动合并的加减和选择框
+    var _u = useMergeAddAndDel({
+        rowSelection: rowSelection,
+        addAndDelProps: addAndDelProps,
+        columns: columns,
+        isAutoMerge: isAutoMerge,
+    }), newRowSelection = _u[0], newAddAndDelProps = _u[1];
     // 处理列配置信息 得到新的列配置信息
-    var newColumns = useColumns(columns, {
+    var _newColumns = useColumns(columns, {
         // 动态列配置相关信息
         dynamicKey: dynamicKey,
         isRemeberFilter: isRemeberFilter,
@@ -151,9 +158,15 @@ var Table = function (props) {
         hiddenAddBtnHandleRef: hiddenAddBtnHandleRef,
         rowKey: props.rowKey,
         filterConfigRef: filterConfigRef,
-        addAndDelProps: addAndDelProps,
+        addAndDelProps: newAddAndDelProps,
         headerAlign: headerAlign,
+        mode: mode,
+        isAutoMerge: isAutoMerge,
     }).newColumns;
+    // 处理表格合并和维度
+    var _v = useAutoMerge(currentTableDataSource, _newColumns, {
+        isAutoMerge: isAutoMerge,
+    }), newDataSource = _v[0], newColumns = _v[1];
     // 内部表格总结栏
     var getSummaryHandle = useSummary(summaryConfig, newColumns, {
         summaryFixed: summaryFixed,
@@ -163,7 +176,7 @@ var Table = function (props) {
         isDel: isDel,
     });
     // 表格验证
-    var _u = useTableValidate(), tableRef = _u.tableRef, getCurrentTable = _u.getCurrentTable, clearErrorClass = _u.clearErrorClass;
+    var _w = useTableValidate(), tableRef = _w.tableRef, getCurrentTable = _w.getCurrentTable, clearErrorClass = _w.clearErrorClass;
     // 虚拟滚动选项
     var vComponents = useMemo(function () {
         if (virtualKey) {
@@ -289,7 +302,7 @@ var Table = function (props) {
         };
     });
     // 表格
-    var SingleTable = (jsx(Table$1, __assign({ className: classes, bordered: bordered, dataSource: currentTableDataSource, columns: newColumns, components: componentsMemo, onRow: onRow, summary: getSummaryHandle, pagination: isInnerPagination
+    var SingleTable = (jsx(Table$1, __assign({ className: classes, bordered: bordered, dataSource: newDataSource, columns: newColumns, components: componentsMemo, onRow: onRow, summary: getSummaryHandle, rowSelection: newRowSelection, pagination: isInnerPagination
             ? pagination
                 ? pagination
                 : paginationConfig
@@ -309,7 +322,7 @@ var Table = function (props) {
                 overflow: "hidden",
                 marginTop: isMarginTop ? 10 : 0,
                 marginBottom: isMarginBottom ? 10 : 0,
-            }, ref: tableRef, id: tableId }, { children: [isMove ? (jsx(DndProvider, __assign({ backend: HTML5Backend, context: window }, { children: SingleTable }))) : (SingleTable), dynamicKey ? (jsx(DynamicSetting, { parentDynamicKey: TABLE_DYNAMIC_KEY, dynamicKey: dynamicKey, defaultList: defaultDynamicList, onCurrentListChange: onCurrentListChange, ref: dynamicSettingRef, hiddenOperationIcon: true, isMore: true, isFixed: true })) : null] })));
+            }, ref: tableRef, id: tableId }, { children: [isMove ? (jsx(DndProvider, __assign({ backend: HTML5Backend, context: window }, { children: SingleTable }))) : (SingleTable), dynamicKey ? (jsx(DynamicSetting, { parentDynamicKey: TABLE_DYNAMIC_KEY, dynamicKey: dynamicKey, defaultList: defaultDynamicList, onCurrentListChange: onCurrentListChange, ref: dynamicSettingRef, hiddenOperationIcon: true, isMore: true, isFixed: true, isDimensionDynamic: isDimensionDynamic })) : null] })));
 };
 var MemoTable = memo(Table);
 MemoTable.displayName = "ZTXK_WEBUI_Table";

package/dist/es/table/useColumns.js

@@ -3,6 +3,7 @@ import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { useRef } from 'react';
 import { getTableColumns, parsePasteData, getFilterRecords, startColumnInsertTableData } from './utils.js';
 import '../node_modules/classnames/index.js';
+import { MERGE_INDEX } from './constant.js';
 import 'ahooks';
 import './components/EnhanceHeaderCell.js';
 import ColumnDynamic from './components/ColumnDynamic.js';
@@ -21,7 +22,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, addAndDelProps = options.addAndDelProps, headerAlign = options.headerAlign;
+    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, addAndDelProps = options.addAndDelProps, headerAlign = options.headerAlign, mode = options.mode, isAutoMerge = options.isAutoMerge;
     var newColumns = getTableColumns(columns, currentDynamicList).columns;
     // 表头过滤的一些配置（获取表头过滤的input的输入框的引用）
     var searchValueInputRef = useRef(null);
@@ -382,6 +383,21 @@ function useColumns(columns, options) {
                 } }, addAndDelProps);
             myNewColumns.unshift(newColumn);
         }
+        if (mode === "index") {
+            myNewColumns.unshift({
+                title: "序号",
+                width: 60,
+                key: MERGE_INDEX,
+                fixed: "left",
+                align: "center",
+                isFilter: false,
+                isMerge: isAutoMerge,
+                render: function (value, record, index) {
+                    var v = record[MERGE_INDEX] !== undefined ? record[MERGE_INDEX] : index;
+                    return "".concat(v + 1);
+                },
+            });
+        }
         // 如果配置了动态列配置
         // 处理一些配置放置的位置
         if (dynamicKey && !hiddenDynamicIcon) {

package/dist/es/table/useDynamicListByColumns.js

@@ -5,7 +5,7 @@ import isEqual from 'lodash/isEqual';
 
 // 处理列信息
 function parseColumn(column, index, indexs) {
-    var _a = column, key = _a.key, dataIndex = _a.dataIndex, title = _a.title, dynamicTitle = _a.dynamicTitle, dynamicDisabled = _a.dynamicDisabled, defaultUnChecked = _a.defaultUnChecked, width = _a.width, fixed = _a.fixed;
+    var _a = column, key = _a.key, dataIndex = _a.dataIndex, title = _a.title, dynamicTitle = _a.dynamicTitle, dynamicDisabled = _a.dynamicDisabled, defaultUnChecked = _a.defaultUnChecked, width = _a.width, fixed = _a.fixed, isDimension = _a.isDimension, dimensionPriority = _a.dimensionPriority, dimensionExclusive = _a.dimensionExclusive, isDimensionSum = _a.isDimensionSum;
     // 动态列配置 title必须为一个字符串
     if (title && !dynamicTitle && typeof title !== "string") {
         console.error("\u4F60\u4F20\u5165\u7684title\u4E0D\u662F\u4E00\u4E2A\u5B57\u7B26\u4E32,\u5E76\u4E14\u4F60\u6CA1\u6709\u4F20\u5165dynamicTitle\u7684\u914D\u7F6E\u3002\n    \u95EE\u9898\u53EF\u80FD\u51FA\u73B0\u518D:".concat(key || dataIndex, " \u5217\u3002\u8BF7\u4F20\u5165\u4E00\u4E2AdynamicTitle \u4F5C\u4E3A\u52A8\u6001\u5217\u914D\u7F6E\u7684title\u503C"));
@@ -28,6 +28,10 @@ function parseColumn(column, index, indexs) {
         indexs: indexs,
         width: width,
         fixed: fixed,
+        isDimension: isDimension,
+        dimensionPriority: dimensionPriority,
+        dimensionExclusive: dimensionExclusive,
+        isDimensionSum: isDimensionSum,
     };
     column.key = myKey;
     return item;