zmdms-webui 1.7.1 → 1.7.3

package/dist/es/table/hooks.js

@@ -30,7 +30,7 @@ function useEditChange(dataSourceRef, onTableChange) {
  * @returns 排序相关方法
  */
 function useMoveRowChange(dataSourceRef, onTableChange, options) {
-    var isMove = options.isMove, refreshScuCell = options.refreshScuCell, currentPage = options.currentPage;
+    var isMove = options.isMove, refreshScuCell = options.refreshScuCell, currentPage = options.currentPage, extraOnRow = options.extraOnRow, fixedRowsCount = options.fixedRowsCount, fixedRowsConfig = options.fixedRowsConfig;
     var moveRow = useCallback(function (dI, hI) {
         var _a;
         // 内部分页时，获取数据真正的行数
@@ -56,13 +56,30 @@ function useMoveRowChange(dataSourceRef, onTableChange, options) {
             });
     }, [dataSourceRef, onTableChange, refreshScuCell, currentPage]);
     var onRow = useCallback(function (_, index) {
-        return {
+        var baseProps = {
             index: index,
             moveRow: moveRow,
         };
-    }, [moveRow]);
+        // 确定固定行数量和行高
+        var fixedCount = (fixedRowsConfig === null || fixedRowsConfig === void 0 ? void 0 : fixedRowsConfig.count) || fixedRowsCount;
+        var rowHeight = (fixedRowsConfig === null || fixedRowsConfig === void 0 ? void 0 : fixedRowsConfig.rowHeight) || 36; // 默认行高36px
+        var customStyle = fixedRowsConfig === null || fixedRowsConfig === void 0 ? void 0 : fixedRowsConfig.style;
+        // 在这里处理固定行样式
+        if (fixedCount && index !== undefined && index < fixedCount) {
+            var defaultStyle = {
+                position: "sticky",
+                top: rowHeight * index,
+                background: "#fff",
+                borderBottom: "1px solid #f0f0f0",
+                zIndex: 10,
+            };
+            return __assign(__assign({}, baseProps), { style: customStyle
+                    ? __assign(__assign({}, defaultStyle), customStyle) : defaultStyle });
+        }
+        return baseProps;
+    }, [moveRow, fixedRowsCount, fixedRowsConfig]);
     return {
-        onRow: isMove ? onRow : undefined,
+        onRow: isMove || fixedRowsCount || fixedRowsConfig ? onRow : extraOnRow,
     };
 }
 /**

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

@@ -416,6 +416,32 @@ interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"
      * 表格id
      */
     tableId?: string;
