zmdms-webui 0.0.76 → 0.0.78

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

@@ -0,0 +1,24 @@
+import { __rest, __assign } from '../../_virtual/_tslib.js';
+import { jsx } from 'react/jsx-runtime';
+import { useMemo } from 'react';
+import classNames from '../../node_modules/classnames/index.js';
+import useDragRef from './useDragRef.js';
+
+var BasicBodyRow = function (props) {
+    var className = props.className, resetProps = __rest(props, ["className"]);
+    var classes = classNames("ztxk-table__enhance-row", className);
+    return jsx("tr", __assign({ className: classes }, resetProps));
+};
+// 拖拽行配置
+var MoveBodyRow = function (props) {
+    var className = props.className, style = props.style, index = props.index, moveRow = props.moveRow, vRow = props.vRow, resetProps = __rest(props, ["className", "style", "index", "moveRow", "vRow"]);
+    var _a = useDragRef(index, moveRow), ref = _a.ref, isOver = _a.isOver, dropClassName = _a.dropClassName;
+    var memoStyle = useMemo(function () { return (__assign({ cursor: !moveRow ? "default" : "move" }, style)); }, [moveRow, style]);
+    var classes = classNames("ztxk-table__enhance-row", className, isOver ? dropClassName : "");
+    var tempProps = useMemo(function () {
+        return __assign({ ref: ref, className: classes, style: memoStyle }, resetProps);
+    }, [classes, resetProps, memoStyle, ref]);
+    return vRow ? (vRow(tempProps, ref)) : (jsx("tr", __assign({ ref: ref, style: __assign({ cursor: "move" }, style), className: classes }, resetProps)));
+};
+
+export { BasicBodyRow, MoveBodyRow };

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

@@ -0,0 +1,41 @@
+import { __rest, __assign } from '../../_virtual/_tslib.js';
+import { jsx } from 'react/jsx-runtime';
+import React__default, { useState } from 'react';
+import { Resizable } from '../../node_modules/react-resizable/index.js';
+import classNames from '../../node_modules/classnames/index.js';
+
+var EnhanceHeaderCell = function (props) {
+    var onResize = props.onResize, width = props.width; props.onMouseEnter; props.onMouseLeave; var restProps = __rest(props, ["onResize", "width", "onMouseEnter", "onMouseLeave"]);
+    // 添加偏移量
+    var _a = useState(0), offset = _a[0], setOffset = _a[1];
+    if (!width) {
+        return jsx("th", __assign({}, restProps));
+    }
+    return (jsx(Resizable, __assign({ width: Number(width) + Number(offset), height: 0, handle: jsx("span", { 
+            // 有偏移量显示竖线
+            // className="react-resizable-handle"
+            className: classNames(["react-resizable-handle", offset && "active"]), 
+            // 拖拽层偏移
+            style: { transform: "translateX(".concat(offset, "px)") }, onClick: function (e) {
+                e.stopPropagation();
+                e.preventDefault();
+            } }), onResize: function (e, _a) {
+            var size = _a.size;
+            // 这里只更新偏移量，数据列表其实并没有伸缩
+            setOffset(size.width - width);
+        }, onResizeStop: function (e, data) {
+            // 拖拽结束以后偏移量归零
+            setOffset(0);
+            // 这里是props传进来的事件，在外部是列数据中的onHeaderCell方法提供的事件，请自行研究官方提供的案例
+            onResize(e, data);
+        }, draggableOpts: { enableUserSelectHack: false } }, { children: jsx("th", __assign({}, restProps, { style: __assign({ overflow: "visible" }, restProps.style) }, { children: jsx("div", __assign({ style: {
+                    width: "100%",
+                    overflow: "hidden",
+                    whiteSpace: "nowrap",
+                    textOverflow: "ellipsis",
+                    // 此处样式是在th中增加div块，为了解决拖拉时偏移虚线在右侧不出现问题
+                } }, { children: restProps.children })) })) })));
+};
+var EnhanceHeaderCell$1 = React__default.memo(EnhanceHeaderCell);
+
+export { EnhanceHeaderCell$1 as default };

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

