zmdms-webui 1.6.1 → 1.6.3

package/dist/es/input/TextArea.d.ts

@@ -3,7 +3,7 @@ import { TextAreaProps } from 'antd/es/input';
 
 interface ITextAreaProps extends TextAreaProps {
     /** 在表单中是否可以自行调整尺寸 */
-    formReSize?: boolean;
+    formResize?: boolean;
 }
 interface ITextAreaComponent extends React__default.ForwardRefExoticComponent<ITextAreaProps & React__default.RefAttributes<unknown>> {
     displayName: string;

package/dist/es/input/TextArea.js

@@ -5,9 +5,9 @@ import { Input } from 'antd';
 import classNames from '../node_modules/classnames/index.js';
 
 var TextArea = function (props, ref) {
-    var formReSize = props.formReSize, className = props.className, resetProps = __rest(props, ["formReSize", "className"]);
+    var formResize = props.formResize, className = props.className, resetProps = __rest(props, ["formResize", "className"]);
     var classes = classNames(className, {
-        "ztxk-input-textArea--form-resize": formReSize,
+        "ztxk-input-textArea--form-resize": formResize,
     });
     return jsx(Input.TextArea, __assign({ className: classes }, resetProps, { ref: ref }));
 };

package/dist/es/table/hooks.js

@@ -284,6 +284,31 @@ function useCustomSort(dataSource, onTableChange, options) {
         sortDataSource: sortDataSource,
         customSortHandle: customSortHandle,
     };
+}
+/**
+ * 计算表格高度
+ * @param isAutoScrollY 是否自动计算高度
+ * @param marginBottom table下面留出的距离
+ * @param id 表格id
+ * @returns 表格高度
+ */
+function useCalcScrollY(isAutoScrollY, subHeight, id) {
+    if (subHeight === void 0) { subHeight = 20; }
+    var _a = useState(undefined), tableHeight = _a[0], setTableHeight = _a[1];
+    useEffect(function () {
+        var _a, _b;
+        if (!isAutoScrollY)
+            return;
+        var containerRect = (_a = document
+            .querySelector(".ztxk-container")) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect();
+        var tableRect = (_b = document
+            .querySelector(id ? "#".concat(CSS.escape(id), " .ant-table-tbody") : ".ant-table-tbody")) === null || _b === void 0 ? void 0 : _b.getBoundingClientRect();
+        if (containerRect && tableRect) {
+            var tableHeight_1 = containerRect.height + containerRect.top - tableRect.top - subHeight;
+            setTableHeight(tableHeight_1);
+        }
+    }, [isAutoScrollY, subHeight, id]);
+    return tableHeight;
 }
 
-export { useAddAndDelChange, useCustomSort, useEditChange, useMoveRowChange, useScuRfresh };
+export { useAddAndDelChange, useCalcScrollY, useCustomSort, useEditChange, useMoveRowChange, useScuRfresh };

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

@@ -404,6 +404,18 @@ interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"
      * 新增或删除行配置
      */
     addAndDelProps?: IColumnsTypeProp<RecordType>;
