zmdms-webui 2.6.1 → 2.6.3

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

@@ -228,6 +228,52 @@ interface ICanvasRowSelection<RecordType = any> {
      */
     fixed?: boolean;
 }
+interface IExpandable<RecordType = any> {
+    /**
+     * 展开的keys集合
+     */
+    expandedRowKeys?: React__default.Key[];
+    /**
+     * 默认展开的keys集合
+     */
+    defaultExpandedRowKeys?: React__default.Key[];
+    /**
+     * 展开状态改变时的回调
+     */
+    onExpandedRowsChange?: (expandedKeys: React__default.Key[], row: RecordType, action: 'expand' | 'collapse') => void;
+    /**
+     * 是否默认展开所有行
+     */
+    defaultExpandAllRows?: boolean;
+    /**
+     * 展开图标的列索引（默认0，第一列）
+     */
+    expandIconColumnIndex?: number;
+    /**
+     * 自定义展开图标
+     */
+    expandIcon?: (params: {
+        expanded: boolean;
+        record: RecordType;
+        onExpand: (record: RecordType, expanded: boolean) => void;
+    }) => React__default.ReactNode;
+    /**
+     * 展开行的自定义渲染
+     */
+    expandedRowRender?: (params: {
+        record: RecordType;
+        index: number;
+        expanded: boolean;
+    }) => React__default.ReactNode;
+    /**
+     * 展开行的类名
+     */
+    expandedRowClassName?: (record: RecordType, index: number) => string;
+    /**
+     * 子节点数据的字段名（默认为'children'）
+     */
+    childrenColumnName?: string;
+}
 interface ICanvasTableProps<RecordType = any> {
     /**
      * 数据源
@@ -273,6 +319,10 @@ interface ICanvasTableProps<RecordType = any> {
      * 勾选配置
      */
     rowSelection?: ICanvasRowSelection<RecordType>;
+    /**
+     * 树形展开配置
+     */
+    expandable?: IExpandable<RecordType>;
     /**
      * 排序改变回调
      */
@@ -473,6 +523,26 @@ interface ICanvasTableRefHandle {
      * 设置选中的行keys
      */
     setSelectedRowKeys: (keys: React__default.Key[]) => void;
+    /**
+     * 获取展开的keys
+     */
+    getExpandedRowKeys: () => React__default.Key[];
+    /**
+     * 设置展开的keys
+     */
+    setExpandedRowKeys: (keys: React__default.Key[]) => void;
+    /**
+     * 展开指定行
+     */
+    expandRow: (key: React__default.Key) => void;
+    /**
+     * 收起指定行
+     */
+    collapseRow: (key: React__default.Key) => void;
+    /**
+     * 切换指定行展开状态
+     */
+    toggleExpandRow: (key: React__default.Key) => void;
     /**
      * 滚动到指定位置
      */
@@ -511,4 +581,4 @@ interface ICanvasTableRefHandle {
     clearFilter: () => void;
 }
 
-export { ColumnDataType, FilterConfig, IBadgeProps, ICanvasColumnType, ICanvasColumnsType, ICanvasRowSelection, ICanvasTableProps, ICanvasTableRefHandle, SortOrder };
+export { ColumnDataType, FilterConfig, IBadgeProps, ICanvasColumnType, ICanvasColumnsType, ICanvasRowSelection, ICanvasTableProps, ICanvasTableRefHandle, IExpandable, SortOrder };

package/dist/es/canvastable/utils/renderHelpers.js

@@ -0,0 +1,118 @@
+import { TEXT_PADDING, COLORS } from './constants.js';
+
+/**
+ * 渲染辅助工具函数
+ * 提供通用的渲染计算和绘制功能
+ */
+/**
+ * 计算文本X坐标（根据对齐方式）
+ */
+var calculateTextX = function (drawX, actualWidth, align, padding) {
+    if (align === void 0) { align = "left"; }
+    if (padding === void 0) { padding = TEXT_PADDING; }
+    if (align === "center") {
+        return drawX + actualWidth / 2;
+    }
+    else if (align === "right") {
+        return drawX + actualWidth - padding;
+    }
+    return drawX + padding;
+};
+/**
+ * 设置Canvas文本对齐方式
+ */
+var setTextAlign = function (ctx, align) {
+    if (align === void 0) { align = "left"; }
+    ctx.textAlign = align;
+};
+/**
+ * 计算固定列的右边界
+ */
+var calculateFixedColumnsRightEdge = function (columnRenderInfos, getColumnWidth) {
+    var rightEdge = 0;
+    columnRenderInfos.forEach(function (info, index) {
+        if (info.fixed) {
+            var actualWidth = getColumnWidth ? getColumnWidth(index) : info.width;
+            rightEdge = Math.max(rightEdge, info.fixedLeft + actualWidth);
+        }
+    });
+    return rightEdge;
+};
+/**
+ * 判断是否应该在Canvas中渲染
+ * 检查render函数的返回值类型
+ */
+var shouldRenderInCanvas = function (renderFn, cellValue, record, rowIndex, isSummaryRow) {
+    if (isSummaryRow === void 0) { isSummaryRow = false; }
+    // 合计行不应用 render 函数
+    if (isSummaryRow) {
+        return true;
+    }
+    // 如果没有 render 函数，在 Canvas 中渲染
+    if (!renderFn) {
+        return true;
+    }
+    var rendered = renderFn(cellValue, record, rowIndex);
+    // 如果返回的是字符串或数字，在 Canvas 中渲染
+    if (typeof rendered === "string" ||
+        typeof rendered === "number" ||
+        rendered === null ||
+        rendered === undefined) {
+        return true;
+    }
+    // 否则是自定义组件，应该在覆盖层渲染
+    return false;
+};
+var setupCellClip = function (params) {
+    var ctx = params.ctx, drawX = params.drawX, y = params.y, width = params.width, cellHeight = params.cellHeight, headerHeight = params.headerHeight, effectiveHeight = params.effectiveHeight, _a = params.fixedColumnsRightEdge, fixedColumnsRightEdge = _a === void 0 ? 0 : _a, isFixed = params.isFixed;
+    // 裁剪区域：确保不覆盖表头，从 headerHeight 开始
+    var clipY = Math.max(y, headerHeight);
+    // 计算单元格实际底部位置，并限制在可视区域内
+    var cellBottom = Math.min(y + cellHeight, effectiveHeight);
+    // 裁剪高度 = 单元格可见底部 - 裁剪起始位置
+    var clipHeight = Math.max(0, cellBottom - clipY);
+    // 对于非fixed列，还需要裁剪掉被fixed列遮挡的部分
+    var clipX = drawX;
+    var clipWidth = width;
+    if (!isFixed && fixedColumnsRightEdge > 0 && drawX < fixedColumnsRightEdge) {
+        // 调整裁剪区域，去掉被fixed列遮挡的部分
+        var overlap = fixedColumnsRightEdge - drawX;
+        if (overlap < width) {
+            clipX = fixedColumnsRightEdge;
+            clipWidth = width - overlap;
+        }
+    }
+    ctx.beginPath();
+    ctx.rect(clipX, clipY, clipWidth, clipHeight);
+    ctx.clip();
+    return { clipX: clipX, clipY: clipY, clipWidth: clipWidth, clipHeight: clipHeight };
+};
+var drawCellBackground = function (params) {
+    var ctx = params.ctx, clipX = params.clipX, clipY = params.clipY, clipWidth = params.clipWidth, clipHeight = params.clipHeight, isSelected = params.isSelected, isHover = params.isHover, isSummaryRow = params.isSummaryRow, isStriped = params.isStriped, rowIndex = params.rowIndex, customBgColor = params.customBgColor;
+    if (clipHeight > 0 && clipWidth > 0) {
+        var bgColor = void 0;
+        if (customBgColor) {
+            bgColor = customBgColor;
+        }
+        else if (isSelected) {
+            bgColor = COLORS.selectedBg;
+        }
+        else if (isSummaryRow) {
+            // 合计行使用表头背景色
+            bgColor = COLORS.headerBg;
+        }
+        else if (isHover) {
+            bgColor = COLORS.hoverBg;
+        }
+        else if (isStriped && rowIndex % 2 === 1) {
+            bgColor = COLORS.stripedBg;
+        }
+        else {
+            bgColor = COLORS.white;
+        }
+        ctx.fillStyle = bgColor;
+        ctx.fillRect(clipX, clipY, clipWidth, clipHeight);
+    }
+};
+
+export { calculateFixedColumnsRightEdge, calculateTextX, drawCellBackground, setTextAlign, setupCellClip, shouldRenderInCanvas };

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

@@ -102,10 +102,6 @@ interface IModalProps extends Omit<ModalProps, "onOk"> {
      * 最大高度
      */
     maxHeight?: number;
-    /**
-     * 默认宽度
-     */
-    defaultWidth?: string | number;
     /**
      * 默认高度
      */

package/dist/es/modal/modal.js

@@ -9,18 +9,18 @@ import useResizable from './useResizable.js';
 import myMessage from '../message/index.js';
 
 var Modal = function (_a, ref) {
-    var className = _a.className, defaultOpen = _a.defaultOpen, defaultTitle = _a.defaultTitle, defaultConfirmMsg = _a.defaultConfirmMsg, defaultConfirmOkText = _a.defaultConfirmOkText, defaultType = _a.defaultType, confirmPreHandle = _a.confirmPreHandle, confirmOnOk = _a.confirmOnOk, onOk = _a.onOk, footer = _a.footer, onOkValidate = _a.onOkValidate, _b = _a.isDrag, isDrag = _b === void 0 ? true : _b, _c = _a.isResize, isResize = _c === void 0 ? false : _c, minWidth = _a.minWidth, minHeight = _a.minHeight, maxWidth = _a.maxWidth, maxHeight = _a.maxHeight, defaultWidth = _a.defaultWidth, _d = _a.defaultHeight, defaultHeight = _d === void 0 ? 500 : _d, modalTitle = _a.title, modalRender = _a.modalRender, resetProps = __rest(_a, ["className", "defaultOpen", "defaultTitle", "defaultConfirmMsg", "defaultConfirmOkText", "defaultType", "confirmPreHandle", "confirmOnOk", "onOk", "footer", "onOkValidate", "isDrag", "isResize", "minWidth", "minHeight", "maxWidth", "maxHeight", "defaultWidth", "defaultHeight", "title", "modalRender"]);
+    var className = _a.className, defaultOpen = _a.defaultOpen, defaultTitle = _a.defaultTitle, defaultConfirmMsg = _a.defaultConfirmMsg, defaultConfirmOkText = _a.defaultConfirmOkText, defaultType = _a.defaultType, confirmPreHandle = _a.confirmPreHandle, confirmOnOk = _a.confirmOnOk, onOk = _a.onOk, footer = _a.footer, onOkValidate = _a.onOkValidate, _b = _a.isDrag, isDrag = _b === void 0 ? true : _b, _c = _a.isResize, isResize = _c === void 0 ? false : _c, minWidth = _a.minWidth, minHeight = _a.minHeight, maxWidth = _a.maxWidth, maxHeight = _a.maxHeight, defaultHeight = _a.defaultHeight, modalTitle = _a.title, modalRender = _a.modalRender, resetProps = __rest(_a, ["className", "defaultOpen", "defaultTitle", "defaultConfirmMsg", "defaultConfirmOkText", "defaultType", "confirmPreHandle", "confirmOnOk", "onOk", "footer", "onOkValidate", "isDrag", "isResize", "minWidth", "minHeight", "maxWidth", "maxHeight", "defaultHeight", "title", "modalRender"]);
     var classes = classNames("ztxk-modal", isResize && "ztxk-modal-resize", className);
     // 模态框基本属性
-    var _e = useState(defaultOpen), open = _e[0], setOpen = _e[1];
-    var _f = useState(defaultTitle), title = _f[0], setTitle = _f[1];
-    var _g = useState(), loading = _g[0], setLoading = _g[1];
+    var _d = useState(defaultOpen), open = _d[0], setOpen = _d[1];
+    var _e = useState(defaultTitle), title = _e[0], setTitle = _e[1];
+    var _f = useState(), loading = _f[0], setLoading = _f[1];
     // 二次确认框相关配置
-    var _h = useState(confirmOnOk ? true : false), isConfirm = _h[0], setIsConfirm = _h[1];
-    var _j = useState(defaultConfirmMsg), confirmMsg = _j[0], setConfirmMsg = _j[1];
-    var _k = useState(defaultConfirmOkText), confirmOkText = _k[0], setConfirmOkText = _k[1];
+    var _g = useState(confirmOnOk ? true : false), isConfirm = _g[0], setIsConfirm = _g[1];
+    var _h = useState(defaultConfirmMsg), confirmMsg = _h[0], setConfirmMsg = _h[1];
+    var _j = useState(defaultConfirmOkText), confirmOkText = _j[0], setConfirmOkText = _j[1];
     // 模态框类型
-    var _l = useState(defaultType), type = _l[0], setType = _l[1];
+    var _k = useState(defaultType), type = _k[0], setType = _k[1];
     var close = useCallback(function () {
         setOpen(false);
     }, []);
@@ -142,21 +142,21 @@ var Modal = function (_a, ref) {
             setConfirmMsg: setConfirmOkText,
         };
     });
-    var _m = useResizable({
+    var _l = useResizable({
         isResize: isResize,
         minWidth: minWidth,
         minHeight: minHeight,
         maxWidth: maxWidth,
         maxHeight: maxHeight,
-        defaultWidth: defaultWidth,
+        defaultWidth: resetProps.width,
         defaultHeight: defaultHeight,
         modalRender: modalRender,
-    }), resizableWidth = _m.width, resizableModalRender = _m.resizableModalRender;
-    var _o = useDraggable({
+    }), resizableWidth = _l.width, resizableModalRender = _l.resizableModalRender;
+    var _m = useDraggable({
         isDrag: isDrag,
         title: modalTitle || title,
         modalRender: modalRender,
-    }), dragTitle = _o.dragTitle, dragModalRender = _o.dragModalRender;
+    }), dragTitle = _m.dragTitle, dragModalRender = _m.dragModalRender;
     var finalWidth = isResize ? resizableWidth : resetProps.width || "70%";
     return (jsx(Modal$1, __assign({ open: open, onCancel: close, className: classes, okText: "\u4FDD\u5B58", onOk: footer ? undefined : onOkHandle, title: dragTitle, keyboard: false, maskClosable: false, confirmLoading: loading, cancelButtonProps: { loading: loading }, footer: footer, modalRender: function (modal) {
             var resized = resizableModalRender(modal);

package/dist/es/modal/useResizable.js

@@ -3,7 +3,7 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import React__default, { useState, useRef, useCallback } from 'react';
 
 var useResizable = function (options) {
-    var isResize = options.isResize, _a = options.minWidth, minWidth = _a === void 0 ? 400 : _a, _b = options.minHeight, minHeight = _b === void 0 ? 300 : _b, maxWidth = options.maxWidth, maxHeight = options.maxHeight, _c = options.defaultWidth, defaultWidth = _c === void 0 ? "70%" : _c, _d = options.defaultHeight, defaultHeight = _d === void 0 ? "auto" : _d;
+    var isResize = options.isResize, _a = options.minWidth, minWidth = _a === void 0 ? 100 : _a, _b = options.minHeight, minHeight = _b === void 0 ? 100 : _b, maxWidth = options.maxWidth, maxHeight = options.maxHeight, _c = options.defaultWidth, defaultWidth = _c === void 0 ? "70%" : _c, _d = options.defaultHeight, defaultHeight = _d === void 0 ? "auto" : _d;
     var _e = useState({
         width: defaultWidth,
         height: defaultHeight,

package/dist/es/table/excel.js

@@ -551,7 +551,7 @@ function applyExcelStyles(worksheet, data, numKeys, dateKeys, columns, headerRow
                 var cellValue = rowData[dateKey.dataIndex];
                 if (cellValue) {
                     try {
-                        var date = dayjs(cellValue).toDate();
+                        var date = dayjs(String(cellValue)).toDate();
                         cell.value = date;
                         cell.numFmt = columns[colIndex].dateFormat;
                     }

package/package.json

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