zmdms-webui 1.7.1 → 1.7.2

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,28 @@ interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"
      * 表格id
      */
     tableId?: string;
+    /**
+     * 固定前几行，后面的行使用虚拟滚动
+     * 当开启虚拟滚动时，可以设置固定前几行不参与虚拟滚动
+     */
+    fixedRowsCount?: number;
+    /**
+     * 固定行配置
+     */
+    fixedRowsConfig?: {
+        /**
+         * 固定行数量
+         */
+        count: number;
+        /**
+         * 行高，用于计算固定行的top位置
+         */
+        rowHeight?: number;
+        /**
+         * 固定行的样式
+         */
+        style?: React.CSSProperties;
+    };
 }
 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, 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"]);
     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, {
@@ -208,9 +212,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/package.json

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