@hailin-zheng/editor-core 1.1.2 → 1.1.4

package/index-cjs.js

@@ -394,6 +394,7 @@ class BlockContentRenderObject extends BranchRenderObject {
     }
 }
 class InlineGroupRenderObject extends BranchRenderObject {
+    paintPos;
 }
 /**
  * 包含块级渲染元素的容器元素,例如body、table-cell等
@@ -935,8 +936,10 @@ class Subject$1 extends EventSourceCore$1 {
         this.addSub(sub);
         return sub;
     }
-    onceSubscribe(listener) {
-        const sub = this.subscribe(listener);
+}
+class OnceSubject extends Subject$1 {
+    subscribe(listener) {
+        const sub = super.subscribe(listener);
         sub.once = true;
         return sub;
     }
@@ -1323,13 +1326,23 @@ class BranchElement extends Element {
         }
         else {
             this.modifyFlag = exports.ModifyFlag.Modify;
-            for (let i = 0; i < this.length; i++) {
-                this.getChild(i).pubOnChange('to-child');
-            }
+            clearChildrenRenderCache(this);
+            // for (let i = 0; i < this.length; i++) {
+            //     this.getChild(i).pubOnChange('to-child')
+            // }
         }
         this._onChangeEvent.next();
     }
 }
+function clearChildrenRenderCache(ele) {
+    for (let i = 0; i < ele.length; i++) {
+        const curr = ele.getChild(i);
+        curr.cacheRender = null;
+        if (curr instanceof BranchElement) {
+            clearChildrenRenderCache(curr);
+        }
+    }
+}
 /**
  * 行内编组元素
  */
@@ -1443,6 +1456,8 @@ class ViewOptions {
     defaultColor = "rgb(0,0,0)";
     selectionOverlaysColor = 'rgb(131,175,155,0.5)';
     dataEleOverlaysColor = 'rgb(131,175,155,0.5)';
+    dataEleFocusedBgColor = 'rgb(131,175,155,0.8)';
+    dataEleErrorBgColor = '#ff4d4f';
     dataEleReadOnlyOverlayColor = '#d9d9d9';
     dataEleOutlineColor = 'rgb(131,175,155,0.7)';
     viewBackcolor = 'rgb(230,230,230)';
@@ -1474,6 +1489,8 @@ class ViewOptions {
     enableDyExpression = false;
     //是否显示标尺
     showRule = true;
+    //是否开启数据元输入验证功能
+    enableDataEleInputValidate = false;
     //整页模式，不分页
     _fullPageView = false;
     get fullPageView() {
@@ -3563,6 +3580,173 @@ function getCalleeName(node) {
     return node['name'];
 }
 
+class ParagraphElement extends BlockContentElement {
+    constructor() {
+        super('p');
+        this.props = new ParagraphProps();
+        this.addEvent('BackspaceKey', (evt) => {
+            if (evt.selectionState.collapsed) {
+                const pFirstLeafElement = ElementUtil.getFirstLeafElement(this);
+                if (pFirstLeafElement === evt.source && evt.sourceOffset === 0) {
+                    if (this.props.numberType >= 0) {
+                        this.props.numberType = -1;
+                        evt.isCancel = true;
+                    }
+                    else if (this.props.indent) {
+                        this.props.indent = 0;
+                        evt.isCancel = true;
+                    }
+                }
+            }
+        }, true);
+        this.addEvent('ElementKeyDown', evt => {
+            //当前存在缩进，点击tab
+            if (evt.sourceEvent.keyCode === 9) {
+                const { startControl, startOffset } = evt.selectionState;
+                if (startOffset === 0 && startControl === this.getChild(0)) {
+                    const defaultIndent = evt.ctx.viewOptions.defaultIndent;
+                    let increaseValue = evt.sourceEvent.shiftKey ? -defaultIndent : defaultIndent;
+                    this.props.indent += increaseValue;
+                    evt.isCancel = true;
+                    evt.sourceEvent.preventDefault();
+                }
+            }
+        }, true);
+    }
+    /**
+     * 设置样式
+     * @param format
+     */
+    setFormat(format) {
+        formatEle(this, format);
+        Object.keys(format).forEach(key => {
+            this.props[key] = format[key];
+        });
+    }
+    createRenderObject() {
+        return new ParagraphRenderObject(this);
+    }
+    createLineRect() {
+        return new ParagraphLineRectRenderObject(null);
+    }
+    serialize(viewOptions) {
+        return {
+            type: 'p',
+            props: {
+                ...this.props.getSerializeProps(viewOptions)
+            }
+        };
+    }
+    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));
+            }
+        }
+        return clone;
+    }
+    static createElement() {
+        return new ParagraphElement();
+    }
+}
+class ParagraphRenderObject extends MuiltBlockLineRenderObject {
+    render(e) {
+        e.nextRender();
+        this.drawProjectNumber(e.render, e.docCtx.viewOptions, e);
+    }
+    /**
+     * 绘制项目符号
+     */
+    drawProjectNumber(ctx, viewOptions, e) {
+        const paraElement = this.element;
+        if (paraElement.props.numberType !== exports.ParagraphNumberType.none) {
+            if (paraElement.paintRenders.indexOf(this) > 0) {
+                return;
+            }
+            const line = this.getChild(0);
+            // const firstInlinePaintPos = ElementUtil.getRenderAbsolutePaintPos(firstInline, {
+            //     x: 0,
+            //     y: -viewOptions.translateY
+            // });
+            const firstInlinePaintPos = {
+                x: e.position.x + line.rect.x,
+                y: e.position.y + line.rect.y
+            };
+            if (paraElement.props.numberType === exports.ParagraphNumberType.ul) {
+                const numberSymbolY = firstInlinePaintPos.y + line.baseTopLine + Math.floor((line.baseBottomLine - line.baseTopLine) / 2);
+                ctx.contentContext.fillCircular(firstInlinePaintPos.x + 4 + paraElement.props.indent, numberSymbolY, 4);
+            }
+            else if (paraElement.props.numberType === exports.ParagraphNumberType.ol) {
+                const parent = paraElement.parent;
+                let i = paraElement.getIndex() - 1;
+                for (; i >= 0; i--) {
+                    if (parent.getChild(i) instanceof ParagraphElement) {
+                        //紧挨上面的段落
+                        const prevSiblingPara = parent.getChild(i);
+                        if (prevSiblingPara.props.numberType !== paraElement.props.numberType || prevSiblingPara.props.indent !== paraElement.props.indent) {
+                            break;
+                        }
+                    }
+                }
+                const olText = (paraElement.getIndex() - i) + '.';
+                const textProps = new TextProps();
+                textProps.color = '#000';
+                textProps.fontSize = line.baseBottomLine - line.baseTopLine;
+                textProps.fontName = '宋体';
+                ctx.contentContext.drawText(olText, textProps, firstInlinePaintPos.x, firstInlinePaintPos.y + line.baseTopLine, 40, textProps.fontSize);
+            }
+        }
+    }
+    clone() {
+        const cloneRender = new ParagraphRenderObject(this.element);
+        cloneRender.rect = ElementUtil.cloneRect(this.rect);
+        for (let i = 0; i < this.length; i++) {
+            cloneRender.addChild(this.getChild(i).clone());
+        }
+        return cloneRender;
+    }
+}
+class ParagraphFactory extends ElementFactory {
+    match(type) {
+        return type === 'p';
+    }
+    createElement(data) {
+        const paraElement = new ParagraphElement();
+        const props = data.props;
+        paraElement.props.indent = props?.indent ?? 0;
+        paraElement.props.hanging = props?.hanging ?? 0;
+        paraElement.props.textAlign = props?.textAlign ?? 'left';
+        paraElement.props.numberType = props?.numberType ?? -1;
+        paraElement.props.lineHeight = props?.lineHeight ?? this.options.defaultLineHeight;
+        paraElement.props.marginTop = props?.marginTop ?? 0;
+        paraElement.props.marginBottom = props?.marginBottom ?? 0;
+        paraElement.props.tabs = props?.tabs ?? [];
+        return paraElement;
+    }
+}
+/**
+ * 段落行框
+ */
+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);
+        cloneRender.baseTopLine = this.baseTopLine;
+        cloneRender.baseBottomLine = this.baseBottomLine;
+        for (let i = 0; i < this.length; i++) {
+            cloneRender.addChild(this.getChild(i).clone());
+        }
+        return cloneRender;
+    }
+}
+
 /**
  * 所有的数据元继承上述两个抽象类
  */
