@hailin-zheng/editor-core 2.1.20 → 2.1.21

package/index-cjs.js

@@ -658,10 +658,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 {
@@ -741,6 +792,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();
@@ -1212,6 +1266,8 @@ class Element {
     disposed;
     //加载完毕
     loaded;
+    visibleExpr;
+    attribute;
     _parent;
     get parent() {
         return this._parent;
@@ -1284,7 +1340,6 @@ class Element {
         listeners.forEach(item => item(evt));
     }
     beginMeasure(data) {
-        this.paintRenders.length = 0;
     }
     endMeasure() {
     }
@@ -1700,6 +1755,7 @@ class ViewOptions {
     printHeaderFooterLine = false;
     //显示段落回车符号
     showEnterSymbol = false;
+    enableVisibleExpression = false;
     get fullPageView() {
         return this._fullPageView;
     }
@@ -1813,6 +1869,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 {
@@ -2819,11 +2899,8 @@ 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;
     }
 }
@@ -2906,7 +2983,7 @@ 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;
     }
 }
@@ -2981,7 +3058,7 @@ class DataDecorateRenderObject extends LeafRenderObject {
     }
 }
 
-function parser(code) {
+function parser(code, objects) {
     const node = acor__namespace.parse(code, { ecmaVersion: 'latest' });
     estraverse__default["default"].traverse(node, {
         enter: (child, parent) => {
@@ -2989,6 +3066,7 @@ function parser(code) {
                 const identifierName = child['name'];
                 if (identifierName.startsWith('$')) {
                     child['name'] = `getObject('${identifierName.slice(1)}').value`;
+                    objects?.push(identifierName.slice(1));
                 }
             }
         }
@@ -3015,6 +3093,28 @@ function parser(code) {
     });
     return astring.generate(node);
 }
+//判断代码的语句，如果最后一个语句不是return，那么加上return
+function addReturn(code) {
+    const node = acor__namespace.parse(code, { ecmaVersion: 'latest' });
+    estraverse__default["default"].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 astring.generate(node);
+}
 /**
  * 将参数转为函数调用arg  => ()=>arg
  * @param nodes
@@ -3108,11 +3208,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() {
@@ -3308,9 +3405,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;
     }
     /**
@@ -3687,6 +3783,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) {
@@ -3809,7 +3906,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) {
@@ -4103,11 +4200,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) {
@@ -4157,11 +4251,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) {
@@ -4237,11 +4328,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) {
@@ -4339,6 +4427,7 @@ class PSymbolElement extends LeafElement {
     clone() {
         const clone = new PSymbolElement();
         clone.defaultHeight = this.defaultHeight;
+        cloneElementBase(this, clone);
         return clone;
     }
     getSelfLength(pure) {
@@ -4420,11 +4509,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() {
@@ -4732,6 +4818,7 @@ class TextGroupElement extends LeafElement {
         const clone = new TextGroupElement();
         this.props.clone(clone.props);
         clone.text = this.text;
+        cloneElementBase(this, clone);
         return clone;
     }
     destroy() {
@@ -6457,11 +6544,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() {
@@ -6750,6 +6834,7 @@ class CheckBoxElement extends LeafElement {
     }
     clone() {
         const clone = new CheckBoxElement();
+        cloneElementBase(this, clone);
         this.props.clone(clone.props);
         return clone;
     }
@@ -6853,11 +6938,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) {
@@ -7134,6 +7216,7 @@ class CommentElement extends LeafElement {
     clone() {
         const clone = new CommentElement();
         this.props.clone(clone.props);
+        cloneElementBase(this, clone);
         return clone;
     }
 }
@@ -7283,11 +7366,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) {
@@ -8215,6 +8295,7 @@ class DataElementBarcode extends DataElementLeaf {
     clone(data) {
         const clone = new DataElementBarcode();
         this.props.clone(clone.props);
+        cloneElementBase(this, clone);
         return clone;
     }
     setValue(val) {
@@ -8368,6 +8449,7 @@ class DataElementCheck extends DataElementLeaf {
     clone(data) {
         const clone = new DataElementCheck();
         this.props.clone(clone.props);
+        cloneElementBase(this, clone);
         return clone;
     }
     setValue(val) {
@@ -8738,6 +8820,7 @@ class DataElementImage extends DataElementLeaf {
     clone(data) {
         const clone = new DataElementImage();
         this.props.clone(clone.props);
+        cloneElementBase(this, clone);
         return clone;
     }
     destroy() {
@@ -8989,7 +9072,7 @@ class BreakElement extends LeafElement {
     }
     clone() {
         const clone = new BreakElement();
-        //clone.renderCtx = this.renderCtx;
+        cloneElementBase(this, clone);
         return clone;
     }
 }
@@ -9210,11 +9293,8 @@ 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;
     }
 }
@@ -9312,6 +9392,7 @@ class DataElementMH extends DataElementLeaf {
     clone(data) {
         const element = new DataElementMH();
         this.props.clone(element.props);
+        cloneElementBase(this, element);
         return element;
     }
     getCurrentLayoutItem() {
@@ -9557,6 +9638,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';
@@ -9585,6 +9812,7 @@ class PictureElement extends LeafElement {
     clone(data) {
         const clone = new PictureElement();
         this.props.clone(clone.props);
+        cloneElementBase(this, clone);
         return clone;
     }
     destroy() {
@@ -9710,6 +9938,7 @@ class RadioBoxElement extends LeafElement {
     clone() {
         const clone = new RadioBoxElement();
         this.props.clone(clone.props);
+        cloneElementBase(this, clone);
         return clone;
     }
 }
@@ -9761,7 +9990,7 @@ class PageBreakElement extends LeafElement {
     }
     clone() {
         const clone = new PageBreakElement();
-        //clone.renderCtx = this.renderCtx;
+        cloneElementBase(this, clone);
         return clone;
     }
 }
@@ -9798,7 +10027,9 @@ class TabElement extends LeafElement {
         };
     }
     clone() {
-        return new TabElement();
+        const clone = new TabElement();
+        cloneElementBase(this, clone);
+        return clone;
     }
 }
 class TabRenderObject extends LeafRenderObject {
@@ -10393,6 +10624,7 @@ class SVGElement extends LeafElement {
     clone(data) {
         const clone = new SVGElement();
         this.props.clone(clone.props);
+        cloneElementBase(this, clone);
         return clone;
     }
     destroy() {
@@ -10519,6 +10751,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 }) {
@@ -10541,6 +10776,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
@@ -10639,12 +10889,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) {
@@ -12528,6 +12774,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 {
@@ -13162,10 +13428,7 @@ class EditorContext {
     isDirty = false;
     cursorRect;
     _document;
-    //文档刷新的订阅事件
-    //refSub!: Subscription;
     syncRefresh;
-    //imageLoader: IImageLoader;
     dynamicFunc;
     docChange;
     clearPrevDocCb;
@@ -13219,6 +13482,7 @@ class EditorContext {
         //this.imageLoader.clear();
         this.dynamicFunc.destroyScripts();
         this.isDirty = false;
+        //this.clearEleDepMaps();
     }
     get defaultCtx() {
         return new DocumentContext(this._document, this.selectionState);
@@ -13293,17 +13557,6 @@ class EditorContext {
         return this._document.modifyFlag === exports.ModifyFlag.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>>;
-// }
 /**
  * 文档上下文
  */
@@ -13566,13 +13819,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) {
@@ -13584,6 +13847,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);
@@ -13602,6 +13869,9 @@ class DynamicContextParser {
                 if (control) {
                     control.setValue(val);
                 }
+            },
+            get ref() {
+                return control;
             }
         };
     }
