zmdms-webui 2.5.4 → 2.5.6

package/dist/es/applayoutheader/appLayoutHeader.d.ts

@@ -9,7 +9,12 @@ interface IProps {
     logout?: () => void;
     userInfo?: any;
     updatePassword?: Function;
+    isNewUpdatePwd?: boolean;
     isSaveState?: boolean;
+    selfRender?: any;
+    userDetail?: boolean;
+    userInfoCanEdit?: boolean;
+    updateUserInfo?: Function;
 }
 declare const _default: React__default.NamedExoticComponent<IProps>;
 

package/dist/es/applayoutheader/appLayoutHeader.js

@@ -7,9 +7,9 @@ import { LayoutHeaderContext } from './LayoutHeaderContext.js';
 import { Layout } from 'antd';
 
 var AppLayoutHeader = function (_a) {
-    var tabs = _a.tabs, activeTab = _a.activeTab, deleteTabHandle = _a.deleteTabHandle, deleteTabsHandle = _a.deleteTabsHandle, setActiveTab = _a.setActiveTab, logout = _a.logout, userInfo = _a.userInfo, updatePassword = _a.updatePassword, isSaveState = _a.isSaveState;
+    var tabs = _a.tabs, activeTab = _a.activeTab, deleteTabHandle = _a.deleteTabHandle, deleteTabsHandle = _a.deleteTabsHandle, setActiveTab = _a.setActiveTab, logout = _a.logout, userInfo = _a.userInfo, updatePassword = _a.updatePassword, isSaveState = _a.isSaveState, selfRender = _a.selfRender, userDetail = _a.userDetail, userInfoCanEdit = _a.userInfoCanEdit, updateUserInfo = _a.updateUserInfo, isNewUpdatePwd = _a.isNewUpdatePwd;
     // console.log("layout-header- rerender");
-    return (jsx(Layout.Header, __assign({ className: "zmdms-content--header" }, { children: jsxs(LayoutHeaderContext.Provider, __assign({ value: { userInfo: userInfo } }, { children: [jsx(TabsCom, { tabs: tabs, activeTab: activeTab, deleteTabHandle: deleteTabHandle, deleteTabsHandle: deleteTabsHandle, setActiveTab: setActiveTab, isSaveState: isSaveState }), jsx(SettingCom, { logout: logout, updatePassword: updatePassword })] })) })));
+    return (jsx(Layout.Header, __assign({ className: "zmdms-content--header" }, { children: jsxs(LayoutHeaderContext.Provider, __assign({ value: { userInfo: userInfo } }, { children: [jsx(TabsCom, { tabs: tabs, activeTab: activeTab, deleteTabHandle: deleteTabHandle, deleteTabsHandle: deleteTabsHandle, setActiveTab: setActiveTab, isSaveState: isSaveState }), jsx(SettingCom, { logout: logout, updatePassword: updatePassword, userDetail: userDetail, userInfoCanEdit: userInfoCanEdit, updateUserInfo: updateUserInfo, isNewUpdatePwd: isNewUpdatePwd }), selfRender] })) })));
 };
 AppLayoutHeader.displayName = "ZTXK_WEBUI_AppLayoutHeader";
 var AppLayoutHeader$1 = memo(AppLayoutHeader);

package/dist/es/applayoutheader/setting/index.js

@@ -4,8 +4,8 @@ import FullCom from './fullCom.js';
 import UserInfo from './userInfo.js';
 
 var SettingCom = function (_a) {
-    var logout = _a.logout, updatePassword = _a.updatePassword;
-    return (jsxs("div", __assign({ className: "zmdms-content--header-info" }, { children: [jsx(FullCom, {}), jsx(UserInfo, { logout: logout, updatePassword: updatePassword })] })));
+    var logout = _a.logout, updatePassword = _a.updatePassword, userDetail = _a.userDetail, userInfoCanEdit = _a.userInfoCanEdit, updateUserInfo = _a.updateUserInfo, isNewUpdatePwd = _a.isNewUpdatePwd;
+    return (jsxs("div", __assign({ className: "zmdms-content--header-info" }, { children: [jsx(FullCom, {}), jsx(UserInfo, { logout: logout, updatePassword: updatePassword, userDetail: userDetail, userInfoCanEdit: userInfoCanEdit, updateUserInfo: updateUserInfo, isNewUpdatePwd: isNewUpdatePwd })] })));
 };
 
 export { SettingCom as default };

package/dist/es/applayoutheader/setting/userInfo.js