@@ -3678,8 +3862,12 @@ class InlineGroupInputElement extends InlineGroupElement {
     }
 }
 class DataElementInlineGroup extends InlineGroupInputElement {
+    errorTip;
     constructor(type) {
         super(type);
+        this.onChangeSubject.subscribe(() => {
+            this.onChangedValidate();
+        });
         this.addEvent('ElementMousemove', (evt) => {
             this.isMouseenter = true;
             this.refreshView();
@@ -3743,19 +3931,44 @@ class DataElementInlineGroup extends InlineGroupInputElement {
             this.expressFn = new Function();
         }
     }
+    /**
+     * 数据元发生更改后，进行数据验证
+     */
+    onChangedValidate() {
+        this.errorTip = '';
+        const options = getCurrOptions(this);
+        if (!options || !options.enableDataEleInputValidate) {
+            return;
+        }
+        this.errorTip = this.validate();
+    }
+}
+function getCurrOptions(ele) {
+    const doc = ElementUtil.getParent(ele, item => item.type === 'doc');
+    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) {
-                const overlayColor = this.element.props.editable ? viewOptions.dataEleOverlaysColor : viewOptions.dataEleReadOnlyOverlayColor;
-                render.overlaysContext.fillRect(position.x, position.y - 2, this.rect.width, this.rect.height + 4, overlayColor);
+                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.overlaysContext.fillRect(position.x, position.y - 2, this.rect.width, this.rect.height + 4, bgColor);
             }
             if (this.element.props.secretBrowse && viewOptions.secretBrowse) {
                 render.contentContext.ctx.filter = "blur(10px)";
@@ -3770,6 +3983,9 @@ class DataElementRenderObject extends InlineGroupRenderObject {
             e.nextRender();
             this.drawCaption(e);
         });
+        e.render.onRenderCompleted.subscribe(() => {
+            drawDecorator(e, this);
+        });
     }
     /**
      * 绘制数据元标题
@@ -3777,23 +3993,25 @@ class DataElementRenderObject extends InlineGroupRenderObject {
      * @private
      */
     drawCaption(e) {
-        const { render, position, docCtx: { viewOptions } } = e;
-        //获取到焦点时，绘制数据元标题
-        if (render.drawMode === 'view' && this.element.isFocused && this.element.paintRenders.indexOf(this) === 0) {
-            const { caption } = this.element.props;
-            if (!caption) {
-                return;
+        e.render.onRenderCompleted.subscribe(() => {
+            const { render, position, docCtx: { viewOptions } } = e;
+            //获取到焦点时，绘制数据元标题
+            if (render.drawMode === 'view' && this.element.isFocused && this.element.paintRenders.indexOf(this) === 0) {
+                const { caption } = this.element.props;
+                if (!caption) {
+                    return;
+                }
+                const textProps = new TextProps();
+                textProps.fontSize = 16;
+                textProps.fontName = viewOptions.defaultFontName;
+                textProps.color = '#fff';
+                const titleWidth = render.contentContext.measureText(caption, textProps).width;
+                const x = position.x;
+                const y = position.y - 20;
+                render.contentContext.fillRect(x, y, titleWidth + 10, 20, 'blue');
+                render.contentContext.drawText(caption, textProps, x + 5, y, titleWidth, 20);
             }
-            const textProps = new TextProps();
-            textProps.fontSize = 16;
-            textProps.fontName = viewOptions.defaultFontName;
-            textProps.color = '#fff';
-            const titleWidth = render.contentContext.measureText(caption, textProps).width;
-            const x = position.x;
-            const y = position.y - 20;
-            render.contentContext.fillRect(x, y, titleWidth + 10, 20, 'blue');
-            render.contentContext.drawText(caption, textProps, x + 5, y, titleWidth, 20);
-        }
+        });
     }
 }
 const validateDataEle = (ele) => {
@@ -3848,6 +4066,57 @@ class DataElementBaseFactory extends ElementFactory {
         }
     }
 }