@@ -13673,9 +13943,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;
     }
     /**
      * 段落排版：
@@ -13771,7 +14044,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++) {
@@ -13912,7 +14188,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;
@@ -13966,10 +14242,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);
                 }
@@ -13998,7 +14271,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);
         }
@@ -14195,11 +14468,85 @@ 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
+        });
+    }
+}
+
+/**
+ * 用于处理选区拖蓝
+ */
 class SelectionOverlays {
     selectionState;
     selectionRange;
@@ -14326,6 +14673,8 @@ class DocumentArrange {
     renderCtx;
     seo;
     options;
+    execute;
+    pMeasure;
     constructor(docCtx, renderCtx, seo) {
         this.docCtx = docCtx;
         this.renderCtx = renderCtx;
@@ -14345,10 +14694,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();
@@ -14464,15 +14815,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;
@@ -14483,7 +14825,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) {
@@ -14499,12 +14841,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;
@@ -14517,8 +14858,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;
                 }
@@ -14528,7 +14869,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);
                             }
@@ -14556,12 +14897,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;
@@ -14580,7 +14915,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;
@@ -14757,7 +15092,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);
@@ -14873,647 +15208,18 @@ class DocumentArrange {
         return -1;
     }
     getHeaderRows(tb) {
-        const rows = [];
-        for (let i = 0; i < tb.length; i++) {
-            const rowRender = tb.getChild(i);
-            const rowEle = rowRender.element;
-            if (rowEle.props.headerRow) {
-                rows.push(rowRender);
-            }
-            else {
-                break;
-            }
-        }
-        return rows;
-    }
-    /**
-     * 修改测量完毕后的元素状态
-     * @param ele
-     */
-    setMeasureCompletedModifyFlag(ele) {
-        if (ele instanceof BranchElement) {
-            for (let i = 0; i < ele.length; i++) {
-                this.setMeasureCompletedModifyFlag(ele.getChild(i));
-            }
-        }
-        ele.modifyFlag = exports.ModifyFlag.None;
-        if (!ele.loaded) {
-            ele.loaded = true;
-        }
-    }
-    clearPaintCache(ele, data) {
-        ele.beginMeasure(data);
-        this.identifyComment(ele);
-        if (ele instanceof BranchElement) {
-            for (let i = 0; i < ele.length; i++) {
-                this.clearPaintCache(ele.getChild(i), data);
-            }
-        }
-    }
-    identifyComment(ele) {
-        if (ele instanceof CommentElement) {
-            this.docCtx.document.identifyCommMark(ele);
-        }
-    }
-    cacheDoc;
-    cacheDocRenders(docs) {
-        docs.forEach(doc => {
-            this.cacheDoc = doc;
-            this.cacheRenders(doc);
-        });
-        this.cacheDoc = null;
-    }
-    /**
-     * 生成批注区间信息
-     * @param renderTree
-     */
-    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 === exports.ModifyFlag.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 === exports.ModifyFlag.Modify || element.modifyFlag === exports.ModifyFlag.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;
-                }
+        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 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);
-                }
+            else {
+                break;
             }