@@ -1,64 +1,80 @@
 import { __assign, __awaiter, __generator } from '../../_virtual/_tslib.js';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
-import { useContext, useState, useMemo } from 'react';
+import { useContext, useState, useRef, useMemo } from 'react';
 import { LayoutHeaderContext } from '../LayoutHeaderContext.js';
 import { useLatest } from 'ahooks';
-import LogoutOutlined from '../../node_modules/@ant-design/icons/es/icons/LogoutOutlined.js';
-import UnlockOutlined from '../../node_modules/@ant-design/icons/es/icons/UnlockOutlined.js';
+import UserInfoModal from './userInfoModal.js';
+import userPwdModal from './userPwdModal.js';
 import UserOutlined from '../../node_modules/@ant-design/icons/es/icons/UserOutlined.js';
+import UnlockOutlined from '../../node_modules/@ant-design/icons/es/icons/UnlockOutlined.js';
+import LogoutOutlined from '../../node_modules/@ant-design/icons/es/icons/LogoutOutlined.js';
 import { Dropdown, Spin } from 'antd';
 
 var UserInfo = function (_a) {
-    var logout = _a.logout, updatePassword = _a.updatePassword;
+    var logout = _a.logout, userDetail = _a.userDetail, updatePassword = _a.updatePassword, userInfoCanEdit = _a.userInfoCanEdit, updateUserInfo = _a.updateUserInfo, isNewUpdatePwd = _a.isNewUpdatePwd;
     var userInfo = useContext(LayoutHeaderContext).userInfo;
     var _b = useState(false), spinning = _b[0], setSpinning = _b[1];
     var logoutLatest = useLatest(logout);
+    var userInfoModalRef = useRef(null);
+    var userPwdModalRef = useRef(null);
     var items = useMemo(function () {
-        var items = [
-            {
-                label: (jsxs("div", __assign({ onClick: function () { return __awaiter(void 0, void 0, void 0, function () {
-                        var err_1;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    setSpinning(true);
-                                    if (!logoutLatest.current) return [3 /*break*/, 4];
-                                    _a.label = 1;
-                                case 1:
-                                    _a.trys.push([1, 3, , 4]);
-                                    return [4 /*yield*/, logoutLatest.current()];
-                                case 2:
-                                    _a.sent();
-                                    return [3 /*break*/, 4];
-                                case 3:
-                                    err_1 = _a.sent();
-                                    console.log(err_1);
-                                    return [3 /*break*/, 4];
-                                case 4:
-                                    setSpinning(false);
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); } }, { children: [jsx(LogoutOutlined, { style: { marginRight: 5 } }), " \u9000\u51FA\u7CFB\u7EDF"] }))),
-                key: "logout",
-            },
-        ];
+        var items = [];
+        if (userDetail) {
+            items.push({
+                label: (jsxs("div", __assign({ onClick: function () {
+                        userInfoModalRef.current.show();
+                    } }, { children: [jsx(UserOutlined, { style: { marginRight: 5 } }), " \u8D26\u53F7\u4FE1\u606F"] }))),
+                key: "userDetail",
+            });
+        }
         if (updatePassword) {
-            items.unshift.apply(items, [
-                {
-                    label: (jsxs("div", __assign({ onClick: function () {
-                            updatePassword();
-                        } }, { children: [jsx(UnlockOutlined, { style: { marginRight: 5 } }), " \u4FEE\u6539\u5BC6\u7801"] }))),
-                    key: "info",
-                },
-                {
-                    type: "divider",
-                },
-            ]);
+            items.push({
+                label: (jsxs("div", __assign({ onClick: function () {
+                        if (isNewUpdatePwd) {
+                            userPwdModalRef.current.show();
+                        }
+                        else {
+                            updatePassword === null || updatePassword === void 0 ? void 0 : updatePassword();
+                        }
+                    } }, { children: [jsx(UnlockOutlined, { style: { marginRight: 5 } }), " \u4FEE\u6539\u5BC6\u7801"] }))),
+                key: "info",
+            });
+        }
+        if (userDetail || updatePassword) {
+            items.push({
+                type: "divider",
+            });
         }
+        items.push({
+            label: (jsxs("div", __assign({ onClick: function () { return __awaiter(void 0, void 0, void 0, function () {
+                    var err_1;
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                setSpinning(true);
+                                if (!logoutLatest.current) return [3 /*break*/, 4];
+                                _a.label = 1;
+                            case 1:
+                                _a.trys.push([1, 3, , 4]);
+                                return [4 /*yield*/, logoutLatest.current()];
+                            case 2:
+                                _a.sent();
+                                return [3 /*break*/, 4];
+                            case 3:
+                                err_1 = _a.sent();
+                                console.log(err_1);
+                                return [3 /*break*/, 4];
+                            case 4:
+                                setSpinning(false);
+                                return [2 /*return*/];
+                        }
+                    });
+                }); } }, { children: [jsx(LogoutOutlined, { style: { marginRight: 5 } }), " \u9000\u51FA\u7CFB\u7EDF"] }))),
+            key: "logout",
+        });
         return items;
-    }, [updatePassword, logoutLatest]);
-    return (jsxs(Fragment, { children: [jsx(Dropdown, __assign({ menu: { items: items }, trigger: ["click"], placement: "bottomLeft" }, { children: jsxs("div", __assign({ className: "user-operation" }, { children: [jsx(UserOutlined, {}), jsx("span", { children: userInfo === null || userInfo === void 0 ? void 0 : userInfo.realName })] })) })), spinning && jsx(Spin, { spinning: true, tip: "\u9000\u51FA\u767B\u5F55\u4E2D", className: "logout-spin" })] }));
+    }, [userDetail, updatePassword, logoutLatest, isNewUpdatePwd]);
+    return (jsxs(Fragment, { children: [jsx(Dropdown, __assign({ menu: { items: items }, trigger: ["click"], placement: "bottomLeft" }, { children: jsxs("div", __assign({ className: "user-operation" }, { children: [jsx(UserOutlined, {}), jsx("span", { children: userInfo === null || userInfo === void 0 ? void 0 : userInfo.realName })] })) })), jsx(UserInfoModal, { ref: userInfoModalRef, userInfo: userInfo, canEdit: userInfoCanEdit, updateUserInfo: updateUserInfo }), jsx(userPwdModal, { ref: userPwdModalRef, updatePassword: updatePassword }), spinning && jsx(Spin, { spinning: true, tip: "\u9000\u51FA\u767B\u5F55\u4E2D", className: "logout-spin" })] }));
 };
 
 export { UserInfo as default };

