@hailin-zheng/editor-core 2.1.19 → 2.1.21

package/index.js

@@ -246,8 +246,6 @@ class RenderObject {
         this.margin = new MarginProps();
         this.padding = new PaddingProps();
     }
-    pagePaintCompleted(e) {
-    }
     destroy() {
         //this.parent = null;
         //this.margin = null;
@@ -631,10 +629,61 @@ class CommonUtil {
         return reg.test(str);
     }
     static cloneValue(val) {
-        if (typeof val === 'object' && val) {
-            return JSON.parse(JSON.stringify(val));
+        return CommonUtil.cloneDeep(val);
+    }
+    // @ts-ignore
+    static cloneDeep(source, visited = new WeakMap()) {
+        if (source === null || typeof source !== 'object') {
+            // 如果是基本类型或 null，则直接返回
+            return source;
+        }
+        // 处理循环引用
+        if (visited.has(source)) {
+            return visited.get(source);
+        }
+        if (Array.isArray(source)) {
+            // 如果是数组，则递归复制数组元素
+            const arrayClone = [];
+            visited.set(source, arrayClone);
+            source.forEach((item, index) => {
+                arrayClone[index] = CommonUtil.cloneDeep(item, visited);
+            });
+            return arrayClone;
+        }
+        if (source instanceof Date) {
+            // 如果是 Date 对象，则直接创建一个新的 Date 对象
+            return new Date(source.getTime());
+        }
+        if (source instanceof Map) {
+            // 如果是 Map 对象，则递归复制键值对
+            const mapClone = new Map();
+            visited.set(source, mapClone);
+            source.forEach((value, key) => {
+                mapClone.set(CommonUtil.cloneDeep(key, visited), CommonUtil.cloneDeep(value, visited));
+            });
+            return mapClone;
+        }
+        if (source instanceof Set) {
+            // 如果是 Set 对象，则递归复制元素
+            const setClone = new Set();
+            visited.set(source, setClone);
+            source.forEach(value => {
+                setClone.add(CommonUtil.cloneDeep(value, visited));
+            });
+            return setClone;
         }
-        return val;
+        if (Object.prototype.toString.call(source) === '[object Object]') {
+            // 如果是普通对象，则递归复制对象属性
+            const objectClone = {};
+            visited.set(source, objectClone);
+            for (const key in source) {
+                if (source.hasOwnProperty(key)) {
+                    objectClone[key] = CommonUtil.cloneDeep(source[key], visited);
+                }
+            }
+            return objectClone;
+        }
+        return source;
     }
     static isConstructor(f) {
         try {
@@ -714,6 +763,9 @@ class CommonUtil {
         return btoa(unescape(encodeURIComponent(str)));
         //return btoa(str.replace(/[\u00A0-\u2666]/g, c => `&#${c.charCodeAt(0)};`));
     }
+    static isEqual(a, b) {
+        return JSON.stringify(a) === JSON.stringify(b);
+    }
 }
 
 const docOpsMap = new Map();
@@ -1185,6 +1237,8 @@ class Element {
     disposed;
     //加载完毕
     loaded;
+    visibleExpr;
+    attribute;
     _parent;
     get parent() {
         return this._parent;
@@ -1257,7 +1311,6 @@ class Element {
         listeners.forEach(item => item(evt));
     }
     beginMeasure(data) {
-        this.paintRenders.length = 0;
     }
     endMeasure() {
     }
@@ -1673,6 +1726,7 @@ class ViewOptions {
     printHeaderFooterLine = false;
     //显示段落回车符号
     showEnterSymbol = false;
+    enableVisibleExpression = false;
     get fullPageView() {
         return this._fullPageView;
     }
@@ -1786,6 +1840,30 @@ class BorderProps {
         return new BorderProps(this.width, this.color, this.style);
     }
 }
+/**
+ * 克隆元素的基本属性
+ * @param ele
+ * @param target
+ */
+function cloneElementBase(ele, target) {
+    target.attribute = ele.attribute ? CommonUtil.cloneValue(ele.attribute) : undefined;
+}
+/**
+ * 克隆元素的子元素
+ * @param ele
+ * @param target
+ * @param data
+ */
+function cloneChildren(ele, target, data) {
+    if (!data) {
+        return;
+    }
+    for (let i = 0; i < ele.length; i++) {
+        const child = ele.getChild(i);
+        const cloneChild = child.clone(true);
+        target.addChild(cloneChild);
+    }
+}
 class IDispose {
 }
 class ResizeLeafRenderObject extends LeafRenderObject {
@@ -2223,6 +2301,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;
@@ -2766,26 +2870,15 @@ class CommsContainerElement extends BlockContainerElement {
     }
     clone(data) {
         const clone = new CommsContainerElement();
-        if (data) {
-            for (let i = 0; i < this.length; i++) {
-                clone.addChild(this.getChild(i).clone(true));
-            }
-        }
+        cloneElementBase(this, clone);
+        cloneChildren(this, clone, data);
         return clone;
     }
 }
 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);
@@ -2861,14 +2954,11 @@ class DataDecorateElement extends LeafElement {
     clone() {
         const clone = new DataDecorateElement(this.dataEle, this.isPrefix);
         this.props.clone(clone.props);
-        //clone.renderCtx = this.renderCtx;
+        cloneElementBase(this, clone);
         return clone;
     }
 }
 class DataDecorateRenderObject extends LeafRenderObject {
-    render(e) {
-        this.renderDecorRect(e.render, e.position);
-    }
     renderDecorRect(ctx, position) {
         if (ctx.drawMode === 'print') {
             return;
@@ -2939,7 +3029,7 @@ class DataDecorateRenderObject extends LeafRenderObject {
     }
 }
 
-function parser(code) {
+function parser(code, objects) {
     const node = acor.parse(code, { ecmaVersion: 'latest' });
     estraverse.traverse(node, {
         enter: (child, parent) => {
@@ -2947,6 +3037,7 @@ function parser(code) {
                 const identifierName = child['name'];
                 if (identifierName.startsWith('$')) {
                     child['name'] = `getObject('${identifierName.slice(1)}').value`;
+                    objects?.push(identifierName.slice(1));
                 }
             }
         }
@@ -2973,6 +3064,28 @@ function parser(code) {
     });
     return generate(node);
 }
+//判断代码的语句，如果最后一个语句不是return，那么加上return
+function addReturn(code) {
+    const node = acor.parse(code, { ecmaVersion: 'latest' });
+    estraverse.replace(node, {
+        leave: (child) => {
+            //函数调用
+            if (child.type == 'Program') {
+                const body = child['body'];
+                const lastNode = body[body.length - 1];
+                if (lastNode.type !== 'ReturnStatement') {
+                    body[body.length - 1] = {
+                        type: 'ReturnStatement',
+                        start: -1, end: -1,
+                        argument: lastNode
+                    };
+                }
+                return child;
+            }
+        }
+    });
+    return generate(node);
+}
 /**
  * 将参数转为函数调用arg  => ()=>arg
  * @param nodes
@@ -3066,11 +3179,8 @@ class ParagraphElement extends BlockContentElement {
     clone(data) {
         const clone = new ParagraphElement();
         this.props.clone(clone.props);
-        if (data) {
-            for (let i = 0; i < this.length; i++) {
-                clone.addChild(this.getChild(i).clone(true));
-            }
-        }
+        cloneElementBase(this, clone);
+        cloneChildren(this, clone, data);
         return clone;
     }
     static createElement() {
@@ -3078,10 +3188,6 @@ class ParagraphElement extends BlockContentElement {
     }
 }
 class ParagraphRenderObject extends MuiltBlockLineRenderObject {
-    render(e) {
-        e.nextRender();
-        this.drawProjectNumber(e.render, e.docCtx.viewOptions, e);
-    }
     /**
      * 绘制项目符号
      */
@@ -3159,8 +3265,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);
@@ -3272,9 +3376,8 @@ class DocumentElement extends BlockContainerElement {
     clone() {
         const clone = new DocumentElement();
         this.props.clone(clone.props);
-        for (let i = 0; i < this.length; i++) {
-            clone.addChild(this.getChild(i).clone(true));
-        }
+        cloneElementBase(this, clone);
+        cloneChildren(this, clone, true);
         return clone;
     }
     /**
@@ -3362,21 +3465,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);
-        });
-    }
     /**
      * 打印模式检查
      * 如果是续打模式，需要进行裁剪打印范围，页眉页脚都不需要打印
@@ -3666,6 +3754,7 @@ class InlineGroupInputElement extends InlineGroupElement {
     }
     cloneSelf(data, constr) {
         const clone = new constr();
+        cloneElementBase(this, clone);
         this.props['clone'](clone.props);
         //cloneFunc.apply(this, clone.props);
         if (data) {
@@ -3788,7 +3877,7 @@ class DataElementInlineGroup extends InlineGroupInputElement {
                 const code = parser(this.props.expression);
                 this.expressFn = new Function(`with(this){ ${code} }`);
             }
-            this.expressFn.bind(data.parser)();
+            this.expressFn.bind(data.execute)();
             //this.expressFn();
         }
         catch (e) {
@@ -3812,45 +3901,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);
@@ -4121,11 +4171,8 @@ class DocumentBodyElement extends BlockContainerElement {
     }
     clone(data) {
         const clone = new DocumentBodyElement();
-        if (data) {
-            for (let i = 0; i < this.length; i++) {
-                clone.addChild(this.getChild(i).clone(true));
-            }
-        }
+        cloneElementBase(this, clone);
+        cloneChildren(this, clone, data);
         return clone;
     }
     beginMeasure(data) {
@@ -4136,15 +4183,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);
@@ -4184,11 +4222,8 @@ class DocumentFooterElement extends BlockContainerElement {
     }
     clone(data) {
         const clone = new DocumentFooterElement();
-        if (data) {
-            for (let i = 0; i < this.length; i++) {
-                clone.addChild(this.getChild(i).clone(true));
-            }
-        }
+        cloneElementBase(this, clone);
+        cloneChildren(this, clone, data);
         return clone;
     }
     beginMeasure(data) {
@@ -4214,22 +4249,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);
@@ -4280,11 +4299,8 @@ class DocumentHeaderElement extends BlockContainerElement {
     }
     clone(data) {
         const clone = new DocumentHeaderElement();
-        if (data) {
-            for (let i = 0; i < this.length; i++) {
-                clone.addChild(this.getChild(i).clone(true));
-            }
-        }
+        cloneElementBase(this, clone);
+        cloneChildren(this, clone, data);
         return clone;
     }
     switchEditMode(evt) {
@@ -4310,27 +4326,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);
@@ -4403,6 +4398,7 @@ class PSymbolElement extends LeafElement {
     clone() {
         const clone = new PSymbolElement();
         clone.defaultHeight = this.defaultHeight;
+        cloneElementBase(this, clone);
         return clone;
     }
     getSelfLength(pure) {
@@ -4410,13 +4406,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;
@@ -4491,11 +4480,8 @@ class TableCellElement extends BlockContainerElement {
     clone(data) {
         const clone = new TableCellElement();
         this.props.clone(clone.props);
-        if (data) {
-            for (let i = 0; i < this.length; i++) {
-                clone.addChild(this.getChild(i).clone(true));
-            }
-        }
+        cloneElementBase(this, clone);
+        cloneChildren(this, clone, data);
         return clone;
     }
     getCellWidth() {
@@ -4529,22 +4515,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
@@ -4713,8 +4683,6 @@ class TableRowRenderObject extends MuiltBlockLineRenderObject {
     remeasureState = true;
     //当前行是否存在合并单元格
     hasMergeCells = undefined;
-    render(e) {
-    }
     clone() {
         const cloneRender = new TableRowRenderObject(this.element);
         cloneRender.remeasureState = this.remeasureState;
@@ -4743,17 +4711,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.");
     }
@@ -4832,6 +4789,7 @@ class TextGroupElement extends LeafElement {
         const clone = new TextGroupElement();
         this.props.clone(clone.props);
         clone.text = this.text;
+        cloneElementBase(this, clone);
         return clone;
     }
     destroy() {
@@ -4870,17 +4828,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);
     }
@@ -6568,11 +6515,8 @@ class TableElement extends BlockContainerElement {
     clone(data) {
         const clone = new TableElement();
         this.props.clone(clone.props);
-        if (data) {
-            for (let i = 0; i < this.length; i++) {
-                clone.addChild(this.getChild(i).clone(true));
-            }
-        }
+        cloneElementBase(this, clone);
+        cloneChildren(this, clone, data);
         return clone;
     }
     createRenderObject() {
@@ -6596,56 +6540,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;
@@ -6911,6 +6805,7 @@ class CheckBoxElement extends LeafElement {
     }
     clone() {
         const clone = new CheckBoxElement();
+        cloneElementBase(this, clone);
         this.props.clone(clone.props);
         return clone;
     }
@@ -6930,10 +6825,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;
@@ -7017,11 +6909,8 @@ class CommContentElement extends CommContentBaseElement {
     clone(data) {
         const clone = new CommContentElement();
         this.props.clone(clone.props);
-        if (data) {
-            for (let i = 0; i < this.length; i++) {
-                clone.addChild(this.getChild(i).clone(true));
-            }
-        }
+        cloneElementBase(this, clone);
+        cloneChildren(this, clone, data);
         return clone;
     }
     beginMeasure(data) {
@@ -7032,34 +6921,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 = [];
@@ -7326,20 +7187,11 @@ class CommentElement extends LeafElement {
     clone() {
         const clone = new CommentElement();
         this.props.clone(clone.props);
+        cloneElementBase(this, clone);
         return clone;
     }
 }
 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 });
@@ -7485,11 +7337,8 @@ class ValidateElement extends CommContentBaseElement {
     clone(data) {
         const clone = new ValidateElement();
         this.props.clone(clone.props);
-        if (data) {
-            for (let i = 0; i < this.length; i++) {
-                clone.addChild(this.getChild(i).clone(true));
-            }
-        }
+        cloneElementBase(this, clone);
+        cloneChildren(this, clone, data);
         return clone;
     }
     setContent(content) {
@@ -7505,31 +7354,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();
@@ -8442,6 +8266,7 @@ class DataElementBarcode extends DataElementLeaf {
     clone(data) {
         const clone = new DataElementBarcode();
         this.props.clone(clone.props);
+        cloneElementBase(this, clone);
         return clone;
     }
     setValue(val) {
@@ -8455,40 +8280,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') {
@@ -8624,6 +8420,7 @@ class DataElementCheck extends DataElementLeaf {
     clone(data) {
         const clone = new DataElementCheck();
         this.props.clone(clone.props);
+        cloneElementBase(this, clone);
         return clone;
     }
     setValue(val) {
@@ -8653,27 +8450,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;
@@ -8964,12 +8740,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);
@@ -9021,6 +8791,7 @@ class DataElementImage extends DataElementLeaf {
     clone(data) {
         const clone = new DataElementImage();
         this.props.clone(clone.props);
+        cloneElementBase(this, clone);
         return clone;
     }
     destroy() {
@@ -9037,38 +8808,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 = [{
@@ -9299,18 +9043,11 @@ class BreakElement extends LeafElement {
     }
     clone() {
         const clone = new BreakElement();
-        //clone.renderCtx = this.renderCtx;
+        cloneElementBase(this, clone);
         return clone;
     }
 }
 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;
@@ -9476,8 +9213,6 @@ class FillNullSpaceRenderObject extends LeafRenderObject {
         super(null);
         this.disableClick = true;
     }
-    render(e) {
-    }
     clone() {
         const clone = new FillNullSpaceRenderObject();
         clone.rect = ElementUtil.cloneRect(this.rect);
@@ -9529,20 +9264,12 @@ class DocumentBodyPartElement extends BlockContainerElement {
     clone(data) {
         const clone = new DocumentBodyPartElement();
         clone.props.partId = this.props.partId;
-        if (data) {
-            for (let i = 0; i < this.length; i++) {
-                clone.addChild(this.getChild(i).clone(true));
-            }
-        }
+        cloneElementBase(this, clone);
+        cloneChildren(this, clone, data);
         return clone;
     }
 }
 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);
@@ -9636,6 +9363,7 @@ class DataElementMH extends DataElementLeaf {
     clone(data) {
         const element = new DataElementMH();
         this.props.clone(element.props);
+        cloneElementBase(this, element);
         return element;
     }
     getCurrentLayoutItem() {
@@ -9682,9 +9410,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 = [];
@@ -9884,6 +9609,152 @@ function renderMHHTML(event, element, isPaint, nodes = []) {
     }
 }
 
+const fontSize = 12;
+const verPadding = 2;
+/**
+ * 恒牙牙位图
+ */
+class PermanentTeethElement extends DataElementLeaf {
+    constructor() {
+        super('permanent-teeth');
+        this.props = new PermanentTeethProps();
+        this.props.topLeft = '';
+        this.props.topRight = '';
+        this.props.bottomLeft = '';
+        this.props.bottomRight = '';
+    }
+    setValue(val) {
+        if (typeof val === 'string' && val) {
+            const items = val.split(';');
+            if (items.length >= 4) {
+                this.props.topLeft = items[0];
+                this.props.topRight = items[1];
+                this.props.bottomLeft = items[2];
+                this.props.bottomRight = items[3];
+            }
+        }
+        else if (typeof val === 'object') {
+            this.props.topLeft = val?.topLeft ?? '';
+            this.props.topRight = val?.topRight ?? '';
+            this.props.bottomLeft = val?.bottomLeft ?? '';
+            this.props.bottomRight = val?.bottomRight ?? '';
+        }
+    }
+    getValue() {
+        const { topLeft, topRight, bottomLeft, bottomRight } = this.props;
+        return `${topLeft};${topRight};${bottomLeft};${bottomRight}`;
+    }
+    clone(data) {
+        const clone = new PermanentTeethElement();
+        clone.props = this.props.clone();
+        cloneElementBase(this, clone);
+        return clone;
+    }
+    createRenderObject(data) {
+        const clone = new PermanentTeethRenderObject(this);
+        clone.rect.width = 150;
+        //字体大小*2+上下间距2*2
+        clone.rect.height = fontSize * 2 + verPadding * 2;
+        //clone.rect= ElementUtil.cloneRect(this.rect);
+        return clone;
+    }
+    serialize(viewOptions) {
+        return {
+            type: this.type,
+            props: this.props.getSerializeProps(viewOptions)
+        };
+    }
+}
+class PermanentTeethRenderObject extends LeafRenderObject {
+    clone() {
+        const clone = new PermanentTeethRenderObject(this.element);
+        clone.rect = ElementUtil.cloneRect(this.rect);
+        return clone;
+    }
+    // measure(): { width: number, height: number } {
+    //     const ele = this.element;
+    //
+    // }
+    exportHTML(event) {
+        const ele = this.element;
+        const g = super.exportHTML(event);
+        const contentHorPadding = 4;
+        g.children = [];
+        // g.children.push(ElementUtil.getFillSvgPath(`M 0 ${this.rect.height / 2} h${this.rect.width}`, '#000', 1));
+        // g.children.push(ElementUtil.getFillSvgPath(`M ${this.rect.width / 2} 0 v${this.rect.height}`, '#000', 1));
+        //
+        g.children.push(ElementUtil.getFillSvgRect(0, this.rect.height / 2, this.rect.width, 1, '#000'));
+        g.children.push(ElementUtil.getFillSvgRect(this.rect.width / 2, 0, 1, this.rect.height, '#000'));
+        const getSvgText = (text, x, y) => {
+            return {
+                sel: 'text',
+                text: text,
+                data: {
+                    ns: "http://www.w3.org/2000/svg",
+                    attrs: {
+                        'dominant-baseline': 'hanging',
+                        'font-family': 'Arial',
+                        'font-size': fontSize,
+                        x,
+                        y,
+                    }
+                },
+            };
+        };
+        const topLeftWidth = event.renderCtx.mainContext.measureTextWidth(ele.props.topLeft, {
+            fontSize: fontSize,
+            fontName: 'Arial'
+        });
+        const bottomLeftWidth = event.renderCtx.mainContext.measureTextWidth(ele.props.bottomLeft, {
+            fontSize: fontSize,
+            fontName: 'Arial'
+        });
+        g.children.push(getSvgText(ele.props.topLeft, this.rect.width / 2 - topLeftWidth - contentHorPadding, verPadding));
+        g.children.push(getSvgText(ele.props.topRight, this.rect.width / 2 + contentHorPadding, verPadding));
+        g.children.push(getSvgText(ele.props.bottomLeft, this.rect.width / 2 - bottomLeftWidth - contentHorPadding, this.rect.height - fontSize + verPadding));
+        g.children.push(getSvgText(ele.props.bottomRight, this.rect.width / 2 + contentHorPadding, this.rect.height - fontSize + verPadding));
+        return g;
+    }
+}
+class PermanentTeethFactory extends ElementFactory {
+    match(type) {
+        return type === 'permanent-teeth';
+    }
+    createElement(data) {
+        const ele = new PermanentTeethElement();
+        ele.props.bottomLeft = data.props?.bottomLeft ?? '';
+        ele.props.bottomRight = data.props?.bottomRight ?? '';
+        ele.props.topLeft = data.props?.topLeft ?? '';
+        ele.props.topRight = data.props?.topRight ?? '';
+        return ele;
+    }
+}
+/**
+ * 恒牙牙位图属性
+ */
+class PermanentTeethProps extends INotifyPropertyChanged {
+    topLeft;
+    topRight;
+    bottomLeft;
+    bottomRight;
+    getSerializeProps(viewOptions) {
+        return {
+            topLeft: this.topLeft,
+            topRight: this.topRight,
+            bottomLeft: this.bottomLeft,
+            bottomRight: this.bottomRight,
+        };
+    }
+    clone(dest) {
+        dest = dest || new PermanentTeethProps();
+        dest.topLeft = this.topLeft;
+        dest.topRight = this.topRight;
+        dest.bottomLeft = this.bottomLeft;
+        dest.bottomRight = this.bottomRight;
+        return dest;
+    }
+}
+
 class PictureElement extends LeafElement {
     //props: PictureProps;
     status = 'no';
@@ -9912,6 +9783,7 @@ class PictureElement extends LeafElement {
     clone(data) {
         const clone = new PictureElement();
         this.props.clone(clone.props);
+        cloneElementBase(this, clone);
         return clone;
     }
     destroy() {
@@ -9919,36 +9791,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;
@@ -10062,6 +9909,7 @@ class RadioBoxElement extends LeafElement {
     clone() {
         const clone = new RadioBoxElement();
         this.props.clone(clone.props);
+        cloneElementBase(this, clone);
         return clone;
     }
 }
@@ -10080,10 +9928,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);
@@ -10117,18 +9961,11 @@ class PageBreakElement extends LeafElement {
     }
     clone() {
         const clone = new PageBreakElement();
-        //clone.renderCtx = this.renderCtx;
+        cloneElementBase(this, clone);
         return clone;
     }
 }
 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);
@@ -10161,17 +9998,12 @@ class TabElement extends LeafElement {
         };
     }
     clone() {
-        return new TabElement();
+        const clone = new TabElement();
+        cloneElementBase(this, clone);
+        return clone;
     }
 }
 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);
@@ -10737,6 +10569,116 @@ class TableSplitCell {
     }
 }
 
+class SVGElement extends LeafElement {
+    resizeable = true;
+    constructor() {
+        super('svg');
+        this.props = new SVGProps();
+        //this.addPropValueChangedSub(this.props);
+        this.cursorType = 'move';
+        this.focusable = true;
+    }
+    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);
+        cloneElementBase(this, clone);
+        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对象
@@ -10780,6 +10722,9 @@ class ElementSerialize {
         if (element.props && element.props['__attachedProperty'] && !result.props['__attachedProperty']) {
             result.props['__attachedProperty'] = CommonUtil.cloneValue(element.props['__attachedProperty']);
         }
+        if (element.attribute) {
+            result['attribute'] = this.serializeAttribute(element);
+        }
         return result;
     }
     static serializeString(element, options = { all: false }) {
@@ -10789,6 +10734,9 @@ class ElementSerialize {
         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++) {
@@ -10799,6 +10747,21 @@ class ElementSerialize {
         }
         return "";
     }
+    static serializeAttribute(element) {
+        if (element.attribute) {
+            const result = {};
+            for (const key in element.attribute) {
+                if (element.attribute[key] !== undefined && element.attribute[key] !== null) {
+                    result[key] = element.attribute[key];
+                }
+            }
+            if (Object.keys(result).length === 0) {
+                return null;
+            }
+            return CommonUtil.cloneValue(result);
+        }
+        return null;
+    }
     /**
      * 获取选中的结构
      * @param ss
@@ -10897,12 +10860,8 @@ class TrackRunElement extends InlineGroupElement {
     clone(data) {
         const clone = new TrackRunElement(this.type);
         this.props.clone(clone.props);
-        if (data) {
-            const length = this.length;
-            for (let i = 0; i < length; i++) {
-                clone.addChild(this.getChild(i).clone(true));
-            }
-        }
+        cloneElementBase(this, clone);
+        cloneChildren(this, clone, data);
         return clone;
     }
     createRenderObject(data) {
@@ -10939,32 +10898,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);
@@ -12527,9 +12460,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;
         }
     }
@@ -12812,6 +12745,26 @@ class ElementUtil {
             ss.resetRange(ele.getChild(ele.length - 2), -1);
         }
     }
+    static setEleAttribute(ele, attr, value) {
+        if (!ele.attribute) {
+            ele.attribute = {};
+        }
+        if (ele.attribute[attr] === value) {
+            return;
+        }
+        ele.attribute[attr] = value;
+    }
+    static getEleAttribute(ele, attr) {
+        if (ele.attribute) {
+            return ele.attribute[attr];
+        }
+        return undefined;
+    }
+    static removeEleAttribute(ele, attr) {
+        if (ele.attribute) {
+            delete ele.attribute[attr];
+        }
+    }
 }
 
 class RenderContext {
@@ -13259,12 +13212,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) {
@@ -13293,25 +13246,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);
             }
         }
         //处理选中拖蓝
@@ -13364,14 +13317,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;
@@ -13383,24 +13336,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);
-        }
     }
 }
 
@@ -13461,10 +13399,7 @@ class EditorContext {
     isDirty = false;
     cursorRect;
     _document;
-    //文档刷新的订阅事件
-    //refSub!: Subscription;
     syncRefresh;
-    //imageLoader: IImageLoader;
     dynamicFunc;
     docChange;
     clearPrevDocCb;
@@ -13518,6 +13453,7 @@ class EditorContext {
         //this.imageLoader.clear();
         this.dynamicFunc.destroyScripts();
         this.isDirty = false;
+        //this.clearEleDepMaps();
     }
     get defaultCtx() {
         return new DocumentContext(this._document, this.selectionState);
@@ -13592,17 +13528,6 @@ class EditorContext {
         return this._document.modifyFlag === ModifyFlag$1.None ? 'appearance' : 'content';
     }
 }
-// export interface IImageLoader {
-//     clear(): void;
-//
-//     loadImage(src: string, onCallback: (status: ImgLoadStatus) => void): void;
-//
-//     getImage(src: string): HTMLImageElement | undefined;
-//
-//     imagesLoadCompleted(): boolean;
-//
-//     getLoadTasks(): Array<Promise<void>>;
-// }
 /**
  * 文档上下文
  */
@@ -13865,13 +13790,23 @@ class DocumentContext {
     }
 }
 
-class DynamicContextParser {
+class DynamicExecute {
     doc;
     ss;
+    current;
+    depItems;
     constructor(doc, ss) {
         this.doc = doc;
         this.ss = ss;
     }
+    setCurrentCtx(ele, depItems) {
+        this.current = ele;
+        this.depItems = depItems;
+    }
+    clearCurrentCtx() {
+        this.current = undefined;
+        this.depItems = undefined;
+    }
     cacheList;
     getControlById(id) {
         if (!this.cacheList) {
@@ -13883,6 +13818,10 @@ class DynamicContextParser {
         //return this.cacheList.find(item => item['props']['id'] === id);
     }
     getObject(id) {
+        //如果当前存在编译缓存，则直接从缓存中获取
+        if (this.depItems && this.depItems.has(id)) {
+            return this.depItems.get(id);
+        }
         new DocumentContext(this.doc, this.ss);
         if (id.startsWith('$')) {
             id = id.slice(1);
@@ -13901,6 +13840,9 @@ class DynamicContextParser {
                 if (control) {
                     control.setValue(val);
                 }
+            },
+            get ref() {
+                return control;
             }
         };
     }
@@ -13972,9 +13914,12 @@ class DynamicContextParser {
 class ParagraphMeasure {
     options;
     renderCtx;
-    constructor(options, renderCtx) {
+    execute;
+    constructor(options, renderCtx, execute) {
         this.options = options;
         this.renderCtx = renderCtx;
+        this.execute = execute;
+        this.execute = execute;
     }
     /**
      * 段落排版：
@@ -14070,7 +14015,10 @@ class ParagraphMeasure {
         const paraRenders = [];
         for (let i = 0; i < paraModels.length; i++) {
             const innerLineRects = paraModels[i].innerLine;
-            let render = p.createRenderObject();
+            let render = this.createRenderObject(p);
+            if (!render) {
+                return [];
+            }
             render.setRenderWidth(limitWidth);
             paraRenders.push(render);
             for (let j = 0; j < innerLineRects.length; j++) {
@@ -14211,7 +14159,7 @@ class ParagraphMeasure {
     }
     arrangeInlineGroupElement(parentLine, ele) {
         const { options, renderCtx } = this;
-        let render = ele.createRenderObject({ options, renderCtx });
+        let render = this.createRenderObject(ele);
         //记录多行情况下的渲染对象，用于计算总长度，生成fill-null-space
         const inlineGroupRenders = [];
         ele.cacheRender = render;
@@ -14265,10 +14213,7 @@ class ParagraphMeasure {
                     const baseTextProps = ele.props;
                     nullText.text = baseTextProps.nullText;
                     baseTextProps.nullTextProps.clone(nullText.props);
-                    const nullTextRender = nullText.createRenderObject({
-                        options: this.options,
-                        renderCtx: this.renderCtx
-                    });
+                    const nullTextRender = this.createRenderObject(nullText);
                     //inlineGroupRender.insertChild(nullTextRender, 1);
                     this.arrangeLeafRender(data, nullTextRender);
                 }
@@ -14297,7 +14242,7 @@ class ParagraphMeasure {
         }
     }
     arrangeLeafElement(parentLine, ele) {
-        ele.cacheRender = ele.createRenderObject({ options: this.options, renderCtx: this.renderCtx });
+        ele.cacheRender = this.createRenderObject(ele);
         if (ele.cacheRender) {
             this.arrangeLeafRender(parentLine, ele.cacheRender);
         }
@@ -14494,6 +14439,80 @@ class ParagraphMeasure {
         }
         throw new Error('未到达计算位置');
     }
+    /**
+     * 解析可见性表达式
+     * @param ele
+     * @param execute
+     * @private
+     */
+    parseVisibleExpression(ele, execute) {
+        if (ele.visibleExpr)
+            return;
+        if (!ele.attribute?.visibleExpr)
+            return;
+        const reactiveMode = this.renderCtx.drawMode !== 'print';
+        try {
+            const depIdItems = [];
+            const depEleMap = new Map();
+            let compliedCode = parser(ele.attribute?.visibleExpr, depIdItems);
+            compliedCode = addReturn(compliedCode);
+            if (depIdItems.length) {
+                depIdItems.forEach(dep => {
+                    const refCtx = execute.getObject(dep);
+                    if (refCtx.ref) {
+                        const refEle = refCtx.ref.item;
+                        depEleMap.set(dep, refCtx);
+                        //当前有可能是checkbox数组
+                        const refEles = Array.isArray(refEle) ? refEle : [refEle];
+                        reactiveMode && refEles.forEach(item => {
+                            //求值依赖元素更改的时候，发布当前元素重新计算的指令
+                            item.onChangeSubject.subscribe(() => {
+                                ele.pubOnChange('self');
+                            });
+                        });
+                    }
+                });
+            }
+            ele.visibleExpr = { compliedCode, func: new Function(`with(this){ ${compliedCode} }`), depItems: depEleMap };
+        }
+        catch (e) {
+            console.error('解析表达式出错', ele.attribute?.visibleExpr);
+        }
+    }
+    /**
+     * 元素可见行求值
+     * @param ele
+     * @param executeCtx
+     * @private
+     */
+    evalVisibleExpr(ele, executeCtx) {
+        if (ele.visibleExpr && ele.visibleExpr.func) {
+            try {
+                executeCtx.setCurrentCtx(ele, ele.visibleExpr.depItems);
+                const func = ele.visibleExpr.func.bind(executeCtx);
+                return func() === true;
+            }
+            catch (e) {
+                console.error(e, "表达式执行出错", ele.visibleExpr.compliedCode);
+            }
+            finally {
+                executeCtx.clearCurrentCtx();
+            }
+        }
+        return true;
+    }
+    createRenderObject(element) {
+        if (this.options.enableVisibleExpression) {
+            this.parseVisibleExpression(element, this.execute);
+            if (!this.evalVisibleExpr(element, this.execute)) {
+                return null;
+            }
+        }
+        return element.createRenderObject({
+            options: this.options,
+            renderCtx: this.renderCtx
+        });
+    }
 }
 
 /**
@@ -14625,6 +14644,8 @@ class DocumentArrange {
     renderCtx;
     seo;
     options;
+    execute;
+    pMeasure;
     constructor(docCtx, renderCtx, seo) {
         this.docCtx = docCtx;
         this.renderCtx = renderCtx;
@@ -14644,10 +14665,12 @@ class DocumentArrange {
         //测量阶段，对于空段落会插入段落符号，新表格会插入空段落，此时不需要记录节点的更改，以最大的节点进行记录
         return suppressTracking(() => {
             const doc = this.docCtx.document;
+            this.execute = new DynamicExecute(doc, this.docCtx.selectionState);
+            this.pMeasure = new ParagraphMeasure(this.options, this.renderCtx, this.execute);
             const data = {
                 doc,
                 viewOptions: this.options,
-                parser: new DynamicContextParser(doc, this.docCtx.selectionState),
+                execute: this.execute,
                 createParaFn: () => this.createDefaultPara()
             };
             doc.clearMarkItems();
@@ -14763,15 +14786,6 @@ class DocumentArrange {
             cloneFooterRender.rect.x = limitRect.x;
             cloneFooterRender.rect.y = documentRender.rect.height - bodyMarginBottom;
             currColumn === 0 && documentRender.addChild(cloneFooterRender);
-            // //审阅模式，添加审阅窗口
-            // if (this.options.showReviewWindow && commentsRender) {
-            //     const commentsContainer = this.createRenderObject(commentsRender.element) as CommsContainerRenderObject;
-            //     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;
-            // }
             currColumn++;
             if (currColumn === docColumns) {
                 currColumn = 0;
@@ -14782,7 +14796,7 @@ class DocumentArrange {
         return docPages;
     }
     createEmptyBodyRender(bodyRender, limitRect) {
-        const pageBodyRender = this.createRenderObject(bodyRender.element);
+        const pageBodyRender = this.pMeasure.createRenderObject(bodyRender.element);
         pageBodyRender.rect.width = limitRect.width;
         const bodyInnerLimitRect = pageBodyRender.getInnerRect();
         if (this.options.fullPageView) {
@@ -14798,12 +14812,11 @@ class DocumentArrange {
             return element.cacheRender;
         }
         if (element instanceof BlockContentElement) {
-            const pRange = new ParagraphMeasure(this.options, this.renderCtx);
-            return pRange.measureParagraph(element, maxWidth);
+            return this.pMeasure.measureParagraph(element, maxWidth);
         }
         else if (element instanceof BlockContainerElement) {
             const renders = [];
-            let render = this.createRenderObject(element);
+            let render = this.pMeasure.createRenderObject(element);
             if (!render) {
                 element.cacheRender = null;
                 return null;
@@ -14816,8 +14829,8 @@ class DocumentArrange {
             const innerMaxWidth = render.getInnerMaxWidth();
             for (let i = 0; i < element.length; i++) {
                 const child = element.getChild(i);
-                const blockContentELement = child;
-                const childRender = this.measureControl(blockContentELement, innerMaxWidth);
+                const blockContentElement = child;
+                const childRender = this.measureControl(blockContentElement, innerMaxWidth);
                 if (!childRender) {
                     continue;
                 }
@@ -14827,7 +14840,7 @@ class DocumentArrange {
                     }
                     for (let j = 0; j < childRender.length; j++) {
                         if (j > 0) {
-                            render = this.createRenderObject(element);
+                            render = this.pMeasure.createRenderObject(element);
                             if (!render.rect.width) {
                                 render.setRenderWidth(maxWidth);
                             }
@@ -14855,12 +14868,6 @@ class DocumentArrange {
             textLineRenderMode(cacheRender, { options: this.options, renderCtx: this.renderCtx });
         }
     }
-    createRenderObject(element) {
-        return element.createRenderObject({
-            options: this.options,
-            renderCtx: this.renderCtx
-        });
-    }
     getDocInnerRect(documentRender) {
         const render = documentRender.element.createRenderObject();
         render.padding = documentRender.padding;
@@ -14879,7 +14886,7 @@ class DocumentArrange {
         if (render instanceof TableRenderObject) {
             return this.cutTable(render, limitHeight);
         }
-        const cloneRender = this.createRenderObject(render.element);
+        const cloneRender = this.pMeasure.createRenderObject(render.element);
         cloneRender.setRenderWidth(render.rect.width);
         if (render instanceof MuiltBlockLineRenderObject) {
             let sumHeight = 0;
@@ -14964,10 +14971,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;
                 }
                 //限制的外框尺寸
@@ -15055,7 +15063,7 @@ class DocumentArrange {
             for (let i = 0; i < cutCellRenders.length; i++) {
                 let cellRender = cutCellRenders[i];
                 if (!cellRender) {
-                    cellRender = this.createRenderObject(cellRenders[i].element);
+                    cellRender = this.pMeasure.createRenderObject(cellRenders[i].element);
                     cellRender.rect = ElementUtil.cloneRect(cellRenders[i].rect);
                     cellRender.rect.height = 0;
                     ElementUtil.remeasure(cellRender);
@@ -15200,6 +15208,7 @@ class DocumentArrange {
         }
     }
     clearPaintCache(ele, data) {
+        ele.paintRenders.length = 0;
         ele.beginMeasure(data);
         this.identifyComment(ele);
         if (ele instanceof BranchElement) {
@@ -15227,1105 +15236,65 @@ class DocumentArrange {
      */
     generateCommRange() {
         this.seo.commRangeSets.clear();
-        const commMarks = this.docCtx.document.markPairs;
-        for (let i = 0; i < commMarks.length; i++) {
-            const commMark = commMarks[i];
-            if (commMark.start && commMark.end) {
-                const ancestor = DocumentSelection.getAncestorCommonControl(commMark.start, commMark.end);
-                const range = RangeUtil.getSectionRange(commMark.start, 0, commMark.end, 1, ancestor);
-                SelectionOverlays.addToCommentSets(range, this.seo.commRangeSets, commMark.start.color);
-            }
-        }
-    }
-    cacheRenders(renderTree) {
-        if (renderTree.element) {
-            renderTree.element.paintRenders.push(renderTree);
-        }
-        for (let i = 0; i < renderTree.length; i++) {
-            const currRender = renderTree.getChild(i);
-            if (currRender.element) {
-                this.cacheCommsRender(currRender);
-            }
-            if (currRender instanceof BranchRenderObject) {
-                this.cacheRenders(currRender);
-            }
-            else {
-                currRender.element && currRender.element.paintRenders.push(currRender);
-            }
-        }
-    }
-    /**
-     * 缓存批注标志
-     * @private
-     */
-    cacheCommsRender(render) {
-        if (render.element && render.element.type === 'comm') {
-            const commElement = render.element;
-            if (commElement.props.markType === 'start') {
-                const currDocRender = this.cacheDoc;
-                const docCommContainer = currDocRender.getItems().find(item => item instanceof CommsContainerRenderObject);
-                if (docCommContainer) {
-                    docCommContainer.commsMarks.push(render);
-                }
-            }
-        }
-        if (render.element && render.element.type === 'comm-list') {
-            const commContainer = render;
-            CommentsUtil.createCommentsImage(commContainer);
-        }
-    }
-    endMeasures(ele) {
-        ele.endMeasure();
-        if (ele instanceof BranchElement) {
-            for (let i = 0; i < ele.length; i++) {
-                this.endMeasures(ele.getChild(i));
-            }
-        }
-    }
-    createDefaultPara() {
-        const tmp = new ParagraphElement();
-        tmp.props.lineHeight = this.options.defaultLineHeight;
-        return tmp;
-    }
-}
-
-/**
-* 文字行渲染模式
-用于医嘱打印模式
-*/
-function runTextLineRender(ele, data) {
-    if (!data.options.textRowLineMode) {
-        return;
-    }
-    if (ele instanceof TableElement) {
-        // textLineRenderMode(ele, data);
-        // remeasureParentRenders(ele.cacheRender)
-        return;
-    }
-    if (ele instanceof BranchElement) {
-        for (let i = 0; i < ele.length; i++) {
-            runTextLineRender(ele.getChild(i), data);
-        }
-    }
-}
-
-/**
- * 测量阶段，生成Render-UI
- */
-class ElementMeasure {
-    docCtx;
-    renderCtx;
-    options;
-    constructor(docCtx, renderCtx) {
-        this.docCtx = docCtx;
-        this.renderCtx = renderCtx;
-        this.options = docCtx.viewOptions;
-    }
-    measureDocument(document) {
-        //测量阶段，对于空段落会插入段落符号，新表格会插入空段落，此时不需要记录节点的更改，以最大的节点进行记录
-        return suppressTracking(() => {
-            this.clearPaintCache(document, {
-                doc: document,
-                viewOptions: this.options,
-                parser: new DynamicContextParser(document, this.docCtx.selectionState),
-                createParaFn: () => new ParagraphElement()
-            });
-            const docRender = this.measureControl(document, this.options.docPageSettings.width);
-            this.setMeasureCompletedModifyFlag(document);
-            runTextLineRender(document, { options: this.options, renderCtx: this.renderCtx });
-            return docRender;
-        });
-    }
-    measureControl(element, maxWidth) {
-        if (element.modifyFlag === ModifyFlag$1.None) {
-            return element.cacheRender;
-        }
-        if (element instanceof BlockContentElement) {
-            const render = element.createRenderObject({ options: this.options, renderCtx: this.renderCtx });
-            element.cacheRender = render;
-            //测量阶段，只限制最大宽度即可
-            render.setRenderWidth(maxWidth);
-            if (element instanceof ParagraphElement) {
-                this.measureParagraph(element, render);
-            }
-            else {
-                throw new Error('未实现');
-            }
-            return render;
-        }
-        else if (element instanceof BlockContainerElement) {
-            //ElementUtil.fixBlockContainer(element);
-            let render = null;
-            if (element.modifyFlag === ModifyFlag$1.Modify || element.modifyFlag === ModifyFlag$1.Track) {
-                //ElementUtil.fixBlockContainer(element);
-                element.cacheRender = null;
-                render = element.createRenderObject({ options: this.options, renderCtx: this.renderCtx });
-                if (!render) {
-                    element.cacheRender = null;
-                    return null;
-                }
-                if (!render.rect.width) {
-                    render.setRenderWidth(maxWidth);
-                }
-            }
-            if (!render) {
-                throw new Error('render is null');
-            }
-            element.cacheRender = render;
-            const innerMaxWidth = render.getInnerMaxWidth();
-            for (let i = 0; i < element.length; i++) {
-                const child = element.getChild(i);
-                const blockContentELement = child;
-                const childRender = this.measureControl(blockContentELement, innerMaxWidth);
-                if (!childRender) {
-                    continue;
-                }
-                render.addChild(childRender);
-            }
-            ElementUtil.remeasure(render);
-            return render;
-        }
-        else {
-            throw new Error('未实现');
-        }
-    }
-    /**
-     * 生成段落 UI 树
-     * @param para
-     * @param render
-     */
-    measureParagraph(para, render) {
-        ElementUtil.fixParagraphContent(para);
-        const renderObjects = [];
-        for (let i = 0; i < para.length; i++) {
-            const child = para.getChild(i);
-            if (child instanceof InlineGroupElement) {
-                child.cacheRender = this.getInlineGroupRenderItem(child);
-                if (child.cacheRender) {
-                    renderObjects.push(child.cacheRender);
-                }
-            }
-            else if (child instanceof LeafElement) {
-                child.cacheRender = child.createRenderObject({ options: this.options, renderCtx: this.renderCtx });
-                if (child.cacheRender) {
-                    renderObjects.push(child.cacheRender);
-                }
-            }
-        }
-        this.measureInnerParagraph(render, para, renderObjects);
-    }
-    /**
-     * 根据段落UI元素，进行排列
-     * @param render
-     * @param paragraph
-     * @param renderObjects
-     */
-    measureInnerParagraph(render, paragraph, renderObjects) {
-        return;
-        // let lineRect = render.createLineRect();
-        // let maxLineWidth=render.rect.width;
-        // //行内框
-        // const innerLineRects: Array<ParagraphLineRectRenderObject> = [];
-        // const addInnerLineFunc = (lineRect: ParagraphLineRectRenderObject): void => {
-        //     maxLineWidth=render.rect.width;
-        //     innerLineRects.push(lineRect);
-        //     if (innerLineRects.indexOf(lineRect) === 0) {
-        //         if (paragraph.props.indent > 0) {
-        //             maxLineWidth -= paragraph.props.indent;
-        //         }
-        //     } else {
-        //         maxLineWidth -= paragraph.props.hanging;
-        //     }
-        // };
-        // addInnerLineFunc(lineRect);
-        // let i = 0;
-        // let currItem = renderObjects[i++];
-        // const inCloseBody = paragraph.parent.type === 'body';
-        // while (currItem) {
-        //     const maxWidth = maxLineWidth;
-        //     const nextItem = renderObjects[i];
-        //     const {
-        //         firstItem,
-        //         lastItem,
-        //         br
-        //     } = this.cutRenderItem(currItem, nextItem, maxWidth - lineRect.rect.width, lineRect.length === 0, inCloseBody);
-        //     if (firstItem) {
-        //         if (lastItem) {
-        //             renderObjects.splice(i, 0, lastItem);
-        //         }
-        //         currItem = firstItem;
-        //     } else {
-        //         lineRect = render.createLineRect();
-        //         addInnerLineFunc(lineRect);
-        //         continue;
-        //     }
-        //     lineRect.addChild(currItem);
-        //     currItem.rect.x = lineRect.rect.width;
-        //     if (currItem.rect.height > lineRect.rect.height) {
-        //         lineRect.rect.height = currItem.rect.height;
-        //     }
-        //     lineRect.rect.width += currItem.rect.width;
-        //     if (br) {
-        //         //lineRect.rect.maxWidth = lineRect.rect.width;
-        //         lineRect = render.createLineRect();
-        //         addInnerLineFunc(lineRect);
-        //     }
-        //     currItem = renderObjects[i++];
-        // }
-        // for (let i = 0; i < innerLineRects.length; i++) {
-        //     const innerLineRect = innerLineRects[i] as ParagraphLineRectRenderObject;
-        //     innerLineRect.rect.x = this.getParaLineRectStartX(innerLineRects.length, i, paragraph, render, innerLineRect);
-        //     //限制最大行高
-        //     const maxLineHeight = paragraph.props.lineHeight !== this.options.defaultLineHeight ? 100 : Math.floor(14 * 2);
-        //     //fillLineHeight填充行高
-        //     let fillLineHeight = Math.ceil(innerLineRect.rect.height * (paragraph.props.lineHeight - 1));
-        //     fillLineHeight = fillLineHeight > maxLineHeight ? maxLineHeight : fillLineHeight;
-        //     const lineHeight = innerLineRect.rect.height + fillLineHeight;
-        //     const paddingBottom = Math.ceil(fillLineHeight / 2);
-        //     innerLineRect.rect.height = lineHeight;
-        //     for (let j = 0; j < innerLineRect.length; j++) {
-        //         const leaf = innerLineRect.getChild(j);
-        //         leaf.rect.y = innerLineRect.rect.height - paddingBottom - leaf.rect.height;
-        //     }
-        //     //render.rect.height += lineRect.rect.height;
-        //     const outterLineRect = render.createLineRect();
-        //     outterLineRect.rect.width = render.rect.width;
-        //     outterLineRect.addChild(innerLineRect);
-        //     ElementUtil.remeasure(outterLineRect, false);
-        //     render.addChild(outterLineRect);
-        // }
-        // ElementUtil.remeasure(render);
-    }
-    /**
-     * 获取段落行布局横向坐标起始位置，被段落text-align影响
-     */
-    getParaLineRectStartX(counter, paraLineIndex, paraElement, paraRenderObject, paraLineRender) {
-        //左对齐，首行缩进
-        let indent = paraElement.props.indent;
-        //存在项目符号
-        if (paraLineIndex > 0) {
-            indent = paraElement.props.hanging;
-        }
-        if (paraElement.props.textAlign === 'center') {
-            const remainSpace = paraRenderObject.rect.width - paraLineRender.rect.width;
-            return Math.ceil(remainSpace / 2) + indent;
-        }
-        else if (paraElement.props.textAlign === 'right') {
-            const remainSpace = paraRenderObject.rect.width - paraLineRender.rect.width;
-            return remainSpace + indent;
-        }
-        else if (paraElement.props.textAlign === 'justify') {
-            const renderUnitCount = this.getRenderUnitLength(paraLineRender);
-            if (paraLineIndex === counter - 1 || renderUnitCount === 1) {
-                return indent;
-            }
-            const spaceWidth = (paraRenderObject.rect.width - paraLineRender.rect.width) / (renderUnitCount - 1);
-            this.setAlignJustify(paraLineRender, 0, spaceWidth);
-            return indent;
-        }
-        else {
-            return indent;
-        }
-    }
-    /**
-     * 设置两端对齐
-     * @param render
-     * @param count
-     * @param spaceWidth
-     */
-    setAlignJustify(render, count, spaceWidth) {
-        if (render instanceof BranchRenderObject) {
-            let width = 0;
-            for (let i = 0; i < render.length; i++) {
-                const currRender = render.getChild(i);
-                count += this.setAlignJustify(currRender, count, spaceWidth);
-                currRender.rect.x = width;
-                width += currRender.rect.width;
-            }
-            render.rect.width = width;
-        }
-        else if (render instanceof LeafRenderObject) {
-            if (render instanceof TextGroupRenderObject) {
-                let i = count === 0 ? 1 : 0;
-                for (; i < render.textMeasures.length; i++) {
-                    render.textMeasures[i].actualSize = render.textMeasures[i].actualSize + spaceWidth;
-                }
-                render.measure();
-                count += render.textMeasures.length;
-            }
-            else {
-                if (count !== 0) {
-                    render.rect.width += spaceWidth;
-                }
-                count += 1;
-            }
-        }
-        return count;
-    }
-    /**
-     * 获取段落行渲染单位个数,字符需要计算为字符长度
-     */
-    getRenderUnitLength(paraLine) {
-        if (paraLine instanceof LeafRenderObject) {
-            if (paraLine instanceof TextGroupRenderObject) {
-                return paraLine.textMeasures.length;
-            }
-            else {
-                return 1;
-            }
-        }
-        else if (paraLine instanceof BranchRenderObject) {
-            let count = 0;
-            for (let i = 0; i < paraLine.length; i++) {
-                count += this.getRenderUnitLength(paraLine.getChild(i));
-            }
-            return count;
-        }
-        throw new Error('未到达计算位置');
-    }
-    getInlineGroupRenderItem(item) {
-        const inlineGroupRender = item.createRenderObject({ options: this.options, renderCtx: this.renderCtx });
-        if (!inlineGroupRender) {
-            return null;
-        }
-        for (let i = 0; i < item.length; i++) {
-            const child = item.getChild(i);
-            if (child instanceof LeafElement) {
-                child.cacheRender = child.createRenderObject({ options: this.options, renderCtx: this.renderCtx });
-                if (child.cacheRender) {
-                    inlineGroupRender.addChild(child.cacheRender);
-                }
-            }
-            else if (child instanceof InlineGroupElement) {
-                item.cacheRender = this.getInlineGroupRenderItem(child);
-                if (item.cacheRender) {
-                    inlineGroupRender.addChild(item.cacheRender);
-                }
-            }
-            else {
-                throw new Error('未实现');
-            }
-        }
-        ElementUtil.remeasureInlineGroupRender(inlineGroupRender);
-        //限制最小长度
-        if (item instanceof DataElementInlineGroup) {
-            //需要填充null-text
-            if (item.length === 2) {
-                const nullText = new TextGroupElement();
-                nullText.isDecorate = true;
-                nullText.disableClick = true;
-                const baseTextProps = item.props;
-                nullText.text = baseTextProps.nullText;
-                baseTextProps.nullTextProps.clone(nullText.props);
-                const nullTextRender = nullText.createRenderObject({ options: this.options, renderCtx: this.renderCtx });
-                inlineGroupRender.insertChild(nullTextRender, 1);
-                ElementUtil.remeasureInlineGroupRender(inlineGroupRender);
-            }
-            const props = item.props;
-            let minLength = props.minLength ?? 14;
-            minLength = minLength < 14 ? 14 : minLength;
-            if (item instanceof DataElementInlineGroup && inlineGroupRender.rect.width < minLength) {
-                const fillNullSpace = new FillNullSpaceRenderObject();
-                fillNullSpace.rect.width = minLength - inlineGroupRender.rect.width;
-                fillNullSpace.rect.height = inlineGroupRender.rect.height;
-                inlineGroupRender.insertChild(fillNullSpace, inlineGroupRender.length - 1);
-            }
-            ElementUtil.remeasureInlineGroupRender(inlineGroupRender);
-        }
-        return inlineGroupRender;
-    }
-    cutRenderItem(render, nextRender, limitWidth, lineEmpty, inCloseBody) {
-        if (render instanceof LeafRenderObject) {
-            if (render.rect.width > limitWidth && render instanceof TextGroupRenderObject) {
-                return this.cutTextRender(render, nextRender, limitWidth, lineEmpty, inCloseBody);
-            }
-            if (render instanceof FillNullSpaceRenderObject) {
-                return this.cutFillNullRender(render, limitWidth);
-            }
-            if (render.rect.width < limitWidth || lineEmpty || render.element.type === 'br' || render.element.type === 'psym') {
-                return { firstItem: render, lastItem: null, br: render.element.type === 'br' };
-            }
-            return { firstItem: null, lastItem: null };
-        }
-        else if (render instanceof InlineGroupRenderObject) {
-            return this.cutInlineGroupRenderItem(render, limitWidth, lineEmpty, inCloseBody);
-        }
-        throw new Error('到达计算边界');
-    }
-    cutTextRender(render, nextRender, limitWidth, lineEmpty, inCloseBody) {
-        let sumWidth = 0;
-        const cutRender = render.clone();
-        cutRender.textMeasures.length = 0;
-        let i = 0;
-        for (; i < render.textMeasures.length; i++) {
-            sumWidth += render.textMeasures[i].actualSize;
-            if (sumWidth > limitWidth) {
-                if (lineEmpty && i === 0) {
-                    i = 1;
-                }
-                break;
-            }
-        }
-        //后置标点处理
-        i = this.patchHandlePostPunctuation(render, nextRender, i, inCloseBody, lineEmpty);
-        //前置标点处理
-        i = this.patchHandleLeadingPunctuation(render, i, lineEmpty);
-        if (i <= 0) {
-            return { firstItem: null, lastItem: null };
-        }
-        cutRender.textMeasures = render.textMeasures.splice(0, i);
-        render.measure();
-        cutRender.measure();
-        return { firstItem: cutRender, lastItem: render, br: true };
-    }
-    /**
-     * 处理前置标点,前置标点不能出现在末尾
-     * @param render
-     * @param i
-     */
-    patchHandleLeadingPunctuation(render, i, lineEmpty) {
-        if (i === 1 && lineEmpty) {
-            return i;
-        }
-        if (this.containLeadingPunctuation(render.textMeasures[i]?.char)) {
-            return i--;
-        }
-        return i;
-    }
-    /**
-     * 处理后置标点，后置标点不能出现在行首
-     * @param render
-     * @param i
-     * @param lineEmpty
-     */
-    patchHandlePostPunctuation(render, nextRender, i, inCloseBody, lineEmpty) {
-        if (i === render.textMeasures.length - 1) {
-            //紧跟着的字符包含后置标点
-            if (this.containerStartSymbolInTextStart(nextRender)) {
-                i--;
-            }
-        }
-        if (inCloseBody && this.containPostPunctuation(render.textMeasures[i]?.char)) {
-            if (this.containPostPunctuation(render.textMeasures[i + 1]?.char)) {
-                i--;
-            }
-            else {
-                i++;
-            }
-        }
-        else {
-            if (i > 1 && this.containPostPunctuation(render.textMeasures[i]?.char)) {
-                i--;
-            }
-        }
-        return i;
-    }
-    /**
-     * 是否包含后置标点
-     * @param str
-     * @returns
-     */
-    containPostPunctuation(str) {
-        return '!),.:;?]}¨·ˇˉ―‖’”…∶、。〃々〉》」』】〕〗！＂＇），．：；？］｀｜｝～￠'.indexOf(str) > -1;
-    }
-    //是否包含前置标点
-    containLeadingPunctuation(str) {
-        return '‘“〈《「『【〔〖（［｛￡'.indexOf(str) > -1;
-    }
-    /**
-     * 文本开头是否包含后置标点
-     * @param render
-     * @returns
-     */
-    containerStartSymbolInTextStart(render) {
-        //return false;
-        if (render instanceof TextGroupRenderObject) {
-            if (render.textMeasures.length > 0) {
-                return this.containPostPunctuation(render.textMeasures[0].char);
-            }
-        }
-        return false;
-    }
-    cutFillNullRender(render, limitWidth) {
-        if (limitWidth === 0) {
-            return { firstItem: null, lastItem: null };
-        }
-        if (render.rect.width > limitWidth) {
-            const cutRender = new FillNullSpaceRenderObject();
-            cutRender.rect.width = limitWidth;
-            cutRender.rect.height = render.rect.height;
-            render.rect.width = render.rect.width - limitWidth;
-            return { firstItem: cutRender, lastItem: render };
-        }
-        else {
-            return { firstItem: render, lastItem: null };
-        }
-    }
-    /**
-     * 行内编组元素超出行内可用空间，需要根据剩余空间长度进行截断
-     */
-    cutInlineGroupRenderItem(render, limitWidth, emptyLine, inCloseBody) {
-        const cutRender = render.element.createRenderObject({ options: this.options, renderCtx: this.renderCtx });
-        let x = 0;
-        let br = false;
-        const items = [...render.getItems()];
-        for (let i = 0; i < items.length; i++) {
-            const child = items[i];
-            if (child instanceof LeafRenderObject) {
-                if (x + child.rect.width > limitWidth) {
-                    const { firstItem, lastItem, br: childBr } = this.cutRenderItem(child, items[i + 1], limitWidth - x, emptyLine && cutRender.length === 0, inCloseBody);
-                    if (firstItem) {
-                        cutRender.addChild(firstItem);
-                    }
-                    br = childBr || br;
-                    break;
-                }
-                else {
-                    render.removeChild(child);
-                    cutRender.addChild(child);
-                }
-                //软换行符
-                if (child.element && child.element.type === 'br') {
-                    br = true;
-                    break;
-                }
-            }
-            else if (child instanceof InlineGroupRenderObject) {
-                if (x + child.rect.width > limitWidth) {
-                    const { firstItem, br: childBr } = this.cutInlineGroupRenderItem(child, limitWidth - x, emptyLine && cutRender.length === 0, inCloseBody);
-                    if (firstItem) {
-                        cutRender.addChild(firstItem);
-                    }
-                    br = childBr || br;
-                    break;
-                }
-                else {
-                    render.removeChild(child);
-                    cutRender.addChild(child);
-                }
-            }
-            x += child.rect.width;
-        }
-        if (!cutRender.length) {
-            return { firstItem: null, lastItem: null };
-        }
-        ElementUtil.remeasureInlineGroupRender(cutRender);
-        ElementUtil.remeasureInlineGroupRender(render);
-        return { firstItem: cutRender, lastItem: render.length ? render : null, br };
-    }
-    /**
-     * 修改测量完毕后的元素状态
-     * @param ele
-     */
-    setMeasureCompletedModifyFlag(ele) {
-        if (ele instanceof BranchElement) {
-            for (let i = 0; i < ele.length; i++) {
-                this.setMeasureCompletedModifyFlag(ele.getChild(i));
-            }
-        }
-        ele.modifyFlag = ModifyFlag$1.None;
-    }
-    clearPaintCache(ele, data) {
-        ele.beginMeasure(data);
-        if (ele instanceof BranchElement) {
-            for (let i = 0; i < ele.length; i++) {
-                this.clearPaintCache(ele.getChild(i), data);
-            }
-        }
-    }
-    endMeasures(ele) {
-        if (ele instanceof BranchElement) {
-            for (let i = 0; i < ele.length; i++) {
-                this.endMeasures(ele.getChild(i));
-            }
-        }
-    }
-}
-
-class ElementRenderCut {
-    options;
-    renderContext;
-    constructor(options, renderContext) {
-        this.options = options;
-        this.renderContext = renderContext;
-    }
-    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;
-            }
-        }
-        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;
+        const commMarks = this.docCtx.document.markPairs;
+        for (let i = 0; i < commMarks.length; i++) {
+            const commMark = commMarks[i];
+            if (commMark.start && commMark.end) {
+                const ancestor = DocumentSelection.getAncestorCommonControl(commMark.start, commMark.end);
+                const range = RangeUtil.getSectionRange(commMark.start, 0, commMark.end, 1, ancestor);
+                SelectionOverlays.addToCommentSets(range, this.seo.commRangeSets, commMark.start.color);
             }
-            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;
-            }
+    cacheRenders(renderTree) {
+        if (renderTree.element) {
+            renderTree.element.paintRenders.push(renderTree);
         }
-        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;
-                }
+        for (let i = 0; i < renderTree.length; i++) {
+            const currRender = renderTree.getChild(i);
+            if (currRender.element) {
+                this.cacheCommsRender(currRender);
+            }
+            if (currRender instanceof BranchRenderObject) {
+                this.cacheRenders(currRender);
+            }
+            else {
+                currRender.element && currRender.element.paintRenders.push(currRender);
             }
-            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;
+    /**
+     * 缓存批注标志
+     * @private
+     */
+    cacheCommsRender(render) {
+        if (render.element && render.element.type === 'comm') {
+            const commElement = render.element;
+            if (commElement.props.markType === 'start') {
+                const currDocRender = this.cacheDoc;
+                const docCommContainer = currDocRender.getItems().find(item => item instanceof CommsContainerRenderObject);
+                if (docCommContainer) {
+                    docCommContainer.commsMarks.push(render);
+                }
             }
         }
-        const lastCell = destRow.getChild(destRow.length - 1);
-        if (sourceCell.rect.x >= lastCell.rect.x + lastCell.rect.width) {
-            return destRow.length;
+        if (render.element && render.element.type === 'comm-list') {
+            const commContainer = render;
+            CommentsUtil.createCommentsImage(commContainer);
         }
-        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;
+    endMeasures(ele) {
+        ele.endMeasure();
+        if (ele instanceof BranchElement) {
+            for (let i = 0; i < ele.length; i++) {
+                this.endMeasures(ele.getChild(i));
             }
         }
-        return rows;
+    }
+    createDefaultPara() {
+        const tmp = new ParagraphElement();
+        tmp.props.lineHeight = this.options.defaultLineHeight;
+        return tmp;
     }
 }
 
@@ -16333,8 +15302,7 @@ class DocumentPaint {
     renderContext;
     docCtx;
     seo;
-    elementMeasure;
-    elementRenderCut;
+    //elementRenderCut: ElementRenderCut;
     elementPaint;
     docPages;
     docContainer;
@@ -16345,8 +15313,7 @@ class DocumentPaint {
         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.elementRenderCut = new ElementRenderCut(this.viewOptions, this.renderContext);
         this.elementPaint = new ElementPaint(this.renderContext, this.docCtx);
     }
     rePages() {
@@ -16505,132 +15472,6 @@ class DocumentPaint {
     }
 }
 
-const fontSize = 12;
-const verPadding = 2;
-/**
- * 恒牙牙位图
- */
-class PermanentTeethElement extends LeafElement {
-    constructor() {
-        super('permanent-teeth');
-        this.props = new PermanentTeethProps();
-        this.props.topLeft = '';
-        this.props.topRight = '';
-        this.props.bottomLeft = '';
-        this.props.bottomRight = '';
-    }
-    clone(data) {
-        const clone = new PermanentTeethElement();
-        clone.props = this.props.clone();
-        return clone;
-    }
-    createRenderObject(data) {
-        const clone = new PermanentTeethRenderObject(this);
-        clone.rect.width = 150;
-        //字体大小*2+上下间距2*2
-        clone.rect.height = fontSize * 2 + verPadding * 2;
-        //clone.rect= ElementUtil.cloneRect(this.rect);
-        return clone;
-    }
-    serialize(viewOptions) {
-        return {
-            type: this.type,
-            props: this.props.getSerializeProps(viewOptions)
-        };
-    }
-}
-class PermanentTeethRenderObject extends LeafRenderObject {
-    render(e) {
-    }
-    clone() {
-        const clone = new PermanentTeethRenderObject(this.element);
-        clone.rect = ElementUtil.cloneRect(this.rect);
-        return clone;
-    }
-    // measure(): { width: number, height: number } {
-    //     const ele = this.element;
-    //
-    // }
-    exportHTML(event) {
-        const ele = this.element;
-        const g = super.exportHTML(event);
-        const contentHorPadding = 4;
-        g.children = [];
-        // g.children.push(ElementUtil.getFillSvgPath(`M 0 ${this.rect.height / 2} h${this.rect.width}`, '#000', 1));
-        // g.children.push(ElementUtil.getFillSvgPath(`M ${this.rect.width / 2} 0 v${this.rect.height}`, '#000', 1));
-        //
-        g.children.push(ElementUtil.getFillSvgRect(0, this.rect.height / 2, this.rect.width, 1, '#000'));
-        g.children.push(ElementUtil.getFillSvgRect(this.rect.width / 2, 0, 1, this.rect.height, '#000'));
-        const getSvgText = (text, x, y) => {
-            return {
-                sel: 'text',
-                text: text,
-                data: {
-                    ns: "http://www.w3.org/2000/svg",
-                    attrs: {
-                        'dominant-baseline': 'hanging',
-                        'font-family': 'Arial',
-                        'font-size': fontSize,
-                        x,
-                        y,
-                    }
-                },
-            };
-        };
-        const topLeftWidth = event.renderCtx.mainContext.measureTextWidth(ele.props.topLeft, {
-            fontSize: fontSize,
-            fontName: 'Arial'
-        });
-        const bottomLeftWidth = event.renderCtx.mainContext.measureTextWidth(ele.props.bottomLeft, {
-            fontSize: fontSize,
-            fontName: 'Arial'
-        });
-        g.children.push(getSvgText(ele.props.topLeft, this.rect.width / 2 - topLeftWidth - contentHorPadding, verPadding));
-        g.children.push(getSvgText(ele.props.topRight, this.rect.width / 2 + contentHorPadding, verPadding));
-        g.children.push(getSvgText(ele.props.bottomLeft, this.rect.width / 2 - bottomLeftWidth - contentHorPadding, this.rect.height - fontSize + verPadding));
-        g.children.push(getSvgText(ele.props.bottomRight, this.rect.width / 2 + contentHorPadding, this.rect.height - fontSize + verPadding));
-        return g;
-    }
-}
-class PermanentTeethFactory extends ElementFactory {
-    match(type) {
-        return type === 'permanent-teeth';
-    }
-    createElement(data) {
-        const ele = new PermanentTeethElement();
-        ele.props.bottomLeft = data.props?.bottomLeft ?? '';
-        ele.props.bottomRight = data.props?.bottomRight ?? '';
-        ele.props.topLeft = data.props?.topLeft ?? '';
-        ele.props.topRight = data.props?.topRight ?? '';
-        return ele;
-    }
-}
-/**
- * 恒牙牙位图属性
- */
-class PermanentTeethProps extends INotifyPropertyChanged {
-    topLeft;
-    topRight;
-    bottomLeft;
-    bottomRight;
-    getSerializeProps(viewOptions) {
-        return {
-            topLeft: this.topLeft,
-            topRight: this.topRight,
-            bottomLeft: this.bottomLeft,
-            bottomRight: this.bottomRight,
-        };
-    }
-    clone(dest) {
-        dest = dest || new PermanentTeethProps();
-        dest.topLeft = this.topLeft;
-        dest.topRight = this.topRight;
-        dest.bottomLeft = this.bottomLeft;
-        dest.bottomRight = this.bottomRight;
-        return dest;
-    }
-}
-
 class ElementReader {
     docCtx;
     constructor(docCtx) {
@@ -16673,6 +15514,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;
@@ -16693,29 +15535,18 @@ class ElementReader {
         this.setDocument(document);
     }
     setDocument(document) {
-        // if (this.docCtx.document) {
-        //     this.docCtx.document.destroy();
-        // }
-        // this.document?.clearItems();
-        // document.docProps.clone(this.document.docProps);
         document.bodyElement = document.find((item) => item instanceof DocumentBodyElement);
         document.headerElement = document.find((item) => item instanceof DocumentHeaderElement);
         document.footerElement = document.find((item) => item instanceof DocumentFooterElement);
-        // document.commentsContainerElement = document.find((item) => item instanceof CommsContainerElement) as CommsContainerElement;
-        // if (!document.commentsContainerElement) {
-        //     document.commentsContainerElement = new CommsContainerElement();
-        // }
         document.clearItems();
         document.addChild(document.headerElement);
         document.addChild(document.bodyElement);
         document.addChild(document.footerElement);
-        //document.addChild(document.commentsContainerElement);
         this.docCtx.document = document;
         document.viewOptions = this.docCtx.viewOptions;
         const width = Math.floor(document.props.width * this.docCtx.viewOptions.mmToPixelsRatio);
         const height = Math.floor(document.props.height * this.docCtx.viewOptions.mmToPixelsRatio);
         this.docCtx.viewOptions.docPageSettings = new PageOptions(width, height, document.props.orient);
-        //this.viewOptions.viewSettings.width = this.viewOptions.docPageSettings.width + 10;
     }
     readElement(data, strictMode = false) {
         if (typeof data === 'string') {
@@ -16737,6 +15568,7 @@ class ElementReader {
                     }
                 }
                 factory.readCompleted(element, childArr);
+                this.readAttribute(data, element);
                 return element;
             }
         }
@@ -16748,6 +15580,11 @@ class ElementReader {
             return null;
         }
     }
+    readAttribute(data, ele) {
+        if (data.attribute) {
+            ele.attribute = data.attribute;
+        }
+    }
     /**
      * 读取扩展属性
      * @param data
@@ -17813,7 +16650,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,
@@ -17905,7 +16745,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,
@@ -20964,7 +19807,8 @@ class ElementTrackManage {
      * @private
      */
     mergeOps(ops) {
-        return false;
+        return this.mergeFormatOps(ops);
+        //return false;
         //问题在于：
         //1.新输入的字符串，selectState的startOffset、endOffset=1,后输入的字符串的endOffset进行累加
         //2.撤销后重做，选区范围在1-2,英国是0-2,因为之前在创建文本对象后，选区的结束位为1
@@ -21015,6 +19859,41 @@ class ElementTrackManage {
         // }
         // return false;
     }
+    /**
+     * 将对某个元素的最近两次的属性修改合并为一次，ops为当前记录的修改，比较上次的修改，如果为对同一个元素的修改，则合并
+     * @private
+     */
+    mergeFormatOps(ops) {
+        if (ops.length > 1) {
+            return false;
+        }
+        const lastOps = this.actions[this.actions.length - 1];
+        if (!lastOps || lastOps.ops.length > 1) {
+            return false;
+        }
+        const prevOp = lastOps.ops[lastOps.ops.length - 1];
+        const currOp = ops[0];
+        //操作类型相同
+        if ('format' in currOp.ops && 'format' in prevOp.ops && currOp.index === prevOp.index) {
+            // const prevAfterSelection = lastOps.afterSelection;
+            // if (!prevAfterSelection) {
+            //     return false;
+            // }
+            //前后是连续的操作
+            const { format: currFormat } = currOp.ops;
+            const { format: prevFormat } = prevOp.ops;
+            Object.keys(currFormat).forEach(key => {
+                const currValue = currFormat[key].newValue;
+                const prevValue = prevFormat[key].newValue;
+                if (CommonUtil.isEqual(currValue, prevValue)) {
+                    return;
+                }
+                prevFormat[key].newValue = currValue;
+            });
+            return true;
+        }
+        return false;
+    }
     getSelection() {
         const { startControl, startOffset, endControl, endOffset, editable } = this.docCtx.selectionState;
         if (!startControl) {
@@ -28927,7 +27806,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.1.19";
+        return "2.1.21";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -28935,7 +27814,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);
@@ -28980,6 +27859,26 @@ class DocumentCombine {
     }
 }
 
+/**
+* 文字行渲染模式
+用于医嘱打印模式
+*/
+function runTextLineRender(ele, data) {
+    if (!data.options.textRowLineMode) {
+        return;
+    }
+    if (ele instanceof TableElement) {
+        // textLineRenderMode(ele, data);
+        // remeasureParentRenders(ele.cacheRender)
+        return;
+    }
+    if (ele instanceof BranchElement) {
+        for (let i = 0; i < ele.length; i++) {
+            runTextLineRender(ele.getChild(i), data);
+        }
+    }
+}
+
 /**
  * 删除当前段落
  * @param evt
@@ -29111,5 +28010,5 @@ function removeDuplicatesEvent(events) {
     return arr;
 }
 
-export { BlockContainerElement, BlockContainerRenderObject, BlockContentElement, BlockContentRenderObject, BlockLineRectRenderObject, BodyPartProps, BooleanEnum, BorderProps, BranchElement, BranchRenderObject, BreakElement, BreakFactory, BreakRenderObject, CheckBoxElement, CheckBoxFactory, CheckBoxProps, CheckBoxRenderObject, ColumnPatchUtil, CommContentBaseElement, CommContentBaseRenderObject, CommContentElement, CommContentProps, CommContentRenderObject, CommProps, CommentContentFactory, CommentElement, CommentFactory, CommentRenderObject, CommentsFactory, CommentsUtil, CommonUtil, CommsContainerElement, CommsContainerRenderObject, ContentMenuItem, ContextMenuElementEvent, CopyElementEvent, DOMEventSource, DOMSubscription, DataDecorateElement, DataDecorateProps, DataDecorateRenderObject, DataEleBaseProps, DataEleBaseTextProps, DataEleCheckProps, DataEleDateProps, DataEleImageProps, DataEleListProps, DataEleMHProps, DataElementBarcode, DataElementBarcodeFactory, DataElementBarcodeProps, DataElementBarcodeRenderObject, DataElementBaseFactory, DataElementCheck, DataElementCheckFactory, DataElementCheckRenderObject, DataElementDate, DataElementDateFactory, DataElementDateRenderObject, DataElementGroupElement, DataElementGroupFactory, DataElementGroupProps, DataElementGroupRenderObject, DataElementImage, DataElementImgFactory, DataElementInlineGroup, DataElementLeaf, DataElementList, DataElementListFactory, DataElementListRenderObject, DataElementMH, DataElementMHFactory, DataElementRenderObject, DataElementText, DataElementTextFactory, DataElementTextRenderObject, DataImageRenderObject, DataRenderMH, DocEditor, DocMode, DocumentBodyElement, DocumentBodyFactory, DocumentBodyPartElement, DocumentBodyPartFactory, DocumentBodyPartRenderObject, DocumentBodyRenderObject, DocumentChange, DocumentCombine, DocumentComment, DocumentContainerRender, DocumentContext, DocumentCursor, DocumentElement, DocumentEvalFunc, DocumentEvent, DocumentFactory, DocumentFooterElement, DocumentFooterFactory, DocumentFooterRenderObject, DocumentHeaderElement, DocumentHeaderFactory, DocumentHeaderRenderObject, DocumentInput, DocumentPaint, DocumentPrintOffscreen, DocumentPrintOffscreenBase, DocumentProps, DocumentRenderObject, DocumentSelection, DocumentTemplate, DropElementEvent, EditMode, EditorContext, Element, ElementEvent, ElementFactory, ElementPaint, ElementReader, ElementSerialize, ElementUtil, EventBus, EventMap, EventSourceCore$1 as EventSourceCore, FillNullSpaceElement, FillNullSpaceRenderObject, GetTrackTipsEvent, GotCursorEvent, IDispose, INotifyPropertyChanged, InlineBlockContainer, InlineGroupElement, InlineGroupInputElement, InlineGroupRenderObject, InlineMuiltBlockLineRenderObject, InputElementEvent, IsInSideDataElement, IsInSideInlineGroupInputElement, KeyboradElementEvent, LeafElement, LeafRenderObject, LostCursorEvent, MarginProps, ModifyFlag$1 as ModifyFlag, MouseElementEvent, MousedownElementEvent, MuiltBlockLineRenderObject, OnceSubject, PSymbolElement, PSymbolRenderObject, PaddingProps, PageBreakElement, PageBreakFactory, PageBreakRenderObject, PageOptions, PaintContent, ParagraphElement, ParagraphFactory, ParagraphLineRectRenderObject, ParagraphNumberType, ParagraphProps, ParagraphRenderObject, PasteElementEvent, PictureElement, PictureFactory, PictureProps, PictureRenderObject, RadioBoxElement, RadioBoxFactory, RadioBoxProps, RadioBoxRenderObject, RangeUtil, Rect, RenderContext, RenderObject, RenderObjectType, ResizeLeafRenderObject, RunElementFactory, SelectionOverlays, SelectionRange, SelectionState, Subject$1 as Subject, SubjectSubscription$1 as SubjectSubscription, Subscription$1 as Subscription, TabElement, TabFactory, TabRenderObject, TableCellElement, TableCellFactory, TableCellProps, TableCellRenderObject, TableElement, TableFactory, TableProps, TableRenderObject, TableRowElement, TableRowFactory, TableRowProps, TableRowRenderObject, TableSplitCell, TableUtil, TextGroupElement, TextGroupFactory, TextGroupRenderObject, TextProps, TrackRunElement, TrackRunProps, TrackRunRenderObject, TrackRunTypeEnum, ValidateCondition, ValidateElement, ValidateProps, ValidateRenderObject, ViewOptions, clearChildrenRenderCache, clearTraces, createPrintTemplate, defaultParaHanging, deleteCurrentParagraph, docOpsMap, documentPrint, drawDecorator, elementTypeEventHandler, exportDecoratorHTML, falseChar, fontMapFunc, formatEle, fromEvent, generatePatch, getCalleeName, getFocusTextSegment, inputText, insertEle, invokeTypeHandler, isDate, logUpdateEleProps, objectToString$4 as objectToString, onTableContextmenu, onceTask, parser, printNodes, reactiveMap, removeEle, removeText, runTextLineRender, setChildrenModifyFlag, setDataElementProps, setNotifyChangedCallback, setTraceTrackingFlag, suppressTracking, targetMaps, textLineRenderMode, toRawType, toTypeString, trueChar, validateDataEle, validateDataEleRenderObj, validateInlineInputRenderObj, watchChanged };
+export { BlockContainerElement, BlockContainerRenderObject, BlockContentElement, BlockContentRenderObject, BlockLineRectRenderObject, BodyPartProps, BooleanEnum, BorderProps, BranchElement, BranchRenderObject, BreakElement, BreakFactory, BreakRenderObject, CheckBoxElement, CheckBoxFactory, CheckBoxProps, CheckBoxRenderObject, ColumnPatchUtil, CommContentBaseElement, CommContentBaseRenderObject, CommContentElement, CommContentProps, CommContentRenderObject, CommProps, CommentContentFactory, CommentElement, CommentFactory, CommentRenderObject, CommentsFactory, CommentsUtil, CommonUtil, CommsContainerElement, CommsContainerRenderObject, ContentMenuItem, ContextMenuElementEvent, CopyElementEvent, DOMEventSource, DOMSubscription, DataDecorateElement, DataDecorateProps, DataDecorateRenderObject, DataEleBaseProps, DataEleBaseTextProps, DataEleCheckProps, DataEleDateProps, DataEleImageProps, DataEleListProps, DataEleMHProps, DataElementBarcode, DataElementBarcodeFactory, DataElementBarcodeProps, DataElementBarcodeRenderObject, DataElementBaseFactory, DataElementCheck, DataElementCheckFactory, DataElementCheckRenderObject, DataElementDate, DataElementDateFactory, DataElementDateRenderObject, DataElementGroupElement, DataElementGroupFactory, DataElementGroupProps, DataElementGroupRenderObject, DataElementImage, DataElementImgFactory, DataElementInlineGroup, DataElementLeaf, DataElementList, DataElementListFactory, DataElementListRenderObject, DataElementMH, DataElementMHFactory, DataElementRenderObject, DataElementText, DataElementTextFactory, DataElementTextRenderObject, DataImageRenderObject, DataRenderMH, DocEditor, DocMode, DocumentBodyElement, DocumentBodyFactory, DocumentBodyPartElement, DocumentBodyPartFactory, DocumentBodyPartRenderObject, DocumentBodyRenderObject, DocumentChange, DocumentCombine, DocumentComment, DocumentContainerRender, DocumentContext, DocumentCursor, DocumentElement, DocumentEvalFunc, DocumentEvent, DocumentFactory, DocumentFooterElement, DocumentFooterFactory, DocumentFooterRenderObject, DocumentHeaderElement, DocumentHeaderFactory, DocumentHeaderRenderObject, DocumentInput, DocumentPaint, DocumentPrintOffscreen, DocumentPrintOffscreenBase, DocumentProps, DocumentRenderObject, DocumentSelection, DocumentTemplate, DropElementEvent, EditMode, EditorContext, Element, ElementEvent, ElementFactory, ElementPaint, ElementReader, ElementSerialize, ElementUtil, EventBus, EventMap, EventSourceCore$1 as EventSourceCore, FillNullSpaceElement, FillNullSpaceRenderObject, GetTrackTipsEvent, GotCursorEvent, IDispose, INotifyPropertyChanged, InlineBlockContainer, InlineGroupElement, InlineGroupInputElement, InlineGroupRenderObject, InlineMuiltBlockLineRenderObject, InputElementEvent, IsInSideDataElement, IsInSideInlineGroupInputElement, KeyboradElementEvent, LeafElement, LeafRenderObject, LostCursorEvent, MarginProps, ModifyFlag$1 as ModifyFlag, MouseElementEvent, MousedownElementEvent, MuiltBlockLineRenderObject, OnceSubject, PSymbolElement, PSymbolRenderObject, PaddingProps, PageBreakElement, PageBreakFactory, PageBreakRenderObject, PageOptions, PaintContent, ParagraphElement, ParagraphFactory, ParagraphLineRectRenderObject, ParagraphNumberType, ParagraphProps, ParagraphRenderObject, PasteElementEvent, PermanentTeethElement, PermanentTeethFactory, PermanentTeethProps, PermanentTeethRenderObject, PictureElement, PictureFactory, PictureProps, PictureRenderObject, RadioBoxElement, RadioBoxFactory, RadioBoxProps, RadioBoxRenderObject, RangeUtil, Rect, RenderContext, RenderObject, RenderObjectType, ResizeLeafRenderObject, RunElementFactory, SVGElement, SVGFactory, SVGProps, SVGRenderObject, SelectionOverlays, SelectionRange, SelectionState, Subject$1 as Subject, SubjectSubscription$1 as SubjectSubscription, Subscription$1 as Subscription, TabElement, TabFactory, TabRenderObject, TableCellElement, TableCellFactory, TableCellProps, TableCellRenderObject, TableElement, TableFactory, TableProps, TableRenderObject, TableRowElement, TableRowFactory, TableRowProps, TableRowRenderObject, TableSplitCell, TableUtil, TextGroupElement, TextGroupFactory, TextGroupRenderObject, TextProps, TrackRunElement, TrackRunProps, TrackRunRenderObject, TrackRunTypeEnum, ValidateCondition, ValidateElement, ValidateProps, ValidateRenderObject, ViewOptions, addReturn, clearChildrenRenderCache, clearTraces, cloneChildren, cloneElementBase, createPrintTemplate, defaultParaHanging, deleteCurrentParagraph, docOpsMap, documentPrint, drawDecorator, elementTypeEventHandler, exportDecoratorHTML, falseChar, fontMapFunc, formatEle, fromEvent, generatePatch, getCalleeName, getFocusTextSegment, inputText, insertEle, invokeTypeHandler, isDate, logUpdateEleProps, objectToString$4 as objectToString, onTableContextmenu, onceTask, parser, printNodes, reactiveMap, removeEle, removeText, runTextLineRender, setChildrenModifyFlag, setDataElementProps, setNotifyChangedCallback, setTraceTrackingFlag, suppressTracking, targetMaps, textLineRenderMode, toRawType, toTypeString, trueChar, validateDataEle, validateDataEleRenderObj, validateInlineInputRenderObj, watchChanged };
 //# sourceMappingURL=index.js.map