@@ -4,8 +4,8 @@ import { memo } from 'react';
 import CopyIcon from './CopyIcon.js';
 import FillDown from './FillDown.js';
 import ButtonCom from '../../button/button.js';
-import DownOutlined from '../../node_modules/@ant-design/icons/es/icons/DownOutlined.js';
 import { Dropdown } from 'antd';
+import DownOutlined from '../../node_modules/@ant-design/icons/es/icons/DownOutlined.js';
 
 var TitleOperation = function (_a) {
     var copyKey = _a.copyKey, dataSourceRef = _a.dataSourceRef, isFillDown = _a.isFillDown, dataKey = _a.dataKey, onTableChange = _a.onTableChange;

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

@@ -14,10 +14,9 @@ function useDragRef(index, moveRow) {
                 return {};
             }
             return {
-            // 这里暂时不做拖放的样式 使用浏览器的默认样式
-            // isOver: monitor.isOver(),
-            // dropClassName:
-            //   dragIndex < index ? " drop-over-downward" : " drop-over-upward",
+                // 这里暂时不做拖放的样式 使用浏览器的默认样式
+                isOver: monitor.isOver(),
+                dropClassName: dragIndex < index ? " drop-over-downward" : " drop-over-upward",
             };
         },
         drop: function (item) {
@@ -26,9 +25,9 @@ function useDragRef(index, moveRow) {
             }
             moveRow(item.index, index);
         },
-    }); }, [index]), drop = _a[1];
+    }); }, [index]), _b = _a[0], isOver = _b.isOver, dropClassName = _b.dropClassName, drop = _a[1];
     // 定义拖拽项