package/dist/es/applayoutheader/setting/userInfoModal.js

@@ -0,0 +1,126 @@
+import { __assign, __awaiter, __generator } from '../../_virtual/_tslib.js';
+import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+import { forwardRef, useState, useImperativeHandle, useEffect, useMemo } from 'react';
+import { strLenValidate, phoneValidate, emailValidate, idCardValidate } from 'zmdms-utils';
+import MemoForm from '../../form/form.js';
+import MemoInput from '../../input/input.js';
+import ButtonCom from '../../button/button.js';
+import ModalComponent from '../../modal/modal.js';
+import myMessage from '../../message/index.js';
+
+var UserInfoModal = forwardRef(function (props, ref) {
+    var userInfo = props.userInfo, canEdit = props.canEdit, updateUserInfo = props.updateUserInfo;
+    var _a = useState(false), visible = _a[0], setVisible = _a[1];
+    var form = MemoForm.useForm()[0];
+    var _b = useState(false), isEdit = _b[0], setIsEdit = _b[1];
+    useImperativeHandle(ref, function () { return ({
+        show: function () { return setVisible(true); },
+    }); });
+    useEffect(function () {
+        if (userInfo) {
+            form.setFieldsValue(userInfo);
+        }
+    }, [userInfo, form]);
+    useEffect(function () {
+        if (!visible) {
+            setIsEdit(false);
+        }
+    }, [visible]);
+    var items = useMemo(function () {
+        return [
+            {
+                name: "account",
+                label: "账号",
+                rules: [
+                    { required: true, message: "请输入账号" },
+                    {
+                        pattern: strLenValidate().regex,
+                        message: strLenValidate().message,
+                    },
+                ],
+                isChangeable: isEdit,
+                render: function (props) { return jsx(MemoInput, __assign({}, props)); },
+            },
+            {
+                name: "realName",
+                label: "姓名",
+                rules: [
+                    { required: true, message: "请输入姓名" },
+                    {
+                        pattern: strLenValidate().regex,
+                        message: strLenValidate().message,
+                    },
+                ],
+                isChangeable: isEdit,
+                render: function (props) { return jsx(MemoInput, __assign({}, props)); },
+            },
+            {
+                name: "phone",
+                label: "电话",
+                rules: [
+                    { required: true, message: "请输入电话" },
+                    {
+                        pattern: phoneValidate.regex,
+                        message: phoneValidate.message,
+                    },
+                ],
+                isChangeable: isEdit,
+                render: function (props) { return jsx(MemoInput, __assign({}, props)); },
+            },
+            {
+                name: "email",
+                label: "邮箱",
+                rules: [
+                    {
+                        pattern: emailValidate.regex,
+                        message: emailValidate.message,
+                    },
+                ],
+                isChangeable: isEdit,
+                render: function (props) { return jsx(MemoInput, __assign({}, props)); },
+            },
+            {
+                name: "identityCard",
+                label: "身份证号",
+                rules: [
+                    {
+                        pattern: idCardValidate.regex,
+                        message: idCardValidate.message,
+                    },
+                ],
+                isChangeable: isEdit,
+                render: function (props) { return jsx(MemoInput, __assign({}, props)); },
+            },
+        ];
+    }, [isEdit]);
+    var footerDom = isEdit ? (jsxs(Fragment, { children: [jsx(ButtonCom, __assign({ type: "primary", onClick: function () { return __awaiter(void 0, void 0, void 0, function () {
+                    var data, err_1;
+                    var _a, _b, _c;
+                    return __generator(this, function (_d) {
+                        switch (_d.label) {
+                            case 0:
+                                _d.trys.push([0, 3, , 4]);
+                                return [4 /*yield*/, form.validateFields()];
+                            case 1:
+                                _d.sent();
+                                console.log("验证通过，执行后续事件");
+                                data = form.getFieldsValue();
+                                return [4 /*yield*/, (updateUserInfo === null || updateUserInfo === void 0 ? void 0 : updateUserInfo(data))];
+                            case 2:
+                                _d.sent();
+                                setIsEdit(false);
+                                console.log(data);
+                                return [3 /*break*/, 4];
+                            case 3:
+                                err_1 = _d.sent();
+                                console.log(err_1);
+                                myMessage.error((err_1 === null || err_1 === void 0 ? void 0 : err_1.message) || ((_c = (_b = (_a = err_1 === null || err_1 === void 0 ? void 0 : err_1.errorFields) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.errors) === null || _c === void 0 ? void 0 : _c[0]) || "保存失败!");
+                                return [2 /*return*/];
+                            case 4: return [2 /*return*/];
+                        }
+                    });
+                }); } }, { children: "\u4FDD\u5B58" })), jsx(ButtonCom, __assign({ type: "default", onClick: function () { return setIsEdit(false); } }, { children: "\u53D6\u6D88" }))] })) : (jsx(ButtonCom, __assign({ type: "primary", onClick: function () { return setIsEdit(true); } }, { children: "\u7F16\u8F91" })));
+    return (jsx(ModalComponent, __assign({ title: "\u7528\u6237\u4FE1\u606F", open: visible, onCancel: function () { return setVisible(false); }, footer: canEdit ? footerDom : null }, { children: jsx(MemoForm, { directionColumn: true, form: form, items: items }) })));
+});
+
+export { UserInfoModal as default };

package/dist/es/applayoutheader/setting/userPwdModal.js

@@ -0,0 +1,104 @@
+import { __assign, __awaiter, __generator } from '../../_virtual/_tslib.js';
+import { jsx, Fragment } from 'react/jsx-runtime';
+import { forwardRef, useState, useImperativeHandle, useEffect, useMemo } from 'react';
+import { validatePassword } from 'zmdms-utils';
+import MemoForm from '../../form/form.js';
+import MemoInput from '../../input/input.js';
+import ButtonCom from '../../button/button.js';
+import ModalComponent from '../../modal/modal.js';
+import myMessage from '../../message/index.js';
+
+var userPwdModal = forwardRef(function (props, ref) {
+    var userInfo = props.userInfo, updatePassword = props.updatePassword;
+    var _a = useState(false), visible = _a[0], setVisible = _a[1];
+    var form = MemoForm.useForm()[0];
+    useImperativeHandle(ref, function () { return ({
+        show: function () { return setVisible(true); },
+    }); });
+    useEffect(function () {
+        if (userInfo) {
+            form.setFieldsValue(userInfo);
+        }
+    }, [userInfo, form]);
+    var items = useMemo(function () {
+        return [
+            {
+                name: "oldPassword",
+                label: "原密码",
+                rules: [{ required: true, message: "请输入原密码" }],
+                render: function (props) { return (jsx(MemoInput.Password, __assign({ autoComplete: "new-password" }, props))); },
+            },
+            {
+                name: "newPassword",
+                label: "新密码",
+                rules: [
+                    { required: true, message: "请输入新密码" },
+                    function (_a) {
+                        var getFieldValue = _a.getFieldValue;
+                        return ({
+                            validator: function (rule, value) {
+                                var result = validatePassword(value, getFieldValue("account"));
+                                if (result.result) {
+                                    return Promise.resolve();
+                                }
+                                else {
+                                    return Promise.reject(result.message);
+                                }
+                            },
+                        });
+                    },
+                ],
+                render: function (props) { return (jsx(MemoInput.Password, __assign({ autoComplete: "new-password" }, props))); },
+                nextNode: (jsx(MemoForm.ItemTipDom, __assign({ width: 500 }, { children: "\u5BC6\u7801\u957F\u5EA6\u5927\u4E8E8\u4F4D\uFF0C\u81F3\u5C11\u6EE1\u8DB3\u6570\u5B57\uFF0C\u5927\u5199\u5B57\u6BCD\uFF0C\u5C0F\u5199\u5B57\u6BCD\uFF0C\u7279\u6B8A\u5B57\u7B26\u4E2D\u7684\u4E09\u79CD!" }))),
+            },
+            {
+                name: "newPassword1",
+                label: "确认新密码",
+                rules: [
+                    { required: true, message: "请确认密码" },
+                    function (_a) {
+                        var getFieldValue = _a.getFieldValue;
+                        return ({
+                            validator: function (rule, value) {
+                                if (!value || getFieldValue("newPassword") === value) {
+                                    return Promise.resolve();
+                                }
+                                return Promise.reject("两次密码输入不一致");
+                            },
+                        });
+                    },
+                ],
+                render: function (props) { return (jsx(MemoInput.Password, __assign({ autoComplete: "new-password" }, props))); },
+            },
+        ];
+    }, []);
+    var footerDom = (jsx(Fragment, { children: jsx(ButtonCom, __assign({ type: "primary", onClick: function () { return __awaiter(void 0, void 0, void 0, function () {
+                var data, err_1;
+                var _a, _b, _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            _d.trys.push([0, 3, , 4]);
+                            return [4 /*yield*/, form.validateFields()];
+                        case 1:
+                            _d.sent();
+                            console.log("验证通过，执行后续事件");
+                            data = form.getFieldsValue();
+                            return [4 /*yield*/, (updatePassword === null || updatePassword === void 0 ? void 0 : updatePassword(data))];
+                        case 2:
+                            _d.sent();
+                            console.log(data);
+                            return [3 /*break*/, 4];
+                        case 3:
+                            err_1 = _d.sent();
+                            console.log(err_1);
+                            myMessage.error((err_1 === null || err_1 === void 0 ? void 0 : err_1.message) || ((_c = (_b = (_a = err_1 === null || err_1 === void 0 ? void 0 : err_1.errorFields) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.errors) === null || _c === void 0 ? void 0 : _c[0]) || "保存失败!");
+                            return [2 /*return*/];
+                        case 4: return [2 /*return*/];
+                    }
+                });
+            }); } }, { children: "\u4FDD\u5B58" })) }));
+    return (jsx(ModalComponent, __assign({ title: "\u4FEE\u6539\u5BC6\u7801", open: visible, onCancel: function () { return setVisible(false); }, footer: footerDom, width: "80%" }, { children: jsx(MemoForm, { directionColumn: true, form: form, items: items }) })));
+});
+
+export { userPwdModal as default };