+    /**
+     * 是否开启自动计算Y轴高度
+     */
+    isAutoScrollY?: boolean;
+    /**
+     * 自动计算Y轴高度时，table下面留出的距离
+     */
+    autoScrollYMarginBottom?: number;
+    /**
+     * 表格id
+     */
+    tableId?: string;
 }
 interface IFields {
     /**

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, useEditChange, useMoveRowChange, useAddAndDelChange } from './hooks.js';
+import { useScuRfresh, useCustomSort, useCalcScrollY, useEditChange, useMoveRowChange, useAddAndDelChange } 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,25 +38,25 @@ 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, 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"]);
+    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 ? 60 : _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 classes = classNames("ztxk-table", className, {
         "ztxk-table--flex": isFlex,
     });
     // 针对SCU和增减行 做特殊处理
-    var _o = useScuRfresh(), refreshScuCell = _o.refreshScuCell, getRefreshScuCell = _o.getRefreshScuCell;
+    var _q = useScuRfresh(), refreshScuCell = _q.refreshScuCell, getRefreshScuCell = _q.getRefreshScuCell;
     // 做一些前置处理
     // 比如过滤某些列 不做展示
     var columns = useParseColumns(_columns);
     // 得到动态列配置信息
-    var _p = useDynamicListByColumns(columns, { dynamicKey: dynamicKey, dynamicVersion: dynamicVersion }), defaultDynamicList = _p.defaultDynamicList, onCurrentListChange = _p.onCurrentListChange, currentDynamicList = _p.currentDynamicList, dynamicSettingRef = _p.dynamicSettingRef;
+    var _r = useDynamicListByColumns(columns, { dynamicKey: dynamicKey, dynamicVersion: dynamicVersion }), defaultDynamicList = _r.defaultDynamicList, onCurrentListChange = _r.onCurrentListChange, currentDynamicList = _r.currentDynamicList, dynamicSettingRef = _r.dynamicSettingRef;
     // 因为内部分页需要知晓当前页面的数据展示，要不然数据排序就跟内部分页没关系了
     // 自定义排序方法
-    var _q = useCustomSort(dataSource, onTableChange, {
+    var _s = useCustomSort(dataSource, onTableChange, {
         refreshScuCell: refreshScuCell,
         rowKey: props === null || props === void 0 ? void 0 : props.rowKey,
         serviceOrder: serviceOrder,
         isOrderUpdateData: isOrderUpdateData,
-    }), order = _q.order, setOrder = _q.setOrder, customSortHandle = _q.customSortHandle, sortDataSource = _q.sortDataSource;
+    }), order = _s.order, setOrder = _s.setOrder, customSortHandle = _s.customSortHandle, sortDataSource = _s.sortDataSource;
     // 当前表格展示的数据
     // 如果开启了前端排序的话，排序后的数据，可能会影响到很多地方。
     // 所以后续操作的数据 应该用
@@ -65,28 +65,30 @@ var Table = function (props) {
     var dataSourceRef = useLatest(currentTableDataSource);
     var hiddenDelBtnHandleRef = useLatest(hiddenDelBtnHandle);
     var hiddenAddBtnHandleRef = useLatest(hiddenAddBtnHandle);
+    var scrolly = useCalcScrollY(isAutoScrollY, autoScrollYMarginBottom, tableId);
     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;
+        // 如果没数据时，肯定不需要y轴滚动条
+        if ((!currentTableDataSource ||
+            (currentTableDataSource && (currentTableDataSource === null || currentTableDataSource === void 0 ? void 0 : currentTableDataSource.length) === 0)) &&
+            !virtualKey) {
+            return __assign(__assign({}, scroll), { y: undefined });
+        }
+        // 假设每行高度固定，如果没超过一页，则不出现滚动条
+        // if (currentTableDataSource && currentTableDataSource?.length <= 10) {
+        //   return { ...scroll, y: undefined };
+        // }
+        if (isAutoScrollY) {
+            return __assign(__assign({}, scroll), { y: scrolly });
         }
-        return {};
-    }, [scroll, currentTableDataSource]);
+        return scroll;
+    }, [scroll, currentTableDataSource, virtualKey, scrolly, isAutoScrollY]);
     // 内部分页相关配置
-    var _r = useInnerPagination(isInnerPagination, innerPaginationPageSize, {
+    var _t = useInnerPagination(isInnerPagination, innerPaginationPageSize, {
         innerPaginationPosition: innerPaginationPosition,
         innerPaginationPageSizeOptions: innerPaginationPageSizeOptions,
         innerPaginationConfig: innerPaginationConfig,
         dataSource: currentTableDataSource,
-    }), paginationConfig = _r.paginationConfig, currentPage = _r.currentPage, setCurrent = _r.setCurrent, pageSize = _r.pageSize;
+    }), paginationConfig = _t.paginationConfig, currentPage = _t.currentPage, setCurrent = _t.setCurrent, pageSize = _t.pageSize;
     // 内部表格编辑事件
     var onEditableSave = useEditChange(dataSourceRef, onTableChange);
     // 记录表头过滤的一些配置（通过ref记录，key => filter） 复制整列、过滤后修改数据，需要先走过滤
@@ -156,7 +158,7 @@ var Table = function (props) {
         isDel: isDel,
     });
     // 表格验证
-    var _s = useTableValidate(), tableRef = _s.tableRef, getCurrentTable = _s.getCurrentTable, clearErrorClass = _s.clearErrorClass;
+    var _u = useTableValidate(), tableRef = _u.tableRef, getCurrentTable = _u.getCurrentTable, clearErrorClass = _u.clearErrorClass;
     // 虚拟滚动选项
     var vComponents = useMemo(function () {
         if (virtualKey) {
@@ -302,7 +304,7 @@ var Table = function (props) {
                 overflow: "hidden",
                 marginTop: isMarginTop ? 10 : 0,
                 marginBottom: isMarginBottom ? 10 : 0,
-            }, 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] })));
+            }, 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] })));
 };
 var MemoTable = memo(Table);
 MemoTable.displayName = "ZTXK_WEBUI_Table";

package/package.json

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