+function drawDecorator(e, r) {
+    const { render, docCtx: { viewOptions } } = e;
+    const canPaint = r.element.isMouseenter || r.element.isFocused;
+    if (canPaint && r.element.paintRenders.indexOf(r) === 0) {
+        const currParaRenders = getCurrentParaGroupRenders(r);
+        const verOffset = 3;
+        if (currParaRenders.length > 1) {
+            const secondGroupRenderPos = currParaRenders[1].paintPos;
+            if (secondGroupRenderPos.x + currParaRenders[1].rect.width > r.paintPos.x) {
+                const leftPoints = [];
+                const rightPoints = [];
+                for (let i = 0; i < currParaRenders.length; i++) {
+                    const groupRender = currParaRenders[i];
+                    const groupRenderPos = groupRender.paintPos;
+                    leftPoints.push({ x: groupRenderPos.x, y: groupRenderPos.y - verOffset });
+                    rightPoints.push({
+                        x: groupRenderPos.x + groupRender.rect.width,
+                        y: groupRenderPos.y - verOffset
+                    });
+                    leftPoints.push({
+                        x: groupRenderPos.x,
+                        y: groupRenderPos.y + groupRender.rect.height + verOffset * 2
+                    });
+                    rightPoints.push({
+                        x: groupRenderPos.x + groupRender.rect.width,
+                        y: groupRenderPos.y + groupRender.rect.height + verOffset * 2
+                    });
+                }
+                const sharpPoints1 = CommonUtil.resharpPoints(rightPoints);
+                const sharpPoints = CommonUtil.resharpPoints([...leftPoints.reverse()]);
+                render.overlaysContext.strokeLines([...sharpPoints, ...sharpPoints1, sharpPoints[0]], 1, viewOptions.dataGroupColor);
+                return;
+            }
+        }
+        for (let i = 0; i < currParaRenders.length; i++) {
+            const currRen = currParaRenders[i];
+            render.overlaysContext.strokeRect(currRen.paintPos.x, currRen.paintPos.y - verOffset, currRen.rect.width, currRen.rect.height + verOffset * 2, viewOptions.dataGroupColor);
+        }
+    }
+}
+function getCurrentParaGroupRenders(r) {
+    const renders = [];
+    const currParaRender = ElementUtil.getParentRender(r, ParagraphRenderObject);
+    for (let i = 0; i < r.element.paintRenders.length; i++) {
+        const paraRender = ElementUtil.getParentRender(r.element.paintRenders[i], ParagraphRenderObject);
+        if (paraRender === currParaRender) {
+            renders.push(r.element.paintRenders[i]);
+        }
+    }
+    return renders;
+}
 
 class DocumentElement extends BlockContainerElement {
     //props: DocumentProps;
@@ -4309,173 +4578,6 @@ class DocumentHeaderFactory extends ElementFactory {
     }
 }
 