-    var _b = useDrag({
+    var _c = useDrag({
         type: TABLE_DRAG_ROW_TYPE,
         item: { index: index },
         collect: function (monitor) { return ({
@@ -37,19 +36,19 @@ function useDragRef(index, moveRow) {
         canDrag: function (monitor) { var _a; 
         // 解决拖拽行中有input 选中时 不让其拖拽
         return !((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.tagName.toLowerCase().match(/input|textarea/)); },
-    }), drag = _b[1];
+    }), drag = _c[1];
     drop(drag(ref));
     if (moveRow) {
         return {
             ref: ref,
-            // isOver,
-            // dropClassName,
+            isOver: isOver,
+            dropClassName: dropClassName,
         };
     }
     return {
         ref: ref,
-        // isOver: null,
-        // dropClassName: null,
+        isOver: null,
+        dropClassName: null,
     };
 }
 

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

@@ -131,6 +131,11 @@ interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"
      * 是否开启动态列配置
      */
     dynamicKey?: string;
+    /**
+     * 如果想要开启动态列配置，但是不想要页面出现操作按钮
+     * 一般场景用于记录宽度的变化
+     */
+    hiddenDynamicIcon?: boolean;
     /**
      * 代理动态列配置的类型
      */
@@ -158,6 +163,15 @@ interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"
      * 是否开启表格拖拽排序功能
      */
     isMove?: boolean;
+    /**
+     * 是否开启表头伸缩功能
+     */
+    isResizableColumn?: boolean;
+    /**
+     * 是否开启虚拟滚动
+     * 传入一个虚拟滚动得key值进来即可
+     */
+    virtualKey?: string;
     /**
      * 是否显示增加行功能
      */

package/dist/es/table/table.js

@@ -1,13 +1,14 @@
-import { __rest, __awaiter, __assign, __generator } from '../_virtual/_tslib.js';
+import { __rest, __assign, __awaiter, __generator } from '../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { memo, useRef, useEffect, useMemo, useCallback, useImperativeHandle } from 'react';
 import { Table as Table$1 } from 'antd';
-import { BasicRow, MoveRow } from './components/EnhanceRow.js';
-import EnhanceCell from './components/EnhanceCell.js';
+import { BasicBodyRow, MoveBodyRow } from './components/EnhanceBodyRow.js';
+import EnhanceCell from './components/EnhanceBodyCell.js';
+import classNames from '../node_modules/classnames/index.js';
+import EnhanceHeaderCell from './components/EnhanceHeaderCell.js';
 import './components/ColumnDynamic.js';
 import './components/ColumnAddDel.js';
 import './components/TitleOperation.js';
-import classNames from '../node_modules/classnames/index.js';
 import { TABLE_DYNAMIC_KEY, INNER_TABLE_PAGINATION_POSITION, INNER_TABLE_PAGINATION_PAGESIZEOPTIONS } from './constant.js';
 import { useColumns } from './useColumns.js';
 import { useDynamicListByColumns } from './useDynamicListByColumns.js';
@@ -15,6 +16,7 @@ import useSummary from './useSummary.js';
 import useInnerPagination, { getInnerIndex } from './useInnerPagination.js';
 import { useScuRfresh, useEditChange, useMoveRowChange, useAddAndDelChange, useCustomSort } 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';
 import TitleDirectionColumn from './components/TitleDirectionColumn.js';
 import DynamicSetting from '../dynamicsetting/dynamicSetting.js';
@@ -30,7 +32,7 @@ import { DndProvider } from '../node_modules/react-dnd/dist/core/DndProvider.js'
 // TODO: 实现表头自定义伸缩
 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, columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, _c = props.isDelAll, isDelAll = _c === void 0 ? true : _c, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _d = props.summaryFixed, summaryFixed = _d === void 0 ? true : _d, isInnerPagination = props.isInnerPagination, _e = props.innerPaginationPageSize, innerPaginationPageSize = _e === void 0 ? 30 : _e, _f = props.innerPaginationPosition, innerPaginationPosition = _f === void 0 ? INNER_TABLE_PAGINATION_POSITION : _f, _g = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _g === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _g, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "addMode", "addCallback", "isDel", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "tableRefHandle", "tableName", "serviceOrder", "differences"]);
+    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, hiddenDynamicIcon = props.hiddenDynamicIcon, columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, _c = props.isDelAll, isDelAll = _c === void 0 ? true : _c, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _d = props.summaryFixed, summaryFixed = _d === void 0 ? true : _d, isInnerPagination = props.isInnerPagination, _e = props.innerPaginationPageSize, innerPaginationPageSize = _e === void 0 ? 30 : _e, _f = props.innerPaginationPosition, innerPaginationPosition = _f === void 0 ? INNER_TABLE_PAGINATION_POSITION : _f, _g = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _g === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _g, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _h = props.isResizableColumn, isResizableColumn = _h === void 0 ? true : _h, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "hiddenDynamicIcon", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "addMode", "addCallback", "isDel", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "tableRefHandle", "tableName", "serviceOrder", "differences", "virtualKey", "isResizableColumn"]);
     var classes = classNames("ztxk-table", className, {
         "ztxk-table--flex": isFlex,
     });
@@ -40,14 +42,14 @@ var Table = function (props) {
         dataSourceRef.current = dataSource;
     }, [dataSource]);
     // 得到动态列配置信息
-    var _h = useDynamicListByColumns(columns, dynamicKey), defaultDynamicList = _h.defaultDynamicList, onCurrentListChange = _h.onCurrentListChange, currentDynamicList = _h.currentDynamicList, dynamicSettingRef = _h.dynamicSettingRef;
+    var _j = useDynamicListByColumns(columns, dynamicKey), defaultDynamicList = _j.defaultDynamicList, onCurrentListChange = _j.onCurrentListChange, currentDynamicList = _j.currentDynamicList, dynamicSettingRef = _j.dynamicSettingRef;
     // 针对SCU和增减行 做特殊处理