package/dist/es/canvastable/canvasTable.js

@@ -112,11 +112,14 @@ function CanvasTable(props) {
     }), finalDataSource = _z.finalDataSource, hasSummaryRow = _z.hasSummaryRow;
     // 用于存储计算后的表头高度（用于自动高度的精确计算）
     var _0 = useState(undefined), preciseHeaderHeight = _0[0], setPreciseHeaderHeight = _0[1];
+    // 用于存储是否需要横向滚动条（用于自动高度的精确计算）
+    var _1 = useState(false), needHorizontalScrollbar = _1[0], setNeedHorizontalScrollbar = _1[1];
     // 自动高度计算（需要在容器尺寸计算之前）
     var autoHeight = useCanvasTableAutoHeight(isAutoScrollY, autoScrollYMarginBottom, canvasTableId, finalDataSource.length, // 数据行数（用于 content 模式）
     headerHeight, // 表头基础高度（用于 content 模式的初始计算）
     rowHeight, // 行高（用于 content 模式）
-    preciseHeaderHeight // 计算后的表头高度（用于 content 模式的精确计算）
+    preciseHeaderHeight, // 计算后的表头高度（用于 content 模式的精确计算）
+    needHorizontalScrollbar // 是否需要横向滚动条（用于计算额外高度）
     );
     // 监听容器尺寸变化（提前计算，用于列宽自适应）
     var containerSize = useContainerSize({
@@ -124,6 +127,7 @@ function CanvasTable(props) {
         width: width,
         height: isAutoScrollY ? autoHeight || height : height,
     });
+    console.log("containerSize", containerSize);
     var containerWidth = containerSize.width;
     var containerHeight = containerSize.height;
     // 计算列的渲染信息（使用容器宽度进行自适应填充）
@@ -177,7 +181,7 @@ function CanvasTable(props) {
         return calculateTotalHeight(calculatedHeaderHeight, finalDataSource.length, rowHeight);
     }, [calculatedHeaderHeight, finalDataSource.length, rowHeight]);
     // 计算滚动条指标