-            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 };
+        return rows;
     }
     /**
      * 修改测量完毕后的元素状态
@@ -15526,29 +15232,105 @@ class ElementMeasure {
             }
         }
         ele.modifyFlag = exports.ModifyFlag.None;
+        if (!ele.loaded) {
+            ele.loaded = true;
+        }
     }
     clearPaintCache(ele, data) {
+        ele.paintRenders.length = 0;
         ele.beginMeasure(data);
+        this.identifyComment(ele);
         if (ele instanceof BranchElement) {
             for (let i = 0; i < ele.length; i++) {
                 this.clearPaintCache(ele.getChild(i), data);
             }
         }
     }
+    identifyComment(ele) {
+        if (ele instanceof CommentElement) {
+            this.docCtx.document.identifyCommMark(ele);
+        }
+    }
+    cacheDoc;
+    cacheDocRenders(docs) {
+        docs.forEach(doc => {
+            this.cacheDoc = doc;
+            this.cacheRenders(doc);
+        });
+        this.cacheDoc = null;
+    }
+    /**
+     * 生成批注区间信息
+     * @param renderTree
+     */
+    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;
+    }
 }
 
 class DocumentPaint {
     renderContext;
     docCtx;
     seo;
-    elementMeasure;
     //elementRenderCut: ElementRenderCut;
     elementPaint;
     docPages;
@@ -15560,7 +15342,6 @@ 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.elementPaint = new ElementPaint(this.renderContext, this.docCtx);
     }
@@ -15720,130 +15501,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 {
-    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) {
@@ -15907,29 +15564,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') {
@@ -15951,6 +15597,7 @@ class ElementReader {
                     }
                 }
                 factory.readCompleted(element, childArr);
+                this.readAttribute(data, element);
                 return element;
             }
         }
@@ -15962,6 +15609,11 @@ class ElementReader {
             return null;
         }
     }
+    readAttribute(data, ele) {
+        if (data.attribute) {
+            ele.attribute = data.attribute;
+        }
+    }
     /**
      * 读取扩展属性
      * @param data
@@ -17215,7 +16867,6 @@ class DocumentEvent {
             startHitInfo: this.startHitInfo,
             endHitInfo: this.endHitInfo
         });
-        console.log(this.endHitInfo);
     }
     /**
      * 获取鼠标所在的渲染元素对象
@@ -20185,7 +19836,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
@@ -20236,6 +19888,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) {
@@ -28148,7 +27835,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.1.20";
+        return "2.1.21";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -28201,6 +27888,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
@@ -28489,6 +28196,10 @@ exports.ParagraphLineRectRenderObject = ParagraphLineRectRenderObject;
 exports.ParagraphProps = ParagraphProps;
 exports.ParagraphRenderObject = ParagraphRenderObject;
 exports.PasteElementEvent = PasteElementEvent;
+exports.PermanentTeethElement = PermanentTeethElement;
+exports.PermanentTeethFactory = PermanentTeethFactory;
+exports.PermanentTeethProps = PermanentTeethProps;
+exports.PermanentTeethRenderObject = PermanentTeethRenderObject;
 exports.PictureElement = PictureElement;
 exports.PictureFactory = PictureFactory;
 exports.PictureProps = PictureProps;
@@ -28542,8 +28253,11 @@ exports.ValidateElement = ValidateElement;
 exports.ValidateProps = ValidateProps;
 exports.ValidateRenderObject = ValidateRenderObject;
 exports.ViewOptions = ViewOptions;
+exports.addReturn = addReturn;
 exports.clearChildrenRenderCache = clearChildrenRenderCache;
 exports.clearTraces = clearTraces;
+exports.cloneChildren = cloneChildren;
+exports.cloneElementBase = cloneElementBase;
 exports.createPrintTemplate = createPrintTemplate;
 exports.defaultParaHanging = defaultParaHanging;
 exports.deleteCurrentParagraph = deleteCurrentParagraph;