-    var _j = useScuRfresh(), refreshScuCell = _j.refreshScuCell, getRefreshScuCell = _j.getRefreshScuCell;
+    var _k = useScuRfresh(), refreshScuCell = _k.refreshScuCell, getRefreshScuCell = _k.getRefreshScuCell;
     // 内部分页相关配置
-    var _k = useInnerPagination(isInnerPagination, innerPaginationPageSize, {
+    var _l = useInnerPagination(isInnerPagination, innerPaginationPageSize, {
         innerPaginationPosition: innerPaginationPosition,
         innerPaginationPageSizeOptions: innerPaginationPageSizeOptions,
-    }), paginationConfig = _k.paginationConfig, currentPage = _k.currentPage, setCurrent = _k.setCurrent, pageSize = _k.pageSize;
+    }), paginationConfig = _l.paginationConfig, currentPage = _l.currentPage, setCurrent = _l.setCurrent, pageSize = _l.pageSize;
     // 内部表格编辑事件
     var onEditableSave = useEditChange(dataSourceRef, onTableChange);
     // 内部表格拖拽事件
@@ -66,23 +68,26 @@ var Table = function (props) {
         currentPage: currentPage,
     });
     // 自定义排序方法
-    var _l = useCustomSort(dataSource, onTableChange, {
+    var _m = useCustomSort(dataSource, onTableChange, {
         refreshScuCell: refreshScuCell,
         currentPage: currentPage,
         rowKey: props === null || props === void 0 ? void 0 : props.rowKey,
         serviceOrder: serviceOrder,
-    }), order = _l.order, setOrder = _l.setOrder, customSortHandle = _l.customSortHandle;
+    }), order = _m.order, setOrder = _m.setOrder, customSortHandle = _m.customSortHandle;
     // 处理列配置信息 得到新的列配置信息
     var newColumns = useColumns(columns, {
+        // 动态列配置相关信息
         dynamicKey: dynamicKey,
+        hiddenDynamicIcon: hiddenDynamicIcon,
         currentDynamicList: currentDynamicList,
+        dynamicSettingRef: dynamicSettingRef,
+        onCurrentListChange: onCurrentListChange,
         dataSource: dataSource,
         dataSourceRef: dataSourceRef,
         onEditableSave: onEditableSave,
         isEdit: isEdit,
         isAdd: isAdd,
         isDel: isDel,
-        dynamicSettingRef: dynamicSettingRef,
         onAddAndDel: onAddAndDel,
         getRefreshScuCell: getRefreshScuCell,
         isDelAll: isDelAll,
@@ -92,6 +97,8 @@ var Table = function (props) {
         order: order,
         setOrder: setOrder,
         customSortHandle: customSortHandle,
+        // 伸缩列
+        isResizableColumn: isResizableColumn,
     }).newColumns;
     // 内部表格总结栏
     var getSummaryHandle = useSummary(summaryConfig, newColumns, {
@@ -102,30 +109,66 @@ var Table = function (props) {
         isDel: isDel,
     });
     // 表格验证
-    var _m = useTableValidate(), tableRef = _m.tableRef, getCurrentTable = _m.getCurrentTable, clearErrorClass = _m.clearErrorClass;
+    var _o = useTableValidate(), tableRef = _o.tableRef, getCurrentTable = _o.getCurrentTable, clearErrorClass = _o.clearErrorClass;
+    // 虚拟滚动选项
+    var vComponents = useMemo(function () {
+        var _a;
+        if (virtualKey) {
+            // 使用VList 即可有虚拟列表的效果
+            return VList({
+                vid: virtualKey,
+                height: ((_a = props.scroll) === null || _a === void 0 ? void 0 : _a.y) ? props.scroll.y : 200,
+                resetTopWhenDataChange: false,
+            });
+        }
+        else {
+            return null;
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [virtualKey]);
     // 使用高级表格需要的一些配置
     var componentsMemo = useMemo(function () {
+        var _a, _b;
         var components = undefined;
-        // 如果编辑列
-        if (isEdit) {
+        // 如果伸缩表头
+        if (isResizableColumn) {
             components = {
-                body: {
-                    row: BasicRow,
-                    cell: EnhanceCell,
+                header: {
+                    cell: EnhanceHeaderCell,
                 },
             };
         }
+        // 如果编辑列
+        if (isEdit) {
+            components = __assign(__assign({}, components), { body: {
+                    row: BasicBodyRow,
+                    cell: EnhanceCell,
+                } });
+        }
         // 如果移动列
         if (isMove) {
-            components = {
-                body: {
-                    row: MoveRow,
+            components = __assign(__assign({}, components), { body: {
+                    row: MoveBodyRow,
                     cell: isEdit ? EnhanceCell : undefined,
-                },
-            };
+                } });
+        }
+        // 虚拟滚动
+        if (vComponents) {
+            // 需要支持编辑
+            if ((_a = components === null || components === void 0 ? void 0 : components.body) === null || _a === void 0 ? void 0 : _a.cell) {
+                vComponents.body.cell = components.body.cell;
+            }
+            // 需要支持拖拽
+            if (((_b = components === null || components === void 0 ? void 0 : components.body) === null || _b === void 0 ? void 0 : _b.row) && isMove) {
+                var row_1 = vComponents.body.row;
+                vComponents.body.row = function (props) {
+                    return jsx(MoveBodyRow, __assign({}, props, { vRow: row_1 }));
+                };
+            }
+            components = __assign(__assign({}, components), vComponents);
         }
         return components;
-    }, [isEdit, isMove]);
+    }, [isEdit, isMove, isResizableColumn, vComponents]);
     // 展示差异的行类方法
     var rowClassName = useCallback(function (record, index) {
         if (Array.isArray(differences) && differences.includes(index)) {
@@ -170,6 +213,10 @@ var Table = function (props) {
             }); },
             /** 清除错误样式 */
             clearErrorClass: clearErrorClass,
+            /** 虚拟滚动 滚动到顶部方法 */
+            scrollTo: function (obj) {
+                scrollTo(obj);
+            },
         };
     });
     // 表格
@@ -180,7 +227,7 @@ var Table = function (props) {
             : pagination, rowClassName: rowClassName }, resetProps)));
     return (jsxs("div", __assign({ style: isFlex
             ? { position: "relative", overflow: "hidden", flex: 1 }
-            : { position: "relative", overflow: "hidden" }, ref: tableRef }, { 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 })) : null] })));
+            : { position: "relative", overflow: "hidden" }, ref: tableRef }, { 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] })));
 };
 var MemoTable = memo(Table);
 MemoTable.displayName = "ZTXK_WEBUI_Table";

