e-virt-table 1.2.27 → 1.2.29

package/dist/lib/Overlayer.js

@@ -1,3 +1,4 @@
+import { throttle } from './util';
 export default class Overlayer {
     constructor(ctx) {
         Object.defineProperty(this, "ctx", {
@@ -6,13 +7,67 @@ export default class Overlayer {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "observer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.ctx = ctx;
+        this.observer = new MutationObserver(throttle(() => {
+            // 当 DOM 发生变化时执行的回调
+            const elements = this.ctx.overlayerElement.querySelectorAll('[data-auto-height="true"]');
+            const map = new Map();
+            elements.forEach((element) => {
+                const rowIndex = Number(element.getAttribute('data-row-index'));
+                const colIndex = Number(element.getAttribute('data-col-index'));
+                if (isNaN(rowIndex)) {
+                    return;
+                }
+                if (isNaN(colIndex)) {
+                    return;
+                }
+                if (!(element instanceof HTMLElement)) {
+                    return;
+                }
+                if (element.offsetWidth === 0) {
+                    return;
+                }
+                const key = `${rowIndex}\u200b_${colIndex}`;
+                map.set(key, Math.round(element.offsetHeight));
+            });
+            const overlayerAutoHeightMap = this.ctx.database.getOverlayerAutoHeightMap();
+            const isNeedUpdate = !this.arerMapsEqual(overlayerAutoHeightMap, map);
+            if (isNeedUpdate) {
+                this.ctx.database.setOverlayerAutoHeightMap(map);
+                if (overlayerAutoHeightMap.size === 0 && map.size === 0) {
+                    return;
+                }
+                this.ctx.emit('draw');
+            }
+        }, 16.67));
+        this.observer.observe(this.ctx.overlayerElement, { childList: true, subtree: true, attributes: true });
+    }
+    arerMapsEqual(m1, m2) {
+        if (m1.size !== m2.size)
+            return false;
+        for (let [key, value] of m1) {
+            if (!m2.has(key))
+                return false;
+            if (m2.get(key) !== value)
+                return false;
+        }
+        return true;
     }
     draw() {
         const overlayer = this.getContainer();
         this.ctx.emit('overlayerChange', overlayer);
     }
     destroy() {
+        // 清除MutationObserver
+        if (this.observer) {
+            this.observer.disconnect();
+        }
         this.ctx.emit('overlayerChange', {
             style: {},
             views: [],

package/dist/lib/Overlayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"Overlayer.js","sourceRoot":"","sources":["../../src/Overlayer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Overlayer.js","sourceRoot":"","sources":["../../src/Overlayer.ts"],"names":[],"mappings":"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"}

package/dist/lib/Paint.d.ts

@@ -1,4 +1,4 @@
-import { Align, VerticalAlign } from './types';
+import { Align, LineClampType, VerticalAlign } from './types';
 export type LineOptions = {
     lineCap?: CanvasLineCap;
     lineDash?: number[];
@@ -27,12 +27,27 @@ export type DrawTextOptions = {
     align?: Align;
     padding?: number;
     verticalAlign?: VerticalAlign;
+    autoRowHeight?: boolean;
+    lineHeight?: number;
+    maxLineClamp?: LineClampType;
+    offsetLeft?: number;
+    offsetRight?: number;
+    textCallback?: (textInfo: TextInfo) => void;
+};
+export type TextInfo = {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    left: number;
+    right: number;
+    top: number;
+    bottom: number;
 };
 export declare class Paint {
     private ctx;
     constructor(target: HTMLCanvasElement);
     scale(dpr: number): void;
-    measureTextWidth(text: string, font: string): number;
     save(): void;
     restore(): void;
     translate(x: number, y: number): void;
@@ -63,6 +78,21 @@ export declare class Paint {
      * @returns 是否溢出
      */
     drawText(text: string | undefined, x: number, y: number, width: number, height: number, options?: DrawTextOptions): boolean;
+    /**
+     * 将文本按宽度换行
+     * @param text
+     * @param maxWidth
+     * @returns
+     */
+    private wrapText;
+    /**
+     * 计算文本自适应高度
+     * @param text
+     * @param width
+     * @param options
+     * @returns 计算出的高度
+     */
+    calculateTextHeight(text: string | undefined, width: number, options?: DrawTextOptions): number;
     handleEllipsis(text: string, width: number, padding?: number, font?: string): {
         _text: string;
         ellipsis: boolean;

package/dist/lib/Paint.js

@@ -15,10 +15,6 @@ export class Paint {
         this.ctx.setTransform(1, 0, 0, 1, 0, 0);
         this.ctx.scale(dpr, dpr);
     }
-    measureTextWidth(text, font) {
-        this.ctx.font = font;
-        return this.ctx.measureText(text).width;
-    }
     save() {
         this.ctx.save();
     }
@@ -85,6 +81,7 @@ export class Paint {
                 console.error('Invalid side specified for shadow');
                 break;
         }
+        this.ctx.restore();
     }
     // 绘制线条
     drawLine(points, options) {
@@ -168,41 +165,197 @@ export class Paint {
      */
     drawText(text = '', x, y, width, height, options = {}) {
         this.ctx.save();
-        const { font = '12px Arial', align = 'center', color = '#495060', padding = 0, verticalAlign = 'middle', } = options;
+        const { font = '12px Arial', align = 'center', color = '#495060', padding = 0, verticalAlign = 'middle', maxLineClamp = 1, autoRowHeight = false, offsetLeft = 0, offsetRight = 0, } = options;
         this.ctx.font = font;
         this.ctx.fillStyle = color;
-        this.ctx.textBaseline = verticalAlign;
         this.ctx.textAlign = align;
-        let yPos = 0;
-        if (verticalAlign === 'top') {
-            yPos = y + padding;
+        const fontSize = parseInt(font.match(/\d+/)?.[0] || '12');
+        const lineHeight = fontSize * (options.lineHeight || 1.2); // 默认行高为字体大小的1.2倍
+        const availableWidth = width - padding * 2 - offsetLeft - offsetRight;
+        const ellipsesWidth = this.ctx.measureText('...').width;
+        let textEllipsis = false;
+        // 如果宽度小于省略号宽度,
+        if (width <= ellipsesWidth + padding * 2 + offsetLeft + offsetRight) {
+            this.ctx.restore();
+            textEllipsis = true;
+            return textEllipsis;
         }
-        else if (verticalAlign === 'bottom') {
-            yPos = y + height - padding;
+        // 计算总行数,向上取整round
+        const maxTextLine = Math.round((height - 2 * padding) / lineHeight);
+        // 将文本按可用宽度分割成行,如果为1直接就不计算了,直接绘制
+        let lines = this.wrapText(text, availableWidth);
+        let totalTextLine = Math.min(lines.length, Math.max(maxTextLine, 1));
+        if (maxLineClamp === 'auto' && autoRowHeight) {
+            totalTextLine = lines.length;
+        }
+        else if (typeof maxLineClamp === 'number' && maxLineClamp < maxTextLine) {
+            totalTextLine = maxLineClamp;
         }
         else {
-            yPos = y + (height + 1) / 2;
+            // 处理边界问题
+            if (maxLineClamp === 1 && !autoRowHeight) {
+                lines = [text];
+                totalTextLine = 1;
+            }
+            if (maxLineClamp === 'auto' && maxTextLine === 1) {
+                lines = [text];
+                totalTextLine = 1;
+            }
+        }
+        // 计算起始Y位置
+        let startY = y + padding;
+        const totalTextHeight = Math.round(totalTextLine * lineHeight);
+        if (verticalAlign === 'middle') {
+            startY = y + (height - totalTextHeight) / 2;
         }
-        let xPos = 0;
-        if (align === 'left') {
-            xPos = x + padding;
+        else if (verticalAlign === 'bottom') {
+            startY = y + height - totalTextHeight - padding;
+        }
+        // 计算起始X位置
+        let startX = x + padding + offsetLeft;
+        if (align === 'center') {
+            startX = x + width / 2;
         }
         else if (align === 'right') {
-            xPos = x + width - padding;
+            startX = x + width - padding - offsetRight;
+        }
+        // 绘制每一行用for循环
+        for (let i = 0; i < lines.length; i++) {
+            const lineText = lines[i];
+            const lineY = startY + i * lineHeight;
+            this.ctx.textBaseline = 'top';
+            // 如果设置了lineClamp，则只绘制lineClamp行
+            if (i === totalTextLine - 1) {
+                const { _text, ellipsis } = this.handleEllipsis(lineText, width, padding, font);
+                this.ctx.fillText(_text, startX, lineY);
+                textEllipsis = ellipsis;
+                break;
+            }
+            this.ctx.fillText(lineText, startX, lineY);
+        }
+        // 文字信息回调，用于画跟随图标的
+        if (options.textCallback && lines.length) {
+            const textMaxWidth = Math.round(this.ctx.measureText(lines[0]).width);
+            let left = startX;
+            let right = startX + textMaxWidth;
+            if (align === 'center') {
+                left = startX - textMaxWidth / 2;
+                right = startX + textMaxWidth / 2;
+            }
+            else if (align === 'right') {
+                left = startX - textMaxWidth;
+                right = startX;
+            }
+            const textInfo = {
+                x: startX,
+                y: startY,
+                width: textMaxWidth,
+                height: totalTextHeight,
+                left,
+                right,
+                top: startY,
+                bottom: startY + totalTextHeight,
+            };
+            options.textCallback(textInfo);
+        }
+        this.ctx.restore();
+        return textEllipsis;
+    }
+    /**
+     * 将文本按宽度换行
+     * @param text
+     * @param maxWidth
+     * @returns
+     */
+    wrapText(text, maxWidth) {
+        if (!text)
+            return [''];
+        const lines = [];
+        const paragraphs = text.split('\n');
+        for (const paragraph of paragraphs) {
+            if (paragraph === '') {
+                lines.push('');
+                continue;
+            }
+            const words = paragraph.split('');
+            let currentLine = '';
+            for (const word of words) {
+                const testLine = currentLine + word;
+                const testWidth = this.ctx.measureText(testLine).width;
+                if (testWidth <= maxWidth) {
+                    currentLine = testLine;
+                }
+                else {
+                    if (currentLine) {
+                        lines.push(currentLine);
+                        currentLine = word;
+                    }
+                    else {
+                        // 单个字符也超出宽度，强制换行
+                        lines.push(word);
+                        currentLine = '';
+                    }
+                }
+            }
+            if (currentLine) {
+                lines.push(currentLine);
+            }
+        }
+        // 处理溢出刚好和...溢出问题
+        if (lines.length >= 1) {
+            const lastLine = lines[lines.length - 1];
+            const { ellipsis } = this.handleEllipsis(lastLine, maxWidth, 0, this.ctx.font);
+            if (ellipsis) {
+                const newLine = lastLine.slice(0, -1);
+                lines[lines.length - 1] = newLine;
+                lines.push(lastLine.slice(-1));
+            }
+        }
+        return lines.length > 0 ? lines : [''];
+    }
+    /**
+     * 计算文本自适应高度
+     * @param text
+     * @param width
+     * @param options
+     * @returns 计算出的高度
+     */
+    calculateTextHeight(text = '', width, options = {}) {
+        const { font = '12px Arial', padding = 0, align = 'center', color = '#495060', maxLineClamp = 1 } = options;
+        this.ctx.save();
+        this.ctx.font = font;
+        this.ctx.fillStyle = color;
+        this.ctx.textAlign = align;
+        // // 获取字体高度
+        const fontSize = parseInt(font.match(/\d+/)?.[0] || '12');
+        const lineHeight = fontSize * (options.lineHeight || 1.2); // 默认行高为字体大小的1.2倍
+        // 将文本按可用宽度分割成行
+        const availableWidth = width - padding * 2;
+        const lines = this.wrapText(text, availableWidth);
+        // 计算总行数
+        let totalLines = 1;
+        if (maxLineClamp === 'auto') {
+            totalLines = lines.length;
         }
         else {
-            xPos = x + width / 2;
+            if (lines.length > maxLineClamp) {
+                totalLines = maxLineClamp;
+            }
+            else {
+                totalLines = lines.length;
+            }
         }
-        const { _text, ellipsis } = this.handleEllipsis(text, width, padding, font);
-        this.ctx.fillText(_text, xPos, yPos);
         this.ctx.restore();
-        return ellipsis;
+        // 计算总高度：行数 * 行高 + 上下padding
+        return Math.max(Math.floor(totalLines * lineHeight + padding * 2), Math.floor(fontSize + padding * 2));
     }
     handleEllipsis(text, width, padding = 0, font = '12px Arial') {
+        this.ctx.save();
         let ellipsis = false;
         let _text = text;
         this.ctx.font = font;
         if (text === null || text === undefined || text === '') {
+            this.ctx.restore();
             return {
                 _text: '',
                 ellipsis,
@@ -211,24 +364,29 @@ export class Paint {
         const ellipsesWidth = this.ctx.measureText('...').width;
         // 如果宽度小于省略号宽度，则不进行省略，直接返回空字符串
         if (width <= ellipsesWidth + padding * 2) {
+            this.ctx.restore();
             return {
                 _text: '',
                 ellipsis: true,
             };
         }
         const textWidth = this.ctx.measureText(text).width;
-        if (textWidth && textWidth + ellipsesWidth >= width - padding * 2) {
+        const lineWidth = width - padding * 2;
+        // 单行文本省略
+        if (textWidth && textWidth + ellipsesWidth >= lineWidth) {
             ellipsis = true;
             // text字符截取并添加省略号
             let textLength = 0;
             for (let i = 0; i < text.length; i++) {
                 textLength += this.ctx.measureText(text[i]).width;
-                if (textLength >= width - padding * 2 - ellipsesWidth) {
+                if (textLength >= lineWidth - ellipsesWidth) {
                     _text = text.slice(0, i) + '...';
+                    ellipsis = true;
                     break;
                 }
             }
         }
+        this.ctx.restore();
         return {
             _text,
             ellipsis,

package/dist/lib/Paint.js.map

@@ -1 +1 @@
-{"version":3,"file":"Paint.js","sourceRoot":"","sources":["../../src/Paint.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Paint.js","sourceRoot":"","sources":["../../src/Paint.ts"],"names":[],"mappings":"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"}

package/dist/lib/Row.d.ts

@@ -10,12 +10,15 @@ export default class Row {
     cells: Cell[];
     fixedCells: Cell[];
     noFixedCells: Cell[];
+    calculatedHeightCells: Cell[];
     rowIndex: number;
     rowKey: string;
     rowType: RowType;
     data: any;
+    calculatedHeight: number;
     constructor(ctx: Context, rowIndex: number, x: number | undefined, y: number | undefined, width: number | undefined, height: number | undefined, data: any, rowType?: RowType);
     update(): void;
+    updateCalculatedHeight(): void;
     drawCenter(): void;
     drawFixed(): void;
     drawContainer(): void;

package/dist/lib/Row.js

@@ -49,6 +49,12 @@ export default class Row {
             writable: true,
             value: []
         });
+        Object.defineProperty(this, "calculatedHeightCells", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
         Object.defineProperty(this, "rowIndex", {
             enumerable: true,
             configurable: true,
@@ -73,6 +79,12 @@ export default class Row {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "calculatedHeight", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: -1
+        });
         this.ctx = ctx;
         this.x = x;
         this.y = y;
@@ -89,6 +101,7 @@ export default class Row {
         const cells = [];
         const fixedCells = [];
         const noFixedCells = [];
+        const calculatedHeightCells = [];
         header.renderLeafCellHeaders.forEach((header) => {
             const cell = new Cell(this.ctx, this.rowIndex, header.colIndex, header.x, this.y, header.width, this.height, header.column, this.data, this.rowType);
             if (cell.fixed) {
@@ -98,11 +111,21 @@ export default class Row {
                 noFixedCells.push(cell);
             }
             cells.push(cell);
+            if (cell.autoRowHeight) {
+                calculatedHeightCells.push(cell);
+            }
         });
         this.cells = cells;
+        this.calculatedHeightCells = calculatedHeightCells;
         this.fixedCells = fixedCells;
         this.noFixedCells = noFixedCells;
     }
+    updateCalculatedHeight() {
+        const heights = this.calculatedHeightCells.map((cell) => {
+            return cell.getAutoHeight();
+        });
+        this.calculatedHeight = heights.length ? Math.max(...heights) : -1;
+    }
     drawCenter() {
         this.noFixedCells.forEach((cell) => {
             cell.draw();

package/dist/lib/Row.js.map

@@ -1 +1 @@
-{"version":3,"file":"Row.js","sourceRoot":"","sources":["../../src/Row.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Row.js","sourceRoot":"","sources":["../../src/Row.ts"],"names":[],"mappings":"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"}

package/dist/lib/Selector.js

@@ -767,6 +767,7 @@ export default class Selector {
                     rows.push(this.ctx.database.getRowDataItemForRowKey(rowKey));
                 });
                 this.ctx.emit('pasteChange', changeList, rows);
+                this.ctx.emit('draw');
             })
                 .catch((error) => {
                 console.error('Failed to get the clipboard content:', error);