-    var _1 = useScrollbarMetrics({
+    var _2 = useScrollbarMetrics({
         containerWidth: containerWidth,
         containerHeight: containerHeight,
         totalWidth: totalWidth,
@@ -185,14 +189,14 @@ function CanvasTable(props) {
         headerHeight: calculatedHeaderHeight,
         scrollTop: 0,
         scrollLeft: 0,
-    }), maxScrollTop = _1.maxScrollTop, maxScrollLeft = _1.maxScrollLeft;
+    }), maxScrollTop = _2.maxScrollTop, maxScrollLeft = _2.maxScrollLeft;
     // 滚动管理（使用预先计算的maxScrollTop和maxScrollLeft）
-    var _2 = useTableScroll({
+    var _3 = useTableScroll({
         containerRef: containerRef,
         maxScrollTop: maxScrollTop,
         maxScrollLeft: maxScrollLeft,
         onScroll: onScroll,
-    }), scrollState = _2.scrollState, setScrollState = _2.setScrollState;
+    }), scrollState = _3.scrollState, setScrollState = _3.setScrollState;
     // 使用 ref 保存最新的滚动位置，确保在组件卸载过程中仍能访问
     var scrollPositionRef = useRef({ x: 0, y: 0 });
     useEffect(function () {
@@ -220,13 +224,24 @@ function CanvasTable(props) {
         scrollTop: scrollState.scrollTop,
         scrollLeft: scrollState.scrollLeft,
     }).actualMetrics;
+    // 在 content 模式下，当横向滚动条状态变化时，更新状态以触发自动高度重新计算
+    useEffect(function () {
+        if (isAutoScrollY === "content" &&
+            scrollbarMetrics.needHorizontalScrollbar !== needHorizontalScrollbar) {
+            setNeedHorizontalScrollbar(scrollbarMetrics.needHorizontalScrollbar);
+        }
+    }, [
+        isAutoScrollY,
+        scrollbarMetrics.needHorizontalScrollbar,
+        needHorizontalScrollbar,
+    ]);
     // 单元格框选
-    var _3 = useTableSelection({
+    var _4 = useTableSelection({
         state: state,
         setState: setState,
     }), 
     // selectionStartRef,
-    startSelection = _3.startSelection, updateSelection = _3.updateSelection, extendSelection = _3.extendSelection;
+    startSelection = _4.startSelection, updateSelection = _4.updateSelection, extendSelection = _4.extendSelection;
     // 处理列宽调整
     var handleColumnResize = useCallback(function (columnKey, newWidth) {
         var _a;
@@ -281,20 +296,20 @@ function CanvasTable(props) {
         onCurrentListChange,
     ]);
     // 列宽调整
-    var _4 = useColumnResize({
+    var _5 = useColumnResize({
         columnRenderInfos: columnRenderInfos,
         containerWidth: containerWidth,
         headerHeight: calculatedHeaderHeight,
         scrollLeft: scrollState.scrollLeft,
         onColumnResize: handleColumnResize,
-    }), resizeState = _4.resizeState, checkResizeHandle = _4.checkResizeHandle, startResize = _4.startResize, updateResize = _4.updateResize, endResize = _4.endResize, setHoverResizeColumn = _4.setHoverResizeColumn, getColumnWidth = _4.getColumnWidth, RESIZE_HANDLE_WIDTH = _4.RESIZE_HANDLE_WIDTH;
+    }), resizeState = _5.resizeState, checkResizeHandle = _5.checkResizeHandle, startResize = _5.startResize, updateResize = _5.updateResize, endResize = _5.endResize, setHoverResizeColumn = _5.setHoverResizeColumn, getColumnWidth = _5.getColumnWidth, RESIZE_HANDLE_WIDTH = _5.RESIZE_HANDLE_WIDTH;
     // 复制到剪贴板
-    var _5 = useCopyToClipboard({
+    var _6 = useCopyToClipboard({
         cellSelection: state.cellSelection,
         processedDataSource: finalDataSource,
         columns: processedColumns,
         containerRef: containerRef,
-    }), getSelectedCellsText = _5.getSelectedCellsText, copyToClipboard = _5.copyToClipboard;
+    }), getSelectedCellsText = _6.getSelectedCellsText, copyToClipboard = _6.copyToClipboard;
     // 处理右键菜单的复制操作
     var handleCopy = useCallback(function () {
         var text = getSelectedCellsText();
@@ -313,7 +328,7 @@ function CanvasTable(props) {
         summaryConfig: (exportExcelConfig === null || exportExcelConfig === void 0 ? void 0 : exportExcelConfig.isExportNoSummary) ? undefined : [],
     });
     // 交互事件处理（使用baseScrollbarMetrics的maxScrollTop/maxScrollLeft以保持稳定）
-    var _6 = useTableInteraction({
+    var _7 = useTableInteraction({
         state: state,
         setState: setState,
         scrollState: scrollState,
@@ -360,7 +375,7 @@ function CanvasTable(props) {
         fixedRowsCount: fixedRowsCount,
         fixedRowsConfig: fixedRowsConfig,
         summaryFixed: summaryFixed,
-    }), handleCanvasMouseDown = _6.handleCanvasMouseDown, handleCanvasMouseMove = _6.handleCanvasMouseMove, handleCanvasMouseUp = _6.handleCanvasMouseUp, handleCanvasMouseLeave = _6.handleCanvasMouseLeave, handleCanvasContextMenu = _6.handleCanvasContextMenu;
+    }), handleCanvasMouseDown = _7.handleCanvasMouseDown, handleCanvasMouseMove = _7.handleCanvasMouseMove, handleCanvasMouseUp = _7.handleCanvasMouseUp, handleCanvasMouseLeave = _7.handleCanvasMouseLeave, handleCanvasContextMenu = _7.handleCanvasContextMenu;
     // 渲染表格
     useTableRender(__assign(__assign({ canvasRef: canvasRef, processedDataSource: finalDataSource, columnRenderInfos: columnRenderInfos, columns: processedColumns, // 传递原始columns用于渲染多级表头
         state: state, scrollState: scrollState, rowSelection: rowSelection, containerWidth: containerWidth, containerHeight: containerHeight, headerHeight: calculatedHeaderHeight, baseHeaderHeight: headerHeight, // 传入原始基础高度用于计算每层高度

package/dist/es/canvastable/hooks/useAutoHeight.js

@@ -3,6 +3,8 @@ import { useState, useEffect } from 'react';
 /**
  * CanvasTable 自动高度计算 Hook
  */
+// 滚动条宽度常量
+var SCROLLBAR_SIZE = 12;
 /**
  * 计算CanvasTable高度
  * @param isAutoScrollY 自动高度模式
@@ -12,10 +14,12 @@ import { useState, useEffect } from 'react';
  * @param headerHeight 表头基础高度（用于 content 模式的初始计算）
  * @param rowHeight 行高（用于 content 模式）
  * @param calculatedHeaderHeight 计算后的表头高度（优先使用，用于 content 模式的精确计算）
+ * @param needHorizontalScrollbar 是否需要横向滚动条（用于计算额外高度）
  * @returns 计算出的表格高度
  */
-function useCanvasTableAutoHeight(isAutoScrollY, marginBottom, canvasTableId, dataLength, headerHeight, rowHeight, calculatedHeaderHeight) {
+function useCanvasTableAutoHeight(isAutoScrollY, marginBottom, canvasTableId, dataLength, headerHeight, rowHeight, calculatedHeaderHeight, needHorizontalScrollbar) {
     if (marginBottom === void 0) { marginBottom = 65; }
+    if (needHorizontalScrollbar === void 0) { needHorizontalScrollbar = false; }
     var _a = useState(undefined), tableHeight = _a[0], setTableHeight = _a[1];
     useEffect(function () {
         // 归一化模式：true 转换为 'viewport'
@@ -30,15 +34,14 @@ function useCanvasTableAutoHeight(isAutoScrollY, marginBottom, canvasTableId, da
                 // 优先使用计算后的表头高度（考虑了换行、多级表头等因素）
                 // 如果还未计算完成，使用基础高度作为初始值
                 var actualHeaderHeight = calculatedHeaderHeight || headerHeight;
-                // 计算总高度 = 表头高度 + (数据行数 * 行高)
-                var calculatedHeight = actualHeaderHeight + dataLength * rowHeight;
+                // 计算总高度 = 表头高度 + (数据行数 * 行高) + (横向滚动条高度)
+                var calculatedHeight = actualHeaderHeight +
+                    dataLength * rowHeight +
+                    (needHorizontalScrollbar ? SCROLLBAR_SIZE : 0);
                 // 设置最小高度和最大高度
                 var minHeight = 200;
-                var maxHeight = 5000; // 防止数据过多时表格过高
                 // 如果没有数据，使用最小高度（包含表头和空状态提示）
-                var finalHeight = dataLength === 0
-                    ? minHeight
-                    : Math.min(Math.max(calculatedHeight, minHeight), maxHeight);
+                var finalHeight = dataLength === 0 ? minHeight : Math.max(calculatedHeight, minHeight);
                 setTableHeight(finalHeight);
             }
             return;
@@ -95,7 +98,8 @@ function useCanvasTableAutoHeight(isAutoScrollY, marginBottom, canvasTableId, da
         dataLength,
         headerHeight,
         rowHeight,
-        calculatedHeaderHeight, // 当计算后的表头高度变化时，重新计算总高度
+        calculatedHeaderHeight,
+        needHorizontalScrollbar, // 当横向滚动条状态变化时，重新计算总高度
     ]);
     return tableHeight;
 }

package/dist/index.es.js

@@ -1,4 +1,3 @@
-export { default as Input } from './es/input/input.js';
 export { default as InputNumber } from './es/inputnumber/inputNumber.js';
 export { default as DatePicker } from './es/datepicker/index.js';
 export { default as Calendar } from './es/calendar/index.js';
@@ -10,14 +9,12 @@ export { default as Login } from './es/login/index.js';
 export { default as Icon } from './es/icon/index.js';
 export { default as IconOss } from './es/icon/icon-oss.js';
 export { default as DynamicSetting } from './es/dynamicsetting/dynamicSetting.js';
-export { default as Form } from './es/form/form.js';
 export { default as FormItem } from './es/formitem/formItem.js';
 export { default as Container } from './es/container/container.js';
 export { default as Footer } from './es/footer/footer.js';
 export { default as Pagination } from './es/pagination/pagination.js';
 export { default as Table } from './es/table/table.js';
 export { default as Tabs } from './es/tabs/tabs.js';
-export { default as Modal } from './es/modal/modal.js';
 export { default as DetailList } from './es/detaillist/list.js';
 export { default as AppLayout } from './es/applayout/appLayout.js';
 export { default as AppLayoutHeader } from './es/applayoutheader/appLayoutHeader.js';
@@ -49,4 +46,7 @@ export { default as message } from './es/message/index.js';
 export { default as CanvasTable } from './es/canvastable/canvasTable.js';
 export { Affix, Anchor, AutoComplete, Avatar, BackTop, Badge, Breadcrumb, Card, Carousel, Cascader, Checkbox, Col, Comment, ConfigProvider, Divider, Drawer, Dropdown, Empty, Grid, Image, Layout, List, Mentions, Menu, PageHeader, Popconfirm, Popover, Progress, Radio, Rate, Result, Row, Segmented, Skeleton, Slider, Space, Spin, Statistic, Steps, Switch, Timeline, Tooltip, Transfer, Typography, Upload, notification } from 'antd';
 export { default as Button } from './es/button/button.js';
+export { default as Input } from './es/input/input.js';
+export { default as Form } from './es/form/form.js';
+export { default as Modal } from './es/modal/modal.js';
 export { default as NotAuthPage } from './es/notauthpage/notAuthPage.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
@@ -20,9 +20,9 @@
     "print-js": ">=1.6.0",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0",
+    "react-draggable": ">=4.4.5",
     "react-resizable": "^3.0.5",
     "react-router-dom": ">=6",
-    "react-draggable": ">=4.4.5",
     "zmdms-utils": ">=0.0.1"
   },
   "sideEffects": [
@@ -135,7 +135,7 @@
     "storybook": "^7.6.16",
     "typescript": "^4.9.5",
     "web-vitals": "^2.1.4",
-    "zmdms-utils": "^0.0.73"
+    "zmdms-utils": "^0.0.83"
   },
   "resolutions": {
     "rc-virtual-list": "3.11.3"