+    /**
+     * 固定前几行，后面的行使用虚拟滚动
+     * 当开启虚拟滚动时，可以设置固定前几行不参与虚拟滚动
+     */
+    fixedRowsCount?: number;
+    /**
+     * 固定行配置
+     */
+    fixedRowsConfig?: {
+        /**
+         * 固定行数量
+         */
+        count: number;
+        /**
+         * 行高，用于计算固定行的top位置
+         */
+        rowHeight?: number;
+        /**
+         * 固定行的样式
+         */
+        style?: React.CSSProperties;
+    };
+    /**
+     * 表头对齐方式
+     */
+    headerAlign?: "left" | "center" | "right";
 }
 interface IFields {
     /**

package/dist/es/table/table.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, 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"]);
+    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 classes = classNames("ztxk-table", className, {
         "ztxk-table--flex": isFlex,
     });
@@ -99,6 +99,10 @@ var Table = function (props) {
         refreshScuCell: refreshScuCell,
         currentPage: currentPage,
         filterConfigRef: filterConfigRef,
+        extraOnRow: extraOnRow,
+        fixedRowsCount: fixedRowsCount,
+        fixedRowsConfig: fixedRowsConfig,
+        virtualKey: virtualKey,
     }).onRow;
     // 内部表格新增删除事件
     var onAddAndDel = useAddAndDelChange(dataSourceRef, onTableChange, {
@@ -148,6 +152,7 @@ var Table = function (props) {
         rowKey: props.rowKey,
         filterConfigRef: filterConfigRef,
         addAndDelProps: addAndDelProps,
+        headerAlign: headerAlign,
     }).newColumns;
     // 内部表格总结栏
     var getSummaryHandle = useSummary(summaryConfig, newColumns, {
@@ -208,9 +213,9 @@ var Table = function (props) {
             }
             // 需要支持拖拽
             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;
+                var originalRow_1 = vComponents.body.row;
                 vComponents.body.row = function (props) {
-                    return jsx(MoveBodyRow, __assign({}, props, { vRow: row_1 }));
+                    return jsx(MoveBodyRow, __assign({}, props, { vRow: originalRow_1 }));
                 };
             }
             components = __assign(__assign({}, components), vComponents);

package/dist/es/table/useColumns.js

@@ -21,7 +21,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;
+    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 newColumns = getTableColumns(columns, currentDynamicList).columns;
     // 表头过滤的一些配置（获取表头过滤的input的输入框的引用）
     var searchValueInputRef = useRef(null);
@@ -35,7 +35,8 @@ function useColumns(columns, options) {
         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, popoverText = _column.popoverText, showType = _column.showType, isFilter = _column.isFilter, __dynamicItem__ = _column.__dynamicItem__;
         // 表格列，唯一key
         var _key = key ? key : _column === null || _column === void 0 ? void 0 : _column.dataIndex;
-        var _g = (options || {}).keyIndex, keyIndex = _g === void 0 ? [] : _g;
+        var _g = options || {}, _h = _g.keyIndex, keyIndex = _h === void 0 ? [] : _h, headerAlign = _g.headerAlign;
+        var align = headerAlign || _column.align;
         var isRequireNode = isRequire ? (jsx("i", __assign({ className: "ztxk-column--required" }, { children: "*" }))) : null;
         if (showType) {
             _column.className = _column.className
@@ -51,7 +52,7 @@ function useColumns(columns, options) {
         // 添加自定义排序
         // 用户传入了排序属性，那么说明该列需要排序
         if (_column.sorter === true) {
-            _column.title = (jsx(SortTitle, { title: _column.title, field: _key, onChange: customSortHandle, customOrder: order, setCustomOrder: setOrder, align: _column.align, isStress: isStress }));
+            _column.title = (jsx(SortTitle, { title: _column.title, field: _key, onChange: customSortHandle, customOrder: order, setCustomOrder: setOrder, align: align, isStress: isStress }));
             _column.sorter = false;
         }
         // 如果传入了一个自定义排序函数
@@ -59,12 +60,12 @@ function useColumns(columns, options) {
             var sorterHandle_1 = _column.sorter;
             _column.title = (jsx(SortTitle, { title: _column.title, field: _key, onChange: function (info) {
                     customSortHandle && customSortHandle(info, { sorterHandle: sorterHandle_1 });
-                }, customOrder: order, setCustomOrder: setOrder, align: _column.align, isStress: isStress }));
+                }, customOrder: order, setCustomOrder: setOrder, align: align, isStress: isStress }));
             _column.sorter = false;
         }
         // 纯粹的前端排序
         if (_column.sorter == null && isOrder) {
-            _column.title = (jsx(SortTitle, { title: _column.title, field: _key, onChange: customSortHandle, customOrder: order, setCustomOrder: setOrder, align: _column.align, isStress: isStress }));
+            _column.title = (jsx(SortTitle, { title: _column.title, field: _key, onChange: customSortHandle, customOrder: order, setCustomOrder: setOrder, align: align, isStress: isStress }));
         }
         // 列头增加复制按钮
         // 列头增加往下填充
@@ -74,7 +75,7 @@ function useColumns(columns, options) {
                     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"
+                } }, { children: [jsx("div", __assign({ style: { flexGrow: 1, textAlign: align }, className: isStress ? "ztxk-table--title-stress" : undefined }, { children: typeof _column.title === "function"
                             ? (_c = _column.title) === null || _c === void 0 ? void 0 : _c.call(_column, {})
                             : _column.title })), jsx(TitleOperation, { copyKey: isCopy === true ? _key : isCopy, dataSourceRef: dataSourceRef, isFillDown: isFillDown, dataKey: _key, onTableChange: onTableChange, filterConfigRef: filterConfigRef })] })));
         }
@@ -154,9 +155,7 @@ function useColumns(columns, options) {
             _column.title = (jsxs("div", __assign({ style: {
                     display: "flex",
                     alignItems: "center",
-                    justifyContent: _column.align
-                        ? justifyContent[_column.align]
-                        : undefined,
+                    justifyContent: align ? justifyContent[align] : undefined,
                 } }, { children: [isRequireNode, jsx("div", __assign({ className: isStress ? "ztxk-table--title-stress" : undefined }, { children: typeof _column.title === "function"
                             ? (_f = _column.title) === null || _f === void 0 ? void 0 : _f.call(_column, {})
                             : _column.title }))] })));
@@ -330,6 +329,9 @@ function useColumns(columns, options) {
                         onCurrentListChange === null || onCurrentListChange === void 0 ? void 0 : onCurrentListChange(newList);
                     }
                 }),
+                style: {
+                    textAlign: align,
+                },
             }); };
         }
         // 如果有子元素 递归执行逻辑
@@ -340,7 +342,11 @@ function useColumns(columns, options) {
             _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, isEdit: isEdit });
+                enhanceColumnHandle(_column, {
+                    keyIndex: newKeyIndex,
+                    isEdit: isEdit,
+                    headerAlign: headerAlign,
+                });
                 childrenColumns_1.push(_column);
             });
             _column.children = childrenColumns_1;
@@ -351,7 +357,7 @@ function useColumns(columns, options) {
             // __title 为 记录当前用户传入的列title
             // 因为后续title可能会因为一些功能，添加一些标签等信息
             var _column = __assign(__assign({}, column), { __title: column.title });
-            enhanceColumnHandle(_column, { isEdit: isEdit });
+            enhanceColumnHandle(_column, { isEdit: isEdit, headerAlign: headerAlign });
             myNewColumns.push(_column);
         });
         var showTitleDelIcon_1 = isDelAll &&

package/package.json

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