package/dist/es/table/useColumns.js

@@ -1,8 +1,9 @@
-import { __assign } from '../_virtual/_tslib.js';
-import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+import { __assign, __spreadArray } from '../_virtual/_tslib.js';
+import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { getTableColumns } from './utils.js';
-import '../node_modules/classnames/index.js';
 import 'react';
+import '../node_modules/classnames/index.js';
+import './components/EnhanceHeaderCell.js';
 import ColumnDynamic from './components/ColumnDynamic.js';
 import ColumnAddDel, { ColumnDelAll } from './components/ColumnAddDel.js';
 import TitleOperation from './components/TitleOperation.js';
@@ -13,73 +14,150 @@ import { PLACEHOLDER_NULL } from '../config/constant.js';
 // 根据传入的一些信息 重新生成新的columns配置
 // 不适用column里面的dataIndex字段，使用key字段
 function useColumns(columns, options) {
-    var dynamicKey = options.dynamicKey, currentDynamicList = options.currentDynamicList, dataSourceRef = options.dataSourceRef, onEditableSave = options.onEditableSave, isEdit = options.isEdit, isAdd = options.isAdd, isDel = options.isDel, dynamicSettingRef = options.dynamicSettingRef, onAddAndDel = options.onAddAndDel, getRefreshScuCell = options.getRefreshScuCell, isDelAll = options.isDelAll, currentPage = options.currentPage, onTableChange = options.onTableChange, order = options.order, setOrder = options.setOrder, customSortHandle = options.customSortHandle;
+    var dynamicKey = options.dynamicKey, hiddenDynamicIcon = options.hiddenDynamicIcon, currentDynamicList = options.currentDynamicList, dataSourceRef = options.dataSourceRef, onEditableSave = options.onEditableSave, isEdit = options.isEdit, isAdd = options.isAdd, isDel = options.isDel, 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;
     var newColumns = getTableColumns(columns, currentDynamicList);
     // 循环遍历 neColumns 根据一些内容进行处理
     var myNewColumns = [];
-    if (Array.isArray(newColumns)) {
-        newColumns.forEach(function (column) {
-            var _a, _b;
-            var _column = __assign(__assign({}, column), { __title: column.title });
-            var isCopy = _column.isCopy, editable = _column.editable, editableConfig = _column.editableConfig, title = _column.title, key = _column.key, validate = _column.validate, isRequire = _column.isRequire, isFillDown = _column.isFillDown, isOrder = _column.isOrder, isStress = _column.isStress;
-            var _key = key ? key : _column === null || _column === void 0 ? void 0 : _column.dataIndex;
-            // 添加自定义排序
-            if (isOrder) {
-                _column.title = (jsx(SortTitle, { title: title, field: _key, onChange: customSortHandle, customOrder: order, setCustomOrder: setOrder, align: _column.align, isStress: isStress }));
-            }
-            // 列头增加复制按钮
-            // 列头增加往下填充
-            if (isFillDown || isCopy) {
-                _column.title = (jsxs("div", __assign({ style: {
-                        display: "flex",
-                        alignItems: "center",
-                        justifyContent: "space-between",
-                        flex: "1",
-                    } }, { children: [jsx("div", __assign({ style: { flexGrow: 1, textAlign: _column.align }, className: isStress ? "ztxk-table--title-stress" : undefined }, { children: typeof _column.title === "function"
-                                ? (_a = _column.title) === null || _a === void 0 ? void 0 : _a.call(_column, {})
-                                : _column.title })), jsx(TitleOperation, { copyKey: isCopy === true ? _key : isCopy, dataSourceRef: dataSourceRef, isFillDown: isFillDown, dataKey: _key, onTableChange: onTableChange })] })));
-            }
-            // 列头增加必填标识
-            if (isRequire || isStress) {
-                _column.title = (jsxs("div", __assign({ style: { display: "flex", alignItems: "center" } }, { children: [isRequire ? jsx("i", __assign({ className: "ztxk-column--required" }, { children: "*" })) : null, jsx("div", __assign({ style: { flexGrow: 1 }, className: isStress ? "ztxk-table--title-stress" : undefined }, { children: typeof _column.title === "function"
-                                ? (_b = _column.title) === null || _b === void 0 ? void 0 : _b.call(_column, {})
-                                : _column.title }))] })));
-            }
-            // 如果列添加可编辑配置
-            if (editable && isEdit) {
-                _column.onCell = function (record, index) {
-                    return ({
-                        record: record,
-                        index: index,
-                        editable: editable,
-                        editableConfig: editableConfig,
-                        dataIndex: _key,
-                        title: title,
-                        onEditableSave: onEditableSave,
-                        currentPage: currentPage,
-                        isValidate: validate ? true : false,
-                    });
-                };
-            }
-            // 处理配置了scu的相关逻辑
-            if (_column.shouldCellUpdate) {
-                var fn_1 = _column.shouldCellUpdate;
-                _column.shouldCellUpdate = function (record, preRecord) {
-                    if (getRefreshScuCell && getRefreshScuCell()) {
-                        return true;
+    var enhanceColumnHandle = function (_column, options) {
+        var _a, _b;
+        var isCopy = _column.isCopy, editable = _column.editable, editableConfig = _column.editableConfig, title = _column.title, key = _column.key, validate = _column.validate, isRequire = _column.isRequire, isFillDown = _column.isFillDown, isOrder = _column.isOrder, isStress = _column.isStress;
+        var _key = key ? key : _column === null || _column === void 0 ? void 0 : _column.dataIndex;
+        var _c = (options || {}).keyIndex, keyIndex = _c === void 0 ? [] : _c;
+        // 添加自定义排序
+        if (isOrder) {
+            _column.title = (jsx(SortTitle, { title: title, field: _key, onChange: customSortHandle, customOrder: order, setCustomOrder: setOrder, align: _column.align, isStress: isStress }));
+        }
+        // 列头增加复制按钮
+        // 列头增加往下填充
+        if (isFillDown || isCopy) {
+            _column.title = (jsxs("div", __assign({ style: {
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "space-between",
+                    flex: "1",
+                } }, { children: [jsx("div", __assign({ style: { flexGrow: 1, textAlign: _column.align }, className: isStress ? "ztxk-table--title-stress" : undefined }, { children: typeof _column.title === "function"
+                            ? (_a = _column.title) === null || _a === void 0 ? void 0 : _a.call(_column, {})
+                            : _column.title })), jsx(TitleOperation, { copyKey: isCopy === true ? _key : isCopy, dataSourceRef: dataSourceRef, isFillDown: isFillDown, dataKey: _key, onTableChange: onTableChange })] })));
+        }
+        // 列头增加必填标识
+        if (isRequire || isStress) {
+            _column.title = (jsxs("div", __assign({ style: { display: "flex", alignItems: "center" } }, { children: [isRequire ? jsx("i", __assign({ className: "ztxk-column--required" }, { children: "*" })) : null, jsx("div", __assign({ style: { flexGrow: 1 }, className: isStress ? "ztxk-table--title-stress" : undefined }, { children: typeof _column.title === "function"
+                            ? (_b = _column.title) === null || _b === void 0 ? void 0 : _b.call(_column, {})
+                            : _column.title }))] })));
+        }
+        // 如果列添加可编辑配置
+        if (editable && isEdit) {
+            _column.onCell = function (record, index) {
+                return ({
+                    record: record,
+                    index: index,
+                    editable: editable,
+                    editableConfig: editableConfig,
+                    dataIndex: _key,
+                    title: title,
+                    onEditableSave: onEditableSave,
+                    currentPage: currentPage,
+                    isValidate: validate ? true : false,
+                });
+            };
+        }
+        // 处理配置了scu的相关逻辑
+        if (_column.shouldCellUpdate) {
+            var fn_1 = _column.shouldCellUpdate;
+            _column.shouldCellUpdate = function (record, preRecord) {
+                if (getRefreshScuCell && getRefreshScuCell()) {
+                    return true;
+                }
+                return fn_1(record, preRecord);
+            };
+        }
+        // 添加render字段，
+        if (!_column.render && !_column.editable) {
+            _column.render = function (text, record, index) {
+                if (typeof text === "object") {
+                    return PLACEHOLDER_NULL;
+                }
+                return text == null || text === "" ? PLACEHOLDER_NULL : text;
+            };
+        }
+        // 如果配置了伸缩列
+        if (isResizableColumn) {
+            _column.onHeaderCell = function (column) { return ({
+                width: column.width,
+                onResize: (function (e, _a) {
+                    var _b, _c;
+                    var size = _a.size;
+                    // 更新columns配置 这里应该不需要用loadsh来深拷贝数据
+                    var newList = (_b = currentDynamicList === null || currentDynamicList === void 0 ? void 0 : currentDynamicList.map) === null || _b === void 0 ? void 0 : _b.call(currentDynamicList, function (item) { return (__assign({}, item)); });
+                    var result = null;
+                    // 递归查找
+                    if (Array.isArray(newList)) {
+                        var _loop_1 = function (i) {
+                            var item = newList[i];
+                            // 如果这是顶层
+                            if (keyIndex.length === 0) {
+                                if (item.key === _key) {
+                                    result = item;
+                                    return "break";
+                                }
+                            }
+                            else {
+                                // 需要递归按层级查找到目标
+                                // 找到最顶层
+                                if (item.key === keyIndex[0]) {
+                                    var pList_1 = item.children || [];
+                                    keyIndex.slice(1).forEach(function (k) {
+                                        var _a;
+                                        pList_1 =
+                                            ((_a = pList_1 === null || pList_1 === void 0 ? void 0 : pList_1.find(function (pItem) { return pItem.key === k; })) === null || _a === void 0 ? void 0 : _a.children) || [];
+                                    });
+                                    // 找到最终目标
+                                    var lastResult = pList_1.find(function (pItem) { return pItem.key === _key; });
+                                    if (lastResult) {
+                                        result = lastResult;
+                                    }
+                                    return "break";
+                                }
+                            }
+                        };
+                        for (var i = 0; i < (newList === null || newList === void 0 ? void 0 : newList.length); i++) {
+                            var state_1 = _loop_1(i);
+                            if (state_1 === "break")
+                                break;
+                        }
+                    }
+                    if (result) {
+                        result.width = size.width;
+                    }
+                    if (dynamicKey) {
+                        (_c = dynamicSettingRef === null || dynamicSettingRef === void 0 ? void 0 : dynamicSettingRef.current) === null || _c === void 0 ? void 0 : _c.updateList(newList);
                     }
-                    return fn_1(record, preRecord);
-                };
-            }
-            // 添加render字段，
-            if (!_column.render && !_column.editable) {
-                _column.render = function (text, record, index) {
-                    if (typeof text === "object") {
-                        return PLACEHOLDER_NULL;
+                    else {
+                        onCurrentListChange === null || onCurrentListChange === void 0 ? void 0 : onCurrentListChange(newList);
                     }
-                    return text == null || text === "" ? PLACEHOLDER_NULL : text;
-                };
-            }
+                }),
+            }); };
+        }
+        // 如果有子元素 递归执行逻辑
+        // 支持多级表头控制
+        if (Array.isArray(_column === null || _column === void 0 ? void 0 : _column.children) &&
+            (_column === null || _column === void 0 ? void 0 : _column.children.length) > 0) {
+            var childrenColumns_1 = [];
+            _column.children.forEach(function (column, index) {
+                var _column = __assign(__assign({}, column), { __title: column.title });
+                var newKeyIndex = __spreadArray(__spreadArray([], keyIndex, true), [_key], false);
+                enhanceColumnHandle(_column, { keyIndex: newKeyIndex });
+                childrenColumns_1.push(_column);
+            });
+            _column.children = childrenColumns_1;
+        }
+    };
+    if (Array.isArray(newColumns)) {
+        newColumns.forEach(function (column, index) {
+            // __title 为 记录当前用户传入的列title
+            // 因为后续title可能会因为一些功能，添加一些标签等信息
+            var _column = __assign(__assign({}, column), { __title: column.title });
+            enhanceColumnHandle(_column);
             myNewColumns.push(_column);
         });
         // 如果配置了增减行
@@ -98,7 +176,7 @@ function useColumns(columns, options) {
         }
         // 如果配置了动态列配置
         // 处理一些配置放置的位置
-        if (dynamicKey) {
+        if (dynamicKey && !hiddenDynamicIcon) {
             myNewColumns[0].title = function () {
                 return isAdd || isDel ? (jsxs(Fragment, { children: [isDelAll ? jsx(ColumnDelAll, {}) : null, jsx(ColumnDynamic, { dynamicSettingRef: dynamicSettingRef })] })) : (jsx(ColumnDynamic, { dynamicSettingRef: dynamicSettingRef }));
             };