zmdms-webui 1.4.8 → 1.4.9

package/dist/es/table/table.js

@@ -1,6 +1,6 @@
 import { __rest, __assign, __awaiter, __generator } from '../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { memo, useRef, useMemo, useCallback, useImperativeHandle } from 'react';
+import { memo, useMemo, useRef, useCallback, useImperativeHandle } from 'react';
 import { Table as Table$1 } from 'antd';
 import { BasicBodyRow, MoveBodyRow } from './components/EnhanceBodyRow.js';
 import EnhanceCell from './components/EnhanceBodyCell.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, 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"]);
+    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, 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"]);
     var classes = classNames("ztxk-table", className, {
         "ztxk-table--flex": isFlex,
     });
@@ -65,6 +65,21 @@ var Table = function (props) {
     var dataSourceRef = useLatest(currentTableDataSource);
     var hiddenDelBtnHandleRef = useLatest(hiddenDelBtnHandle);
     var hiddenAddBtnHandleRef = useLatest(hiddenAddBtnHandle);
+    var proxyScroll = useMemo(function () {
+        if (scroll) {
+            // 如果没数据时，肯定不需要y轴滚动条
+            if (!currentTableDataSource ||
+                (currentTableDataSource && (currentTableDataSource === null || currentTableDataSource === void 0 ? void 0 : currentTableDataSource.length) === 0)) {
+                return __assign(__assign({}, scroll), { y: undefined });
+            }
+            // 假设每行高度固定，如果没超过一页，则不出现滚动条
+            // if (currentTableDataSource && currentTableDataSource?.length <= 10) {
+            //   return { ...scroll, y: undefined };
+            // }
+            return scroll;
+        }
+        return {};
+    }, [scroll, currentTableDataSource]);
     // 内部分页相关配置
     var _r = useInnerPagination(isInnerPagination, innerPaginationPageSize, {
         innerPaginationPosition: innerPaginationPosition,
@@ -143,12 +158,11 @@ var Table = function (props) {
     var _s = useTableValidate(), tableRef = _s.tableRef, getCurrentTable = _s.getCurrentTable, clearErrorClass = _s.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,
+                height: (proxyScroll === null || proxyScroll === void 0 ? void 0 : proxyScroll.y) ? proxyScroll.y : 200,
                 resetTopWhenDataChange: false,
             });
         }
@@ -271,7 +285,7 @@ var Table = function (props) {
             ? pagination
                 ? pagination
                 : paginationConfig
-            : pagination, rowClassName: rowClassName }, resetProps)));
+            : pagination, rowClassName: rowClassName, scroll: proxyScroll }, resetProps)));
     return (jsxs("div", __assign({ style: isFlex
             ? {
                 position: "relative",

package/package.json

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