-class ParagraphElement extends BlockContentElement {
-    constructor() {
-        super('p');
-        this.props = new ParagraphProps();
-        this.addEvent('BackspaceKey', (evt) => {
-            if (evt.selectionState.collapsed) {
-                const pFirstLeafElement = ElementUtil.getFirstLeafElement(this);
-                if (pFirstLeafElement === evt.source && evt.sourceOffset === 0) {
-                    if (this.props.numberType >= 0) {
-                        this.props.numberType = -1;
-                        evt.isCancel = true;
-                    }
-                    else if (this.props.indent) {
-                        this.props.indent = 0;
-                        evt.isCancel = true;
-                    }
-                }
-            }
-        }, true);
-        this.addEvent('ElementKeyDown', evt => {
-            //当前存在缩进，点击tab
-            if (evt.sourceEvent.keyCode === 9) {
-                const { startControl, startOffset } = evt.selectionState;
-                if (startOffset === 0 && startControl === this.getChild(0)) {
-                    const defaultIndent = evt.ctx.viewOptions.defaultIndent;
-                    let increaseValue = evt.sourceEvent.shiftKey ? -defaultIndent : defaultIndent;
-                    this.props.indent += increaseValue;
-                    evt.isCancel = true;
-                    evt.sourceEvent.preventDefault();
-                }
-            }
-        }, true);
-    }
-    /**
-     * 设置样式
-     * @param format
-     */
-    setFormat(format) {
-        formatEle(this, format);
-        Object.keys(format).forEach(key => {
-            this.props[key] = format[key];
-        });
-    }
-    createRenderObject() {
-        return new ParagraphRenderObject(this);
-    }
-    createLineRect() {
-        return new ParagraphLineRectRenderObject(null);
-    }
-    serialize(viewOptions) {
-        return {
-            type: 'p',
-            props: {
-                ...this.props.getSerializeProps(viewOptions)
-            }
-        };
-    }
-    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));
-            }
-        }
-        return clone;
-    }
-    static createElement() {
-        return new ParagraphElement();
-    }
-}
-class ParagraphRenderObject extends MuiltBlockLineRenderObject {
-    render(e) {
-        e.nextRender();
-        this.drawProjectNumber(e.render, e.docCtx.viewOptions, e);
-    }
-    /**
-     * 绘制项目符号
-     */
-    drawProjectNumber(ctx, viewOptions, e) {
-        const paraElement = this.element;
-        if (paraElement.props.numberType !== exports.ParagraphNumberType.none) {
-            if (paraElement.paintRenders.indexOf(this) > 0) {
-                return;
-            }
-            const line = this.getChild(0);
-            // const firstInlinePaintPos = ElementUtil.getRenderAbsolutePaintPos(firstInline, {
-            //     x: 0,
-            //     y: -viewOptions.translateY
-            // });
-            const firstInlinePaintPos = {
-                x: e.position.x + line.rect.x,
-                y: e.position.y + line.rect.y
-            };
-            if (paraElement.props.numberType === exports.ParagraphNumberType.ul) {
-                const numberSymbolY = firstInlinePaintPos.y + line.baseTopLine + Math.floor((line.baseBottomLine - line.baseTopLine) / 2);
-                ctx.contentContext.fillCircular(firstInlinePaintPos.x + 4 + paraElement.props.indent, numberSymbolY, 4);
-            }
-            else if (paraElement.props.numberType === exports.ParagraphNumberType.ol) {
-                const parent = paraElement.parent;
-                let i = paraElement.getIndex() - 1;
-                for (; i >= 0; i--) {
-                    if (parent.getChild(i) instanceof ParagraphElement) {
-                        //紧挨上面的段落
-                        const prevSiblingPara = parent.getChild(i);
-                        if (prevSiblingPara.props.numberType !== paraElement.props.numberType || prevSiblingPara.props.indent !== paraElement.props.indent) {
-                            break;
-                        }
-                    }
-                }
-                const olText = (paraElement.getIndex() - i) + '.';
-                const textProps = new TextProps();
-                textProps.color = '#000';
-                textProps.fontSize = line.baseBottomLine - line.baseTopLine;
-                textProps.fontName = '宋体';
-                ctx.contentContext.drawText(olText, textProps, firstInlinePaintPos.x, firstInlinePaintPos.y + line.baseTopLine, 40, textProps.fontSize);
-            }
-        }
-    }
-    clone() {
-        const cloneRender = new ParagraphRenderObject(this.element);
-        cloneRender.rect = ElementUtil.cloneRect(this.rect);
-        for (let i = 0; i < this.length; i++) {
-            cloneRender.addChild(this.getChild(i).clone());
-        }
-        return cloneRender;
-    }
-}
-class ParagraphFactory extends ElementFactory {
-    match(type) {
-        return type === 'p';
-    }
-    createElement(data) {
-        const paraElement = new ParagraphElement();
-        const props = data.props;
-        paraElement.props.indent = props?.indent ?? 0;
-        paraElement.props.hanging = props?.hanging ?? 0;
-        paraElement.props.textAlign = props?.textAlign ?? 'left';
-        paraElement.props.numberType = props?.numberType ?? -1;
-        paraElement.props.lineHeight = props?.lineHeight ?? this.options.defaultLineHeight;
-        paraElement.props.marginTop = props?.marginTop ?? 0;
-        paraElement.props.marginBottom = props?.marginBottom ?? 0;
-        paraElement.props.tabs = props?.tabs ?? [];
-        return paraElement;
-    }
-}
-/**
- * 段落行框
- */
-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);
-        cloneRender.baseTopLine = this.baseTopLine;
-        cloneRender.baseBottomLine = this.baseBottomLine;
-        for (let i = 0; i < this.length; i++) {
-            cloneRender.addChild(this.getChild(i).clone());
-        }
-        return cloneRender;
-    }
-}
-
 class PSymbolElement extends LeafElement {
     textProps;
     defaultHeight = 14;
@@ -4578,6 +4680,9 @@ class TableCellElement extends BlockContainerElement {
             throw new Error('row is null');
         }
         const table = row.parent;
+        if (!table) {
+            debugger;
+        }
         const cellIndex = row.getChildIndex(this);
         let cellWidth = table.getCellWidth(cellIndex);
         const cellOffset = table.getCellOffsetX(cellIndex);
@@ -5638,8 +5743,8 @@ class TableFactory extends ElementFactory {
 /**
  * 行-表格渲染模式
  */
-function textLineRenderMode(ele, data) {
-    const tb = ele.cacheRender;
+function textLineRenderMode(tbRender, data) {
+    const tb = tbRender;
     const rows = [];
     for (let i = 0; i < tb.length; i++) {
         const row = tb.getChild(i);
@@ -7623,8 +7728,7 @@ class RenderContext {
     drawMode = 'view';
     contentOffCanvas;
     overlayOffCanvas;
-    //pageRect!: Omit<Rect, any>;
-    onRenderCompleted = new Subject$1();
+    onRenderCompleted = new OnceSubject();
     constructor(mainContext) {
         this.mainContext = mainContext;
     }
@@ -7646,7 +7750,6 @@ class RenderContext {
         this.pageRect = { x: 0, y: 0, width: pageSetting.width, height: pageSetting.height };
         ElementUtil.setCanvasProps(this.contentOffCanvas, this.contentContext.ctx, pageSetting);
         ElementUtil.setCanvasProps(this.overlayOffCanvas, this.overlaysContext.ctx, pageSetting);
-        //ElementUtil.setCanvasProps(this.mainContext.ctx.canvas, this.mainContext.ctx, pageSetting)
     }
     clear() {
         this.contentContext.clear();
@@ -8685,7 +8788,7 @@ class DataElementDate extends DataElementInlineGroup {
         this.props.valueTextProps.clone(valueText.props);
         valueText.text = formatStr;
         this.addChild(valueText, this.length - 1);
-        //this.beginMeasure();
+        this.onChangedValidate();
     }
     getValue() {
         return ElementSerialize.serializeString(this);
@@ -8775,62 +8878,11 @@ class DataElementGroupElement extends InlineGroupInputElement {
     }
 }
 class DataElementGroupRenderObject extends InlineGroupRenderObject {
-    paintPos;
     render(e) {
         this.paintPos = e.position;
-    }
-    getCurrentParaGroupRenders() {
-        const renders = [];
-        const currParaRender = ElementUtil.getParentRender(this, ParagraphRenderObject);
-        for (let i = 0; i < this.element.paintRenders.length; i++) {
-            const paraRender = ElementUtil.getParentRender(this.element.paintRenders[i], ParagraphRenderObject);
-            if (paraRender === currParaRender) {
-                renders.push(this.element.paintRenders[i]);
-            }
-        }
-        return renders;
-    }
-    pagePaintCompleted(e) {
-        const { render, docCtx: { viewOptions } } = e;
-        const canPaint = this.element.isMouseenter || this.element.isFocused;
-        if (canPaint && this.element.paintRenders.indexOf(this) === 0) {
-            const currParaRenders = this.getCurrentParaGroupRenders();
-            const verOffset = 3;
-            if (currParaRenders.length > 1) {
-                const secondGroupRenderPos = currParaRenders[1].paintPos;
-                if (secondGroupRenderPos.x + currParaRenders[1].rect.width > this.paintPos.x) {
-                    const leftPoints = [];
-                    const rightPoints = [];
-                    for (let i = 0; i < currParaRenders.length; i++) {
-                        const groupRender = currParaRenders[i];
-                        const groupRenderPos = groupRender.paintPos;
-                        leftPoints.push({ x: groupRenderPos.x, y: groupRenderPos.y - verOffset });
-                        rightPoints.push({
-                            x: groupRenderPos.x + groupRender.rect.width,
-                            y: groupRenderPos.y - verOffset
-                        });
-                        leftPoints.push({
-                            x: groupRenderPos.x,
-                            y: groupRenderPos.y + groupRender.rect.height + verOffset * 2
-                        });
-                        rightPoints.push({
-                            x: groupRenderPos.x + groupRender.rect.width,
-                            y: groupRenderPos.y + groupRender.rect.height + verOffset * 2
-                        });
-                    }
-                    const sharpPoints1 = CommonUtil.resharpPoints(rightPoints);
-                    const sharpPoints = CommonUtil.resharpPoints([...leftPoints.reverse()]);
-                    render.overlaysContext.strokeLines([...sharpPoints, ...sharpPoints1, sharpPoints[0]], 1, viewOptions.dataGroupColor);
-                    return;
-                }
-            }
-            for (let i = 0; i < currParaRenders.length; i++) {
-                const currRen = currParaRenders[i];
-                render.overlaysContext.strokeRect(currRen.paintPos.x, currRen.paintPos.y - verOffset, currRen.rect.width, currRen.rect.height + verOffset * 2, viewOptions.dataGroupColor);
-            }
-        }
-    }
-    endRender(ctx, position) {
+        e.render.onRenderCompleted.subscribe(() => {
+            drawDecorator(e, this);
+        });
     }
     clone() {
         const cloneRender = new DataElementGroupRenderObject(this.element);
@@ -9051,6 +9103,7 @@ class DataElementList extends DataElementInlineGroup {
                 this.addChild(valueText, this.length - 1);
             }
         }
+        this.onChangedValidate();
     }
     getValue() {
         const values = ElementSerialize.serializeString(this);
@@ -9144,6 +9197,7 @@ class DataElementText extends DataElementInlineGroup {
             valueText.text = val + '';
             this.addChild(valueText, this.length - 1);
         }
+        this.onChangedValidate();
     }
     getValue() {
         return ElementSerialize.serializeString(this, { all: false });
@@ -10980,8 +11034,6 @@ class ElementPaint {
     }
     paintPagePos;
     drawPages(docContainer, selectedSets) {
-        // this.rePaint = rePaint;
-        //this.measureCommContainer = measureCommContainer;
         this.selectedSets = selectedSets;
         const pageCount = docContainer.length;
         const containerPos = { x: docContainer.rect.x - this.viewOptions.pageOffset.x, y: docContainer.rect.y - this.viewOptions.pageOffset.y };
@@ -11007,13 +11059,13 @@ class ElementPaint {
         });
         nextRenderFn();
         const { scale, viewSettings: { width, height } } = this.viewOptions;
+        while (this.renderCtx.onRenderCompleted.subs.length > 0) {
+            this.renderCtx.onRenderCompleted.next();
+        }
         this.renderCtx.commit({ width, height, scale }, this.viewOptions.pageOffset);
     }
     drawRenderObject(renderObject, parent, parentInViewPort = false) {
         const element = renderObject.element;
-        // if (this.rePaint && element) {
-        //     //element.paintRenders.push(renderObject);
-        // }
         const { x: rx, y: ry, width: rw, height: rh } = renderObject.rect;
         const currPosition = { x: rx + parent.x, y: ry + parent.y };
         //判断当前绘制元素是否在视窗内
@@ -11053,18 +11105,6 @@ class ElementPaint {
                 };
                 renderObject.render(renderData);
             }
-            // //审阅信息
-            // if (this.viewOptions.showReviewWindow && element && element.type === 'comm') {
-            //     const commElement = element as CommentElement;
-            //     if (commElement.props.markType === 'start') {
-            //         //获取当前绘制元素相对于当前页的坐标
-            //         this.paintCommMap.push({
-            //             ele: commElement,
-            //             render: renderObject,
-            //             pos: { x: currPosition.x - this.paintPagePos.x, y: currPosition.y - this.paintPagePos.y }
-            //         });
-            //     }
-            // }
         }
         //处理选中拖蓝
         if (inViewPort && this.selectedSets.has(element)) {
@@ -11500,6 +11540,7 @@ class EditorContext {
         this.clearPrevDocCb?.();
         //this.ele_types_handlers.length = 0;
         this.imageLoader.clear();
+        this._document = null;
     }
     /**
      * 切换行打印模式
@@ -11879,6 +11920,8 @@ class DynamicContextParser {
     TableData(tableId, startRow, startCol, endRow, endCol) {
         const tb = this.doc.treeFind(item => item instanceof TableElement && item.props.id === tableId);
         const res = [];
+        startRow = startRow < 0 ? tb.length + startRow : startRow;
+        startCol = startCol < 0 ? tb.length + startCol : startCol;
         endRow = endRow < 0 ? tb.length + endRow : endRow;
         endCol = endCol < 0 ? tb.length + endCol : endCol;
         for (let i = startRow; i <= endRow; i++) {
@@ -11892,33 +11935,6 @@ class DynamicContextParser {
     }
 }
 
-/**
-* 文字行渲染模式
-用于医嘱打印模式
-*/
-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);
-        }
-    }
-}
-function remeasureParentRenders(render) {
-    if (!render) {
-        return;
-    }
-    ElementUtil.remeasure(render);
-    remeasureParentRenders(render.parent);
-}
-
 class TabElement extends LeafElement {
     constructor() {
         super('tab');
@@ -12256,8 +12272,15 @@ class ParagraphMeasure {
                     }
                 }
             }
-            if (ele.length > 2) ;
-            this.arrange(data, ele.getChild(i));
+            this.arrangeInlineItems(data, ele.getChild(i));
+        }
+    }
+    arrangeInlineItems(parentLine, ele) {
+        if (ele instanceof InlineGroupElement) {
+            this.arrangeInlineGroupElement(parentLine, ele);
+        }
+        else {
+            this.arrange(parentLine, ele);
         }
     }
     arrangeLeafElement(parentLine, ele) {
@@ -12481,7 +12504,6 @@ class DocumentArrange {
             this.docCtx.viewOptions.showReviewWindow = this.docCtx.document.commentsContainerElement.markPairs.length > 0;
             const docRenders = this.arrangeDoc();
             this.setMeasureCompletedModifyFlag(doc);
-            runTextLineRender(doc, { options: this.options, renderCtx: this.renderCtx });
             this.cacheDocRenders(docRenders);
             return docRenders;
         });
@@ -12634,7 +12656,9 @@ class DocumentArrange {
                     continue;
                 }
                 if (Array.isArray(childRender)) {
-                    element.cacheRender = null;
+                    if (childRender.length > 1) {
+                        element.cacheRender = null;
+                    }
                     for (let j = 0; j < childRender.length; j++) {
                         if (j > 0) {
                             render = this.createRenderObject(element);
@@ -12651,12 +12675,20 @@ class DocumentArrange {
                 }
             }
             renders.forEach(item => ElementUtil.remeasure(item));
+            this.processTableTextLineMode(element);
             return renders.length > 1 ? renders : renders[0];
         }
         else {
             throw new Error('未实现');
         }
     }
+    processTableTextLineMode(ele) {
+        if (this.options.textRowLineMode && ele instanceof TableElement && ele.cacheRender) {
+            const cacheRender = ele.cacheRender;
+            clearChildrenRenderCache(ele);
+            textLineRenderMode(cacheRender, { options: this.options, renderCtx: this.renderCtx });
+        }
+    }
     createRenderObject(element) {
         return element.createRenderObject({
             options: this.options,
@@ -13061,6 +13093,26 @@ class DocumentArrange {
     }
 }
 
+/**
+* 文字行渲染模式
+用于医嘱打印模式
+*/
+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
  */
@@ -14353,6 +14405,7 @@ class ElementReader {
         const type = data.type;
         for (const factory of this.factories) {
             if (factory.match(type)) {
+                data.props = data.props ?? {};
                 const element = factory.createElement(data);
                 this.readExtendsProps(data, element);
                 const childArr = [];
@@ -18306,7 +18359,6 @@ function getCurrentActiveAppContext() {
 function setCurrentActiveAppContext(ctx) {
     currentActiveAppContext = ctx;
 }
-let taskId;
 function renderApp(root, renderCtx, nodeEvent) {
     window['root'] = root;
     // const nodeEvent = new NodeEvent(root, renderCtx.mainContext.ctx.canvas);
@@ -18316,15 +18368,13 @@ function renderApp(root, renderCtx, nodeEvent) {
             return;
         }
         delayTask = true;
-        taskId = setTimeout(() => {
-            console.log(taskId + "正在运行中");
+        setTimeout(() => {
             currentActiveAppContext = { root, render: flushTask };
             delayTask = false;
             root.clearPopNodes();
             prepareRender(root, renderCtx, nodeEvent.appState);
             updateCursor(nodeEvent, renderCtx);
             currentActiveAppContext = null;
-            console.log(taskId + "运行完成");
         }, 16);
     };
     flushTask();
@@ -18812,7 +18862,6 @@ class NodeEvent {
             this.setActiveAppContext(() => this.onMousemoveHandler(evt));
         });
         canvas.addEventListener('mouseup', evt => {
-            console.log('##松开了');
             this.setActiveAppContext(() => this.onMouseupHandler(evt));
         });
         canvas.addEventListener('mouseleave', evt => {
@@ -18907,7 +18956,6 @@ class NodeEvent {
         }
         //按下鼠标并进行拖动时，mousemove在按下的元素上处理
         if (this.appState.mousedown) {
-            console.log("offsetY:", evt.offsetY);
             if (this.appState.sourceNode && this.appState.sourceNode.parent) {
                 const currNodePos = getNodePosition(this.appState.sourceNode, { x: 0, y: 0 });
                 this.appState.pos = { x: evt.offsetX, y: evt.offsetY };
@@ -19265,7 +19313,7 @@ function invokeNodeEvent(node, event, name, useCapture) {
 
 class ViewPaint {
     ctx;
-    onRenderCompleted = new Subject$1();
+    onRenderCompleted = new OnceSubject();
     pageSetting;
     pageRect;
     constructor(ctx) {
@@ -20028,7 +20076,7 @@ class MenuContainer extends NodeItems {
     }
     preRender(e) {
         const { render, renderPos, next } = e;
-        e.render.onRenderCompleted.onceSubscribe((render) => {
+        e.render.onRenderCompleted.subscribe((render) => {
             e.appState.surface.registerPopNode(this);
             const parentPos = { x: renderPos.x - this.finalRect.x, y: renderPos.y - this.finalRect.y };
             render.tran(() => {
@@ -20102,11 +20150,31 @@ class ScrollView extends NodeItems {
         });
         this.addEventListener('wheel', evt => {
             const { deltaY, deltaX } = evt;
-            console.log(`deltaX:${deltaX},deltaY:${deltaY}`);
             this.horBar.updateScrollByCurrent(deltaX / 10, deltaY / 10);
             this.verBar.updateScrollByCurrent(deltaX / 10, deltaY / 10);
         });
     }
+    scrollTo(x, y) {
+        if (!this.content.finalRect || !this.finalRect) {
+            return;
+        }
+        if (y > this.content.finalRect.height) {
+            y = this.content.finalRect.height;
+        }
+        if (x > this.content.finalRect.width) {
+            x = this.content.finalRect.width;
+        }
+        let scrollX = x - this.finalRect.width;
+        let scrollY = y - this.finalRect.height;
+        scrollX = scrollX < 0 ? 0 : scrollX;
+        scrollY = scrollY < 0 ? 0 : scrollY;
+        this.scrollX = scrollX;
+        this.scrollY = scrollY;
+        this.onScrollEvent.next({
+            x: this.scrollX,
+            y: this.scrollY
+        });
+    }
     measureOverride(e, availableSize) {
         const measureSize = availableSize;
         this.content.measure(e, measureSize);
@@ -20329,10 +20397,6 @@ class ScrollBar extends NodeItems {
         const x = this.orientation === 'horizontal' ? (scrollView.scrollX / scrollView.content.finalRect.width) * finalSize.width : (ScrollBarSize - this.thumbSize) / 2;
         const y = this.orientation === 'horizontal' ? (ScrollBarSize - this.thumbSize) / 2 : (scrollView.scrollY / scrollView.content.finalRect.height) * finalSize.height;
         this.thumb.arrange(e, { x, y, width, height });
-        if (this.orientation === 'vertical') {
-            console.log(y, height, finalSize.width, finalSize.height, scrollView.scrollY);
-            if (scrollView.scrollY === 4.723577235772358) ;
-        }
         return super.arrangeOverride(e, finalSize);
     }
     render(e) {
@@ -20436,6 +20500,9 @@ class RuleControl extends NodeItems {
         super();
         this.docCtx = docCtx;
         this.ss = docCtx.selectionState;
+        this.bgColor = '#fff';
+        this.shadowBlur = 5;
+        this.shadowColor = '#000';
         this.options = {
             width: 0,
             pagePL: 0,
@@ -21135,7 +21202,7 @@ class CanvasTextEditor extends NodeItems {
      */
     docClickHandle(evt) {
         this.setCursor();
-        this.selectionOverlays.getSelectionTreeData();
+        this.updateSelection();
         this.onClickEvent.next(evt);
     }
     /**
@@ -21147,6 +21214,7 @@ class CanvasTextEditor extends NodeItems {
         if (res) {
             this.flushToSchedule();
         }
+        this.updateSelection();
         this.onDblClickEvent.next(evt);
     }
     /**
@@ -21553,6 +21621,7 @@ class CanvasTextEditor extends NodeItems {
                 return;
             }
             //this.docScroll.scrollTo(cursorPos.rect.x, cursorPos.rect.y - this.viewOptions.translateY);
+            this.scrollView.scrollTo(cursorPos.rect.x, cursorPos.rect.y + 100);
         }
     }
     /**
@@ -21709,6 +21778,13 @@ class CanvasTextEditor extends NodeItems {
         scrollView.y = 30;
         this.scrollView = scrollView;
         scrollView.content.addChild(this);
+        const label = new LabelNode();
+        label.text = '请注意了';
+        label.bgColor = '#fff';
+        label.padding = 2;
+        label.x = 100;
+        label.y = 100;
+        //this.addChild(label);
         scrollView.onScrollEvent.subscribe(data => {
             //console.log(data);
             this.viewOptions.pageOffset.x = data.x;
@@ -21812,6 +21888,24 @@ class CanvasTextEditor extends NodeItems {
             appCtx.root.setInputPosition(caretPos);
         }
     }
+    measureOverride(e, availableSize) {
+        this.controls.forEach(item => {
+            item.measure(e, availableSize);
+        });
+        return super.measureOverride(e, availableSize);
+    }
+    arrangeOverride(e, finalSize) {
+        this.controls.forEach(item => {
+            const itemRect = {
+                x: item.x,
+                y: item.y,
+                width: item.desiredSize.width,
+                height: item.desiredSize.height
+            };
+            item.arrange(e, itemRect);
+        });
+        return super.arrangeOverride(e, finalSize);
+    }
 }
 
 /**
@@ -22240,6 +22334,7 @@ exports.MarginProps = MarginProps;
 exports.MouseElementEvent = MouseElementEvent;
 exports.MousedownElementEvent = MousedownElementEvent;
 exports.MuiltBlockLineRenderObject = MuiltBlockLineRenderObject;
+exports.OnceSubject = OnceSubject;
 exports.PSymbolElement = PSymbolElement;
 exports.PSymbolRenderObject = PSymbolRenderObject;
 exports.PaddingProps = PaddingProps;
@@ -22296,19 +22391,23 @@ exports.ValidateElement = ValidateElement;
 exports.ValidateProps = ValidateProps;
 exports.ValidateRenderObject = ValidateRenderObject;
 exports.ViewOptions = ViewOptions;
+exports.clearChildrenRenderCache = clearChildrenRenderCache;
 exports.createPrintTemplate = createPrintTemplate;
 exports.defaultParaHanging = defaultParaHanging;
 exports.deleteCurrentParagraph = deleteCurrentParagraph;
 exports.documentPrint = documentPrint;
+exports.drawDecorator = drawDecorator;
 exports.elementTypeEventHandler = elementTypeEventHandler;
 exports.fontMapFunc = fontMapFunc;
 exports.fromEvent = fromEvent;
+exports.getCalleeName = getCalleeName;
 exports.getFocusTextSegment = getFocusTextSegment;
 exports.invokeTypeHandler = invokeTypeHandler;
 exports.isDate = isDate;
 exports.objectToString = objectToString;
 exports.onTableContextmenu = onTableContextmenu;
 exports.onceTask = onceTask$1;
+exports.parser = parser;
 exports.printDocOnContextmenu = printDocOnContextmenu;
 exports.printNodes = printNodes;
 exports.reactiveMap = reactiveMap;