@hailin-zheng/editor-core 2.1.19 → 2.1.20

package/index-cjs.js

@@ -275,8 +275,6 @@ class RenderObject {
         this.margin = new MarginProps();
         this.padding = new PaddingProps();
     }
-    pagePaintCompleted(e) {
-    }
     destroy() {
         //this.parent = null;
         //this.margin = null;
@@ -2252,6 +2250,32 @@ class PictureProps extends INotifyPropertyChanged {
         return props;
     }
 }
+class SVGProps extends INotifyPropertyChanged {
+    title;
+    width = 5;
+    height = 5;
+    value;
+    clone(dest) {
+        const clone = dest ?? new SVGProps();
+        super.cloneAttachedProperty(clone);
+        clone.width = this.width;
+        clone.height = this.height;
+        clone.value = this.value;
+        clone.title = this.title;
+        return clone;
+    }
+    getSerializeProps(viewOptions) {
+        const props = {
+            width: this.width,
+            height: this.height,
+            value: this.value,
+        };
+        if (this.title) {
+            props['title'] = this.title;
+        }
+        return props;
+    }
+}
 class DataDecorateProps extends INotifyPropertyChanged {
     content;
     size;
@@ -2806,15 +2830,7 @@ class CommsContainerElement extends BlockContainerElement {
 class CommsContainerRenderObject extends BlockContainerRenderObject {
     //批注内容是否已经重组,只要重新绘制的时候组合一次即可
     isMeasureComm;
-    selectedSet;
-    commentRangeStatus = [];
     commsMarks = [];
-    render(e) {
-        if (this.rect.height === 0) {
-            return;
-        }
-        e.render.contentContext.strokeRect(e.position.x, e.position.y, this.rect.width, this.rect.height, 'black', 0.5);
-    }
     clone() {
         const clone = new CommsContainerRenderObject(this.element);
         clone.rect = ElementUtil.cloneRect(this.rect);
@@ -2895,9 +2911,6 @@ class DataDecorateElement extends LeafElement {
     }
 }
 class DataDecorateRenderObject extends LeafRenderObject {
-    render(e) {
-        this.renderDecorRect(e.render, e.position);
-    }
     renderDecorRect(ctx, position) {
         if (ctx.drawMode === 'print') {
             return;
@@ -3107,10 +3120,6 @@ class ParagraphElement extends BlockContentElement {
     }
 }
 class ParagraphRenderObject extends MuiltBlockLineRenderObject {
-    render(e) {
-        e.nextRender();
-        this.drawProjectNumber(e.render, e.docCtx.viewOptions, e);
-    }
     /**
      * 绘制项目符号
      */
@@ -3188,8 +3197,6 @@ class ParagraphLineRectRenderObject extends BlockLineRectRenderObject {
     baseTopLine = 0;
     baseBottomLine = 0;
     startX = 0;
-    render(e) {
-    }
     clone() {
         const cloneRender = new ParagraphLineRectRenderObject(this.element);
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
@@ -3391,21 +3398,6 @@ class DocumentRenderObject extends BlockContainerRenderObject {
     }
     headerLine;
     footerLine;
-    render(e) {
-        const { render, position, docCtx: { viewOptions } } = e;
-        const { width: docWidth, height: docHeight } = viewOptions.docPageSettings;
-        render.overlaysContext.fillRect(position.x, position.y, docWidth, this.rect.height, 'white', 5, 'black');
-        e.render.tran(() => {
-            e.render.contentContext.ctx.fillStyle = e.docCtx.viewOptions.defaultColor;
-            this.checkPrintMode(e);
-            e.nextRender();
-            this.drawCopyRight(viewOptions, render, position);
-            this.drawDocPageNum(render, viewOptions, position);
-            //绘制文档边距线
-            this.drawMarginLine(position, render, docWidth, docHeight);
-            this.drawWatermark(render, viewOptions, position);
-        });
-    }
     /**
      * 打印模式检查
      * 如果是续打模式，需要进行裁剪打印范围，页眉页脚都不需要打印
@@ -3841,45 +3833,6 @@ function getCurrOptions(ele) {
     return doc?.viewOptions;
 }
 class DataElementRenderObject extends InlineGroupRenderObject {
-    render(e) {
-        const { render, position, docCtx: { viewOptions } } = e;
-        this.paintPos = e.position;
-        //数据元不打印
-        if (!this.element.props.printable && render.drawMode === 'print') {
-            return;
-        }
-        render.contentContext.tran(() => {
-            //绘制数据元区域底色
-            let bgColor = '';
-            if (this.element.isMouseenter) {
-                bgColor = this.element.props.editable ? viewOptions.dataEleOverlaysColor : viewOptions.dataEleReadOnlyOverlayColor;
-            }
-            if (this.element.isFocused) {
-                bgColor = e.docCtx.viewOptions.dataEleFocusedBgColor;
-            }
-            if (this.element.errorTip) {
-                bgColor = viewOptions.dataEleErrorBgColor;
-            }
-            if (bgColor) {
-                render.contentContext.fillRect(position.x, position.y, this.rect.width, this.rect.height, bgColor);
-            }
-            if (this.element.props.secretBrowse && viewOptions.secretBrowse) {
-                render.contentContext.ctx.filter = "blur(10px)";
-            }
-            if (this.element.props.underline) {
-                const y = position.y + 2 + this.rect.height;
-                render.contentContext.strokeLines([{ x: position.x, y }, {
-                        x: position.x + this.rect.width,
-                        y
-                    }], 1, '#595959');
-            }
-            e.nextRender();
-            this.drawCaption(e);
-        });
-        e.render.onRenderCompleted.subscribe(() => {
-            drawDecorator(e, this);
-        });
-    }
     exportHTML(event) {
         const node = super.exportHTML(event);
         exportDecoratorHTML(event, this);
@@ -4165,15 +4118,6 @@ class DocumentBodyElement extends BlockContainerElement {
     }
 }
 class DocumentBodyRenderObject extends MuiltBlockLineRenderObject {
-    render(e) {
-        const { render, position } = e;
-        render.tran(() => {
-            if (this.element.disableClick && render.drawMode === 'view') {
-                render.contentContext.setGlobalAlpha(0.5);
-            }
-            e.nextRender();
-        });
-    }
     clone(cloneData = true) {
         const cloneRender = new DocumentBodyRenderObject(this.element);
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
@@ -4243,22 +4187,6 @@ class DocumentFooterElement extends BlockContainerElement {
     }
 }
 class DocumentFooterRenderObject extends BlockContainerRenderObject {
-    render(e) {
-        const { render, position } = e;
-        render.tran(() => {
-            //判断页眉是否为输入内容
-            const isFooterEmpty = ElementUtil.checkEmptyRenderContent(this);
-            if (this.element.disableClick && render.drawMode === 'view') {
-                if (isFooterEmpty) {
-                    render.contentContext.setGlobalAlpha(0);
-                }
-                else {
-                    render.contentContext.setGlobalAlpha(0.5);
-                }
-            }
-            e.nextRender();
-        });
-    }
     clone() {
         const cloneRender = new DocumentFooterRenderObject(this.element);
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
@@ -4339,27 +4267,6 @@ class DocumentHeaderElement extends BlockContainerElement {
     }
 }
 class DocumentHeaderRenderObject extends BlockContainerRenderObject {
-    render(e) {
-        const { render, position } = e;
-        render.tran(() => {
-            //判断页眉是否为输入内容
-            const isHeaderEmpty = ElementUtil.checkEmptyRenderContent(this);
-            //存在输入内容时，绘制页眉-页体分割线
-            if (!isHeaderEmpty || !this.element.disableClick) {
-                const headerLineY = this.rect.height;
-                render.contentContext.drawHoriLine(position.x, position.y + headerLineY, this.rect.width, 'black', 0.5);
-            }
-            if (this.element.disableClick && render.drawMode === 'view') {
-                if (isHeaderEmpty) {
-                    render.contentContext.setGlobalAlpha(0);
-                }
-                else {
-                    render.contentContext.setGlobalAlpha(0.5);
-                }
-            }
-            e.nextRender();
-        });
-    }
     clone() {
         const cloneRender = new DocumentHeaderRenderObject(this.element);
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
@@ -4439,13 +4346,6 @@ class PSymbolElement extends LeafElement {
     }
 }
 class PSymbolRenderObject extends LeafRenderObject {
-    render(e) {
-        const { render, position } = e;
-        if (render.drawMode === 'print' || !e.docCtx.viewOptions.showParaSymbol) {
-            return;
-        }
-        render.contentContext.drawText('↩', this.element.textProps, position.x, position.y, 20, this.rect.height);
-    }
     exportHTML(event) {
         if (!event.options.showEnterSymbol || event.mode === 'print') {
             return null;
@@ -4558,22 +4458,6 @@ class TableCellElement extends BlockContainerElement {
     }
 }
 class TableCellRenderObject extends InlineMuiltBlockLineRenderObject {
-    render(e) {
-        const { render, position } = e;
-        render.tran(() => {
-            render.contentContext.clip(position.x, position.y, this.rect.width, this.rect.height);
-            const { hMerge, vMerge, backgroundColor, diagonal } = this.element.props;
-            if (hMerge === 'continue' || vMerge === 'continue') {
-                render.contentContext.setGlobalAlpha(0);
-                render.overlaysContext.setGlobalAlpha(0);
-            }
-            if (backgroundColor && this.rect.width && this.rect.height) {
-                render.contentContext.fillRect(position.x, position.y, this.rect.width, this.rect.height, backgroundColor);
-            }
-            this.renderDiagonal(render, diagonal, position);
-            e.nextRender();
-        });
-    }
     /**
      * 绘制对角线
      * @private
@@ -4742,8 +4626,6 @@ class TableRowRenderObject extends MuiltBlockLineRenderObject {
     remeasureState = true;
     //当前行是否存在合并单元格
     hasMergeCells = undefined;
-    render(e) {
-    }
     clone() {
         const cloneRender = new TableRowRenderObject(this.element);
         cloneRender.remeasureState = this.remeasureState;
@@ -4772,17 +4654,6 @@ class DocumentContainerRender extends BlockContainerRenderObject {
     constructor() {
         super(null);
     }
-    render(e) {
-        const { render, nextRender, docCtx: { viewOptions } } = e;
-        const { viewSettings, docPageSettings, viewBackcolor, scale } = viewOptions;
-        render.clear();
-        //render.overlaysContext.fillRect(0,  0, viewSettings.width, viewSettings.height, viewBackcolor);
-        render.tran(() => {
-            render.overlaysContext.ctx.scale(scale, scale);
-            render.contentContext.ctx.scale(scale, scale);
-            nextRender();
-        });
-    }
     clone() {
         throw new Error("Method not implemented.");
     }
@@ -4899,17 +4770,6 @@ class TextGroupElement extends LeafElement {
 }
 class TextGroupRenderObject extends LeafRenderObject {
     textMeasures;
-    render(e) {
-        const { render, position } = e;
-        //null-text不打印
-        if (render.drawMode === 'print' && this.element.isDecorate) {
-            return;
-        }
-        if (this.element.props.border) {
-            render.contentContext.strokeRect(position.x, position.y, this.rect.width, this.rect.height);
-        }
-        render.contentContext.drawTextUnits(this, position.x, position.y + (this.rect.height - this.element.props.fontSize) / 2);
-    }
     constructor(element) {
         super(element);
     }
@@ -6625,56 +6485,6 @@ class TableRenderObject extends MuiltBlockLineRenderObject {
     setRenderWidth(maxWidth) {
         super.setRenderWidth(maxWidth);
     }
-    render(e) {
-        const { render, position } = e;
-        //绘制表格线
-        const border = this.element.props.border;
-        if (border === 'none') {
-            return;
-        }
-        const lineDash = border === 'dashed' ? [2, 2] : [];
-        for (let i = 0; i < this.length; i++) {
-            const rowRender = this.getChild(i);
-            const rowPos = { x: rowRender.rect.x + position.x, y: rowRender.rect.y + position.y };
-            for (let j = 0; j < rowRender.length; j++) {
-                const cellRender = rowRender.getChild(j);
-                const cellPos = { x: cellRender.rect.x + rowPos.x, y: cellRender.rect.y + rowPos.y };
-                //绘制单元格上边框
-                if (i === 0) {
-                    //ctx.contentContext.fillRect(cellPos.x, cellPos.y, cellRender.rect.width, 1);
-                    render.contentContext.fillLines([{ x: cellPos.x, y: cellPos.y }, {
-                            x: cellPos.x + cellRender.rect.width,
-                            y: cellPos.y
-                        }], 1, '#000', lineDash);
-                    //this.drawLine(ctx, { x: cellPos.x, y: cellPos.y }, { x: cellPos.x + cellRender.rect.width, y: cellPos.y });
-                }
-                //绘制左边框
-                if (j === 0) {
-                    //ctx.contentContext.fillRect(cellPos.x, cellPos.y, 1, cellRender.rect.height);
-                    render.contentContext.fillLines([{ x: cellPos.x, y: cellPos.y }, {
-                            x: cellPos.x,
-                            y: cellPos.y + cellRender.rect.height
-                        }], 1, '#000', lineDash);
-                    //this.drawLine(ctx, { x: cellPos.x, y: cellPos.y }, { x: cellPos.x, y: cellPos.y + cellRender.rect.height });
-                }
-                //绘制右边框
-                //ctx.contentContext.fillRect(cellPos.x + cellRender.rect.width, cellPos.y, 1, cellRender.rect.height);
-                render.contentContext.fillLines([{
-                        x: cellPos.x + cellRender.rect.width,
-                        y: cellPos.y
-                    }, { x: cellPos.x + cellRender.rect.width, y: cellPos.y + cellRender.rect.height }], 1, '#000', lineDash);
-                //this.drawLine(ctx, { x: cellPos.x + cellRender.rect.width, y: cellPos.y }, { x: cellPos.x + cellRender.rect.width, y: cellPos.y + cellRender.rect.height });
-                //绘制下边框
-                //ctx.contentContext.fillRect(cellPos.x, cellPos.y + cellRender.rect.height, cellRender.rect.width, 1);
-                render.contentContext.fillLines([{
-                        x: cellPos.x,
-                        y: cellPos.y + cellRender.rect.height
-                    }, { x: cellPos.x + cellRender.rect.width, y: cellPos.y + cellRender.rect.height }], 1, '#000', lineDash);
-                //this.drawLine(ctx, { x: cellPos.x, y: cellPos.y + cellRender.rect.height }, { x: cellPos.x + cellRender.rect.width, y: cellPos.y + cellRender.rect.height });
-                //cellRender.beginRender(ctx, { x: position.x + cellRender.offsetX, y: position.y + cellRender.offsetY });
-            }
-        }
-    }
     exportTableBorder() {
         //绘制表格线
         const border = this.element.props.border;
@@ -6959,10 +6769,7 @@ class CheckBoxFactory extends ElementFactory {
     }
 }
 class CheckBoxRenderObject extends LeafRenderObject {
-    render(e) {
-        e.render.contentContext.drawCheckBox(e.position.x + 2, e.position.y, this.element.props.size, this.element.props.size, this.element.props.isChecked);
-    }
-    clone(cloneData = true) {
+    clone() {
         const clone = new CheckBoxRenderObject(this.element);
         clone.rect = ElementUtil.cloneRect(this.rect);
         return clone;
@@ -7061,34 +6868,6 @@ class CommContentElement extends CommContentBaseElement {
     }
 }
 class CommContentRenderObject extends CommContentBaseRenderObject {
-    render(e) {
-        let borderColor = this.element.focus ? '#fa8c16' : '#ffd591';
-        e.render.contentContext.strokeRect(e.position.x, e.position.y, this.rect.width, this.rect.height, borderColor);
-        e.render.contentContext.fillRect(e.position.x, e.position.y, 8, this.rect.height, '#871400');
-        const docRender = ElementUtil.getParentRender(this.commMarkRender.render, DocumentRenderObject);
-        //获取审阅标记的绘制坐标
-        let commMarkPos = ElementUtil.getRenderAbsolutePaintPos(this.commMarkRender.render, {
-            x: 0,
-            y: -e.docCtx.viewOptions.pageOffset.y
-        });
-        const commMarkLinePos = ElementUtil.getParaLinePos(this.commMarkRender.render, commMarkPos);
-        commMarkPos.y = commMarkLinePos.y + 2;
-        const docRenderPos = ElementUtil.getRenderAbsolutePaintPos(docRender, {
-            x: 0,
-            y: -e.docCtx.viewOptions.pageOffset.y
-        });
-        const marginLeft = commMarkPos.x - docRenderPos.x - docRender.padding.left;
-        const marginRight = e.docCtx.viewOptions.docPageSettings.width - marginLeft - docRender.padding.right * 2;
-        e.render.overlaysContext.drawDashLine([commMarkPos, {
-                x: commMarkPos.x + marginRight,
-                y: commMarkPos.y
-            }], [1, 1], 'red');
-        e.render.overlaysContext.drawDashLine([{
-                x: commMarkPos.x + marginRight,
-                y: commMarkPos.y
-            }, e.position], [1, 1], 'red');
-        this.renderTitle(e.render, e.position);
-    }
     exportHTML(event) {
         const t = super.exportHTML(event);
         t.children = [];
@@ -7359,16 +7138,6 @@ class CommentElement extends LeafElement {
     }
 }
 class CommentRenderObject extends LeafRenderObject {
-    //renderPos!: Position;
-    render(e) {
-        // if (!e.docCtx.viewOptions.showReviewWindow) {
-        //     return;
-        // }
-        // this.renderPos = e.position;
-        // const paraLinePos = ElementUtil.getParaLinePos(this, {x: e.position.x, y: e.position.y});
-        // const color = '#ff4d4f';
-        // e.render.contentContext.fillRect(e.position.x - 1, paraLinePos.y, 2, paraLinePos.height, color)
-    }
     exportHTML(event) {
         const renderPos = { ...event.relativePagePos };
         const paraLinePos = ElementUtil.getParaLinePos(this, { x: renderPos.x, y: renderPos.y });
@@ -7534,31 +7303,6 @@ class ValidateElement extends CommContentBaseElement {
     }
 }
 class ValidateRenderObject extends CommContentBaseRenderObject {
-    render(e) {
-        let borderColor = this.element.focus ? '#fa8c16' : '#ffd591';
-        e.render.contentContext.strokeRect(e.position.x, e.position.y, this.rect.width, this.rect.height, borderColor);
-        e.render.contentContext.fillRect(e.position.x, e.position.y, 8, this.rect.height, '#871400');
-        const docRender = ElementUtil.getParentRender(this.commMarkRender.render, DocumentRenderObject);
-        //获取审阅标记的绘制坐标
-        let commMarkPos = ElementUtil.getRenderAbsolutePaintPos(this.commMarkRender.render, {
-            x: 0,
-            y: -e.docCtx.viewOptions.pageOffset.y
-        });
-        const commMarkLinePos = ElementUtil.getParaLinePos(this.commMarkRender.render, commMarkPos);
-        commMarkPos.y = commMarkLinePos.y + 2;
-        const docRenderPos = ElementUtil.getRenderAbsolutePaintPos(docRender, { x: 0, y: -e.docCtx.viewOptions.pageOffset.y });
-        const marginLeft = commMarkPos.x - docRenderPos.x - docRender.padding.left;
-        const marginRight = e.docCtx.viewOptions.docPageSettings.width - marginLeft - docRender.padding.right * 2;
-        e.render.overlaysContext.drawDashLine([commMarkPos, {
-                x: commMarkPos.x + marginRight,
-                y: commMarkPos.y
-            }], [1, 1], 'red');
-        e.render.overlaysContext.drawDashLine([{
-                x: commMarkPos.x + marginRight,
-                y: commMarkPos.y
-            }, e.position], [1, 1], 'red');
-        this.renderTitle(e.render, e.position);
-    }
     renderTitle(ctx, position) {
         const topPadding = 24;
         const textProps = new TextProps();
@@ -8484,40 +8228,11 @@ class DataElementBarcode extends DataElementLeaf {
     }
 }
 class DataElementBarcodeRenderObject extends ResizeLeafRenderObject {
-    render(e) {
-        // const barcodeEle = this.element as DataElementBarcode;
-        // barcodeEle.drawBarcode(e.render, e.position);
-    }
     clone() {
         const clone = new DataElementBarcodeRenderObject(this.element);
         clone.rect = ElementUtil.cloneRect(this.rect);
         return clone;
     }
-    pagePaintCompleted(e) {
-        if (this.element.isFocused) {
-            const { render, position: pos } = e;
-            const { width, height } = this.rect;
-            render.contentContext.strokeRect(pos.x, pos.y, this.rect.width, this.rect.height, '#1890ff', 0.5);
-            this.drawResizeCircle(render, pos.x, pos.y);
-            this.drawResizeCircle(render, pos.x + width, pos.y);
-            this.drawResizeCircle(render, pos.x, pos.y + height);
-            this.drawResizeCircle(render, pos.x + width, pos.y + height);
-            this.drawResizeCircle(render, pos.x + (Math.floor(width / 2)), pos.y);
-            this.drawResizeCircle(render, pos.x + (Math.floor(width / 2)), pos.y + height);
-            this.drawResizeCircle(render, pos.x, pos.y + (Math.floor(height / 2)));
-            this.drawResizeCircle(render, pos.x + width, pos.y + (Math.floor(height / 2)));
-        }
-    }
-    drawResizeCircle(ctx, x, y) {
-        const ctxNative = ctx.contentContext.ctx;
-        ctxNative.save();
-        ctxNative.fillStyle = '#69c0ff';
-        ctxNative.beginPath();
-        ctxNative.arc(x, y, Math.floor(4 / 5 * 4), 0, 2 * Math.PI);
-        ctxNative.closePath();
-        ctxNative.fill();
-        ctxNative.restore();
-    }
     exportHTML(event) {
         const t = super.exportHTML(event);
         if (this.element.props.type === 'qrcode') {
@@ -8682,27 +8397,6 @@ class DataElementCheckRenderObject extends LeafRenderObject {
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
         return cloneRender;
     }
-    render(e) {
-        const { render, position } = e;
-        const element = this.element;
-        if (element.props.drawStateChar) {
-            const font = `${element.props.size - 2}px 微软雅黑`;
-            const str = element.props.checked ? element.props.trueChar : element.props.falseChar;
-            const color = element.props.checked ? element.props.trueStateColor : element.props.falseStateColor;
-            e.render.contentContext.drawText2(str, font, color, position.x, position.y, element.props.size, element.props.size);
-            if (element.props.border) {
-                e.render.contentContext.strokeRect(position.x + 2, position.y, element.props.size, element.props.size);
-            }
-        }
-        else {
-            if (element.props.multiSelect) {
-                render.contentContext.drawCheckBox(position.x + 2, position.y, element.props.size, element.props.size, element.props.checked);
-            }
-            else {
-                render.contentContext.drawRadioBox(position.x + 2, position.y, element.props.size, element.props.size, element.props.checked);
-            }
-        }
-    }
     exportHTML(event) {
         const t = super.exportHTML(event);
         const props = this.element.props;
@@ -8993,12 +8687,6 @@ class DataElementGroupElement extends InlineGroupInputElement {
     }
 }
 class DataElementGroupRenderObject extends InlineGroupRenderObject {
-    render(e) {
-        this.paintPos = e.position;
-        e.render.onRenderCompleted.subscribe(() => {
-            drawDecorator(e, this);
-        });
-    }
     clone() {
         const cloneRender = new DataElementGroupRenderObject(this.element);
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
@@ -9066,38 +8754,11 @@ class DataElementImage extends DataElementLeaf {
     }
 }
 class DataImageRenderObject extends ResizeLeafRenderObject {
-    render(e) {
-    }
     clone() {
         const clone = new DataImageRenderObject(this.element);
         clone.rect = ElementUtil.cloneRect(this.rect);
         return clone;
     }
-    pagePaintCompleted(e) {
-        if (this.element.isFocused) {
-            const { render, position: pos } = e;
-            const { width, height } = this.rect;
-            render.contentContext.strokeRect(pos.x, pos.y, this.rect.width, this.rect.height, '#1890ff', 0.5);
-            this.drawResizeCircle(render, pos.x, pos.y);
-            this.drawResizeCircle(render, pos.x + width, pos.y);
-            this.drawResizeCircle(render, pos.x, pos.y + height);
-            this.drawResizeCircle(render, pos.x + width, pos.y + height);
-            this.drawResizeCircle(render, pos.x + (Math.floor(width / 2)), pos.y);
-            this.drawResizeCircle(render, pos.x + (Math.floor(width / 2)), pos.y + height);
-            this.drawResizeCircle(render, pos.x, pos.y + (Math.floor(height / 2)));
-            this.drawResizeCircle(render, pos.x + width, pos.y + (Math.floor(height / 2)));
-        }
-    }
-    drawResizeCircle(ctx, x, y) {
-        const ctxNative = ctx.contentContext.ctx;
-        ctxNative.save();
-        ctxNative.fillStyle = '#69c0ff';
-        ctxNative.beginPath();
-        ctxNative.arc(x, y, Math.floor(4 / 5 * 4), 0, 2 * Math.PI);
-        ctxNative.closePath();
-        ctxNative.fill();
-        ctxNative.restore();
-    }
     exportHTML(event) {
         const t = super.exportHTML(event);
         t.children = [{
@@ -9333,13 +8994,6 @@ class BreakElement extends LeafElement {
     }
 }
 class BreakRenderObject extends LeafRenderObject {
-    render(e) {
-        const { render, position } = e;
-        if (render.drawMode === 'print') {
-            return;
-        }
-        render.contentContext.drawText('↓', this.element.textProps, position.x, position.y, 20, this.rect.height);
-    }
     exportHTML(event) {
         if (!event.options.showEnterSymbol || event.mode === 'print') {
             return null;
@@ -9505,8 +9159,6 @@ class FillNullSpaceRenderObject extends LeafRenderObject {
         super(null);
         this.disableClick = true;
     }
-    render(e) {
-    }
     clone() {
         const clone = new FillNullSpaceRenderObject();
         clone.rect = ElementUtil.cloneRect(this.rect);
@@ -9567,11 +9219,6 @@ class DocumentBodyPartElement extends BlockContainerElement {
     }
 }
 class DocumentBodyPartRenderObject extends MuiltBlockLineRenderObject {
-    render(e) {
-        const { render, position } = e;
-        const bgColor = (this.element.isFocused || this.element.isMouseenter) ? '#d9d9d9' : '#ffffff';
-        render.overlaysContext.fillRect(position.x - 2, position.y - 2, this.rect.width + 4, this.rect.height + 4, bgColor, 5, 'black');
-    }
     clone(cloneData = true) {
         const cloneRender = new DocumentBodyPartRenderObject(this.element);
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
@@ -9711,9 +9358,6 @@ function getMHItem(kind) {
     return mhLayoutItems[kindIndex];
 }
 class DataRenderMH extends LeafRenderObject {
-    render(e) {
-        renderMH(this.element, e.render, e.position, true);
-    }
     exportHTML(event) {
         const t = super.exportHTML(event);
         const children = [];
@@ -9948,36 +9592,11 @@ class PictureElement extends LeafElement {
     }
 }
 class PictureRenderObject extends ResizeLeafRenderObject {
-    render(e) {
-    }
     clone() {
         const clone = new PictureRenderObject(this.element);
         clone.rect = ElementUtil.cloneRect(this.rect);
         return clone;
     }
-    pagePaintCompleted(e) {
-        if (this.element.isFocused) {
-            const { render, position: pos } = e;
-            const { width, height } = this.rect;
-            render.contentContext.strokeRect(pos.x, pos.y, width, height, '#1890ff', 0.5);
-            this.drawResizeCircle(render, pos.x, pos.y);
-            this.drawResizeCircle(render, pos.x + width, pos.y);
-            this.drawResizeCircle(render, pos.x, pos.y + height);
-            this.drawResizeCircle(render, pos.x + width, pos.y + height);
-            this.drawResizeCircle(render, pos.x + (Math.floor(width / 2)), pos.y);
-            this.drawResizeCircle(render, pos.x + (Math.floor(width / 2)), pos.y + height);
-            this.drawResizeCircle(render, pos.x, pos.y + (Math.floor(height / 2)));
-            this.drawResizeCircle(render, pos.x + width, pos.y + (Math.floor(height / 2)));
-        }
-    }
-    drawResizeCircle(ctx, x, y) {
-        const ctxNative = ctx.contentContext.ctx;
-        ctxNative.fillStyle = '#69c0ff';
-        ctxNative.beginPath();
-        ctxNative.arc(x, y, Math.floor(4 / 5 * 4), 0, 2 * Math.PI);
-        ctxNative.closePath();
-        ctxNative.fill();
-    }
     exportHTML(event) {
         const picElement = this.element;
         const picProps = picElement.props;
@@ -10109,10 +9728,6 @@ class RadioBoxFactory extends ElementFactory {
     }
 }
 class RadioBoxRenderObject extends LeafRenderObject {
-    render(e) {
-        const { render, position } = e;
-        render.contentContext.drawRadioBox(position.x + 2, position.y, this.element.props.size, this.element.props.size, this.element.props.isChecked);
-    }
     clone(cloneData = true) {
         const clone = new RadioBoxRenderObject(this.element);
         clone.rect = ElementUtil.cloneRect(this.rect);
@@ -10151,13 +9766,6 @@ class PageBreakElement extends LeafElement {
     }
 }
 class PageBreakRenderObject extends LeafRenderObject {
-    render(e) {
-        const { render, position } = e;
-        if (render.drawMode === 'print') {
-            return;
-        }
-        render.contentContext.drawText('↩', this.element.textProps, position.x, position.y, 20, this.rect.height);
-    }
     clone() {
         const render = new PageBreakRenderObject(this.element);
         render.rect = ElementUtil.cloneRect(this.rect);
@@ -10194,13 +9802,6 @@ class TabElement extends LeafElement {
     }
 }
 class TabRenderObject extends LeafRenderObject {
-    render(e) {
-        const { render, position } = e;
-        if (render.drawMode === 'print') {
-            return;
-        }
-        //render.contentContext.fillRect(position.x,position.y,this.rect.width,this.rect.height,'red');
-    }
     clone() {
         const render = new TabRenderObject(this.element);
         render.rect = ElementUtil.cloneRect(this.rect);
@@ -10766,58 +10367,170 @@ class TableSplitCell {
     }
 }
 
-class ElementSerialize {
-    /**
-     * 将当前文档对象构建并输出到标准的JSON对象
-     * @param element
-     * @param viewOptions
-     */
-    static serialize(element, viewOptions) {
-        const result = element.serialize(viewOptions);
-        if (!result) {
-            return null;
-        }
-        if (result.complete) {
-            return result;
-        }
-        if (element instanceof BranchElement) {
-            result.children = [];
-            let prevEle = null;
-            for (let i = 0; i < element.length; i++) {
-                const child = element.getChild(i);
-                const serializeChild = this.serialize(child, viewOptions);
-                if (child.type === 'text' && prevEle && prevEle.ele.type === 'text') {
-                    if (child.props.equals(prevEle.ele.props)) {
-                        prevEle.props.content += serializeChild.content;
-                        continue;
-                    }
-                }
-                if (serializeChild) {
-                    delete serializeChild.complete;
-                    serializeChild.props = serializeChild.props || {};
-                    if (Object.keys(serializeChild.props).length === 0) {
-                        delete serializeChild.props;
-                    }
-                    if (serializeChild.children && serializeChild.children.length === 0) {
-                        delete serializeChild.children;
-                    }
-                    result.children.push(serializeChild);
-                    prevEle = { ele: child, props: serializeChild };
-                }
-            }
-        }
-        if (element.props && element.props['__attachedProperty'] && !result.props['__attachedProperty']) {
-            result.props['__attachedProperty'] = CommonUtil.cloneValue(element.props['__attachedProperty']);
-        }
-        return result;
+class SVGElement extends LeafElement {
+    resizeable = true;
+    constructor() {
+        super('svg');
+        this.props = new SVGProps();
+        //this.addPropValueChangedSub(this.props);
+        this.cursorType = 'move';
+        this.focusable = true;
     }
-    static serializeString(element, options = { all: false }) {
-        if (!options.all && element instanceof TrackRunElement && element.type === exports.TrackRunTypeEnum.Deleted) {
-            return '';
-        }
-        if (element instanceof TextGroupElement && !element.isDecorate) {
+    createRenderObject() {
+        const render = new SVGRenderObject(this);
+        render.rect.width = this.props.width;
+        render.rect.height = this.props.height;
+        return render;
+    }
+    serialize(options) {
+        return {
+            type: 'svg',
+            props: {
+                ...this.props.getSerializeProps(options)
+            }
+        };
+    }
+    clone(data) {
+        const clone = new SVGElement();
+        this.props.clone(clone.props);
+        return clone;
+    }
+    destroy() {
+        super.destroy();
+    }
+}
+class SVGRenderObject extends ResizeLeafRenderObject {
+    clone() {
+        const clone = new SVGRenderObject(this.element);
+        clone.rect = ElementUtil.cloneRect(this.rect);
+        return clone;
+    }
+    drawResizeCircle(ctx, x, y) {
+        const ctxNative = ctx.contentContext.ctx;
+        ctxNative.fillStyle = '#69c0ff';
+        ctxNative.beginPath();
+        ctxNative.arc(x, y, Math.floor(4 / 5 * 4), 0, 2 * Math.PI);
+        ctxNative.closePath();
+        ctxNative.fill();
+    }
+    exportHTML(event) {
+        const props = this.element.props;
+        const t = super.exportHTML(event);
+        t.children = [{
+                sel: 'svg',
+                data: {
+                    ns: "http://www.w3.org/2000/svg",
+                    attrs: {
+                        width: this.rect.width,
+                        height: this.rect.height
+                    }
+                },
+                children: [{
+                        sel: 'image',
+                        data: {
+                            ns: "http://www.w3.org/2000/svg",
+                            attrs: {
+                                "xlink:href": props.value,
+                                width: Math.min(this.rect.width, this.rect.height),
+                                height: Math.min(this.rect.width, this.rect.height)
+                            }
+                        }
+                    }]
+            }];
+        //绘制拖动圆圈
+        if (this.element.isFocused) {
+            const { width, height } = this.rect;
+            const circlePoints = [{ x: 0, y: 0 }, { x: width, y: 0 }, { x: 0, y: height }, { x: width, y: height }, { x: Math.floor(width / 2), y: 0 }, { x: Math.floor(width / 2), y: height }, { x: 0, y: Math.floor(height / 2) }, { x: width, y: Math.floor(height / 2) }];
+            circlePoints.forEach((p) => {
+                t.children.push({
+                    sel: 'circle',
+                    data: {
+                        ns: "http://www.w3.org/2000/svg",
+                        attrs: {
+                            cx: p.x,
+                            cy: p.y,
+                            r: Math.floor(4 / 5 * 4),
+                            fill: '#69c0ff'
+                        }
+                    }
+                });
+            });
+        }
+        return t;
+    }
+}
+class SVGFactory extends ElementFactory {
+    match(type) {
+        return type === 'svg';
+    }
+    createElement(data) {
+        const props = data.props;
+        const pic = new SVGElement();
+        const picProps = pic.props;
+        picProps.width = props.width;
+        picProps.height = props.height;
+        picProps.value = props.value;
+        picProps.title = props.title;
+        pic.props = picProps;
+        return pic;
+    }
+}
+
+class ElementSerialize {
+    /**
+     * 将当前文档对象构建并输出到标准的JSON对象
+     * @param element
+     * @param viewOptions
+     */
+    static serialize(element, viewOptions) {
+        const result = element.serialize(viewOptions);
+        if (!result) {
+            return null;
+        }
+        if (result.complete) {
+            return result;
+        }
+        if (element instanceof BranchElement) {
+            result.children = [];
+            let prevEle = null;
+            for (let i = 0; i < element.length; i++) {
+                const child = element.getChild(i);
+                const serializeChild = this.serialize(child, viewOptions);
+                if (child.type === 'text' && prevEle && prevEle.ele.type === 'text') {
+                    if (child.props.equals(prevEle.ele.props)) {
+                        prevEle.props.content += serializeChild.content;
+                        continue;
+                    }
+                }
+                if (serializeChild) {
+                    delete serializeChild.complete;
+                    serializeChild.props = serializeChild.props || {};
+                    if (Object.keys(serializeChild.props).length === 0) {
+                        delete serializeChild.props;
+                    }
+                    if (serializeChild.children && serializeChild.children.length === 0) {
+                        delete serializeChild.children;
+                    }
+                    result.children.push(serializeChild);
+                    prevEle = { ele: child, props: serializeChild };
+                }
+            }
+        }
+        if (element.props && element.props['__attachedProperty'] && !result.props['__attachedProperty']) {
+            result.props['__attachedProperty'] = CommonUtil.cloneValue(element.props['__attachedProperty']);
+        }
+        return result;
+    }
+    static serializeString(element, options = { all: false }) {
+        if (!options.all && element instanceof TrackRunElement && element.type === exports.TrackRunTypeEnum.Deleted) {
+            return '';
+        }
+        if (element instanceof TextGroupElement && !element.isDecorate) {
             return element.text;
         }
+        if (element instanceof PSymbolElement) {
+            return '\n';
+        }
         if (element instanceof BranchElement) {
             const items = [];
             for (let i = 0; i < element.length; i++) {
@@ -10968,32 +10681,6 @@ class TrackRunRenderObject extends InlineGroupRenderObject {
     constructor(ele) {
         super(ele);
     }
-    render(e) {
-        const { render, position, docCtx: { viewOptions } } = e;
-        render.tran(() => {
-            let fillColor = viewOptions.showTrackChanges ? this.element.type === 'ins-run' ? viewOptions.trackInsColor : viewOptions.trackDelColor : '';
-            if (fillColor) {
-                render.contentContext.ctx.fillStyle = fillColor;
-            }
-            e.nextRender();
-        });
-        const { x, y } = position;
-        //不显示痕迹
-        if (!viewOptions.showTrackChanges) {
-            return;
-        }
-        const color = this.element.type === 'ins-run' ? 'green' : 'red';
-        for (let i = 0; i < this.length; i++) {
-            const childRender = this.getChild(i);
-            const { rect } = childRender;
-            if (childRender.element && childRender.element.type === 'del-run') {
-                continue;
-            }
-            let lineY = y + rect.y + rect.height;
-            lineY = this.element.type === 'ins-run' ? lineY : lineY - rect.height / 2;
-            render.contentContext.drawHoriLine(x + rect.x, lineY, rect.width, color, 1);
-        }
-    }
     exportHTML(event) {
         const { options } = event;
         const t = super.exportHTML(event);
@@ -12556,9 +12243,9 @@ class ElementUtil {
             return this.getTextRenderOffset(render, x);
         }
         else {
-            if (render.element && render.element.type === 'psym') {
-                return 0;
-            }
+            // if (render.element && render.element.type === 'psym') {
+            //     return 0;
+            // }
             return (render.rect.width / 2) >= x ? 0 : 1;
         }
     }
@@ -13288,12 +12975,12 @@ class ElementPaint {
                 }
             }
         });
-        docContainer.render({
-            render: this.renderCtx,
-            position: { x: docContainer.rect.x, y: docContainer.rect.y },
-            nextRender: nextRenderFn,
-            docCtx: this.docCtx
-        });
+        // docContainer.render({
+        //     render: this.renderCtx,
+        //     position: { x: docContainer.rect.x, y: docContainer.rect.y },
+        //     nextRender: nextRenderFn,
+        //     docCtx: this.docCtx
+        // })
         nextRenderFn();
         const { scale, viewSettings: { width, height } } = this.viewOptions;
         while (this.renderCtx.onRenderCompleted.subs.length > 0) {
@@ -13322,25 +13009,25 @@ class ElementPaint {
                         this.drawRenderObject(child, currPosition, inViewPort);
                     }
                 });
-                const renderData = {
+                ({
                     position: currPosition,
                     nextRender: nextRenderFn,
                     render: this.renderCtx,
                     docCtx: this.docCtx
-                };
-                renderObject.render(renderData);
+                });
+                //renderObject.render(renderData);
                 nextRenderFn();
             }
         }
         else if (renderObject instanceof LeafRenderObject) {
             if (inViewPort) {
-                const renderData = {
+                ({
                     position: currPosition,
                     nextRender: () => { },
                     render: this.renderCtx,
                     docCtx: this.docCtx
-                };
-                renderObject.render(renderData);
+                });
+                //renderObject.render(renderData);
             }
         }
         //处理选中拖蓝
@@ -13393,14 +13080,14 @@ class ElementPaint {
      * 触发页面绘制结束事件
      */
     invokedPagePaintCompleted(renderObject, parent) {
-        const { x: rx, y: ry, width: rw, height: rh } = renderObject.rect;
-        const currPosition = { x: rx + parent.x, y: ry + parent.y };
-        renderObject.pagePaintCompleted({ render: this.renderCtx, position: currPosition, docCtx: this.docCtx });
-        if (renderObject instanceof BranchRenderObject) {
-            for (let i = 0; i < renderObject.length; i++) {
-                this.invokedPagePaintCompleted(renderObject.getChild(i), currPosition);
-            }
-        }
+        // const { x: rx, y: ry, width: rw, height: rh } = renderObject.rect;
+        // const currPosition = { x: rx + parent.x, y: ry + parent.y };
+        // renderObject.pagePaintCompleted({ render: this.renderCtx, position: currPosition, docCtx: this.docCtx })
+        // if (renderObject instanceof BranchRenderObject) {
+        //     for (let i = 0; i < renderObject.length; i++) {
+        //         this.invokedPagePaintCompleted(renderObject.getChild(i), currPosition);
+        //     }
+        // }
     }
     static drawPage(renderCtx, docCtx, renderObject, parent) {
         const { x: rx, y: ry } = renderObject.rect;
@@ -13412,24 +13099,9 @@ class ElementPaint {
                     this.drawPage(renderCtx, docCtx, child, currPosition);
                 }
             });
-            const renderData = {
-                position: currPosition,
-                nextRender: nextRenderFn,
-                render: renderCtx,
-                docCtx
-            };
-            renderObject.render(renderData);
+            //renderObject.render(renderData);
             nextRenderFn();
         }
-        else if (renderObject instanceof LeafRenderObject) {
-            const renderData = {
-                position: currPosition,
-                nextRender: () => { },
-                render: renderCtx,
-                docCtx: docCtx
-            };
-            renderObject.render(renderData);
-        }
     }
 }
 
@@ -14993,10 +14665,11 @@ class DocumentArrange {
         let currRow = rows[j];
         const cutRows = [];
         while (currRow) {
+            const minHeight = currRow.element.props.minHeight;
             const rowContentHeight = this.getBlockLineHeight(currRow);
             if (rowContentHeight + sumHeight > limitHeight) {
-                //行存在最小高度，且当前行跨页的情况下，不截断该行
-                if (currRow.element.props.minHeight) {
+                //行存在最小高度，且当前行内容的高度小于最小高度，且当前行跨页的情况下，不截断该行
+                if (minHeight > 0 && minHeight > rowContentHeight) {
                     break;
                 }
                 //限制的外框尺寸
@@ -15871,539 +15544,52 @@ class ElementMeasure {
     }
 }
 
-class ElementRenderCut {
-    options;
+class DocumentPaint {
     renderContext;
-    constructor(options, renderContext) {
-        this.options = options;
+    docCtx;
+    seo;
+    elementMeasure;
+    //elementRenderCut: ElementRenderCut;
+    elementPaint;
+    docPages;
+    docContainer;
+    //commsContainer!: CommsContainerRenderObject;
+    viewOptions;
+    constructor(renderContext, docCtx, seo) {
         this.renderContext = renderContext;
+        this.docCtx = docCtx;
+        this.seo = seo;
+        this.viewOptions = this.docCtx.viewOptions;
+        this.elementMeasure = new ElementMeasure(this.docCtx, this.renderContext);
+        //this.elementRenderCut = new ElementRenderCut(this.viewOptions, this.renderContext);
+        this.elementPaint = new ElementPaint(this.renderContext, this.docCtx);
     }
-    cutPage(documentRender, documentElement) {
-        if (this.options.fullPageView) {
-            return this.getFullViewDocRender(documentRender, documentElement);
-        }
-        const headerRender = documentRender.getChild(0);
-        const bodyRender = documentRender.getChild(1).clone();
-        const footerRender = documentRender.getChild(2);
-        const commentsRender = documentRender.getChild(3);
-        const { headerLine, footerLine } = documentRender;
-        let bodyMarginTop = headerLine + headerRender.rect.height + 6;
-        let bodyMarginBottom = footerLine + footerRender.rect.height;
-        const { top: bodyTop, bottom: bodyBottom } = documentRender.padding;
-        bodyMarginTop = bodyMarginTop > bodyTop ? bodyMarginTop : bodyTop;
-        bodyMarginBottom = bodyMarginBottom > bodyBottom ? bodyMarginBottom : bodyBottom;
-        documentRender.padding.top = bodyMarginTop;
-        documentRender.padding.bottom = bodyMarginBottom;
-        const bodyLimitRect = this.getDocInnerRect(documentRender);
-        const bodyArray = [];
-        let { emptyBody: pageBodyRender, innerRect: bodyInnerLimitRect } = this.createEmptyBodyRender(bodyRender, bodyLimitRect);
-        bodyArray.push(pageBodyRender);
-        const createBodyHolder = () => {
-            const { emptyBody, innerRect } = this.createEmptyBodyRender(bodyRender, bodyLimitRect);
-            pageBodyRender = emptyBody;
-            bodyInnerLimitRect = innerRect;
-            bodyArray.push(pageBodyRender);
-        };
-        const appendToBody = (item) => {
-            item.rect.y = bodyInnerLimitRect.height + item.margin.top;
-            pageBodyRender.addChild(item);
-            bodyInnerLimitRect.height += item.rect.height + item.margin.top + item.margin.bottom;
-            //上一个元素的bottom-margin
-            //bodyInnerLimitRect.prevMargin = item.margin.bottom;
-            ElementUtil.updateRenderHeightByInnerRect(pageBodyRender, bodyInnerLimitRect);
-        };
-        let i = 0;
-        let cloneBlockContentRender = bodyRender.getChild(i);
-        while (cloneBlockContentRender) {
-            if (bodyInnerLimitRect.maxHeight - bodyInnerLimitRect.height - cloneBlockContentRender.rect.height - cloneBlockContentRender.margin.bottom - cloneBlockContentRender.margin.top < 0) {
-                //限制的外框尺寸
-                const bodyAvailHeight = bodyInnerLimitRect.maxHeight - bodyInnerLimitRect.height - cloneBlockContentRender.margin.bottom - cloneBlockContentRender.margin.top;
-                //限制的内框尺寸
-                const limitRenderInnterHeight = ElementUtil.innerRectMaxHeight(cloneBlockContentRender, bodyAvailHeight);
-                const cutRenderObject = this.cutRenderItem(cloneBlockContentRender, limitRenderInnterHeight);
-                //至少有一个块级行元素被切割出来
-                if (cutRenderObject) {
-                    appendToBody(cutRenderObject);
-                }
-                createBodyHolder();
-            }
-            else {
-                appendToBody(cloneBlockContentRender);
-                if (++i < bodyRender.length) {
-                    cloneBlockContentRender = bodyRender.getChild(i);
-                }
-                else {
-                    cloneBlockContentRender = null;
-                }
-            }
-        }
-        const docPages = [];
-        let pageY = this.options.docSpace;
-        for (let i = 0; i < bodyArray.length; i++) {
-            const body = bodyArray[i];
-            const documentRender = documentElement.createRenderObject();
-            docPages.push(documentRender);
-            documentRender.rect.y = pageY;
-            const limitRect = documentRender.getInnerRect();
-            const cloneHeaderRender = headerRender.clone();
-            cloneHeaderRender.rect.x = limitRect.x;
-            cloneHeaderRender.rect.y = headerLine;
-            documentRender.addChild(cloneHeaderRender);
-            body.rect.x = limitRect.x;
-            body.rect.y = bodyMarginTop;
-            body.rect.height = bodyInnerLimitRect.maxHeight;
-            documentRender.addChild(body);
-            pageY += documentRender.rect.height + this.options.docSpace;
-            const cloneFooterRender = footerRender.clone();
-            cloneFooterRender.rect.x = limitRect.x;
-            cloneFooterRender.rect.y = documentRender.rect.height - bodyMarginBottom;
-            documentRender.addChild(cloneFooterRender);
-            //审阅模式，添加审阅窗口
-            if (this.options.showReviewWindow && commentsRender) {
-                const commentsContainer = commentsRender.element.createRenderObject({
-                    options: this.options,
-                    renderCtx: this.renderContext
-                });
-                commentsContainer.padding.top = bodyMarginTop;
-                commentsContainer.rect.height = documentRender.rect.height;
-                documentRender.addChild(commentsContainer);
-                commentsContainer.rect.x = documentRender.rect.x + documentRender.rect.width;
-                documentRender.rect.width += this.options.reviewWindowWidth;
-            }
+    rePages() {
+        if (!this.docCtx.document.length) {
+            return;
         }
-        return docPages;
-    }
-    getDocInnerRect(documentRender) {
-        const render = documentRender.element.createRenderObject({
-            options: this.options,
-            renderCtx: this.renderContext
-        });
-        render.padding = documentRender.padding;
-        return render.getInnerRect();
-    }
-    getFullViewDocRender(documentRender, documentElement) {
-        const commentsRender = documentRender.getChild(3);
-        const commentsContainer = commentsRender.element.createRenderObject({
-            options: this.options,
-            renderCtx: this.renderContext
-        });
-        documentRender.rect.height -= commentsContainer.rect.height;
-        const bodyRender = documentRender.getChild(1);
-        if (this.options.showReviewWindow) {
-            documentRender.removeChild(commentsRender);
-            documentRender.addChild(commentsContainer);
-            commentsContainer.padding.top = bodyRender.rect.y;
-            commentsContainer.rect.height = documentRender.rect.height;
-            commentsContainer.rect.x = documentRender.rect.x + documentRender.rect.width;
-            documentRender.rect.width += this.options.reviewWindowWidth;
-        }
-        return [documentRender];
-    }
-    createEmptyBodyRender(bodyRender, limitRect) {
-        const pageBodyRender = bodyRender.element.createRenderObject({
-            options: this.options,
-            renderCtx: this.renderContext
-        });
-        pageBodyRender.rect.width = limitRect.width;
-        const bodyInnerLimitRect = pageBodyRender.getInnerRect();
-        if (this.options.fullPageView) {
-            bodyInnerLimitRect.height = Number.MAX_VALUE;
-        }
-        return {
-            emptyBody: pageBodyRender,
-            innerRect: { ...bodyInnerLimitRect, prevMargin: 0, maxWidth: limitRect.width, maxHeight: limitRect.height }
-        };
-    }
-    /**
-     * 切割渲染元素
-     * @param render 被切割的对象
-     * @param limitHeight
-     * @returns
-     */
-    cutRenderItem(render, limitHeight) {
-        if (render instanceof TableRowRenderObject) {
-            return this.cutRowRenderItem(render, limitHeight);
-        }
-        if (render instanceof TableRenderObject) {
-            return this.cutTable(render, limitHeight);
-        }
-        const cloneRender = render.element.createRenderObject({
-            options: this.options,
-            renderCtx: this.renderContext
-        });
-        cloneRender.setRenderWidth(render.rect.width);
-        if (render instanceof MuiltBlockLineRenderObject) {
-            let sumHeight = 0;
-            const children = [...render.getItems()];
-            let j = 0;
-            let blockLine = children[j];
-            while (blockLine) {
-                //sumHeight = ElementUtil.remeasure(cloneRender);
-                const calcBlockLineHeight = this.getBlockLineHeight(blockLine);
-                if (calcBlockLineHeight + sumHeight > limitHeight) {
-                    if (blockLine instanceof MuiltBlockLineRenderObject) {
-                        //限制的外框尺寸
-                        const availHeight = limitHeight - sumHeight;
-                        //限制的内框尺寸
-                        const limitRenderInnterHeight = ElementUtil.innerRectMaxHeight(render, availHeight);
-                        const cutRenderObject = this.cutRenderItem(blockLine, limitRenderInnterHeight);
-                        if (cutRenderObject) {
-                            cloneRender.addChild(cutRenderObject);
-                            sumHeight += cutRenderObject.rect.height;
-                            blockLine = children[++j];
-                            break;
-                        }
-                        else {
-                            break;
-                        }
-                    }
-                    else {
-                        break;
-                    }
-                }
-                else {
-                    render.removeChild(blockLine);
-                    cloneRender.addChild(blockLine);
-                    sumHeight += blockLine.rect.height;
-                    blockLine = children[++j];
-                }
-            }
-            ElementUtil.remeasure(cloneRender);
-            ElementUtil.remeasure(render);
-            if (cloneRender.length === 0) {
-                return null;
-            }
-            else {
-                return cloneRender;
-            }
-        }
-        else {
-            throw new Error('未实现');
-        }
-    }
-    /**
-     * 切割渲染元素
-     * @param tbRender 被切割的对象
-     * @param limitHeight
-     * @param addFunc
-     * @returns
-     */
-    cutTable(tbRender, limitHeight) {
-        const cloneTbRender = tbRender.element.createRenderObject();
-        cloneTbRender.setRenderWidth(tbRender.rect.width);
-        let sumHeight = 0;
-        const rows = [...tbRender.getItems()];
-        //获取跨页需要重复显示的行
-        const headerRows = this.getHeaderRows(tbRender);
-        //跨页头的高度
-        const headerHeight = headerRows.reduce((prev, curr) => prev + curr.rect.height, 0);
-        if (headerHeight > limitHeight) {
-            return null;
-        }
-        const copyHeaderRows = headerRows.map(item => item.clone());
-        //获取最后一个截断行,需要根据截断行判断最后一个截断的行位置
-        const cutOffRows = rows.filter(row => limitHeight >= row.rect.y && limitHeight <= row.rect.y + row.rect.height)
-            .map((row) => ({ rowIndex: row.element.getIndex(), row }))
-            .sort((first, second) => second.rowIndex - first.rowIndex);
-        if (cutOffRows.length === 0) {
-            throw new Error('无法获取截断行');
-        }
-        const joinRow = cutOffRows[0].row;
-        let j = 0;
-        let currRow = rows[j];
-        const cutRows = [];
-        while (currRow) {
-            const rowContentHeight = this.getBlockLineHeight(currRow);
-            if (rowContentHeight + sumHeight > limitHeight) {
-                if (currRow instanceof MuiltBlockLineRenderObject) {
-                    //限制的外框尺寸
-                    const availHeight = limitHeight - sumHeight;
-                    //限制的内框尺寸
-                    const limitRenderInnterHeight = ElementUtil.innerRectMaxHeight(tbRender, availHeight);
-                    const cutRow = this.cutRowRenderItem(currRow, limitRenderInnterHeight);
-                    if (cutRow) {
-                        cloneTbRender.addChild(cutRow);
-                        sumHeight += cutRow.rect.height;
-                        cutRows.push(currRow);
-                        if (currRow === joinRow) {
-                            break;
-                        }
-                        currRow = rows[++j];
-                    }
-                    else {
-                        break;
-                    }
-                }
-                else {
-                    break;
-                }
-            }
-            else {
-                tbRender.removeChild(currRow);
-                cloneTbRender.addChild(currRow);
-                sumHeight += currRow.rect.height;
-                currRow = rows[++j];
-            }
-        }
-        this.fixCutTable(tbRender, cutRows);
-        ElementUtil.remeasure(cloneTbRender);
-        //存在跨页需要重复显示的行头，则需要重新放置行头
-        if (copyHeaderRows.length) {
-            copyHeaderRows.forEach((r, i) => tbRender.insertChild(r, i));
-        }
-        ElementUtil.remeasure(tbRender);
-        if (cloneTbRender.length === 0) {
-            return null;
-        }
-        else {
-            return cloneTbRender;
-        }
-    }
-    cutRowRenderItem(render, limitHeight) {
-        if (render.element.props.minHeight > 0 && render.rect.height > limitHeight) {
-            return null;
-        }
-        const cloneRowRender = render.element.createRenderObject();
-        cloneRowRender.rect.width = render.rect.width;
-        render.remeasureState = true;
-        //cloneRowRender.rect.maxWidth = render.rect.height;
-        const cellRenders = [...render.getItems()];
-        const cutCellRenders = [];
-        for (let i = 0; i < cellRenders.length; i++) {
-            const cellRender = cellRenders[i];
-            this.markMergeRowRenderDirty(cellRender);
-            if (cellRender.rect.height > limitHeight) {
-                //限制的内框尺寸
-                const limitCellHeight = ElementUtil.innerRectMaxHeight(cellRender, limitHeight);
-                const cutCellRender = this.cutRenderItem(cellRender, limitCellHeight);
-                if (cutCellRender) {
-                    cutCellRenders.push(cutCellRender);
-                }
-                else {
-                    cutCellRenders.push(null);
-                }
-            }
-            else {
-                const cloneCellRender = cellRender;
-                render.removeChild(cellRender);
-                cutCellRenders.push(cloneCellRender);
-            }
-        }
-        ElementUtil.remeasure(render);
-        if (cutCellRenders.filter(item => item).length === 0) {
-            return null;
-        }
-        else {
-            //补齐单元格
-            for (let i = 0; i < cutCellRenders.length; i++) {
-                let cellRender = cutCellRenders[i];
-                if (!cellRender) {
-                    cellRender = cellRenders[i].element.createRenderObject({
-                        options: this.options,
-                        renderCtx: this.renderContext
-                    });
-                    cellRender.rect = ElementUtil.cloneRect(cellRenders[i].rect);
-                    ElementUtil.remeasure(cellRender);
-                }
-                cloneRowRender.addChild(cellRender);
-            }
-            ElementUtil.remeasure(cloneRowRender);
-            return cloneRowRender;
-        }
-    }
-    /**
-     * 标记合并单元格所在行需要重新计算
-     * @param cellRender
-     * @private
-     */
-    markMergeRowRenderDirty(cellRender) {
-        const cellEle = cellRender.element;
-        if (cellEle.props.vMerge !== 'restart') {
-            return;
-        }
-        const rowRender = cellRender.parent;
-        rowRender.element;
-        const tb = rowRender.parent;
-        const cellYPos = cellRender.rect.y;
-        for (let i = rowRender.getIndex() + 1; i < tb.length; i++) {
-            const nextRowRender = tb.getChild(i);
-            if (nextRowRender.rect.y <= cellYPos) {
-                nextRowRender.remeasureState = true;
-                nextRowRender.getItems().forEach(item => {
-                    this.markMergeRowRenderDirty(item);
-                });
-            }
-            else {
-                break;
-            }
-        }
-    }
-    /**
-     * 修复->已经截断的合并单元格要向下移动到合适的位置
-     * @param tbRender
-     * @param cutRows
-     * @returns
-     */
-    fixCutTable(tbRender, cutRows) {
-        if (!cutRows.length) {
-            return;
-        }
-        const tbEle = tbRender.element;
-        const belowMergeRows = new Set();
-        for (let i = 0; i < tbRender.length; i++) {
-            const row = tbRender.getChild(i);
-            const nextRow = tbRender.getChild(i + 1);
-            if (!nextRow) {
-                break;
-            }
-            if (!cutRows.some(item => item === row)) {
-                break;
-            }
-            if (row.length === tbEle.getColsCount()) {
-                break;
-            }
-            if (this.checkFullRow(row)) {
-                break;
-            }
-            for (let j = 0; j < row.length; j++) {
-                const cell = row.getChild(j);
-                const cellEle = cell.element;
-                const colIndex = cellEle.getIndex();
-                if (!this.existsCellRender(nextRow, colIndex)) {
-                    const insertColIndex = this.getRowInsertCellIndex(cell, nextRow);
-                    if (insertColIndex === -1) {
-                        this.getRowInsertCellIndex(cell, nextRow);
-                        throw new Error('未在紧挨下方找到可以放置的位置');
-                    }
-                    //row.removeChild(cell);
-                    nextRow.insertChild(cell, insertColIndex);
-                    belowMergeRows.add(row);
-                    ElementUtil.remeasure(nextRow);
-                }
-            }
-        }
-        if (belowMergeRows.size) {
-            for (const row of belowMergeRows) {
-                tbRender.removeChild(row);
-                row.clear();
-            }
-            ElementUtil.remeasure(tbRender);
-        }
-    }
-    /**
-     * 校验当前是否是一个完整的行，没有Null单元格，检查当前是否还需要向下合并
-     * @param row
-     */
-    checkFullRow(row) {
-        let x = 0;
-        for (let i = 0; i < row.length; i++) {
-            const cell = row.getChild(i);
-            if (cell.rect.x !== x) {
-                return false;
-            }
-            x += cell.rect.width;
-        }
-        return x === row.rect.width;
-    }
-    existsCellRender(rowRender, cellIndex) {
-        for (let i = 0; i < rowRender.length; i++) {
-            const cellRender = rowRender.getChild(i);
-            const cellEle = cellRender.element;
-            if (cellEle.getIndex() === cellIndex) {
-                return true;
-            }
-        }
-        return false;
-    }
-    getBlockLineHeight(render) {
-        if (render instanceof TableRowRenderObject) {
-            let maxCellHeight = 0;
-            for (let i = 0; i < render.length; i++) {
-                const itemHeight = render.getChild(i).rect.height;
-                if (itemHeight > maxCellHeight) {
-                    maxCellHeight = itemHeight;
-                }
-            }
-            return maxCellHeight;
-        }
-        return render.rect.height;
-    }
-    getRowInsertCellIndex(sourceCell, destRow) {
-        for (let i = 0; i < destRow.length; i++) {
-            const cell = destRow.getChild(i);
-            const rect = cell.rect;
-            if (sourceCell.rect.x < rect.x) {
-                return i;
-            }
-        }
-        const lastCell = destRow.getChild(destRow.length - 1);
-        if (sourceCell.rect.x >= lastCell.rect.x + lastCell.rect.width) {
-            return destRow.length;
-        }
-        return -1;
-    }
-    getHeaderRows(tb) {
-        const rows = [];
-        for (let i = 0; i < tb.length; i++) {
-            const rowRender = tb.getChild(i);
-            const rowEle = rowRender.element;
-            if (rowEle.props.headerRow) {
-                rows.push(rowRender);
-            }
-            else {
-                break;
-            }
-        }
-        return rows;
-    }
-}
-
-class DocumentPaint {
-    renderContext;
-    docCtx;
-    seo;
-    elementMeasure;
-    elementRenderCut;
-    elementPaint;
-    docPages;
-    docContainer;
-    //commsContainer!: CommsContainerRenderObject;
-    viewOptions;
-    constructor(renderContext, docCtx, seo) {
-        this.renderContext = renderContext;
-        this.docCtx = docCtx;
-        this.seo = seo;
-        this.viewOptions = this.docCtx.viewOptions;
-        this.elementMeasure = new ElementMeasure(this.docCtx, this.renderContext);
-        this.elementRenderCut = new ElementRenderCut(this.viewOptions, this.renderContext);
-        this.elementPaint = new ElementPaint(this.renderContext, this.docCtx);
-    }
-    rePages() {
-        if (!this.docCtx.document.length) {
-            return;
-        }
-        this.docContainer = new DocumentContainerRender();
-        this.docCtx.selectionState.renderContainer = this.docContainer;
-        this.docContainer.rect.width = this.viewOptions.docPageSettings.width;
-        // console.time('排版计时');
-        // const documentRender = this.elementMeasure.measureDocument(this.docCtx.document);
-        // this.commsContainer = documentRender.getChild(3) as CommsContainerRenderObject;
-        // if (this.commsContainer) {
-        //     this.commsContainer = this.commsContainer.clone() as CommsContainerRenderObject;
-        // }
-        // //console.timeEnd('排版计时');
-        // //console.time('断页计时');
-        // const docPages = this.elementRenderCut.cutPage(documentRender, this.docCtx.document);
-        const newMeasure = new DocumentArrange(this.docCtx, this.renderContext, this.seo);
-        const docPages = newMeasure.measureDoc();
-        // this.commsContainer = newMeasure.commentsRender as CommsContainerRenderObject;
-        // if (this.commsContainer) {
-        //     this.commsContainer = this.commsContainer.clone() as CommsContainerRenderObject;
-        // }
-        //console.timeEnd('断页计时');
-        this.setCommRangeMark();
-        this.docPages = docPages;
-        this.layoutPages();
+        this.docContainer = new DocumentContainerRender();
+        this.docCtx.selectionState.renderContainer = this.docContainer;
+        this.docContainer.rect.width = this.viewOptions.docPageSettings.width;
+        // console.time('排版计时');
+        // const documentRender = this.elementMeasure.measureDocument(this.docCtx.document);
+        // this.commsContainer = documentRender.getChild(3) as CommsContainerRenderObject;
+        // if (this.commsContainer) {
+        //     this.commsContainer = this.commsContainer.clone() as CommsContainerRenderObject;
+        // }
+        // //console.timeEnd('排版计时');
+        // //console.time('断页计时');
+        // const docPages = this.elementRenderCut.cutPage(documentRender, this.docCtx.document);
+        const newMeasure = new DocumentArrange(this.docCtx, this.renderContext, this.seo);
+        const docPages = newMeasure.measureDoc();
+        // this.commsContainer = newMeasure.commentsRender as CommsContainerRenderObject;
+        // if (this.commsContainer) {
+        //     this.commsContainer = this.commsContainer.clone() as CommsContainerRenderObject;
+        // }
+        //console.timeEnd('断页计时');
+        this.setCommRangeMark();
+        this.docPages = docPages;
+        this.layoutPages();
     }
     /**
      * 文档页面显示布局
@@ -16569,8 +15755,6 @@ class PermanentTeethElement extends LeafElement {
     }
 }
 class PermanentTeethRenderObject extends LeafRenderObject {
-    render(e) {
-    }
     clone() {
         const clone = new PermanentTeethRenderObject(this.element);
         clone.rect = ElementUtil.cloneRect(this.rect);
@@ -16702,6 +15886,7 @@ class ElementReader {
         this.addFactory(PageBreakFactory);
         this.addFactory(TabFactory);
         this.addFactory(PermanentTeethFactory);
+        this.addFactory(SVGFactory);
         // this.registerReadFunc<TrackRunProps>('ins-run', (data) => {
         //     const props = new TrackRunProps(data.type);
         //     props.userId = data.userId;
@@ -17842,7 +17027,10 @@ class DocumentEvent {
         if (renderObject instanceof LeafRenderObject) {
             if (CommonUtil.isInsideRectByPosition(renderObjectRect, hitPos)) {
                 const x = hitPos.x - renderObjectRect.x;
-                const offset = ElementUtil.getHitRenderOffset(renderObject, x);
+                let offset = ElementUtil.getHitRenderOffset(renderObject, x);
+                if (!this.ismousedown && renderObject.element && renderObject.element.type === 'psym') {
+                    offset = 0;
+                }
                 return {
                     render: renderObject,
                     offset,
@@ -17934,7 +17122,10 @@ class DocumentEvent {
                 else {
                     x = position.x - adjacentRender.rect.x;
                 }
-                const offset = ElementUtil.getHitRenderOffset(adjacentRender.render, x);
+                let offset = ElementUtil.getHitRenderOffset(adjacentRender.render, x);
+                if (!this.ismousedown && renderObject.element && renderObject.element.type === 'psym') {
+                    offset = 0;
+                }
                 return {
                     render: adjacentRender.render,
                     absoluteRenderRect: adjacentRender.rect,
@@ -18024,6 +17215,7 @@ class DocumentEvent {
             startHitInfo: this.startHitInfo,
             endHitInfo: this.endHitInfo
         });
+        console.log(this.endHitInfo);
     }
     /**
      * 获取鼠标所在的渲染元素对象
@@ -28956,7 +28148,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.1.19";
+        return "2.1.20";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -28964,7 +28156,7 @@ class DocEditor {
     getTextContent() {
         const paras = this.docCtx.document.treeFilter(item => item instanceof ParagraphElement);
         const paraTexts = paras.map(item => ElementSerialize.serializeString(item, { all: false }));
-        return paraTexts.join('\n');
+        return paraTexts.join('');
     }
     emit(event, args) {
         this.eventBus.emit(event, args);
@@ -29311,6 +28503,10 @@ exports.RenderContext = RenderContext;
 exports.RenderObject = RenderObject;
 exports.ResizeLeafRenderObject = ResizeLeafRenderObject;
 exports.RunElementFactory = RunElementFactory;
+exports.SVGElement = SVGElement;
+exports.SVGFactory = SVGFactory;
+exports.SVGProps = SVGProps;
+exports.SVGRenderObject = SVGRenderObject;
 exports.SelectionOverlays = SelectionOverlays;
 exports.SelectionRange = SelectionRange;
 exports.SelectionState = SelectionState;