@hailin-zheng/editor-core 2.2.6 → 2.2.8

package/index-cjs.js

@@ -417,7 +417,6 @@ class BlockContentRenderObject extends BranchRenderObject {
     }
 }
 class InlineGroupRenderObject extends BranchRenderObject {
-    paintPos;
 }
 /**
  * 包含块级渲染元素的容器元素,例如body、table-cell等
@@ -431,18 +430,18 @@ class BlockContainerRenderObject extends BranchRenderObject {
 /**
  * 多级 ‘BlockLineRectRenderObject’ 包裹元素，例如 p、table
  */
-class MuiltBlockLineRenderObject extends BlockContentRenderObject {
+class MultiBlockLineRenderObject extends BlockContentRenderObject {
 }
 /**
  * 容器-子内容为多个行内块级元素，例如table-row
  */
-class InlineBlockContainer extends MuiltBlockLineRenderObject {
+class InlineBlockContainer extends MultiBlockLineRenderObject {
 }
 /**
  * 服务于table-cell
  * 可被多级拆分的元素
  */
-class InlineMuiltBlockLineRenderObject extends MuiltBlockLineRenderObject {
+class InlineMuiltBlockLineRenderObject extends MultiBlockLineRenderObject {
 }
 /**
  * 最小不可分割单位的块级行框，例如 p-line
@@ -1726,12 +1725,22 @@ class ViewOptions {
     defaultColor = "#000000";
     currentFontSize = 14;
     currentFontName = '宋体';
-    selectionOverlaysColor = 'rgb(131,175,155,0.5)';
-    dataEleOverlaysColor = 'rgb(131,175,155,0.5)';
-    dataEleFocusedBgColor = 'rgb(131,175,155,0.8)';
+    //选区颜色
+    selectionColor = 'rgb(131,175,155,0.5)';
+    dataDecoratorNormalColor = '#0050b3';
+    dataDecoratorMouseEnterColor = '#0050b3';
+    dataDecoratorFocusedColor = '#0050b3';
+    //数据元没有输入值时背景颜色
+    dataEleEmptyBgColor = '';
+    //数据元鼠标悬浮颜色
+    dataEleMouseEnterBgColor = '#d9d9d9';
+    //数据元只读背景颜色
+    dataEleReadOnlyBgColor = '#d9d9d9';
+    //数据元焦点背景颜色
+    dataEleFocusedBgColor = '#d9d9d9';
+    //数据元正常背景颜色
+    dataEleNormalBgColor = '#fafafa';
     dataEleErrorBgColor = '#ff4d4f';
-    dataEleReadOnlyOverlayColor = '#d9d9d9';
-    dataEleOutlineColor = 'rgb(131,175,155,0.7)';
     viewBackcolor = 'rgb(230,230,230)';
     paraSymbolColor = 'rgb(128,128,128)';
     dataGroupColor = 'rgb(0,80,179)';
@@ -1746,7 +1755,6 @@ class ViewOptions {
     showCharRect;
     //数据元交互修饰模式
     dataEleDecoratorMode = 'outline';
-    dataEleDecoratorColor = '#0050b3';
     showTabChar;
     showSpaceChar;
     showLineBreak;
@@ -2528,6 +2536,10 @@ class DataEleListProps extends DataEleBaseTextProps {
         super();
     }
     options = [];
+    /**
+     * 是否保存选项到病历文件里面
+     */
+    saveOptions = true;
     dropDownStyle;
     /**
      * 是否允许多选
@@ -2858,28 +2870,14 @@ class ValidateProps {
         return clone;
     }
 }
-class DataElementGroupProps extends INotifyPropertyChanged {
-    id;
-    name;
-    hidden;
+class DataElementGroupProps extends DataEleBaseProps {
     clone(dest) {
-        dest = dest ?? new DataElementGroupProps();
-        dest.id = this.id;
-        dest.name = this.name;
-        dest.hidden = this.hidden;
+        const clone = dest ?? new DataElementGroupProps();
+        super.cloneBaseProps(clone);
     }
-    getSerializeProps() {
+    getSerializeProps(options) {
         const props = {};
-        if (this.id) {
-            props.id = this.id;
-        }
-        if (this.name) {
-            props.name = this.name;
-        }
-        if (this.hidden) {
-            props.hidden = this.hidden;
-        }
-        return props;
+        return this.getBaseProps(props, options);
     }
 }
 class DataElementBarcodeProps {
@@ -2939,7 +2937,7 @@ class DataDecorateElement extends LeafElement {
         const render = new DataDecorateRenderObject(this);
         //render.rect.width = this.dProps.size / 2;
         render.rect.width = 1;
-        render.rect.height = 14;
+        render.rect.height = Math.ceil(14 * TEXT_HEIGHT_FACTOR);
         return render;
     }
     serialize() {
@@ -2962,6 +2960,17 @@ class DataDecorateRenderObject extends LeafRenderObject {
         if (event.mode === 'print') {
             return null;
         }
+        // if(this.element.parent.parent.type==='data-group'){
+        //     return null;
+        // }
+        const options = event.options;
+        let color = options.dataDecoratorNormalColor;
+        if (this.element.dataEle.isMouseenter && options.dataDecoratorMouseEnterColor) {
+            color = options.dataDecoratorMouseEnterColor;
+        }
+        if (this.element.dataEle.isFocused && options.dataDecoratorFocusedColor) {
+            color = options.dataDecoratorFocusedColor;
+        }
         const element = this.element;
         const lineWidth = 3;
         let path = '';
@@ -2975,7 +2984,7 @@ class DataDecorateRenderObject extends LeafRenderObject {
             path = `M ${x - lineWidth} 2 L ${x} 2 L ${x} ${height} L ${x - lineWidth} ${height}`;
         }
         return ElementUtil.createSvgPath({
-            stroke: '#0050b3',
+            stroke: color,
             fill: "none",
             'stroke-width': 1,
             d: path
@@ -3141,7 +3150,7 @@ class ParagraphElement extends BlockContentElement {
         return new ParagraphElement();
     }
 }
-class ParagraphRenderObject extends MuiltBlockLineRenderObject {
+class ParagraphRenderObject extends MultiBlockLineRenderObject {
     /**
      * 绘制项目符号
      */
@@ -3690,7 +3699,7 @@ class DocumentRenderObject extends BlockContainerRenderObject {
                 },
             },
             children: [
-                pageCorner, copyright, highlight, ...CommonUtil.toArray(event.getChildNodes(this)), pageNum, selection
+                pageCorner, highlight, ...CommonUtil.toArray(event.getChildNodes(this)), pageNum, selection, copyright
             ]
         };
     }
@@ -3728,11 +3737,10 @@ class DocumentRenderObject extends BlockContainerRenderObject {
         }
         const str = "\u6f14\u793a\u7248\u672c";
         const textProps = new TextProps();
-        textProps.color = "#000";
-        textProps.fontName = '仿宋';
+        textProps.color = "#bfbfbf";
+        textProps.fontName = '宋体';
         textProps.fontSize = 80;
         textProps.fontStyle = 'italic';
-        event.renderCtx.contentContext.measureText(str, textProps);
         const getTextRotationAngle = (width, height) => {
             return Math.atan(height / width) * 180 / Math.PI;
         };
@@ -3751,6 +3759,7 @@ class DocumentRenderObject extends BlockContainerRenderObject {
                     'font-size': textProps.fontSize,
                     "stroke": textProps.color,
                     'fill': '#fff',
+                    'opacity': '0.5',
                     x: this.rect.width / 2,
                     y: this.rect.height / 2,
                 }
@@ -3962,19 +3971,83 @@ class DataElementInlineGroup extends InlineGroupInputElement {
     expressFn;
     beginMeasure(data) {
         super.beginMeasure(data);
-        if (!this.props.expression || !data.viewOptions.enableDyExpression) {
+        // if (!this.props.expression || !data.options.enableDyExpression) {
+        //     return;
+        // }
+        // try {
+        //     if (!this.expressFn) {
+        //         const code = parser(this.props.expression);
+        //         this.expressFn = new Function(`with(this){ ${code} }`);
+        //     }
+        //     this.expressFn.bind(data.execute)();
+        //     //this.expressFn();
+        // } catch (e) {
+        //     this.expressFn = new Function();
+        // }
+    }
+    parserExpress;
+    /**
+     * 解析可见性表达式
+     * @param ele
+     * @param execute
+     * @private
+     */
+    parseEleExpression(data) {
+        const execute = data.execute;
+        //不存在表达式，或者不启用表达式，不做处理
+        if (!this.props.expression || !data.options.enableDyExpression)
             return;
-        }
+        //存在表达式，并且已经解析过，不再做处理
+        if (this.parserExpress)
+            return;
+        const reactiveMode = data.renderCtx.drawMode !== 'print';
         try {
-            if (!this.expressFn) {
-                const code = parser(this.props.expression);
-                this.expressFn = new Function(`with(this){ ${code} }`);
+            const depIdItems = [];
+            const depEleMap = new Map();
+            let compliedCode = parser(this.props.expression, 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(() => {
+                                this.pubOnChange('self');
+                            });
+                        });
+                    }
+                });
             }
-            this.expressFn.bind(data.execute)();
-            //this.expressFn();
+            this.parserExpress = { compliedCode, func: new Function(`with(this){ ${compliedCode} }`), depItems: depEleMap };
         }
         catch (e) {
-            this.expressFn = new Function();
+            console.error('解析表达式出错,parseEleExpression', this.props.expression);
+        }
+    }
+    /**
+     * 元素可见行求值
+     * @param ele
+     * @param executeCtx
+     * @private
+     */
+    evalEleExpr(executeCtx) {
+        if (this.parserExpress && this.parserExpress.func) {
+            try {
+                executeCtx.setCurrentCtx(this, this.parserExpress.depItems);
+                const func = this.parserExpress.func.bind(executeCtx);
+                func();
+            }
+            catch (e) {
+                console.error(e, "表达式执行出错:evalVisibleExpr", this.parserExpress.compliedCode);
+            }
+            finally {
+                executeCtx.clearCurrentCtx();
+            }
         }
     }
     /**
@@ -4074,68 +4147,85 @@ class DataElementBaseFactory extends ElementFactory {
  * @param r
  */
 function exportDecoratorHTML(event, r) {
-    const canPaint = r.element.isMouseenter || r.element.isFocused;
-    if (!canPaint) {
+    if (event.mode === 'print') {
         return;
     }
-    const mode = event.options.dataEleDecoratorMode;
-    const color = event.options.dataEleDecoratorColor;
-    if (mode === 'none') {
-        return;
+    const options = event.options;
+    let color = options.dataEleNormalBgColor;
+    //空数据元填充颜色
+    if (r.element.length === 2 && options.dataEleEmptyBgColor) {
+        color = options.dataEleEmptyBgColor;
     }
-    if (mode === 'overlay') {
-        const bgX = event.relativePagePos.x;
-        const bgY = event.relativePagePos.y;
-        event.highlights.push(ElementUtil.getFillSvgRect(bgX, bgY, r.rect.width, r.rect.height, color));
-        return;
+    if (r.element.isMouseenter && options.dataEleMouseEnterBgColor) {
+        color = options.dataEleMouseEnterBgColor;
     }
-    else if (mode === 'outline') {
-        const verOffset = 0;
-        const renderPosMap = getCurrentParaGroupRenders(r).map(item => ({ pos: getRenderPosToDoc(item), render: item }));
-        if (renderPosMap.length > 1) {
-            const secondGroupRenderPos = renderPosMap[1].pos;
-            if (secondGroupRenderPos.x + renderPosMap[1].render.rect.width > event.relativePagePos.x) {
-                const leftPoints = [];
-                const rightPoints = [];
-                for (let i = 0; i < renderPosMap.length; i++) {
-                    const groupRender = renderPosMap[i].render;
-                    const groupRenderPos = renderPosMap[i].pos;
-                    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()]);
-                const path = [...sharpPoints, ...sharpPoints1, sharpPoints[0]].map((item, index) => ((index === 0) ? 'M' : "L") + item.x + " " + item.y).join(" ");
-                event.highlights.push(ElementUtil.createSvgPath({
-                    d: path,
-                    stroke: color,
-                    fill: 'none',
-                    'stroke-width': 1
-                }));
-                return;
-            }
-        }
-        for (let i = 0; i < renderPosMap.length; i++) {
-            const currRen = renderPosMap[i];
-            event.highlights.push(ElementUtil.createSvgPath({
-                d: `M${currRen.pos.x} ${currRen.pos.y} L${currRen.pos.x + currRen.render.rect.width} ${currRen.pos.y} L${currRen.pos.x + currRen.render.rect.width} ${currRen.pos.y + currRen.render.rect.height} L${currRen.pos.x} ${currRen.pos.y + currRen.render.rect.height} Z`,
-                stroke: '#0050b3',
-                fill: 'none',
-                'stroke-width': 1
-            }));
-        }
+    if (r.element.isFocused && options.dataEleFocusedBgColor) {
+        color = options.dataEleFocusedBgColor;
     }
+    //绘制背景
+    const bgX = event.relativePagePos.x;
+    const bgY = event.relativePagePos.y;
+    event.highlights.push(ElementUtil.getFillSvgRect(bgX, bgY, r.rect.width, r.rect.height, color));
+    // const canPaint = r.element.isMouseenter || r.element.isFocused;
+    // if (!canPaint) {
+    //     return;
+    // }
+    // const mode = event.options.dataEleDecoratorMode;
+    // if (mode === 'none') {
+    //     return;
+    // }
+    // if (mode === 'overlay') {
+    //     const bgX = event.relativePagePos.x;
+    //     const bgY = event.relativePagePos.y;
+    //     event.highlights.push(ElementUtil.getFillSvgRect(bgX, bgY, r.rect.width, r.rect.height, color));
+    //     return;
+    // } else if (mode === 'outline') {
+    //     const verOffset = 0;
+    //     const renderPosMap = getCurrentParaGroupRenders(r).map(item => ({ pos: getRenderPosToDoc(item), render: item }));
+    //     if (renderPosMap.length > 1) {
+    //         const secondGroupRenderPos = renderPosMap[1].pos;
+    //         if (secondGroupRenderPos.x + renderPosMap[1].render.rect.width > event.relativePagePos.x) {
+    //             const leftPoints: Array<Position> = [];
+    //             const rightPoints: Array<Position> = [];
+    //             for (let i = 0; i < renderPosMap.length; i++) {
+    //                 const groupRender = renderPosMap[i].render;
+    //                 const groupRenderPos = renderPosMap[i].pos;
+    //                 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()]);
+    //             const path = [...sharpPoints, ...sharpPoints1, sharpPoints[0]].map((item, index) => ((index === 0) ? 'M' : "L") + item.x + " " + item.y).join(" ")
+    //             event.highlights.push(ElementUtil.createSvgPath({
+    //                 d: path,
+    //                 stroke: color,
+    //                 fill: 'none',
+    //                 'stroke-width': 1
+    //             }));
+    //             return;
+    //         }
+    //     }
+    //     for (let i = 0; i < renderPosMap.length; i++) {
+    //         const currRen = renderPosMap[i];
+    //         event.highlights.push(ElementUtil.createSvgPath({
+    //             d: `M${currRen.pos.x} ${currRen.pos.y} L${currRen.pos.x + currRen.render.rect.width} ${currRen.pos.y} L${currRen.pos.x + currRen.render.rect.width} ${currRen.pos.y + currRen.render.rect.height} L${currRen.pos.x} ${currRen.pos.y + currRen.render.rect.height} Z`,
+    //             stroke: '#0050b3',
+    //             fill: 'none',
+    //             'stroke-width': 1
+    //         }));
+    //     }
+    // }
 }
 /**
  * 渲染数据源验证错误提示框
@@ -4240,30 +4330,6 @@ function renderUnderWavyLine(event, r, color) {
     d += Array(Math.ceil(width / 3)).fill("3,0").join(' t ');
     const path = ElementUtil.createSvgPath({ d, fill: 'none', stroke: color });
     event.highlights.push(path);
-}
-/**
- * 获取渲染元素相对稳当的位置
- * @param render
- * @param refPos
- */
-function getRenderPosToDoc(render, refPos = null) {
-    refPos = refPos ?? { x: 0, y: 0 };
-    if (render instanceof DocumentRenderObject) {
-        return refPos;
-    }
-    const currPos = { x: render.rect.x + refPos.x, y: render.rect.y + refPos.y };
-    return getRenderPosToDoc(render.parent, currPos);
-}
-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 DocumentBodyElement extends BlockContainerElement {
@@ -4305,7 +4371,7 @@ class DocumentBodyElement extends BlockContainerElement {
         super.beginMeasure(data);
     }
 }
-class DocumentBodyRenderObject extends MuiltBlockLineRenderObject {
+class DocumentBodyRenderObject extends MultiBlockLineRenderObject {
     clone(cloneData = true) {
         const cloneRender = new DocumentBodyRenderObject(this.element);
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
@@ -4604,7 +4670,7 @@ class TableRowElement extends BlockContainerElement {
         return tr;
     }
 }
-class TableRowRenderObject extends MuiltBlockLineRenderObject {
+class TableRowRenderObject extends MultiBlockLineRenderObject {
     //被截断的行是否需要重新计算高度
     remeasureState = true;
     //当前行是否存在合并单元格
@@ -4834,9 +4900,7 @@ class TextGroupRenderObject extends LeafRenderObject {
             event.highlights.push(ElementUtil.getStrokeSvgPath(path, '#000', 1));
         }
         //处理null-text
-        if (this.element.isDecorate && this.element.disableClick && !this.element.parent) {
-            t.data.attrs['opacity'] = '0.58';
-        }
+        if (this.element.isDecorate && this.element.disableClick && !this.element.parent) ;
         return t;
     }
 }
@@ -6103,7 +6167,7 @@ class TableElement extends BlockContainerElement {
         };
     }
 }
-class TableRenderObject extends MuiltBlockLineRenderObject {
+class TableRenderObject extends MultiBlockLineRenderObject {
     setRenderWidth(maxWidth) {
         super.setRenderWidth(maxWidth);
     }
@@ -8609,7 +8673,7 @@ class DataElementGroupElement extends InlineGroupInputElement {
         return {
             type: this.type,
             props: {
-                ...this.props.getSerializeProps()
+                ...this.props.getSerializeProps(viewOptions)
             }
         };
     }
@@ -8631,9 +8695,7 @@ class DataElementGroupFactory extends DataElementBaseFactory {
     createElement(data) {
         const props = data.props;
         const ele = new DataElementGroupElement();
-        ele.props.id = props.id;
-        ele.props.name = props.name;
-        ele.props.hidden = Boolean(props.hidden);
+        ElementUtil.readEleBaseProps(ele.props, props);
         return ele;
     }
 }
@@ -8938,7 +9000,11 @@ class DataElementText extends DataElementInlineGroup {
         super('data-ele-text');
         this.props = new DataEleBaseTextProps();
     }
-    createRenderObject() {
+    createRenderObject(data) {
+        if (data.options.enableDyExpression) {
+            this.parseEleExpression(data);
+            this.evalEleExpr(data.execute);
+        }
         return new DataElementTextRenderObject(this);
     }
     serialize(viewOptions) {
@@ -9058,33 +9124,23 @@ class DataContainerElement extends BlockContainerElement {
         }
         super.beginMeasure(data);
     }
-    serialize() {
-        const p = {
+    serialize(viewOptions) {
+        return {
             type: this.type,
-            props: {}
+            props: {
+                ...this.props.getSerializeProps(viewOptions)
+            }
         };
-        if (this.props.id) {
-            p['id'] = this.props.id;
-        }
-        if (this.props.name) {
-            p['name'] = this.props.name;
-        }
-        if (this.props.caption) {
-            p['caption'] = this.props.caption;
-        }
-        return p;
     }
     clone(data) {
         const clone = new DataContainerElement();
-        clone.props.id = this.props.id;
-        clone.props.name = this.props.name;
-        clone.props.caption = this.props.caption;
+        this.props.clone(clone.props);
         cloneElementBase(this, clone);
         cloneChildren(this, clone, data);
         return clone;
     }
 }
-class DataContainerRenderObject extends MuiltBlockLineRenderObject {
+class DataContainerRenderObject extends MultiBlockLineRenderObject {
     clone(cloneData = true) {
         const cloneRender = new DataContainerRenderObject(this.element);
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
@@ -9109,24 +9165,21 @@ class DataContainerFactory extends ElementFactory {
         return type === 'data-container';
     }
     createElement(data) {
-        const element = new DataContainerElement();
+        const ele = new DataContainerElement();
         const props = data.props;
-        if (props?.id) {
-            element.props.id = props.id;
-        }
-        if (props?.name) {
-            element.props.name = props.name;
-        }
-        if (props?.caption) {
-            element.props.caption = props.caption;
-        }
-        return element;
+        ElementUtil.readEleBaseProps(ele.props, props);
+        return ele;
     }
 }
-class DataContainerProps {
-    caption;
-    id;
-    name;
+class DataContainerProps extends DataEleBaseProps {
+    clone(dest) {
+        const clone = dest ?? new DataContainerProps();
+        super.cloneBaseProps(clone);
+    }
+    getSerializeProps(options) {
+        const props = {};
+        return this.getBaseProps(props, options);
+    }
 }
 
 /**
@@ -9212,7 +9265,7 @@ class DocumentBodyPartElement extends BlockContainerElement {
         return clone;
     }
 }
-class DocumentBodyPartRenderObject extends MuiltBlockLineRenderObject {
+class DocumentBodyPartRenderObject extends MultiBlockLineRenderObject {
     clone(cloneData = true) {
         const cloneRender = new DocumentBodyPartRenderObject(this.element);
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
@@ -10588,10 +10641,10 @@ class ElementSerialize {
             }
         }
         if (element.props && element.props['__attachedProperty'] && !result.props['__attachedProperty']) {
-            result.props['__attachedProperty'] = CommonUtil.cloneValue(element.props['__attachedProperty']);
+            result.props['__attachedProperty'] = this.serializeObject(element.props['__attachedProperty']);
         }
         if (element.attribute) {
-            result['attribute'] = this.serializeAttribute(element);
+            result['attribute'] = this.serializeObject(element.attribute);
         }
         return result;
     }
@@ -10615,20 +10668,23 @@ 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];
+    static serializeObject(obj) {
+        if (obj === null || obj === undefined) {
+            return null;
+        }
+        const result = {};
+        for (const key in obj) {
+            if (obj[key] !== undefined && obj[key] !== null) {
+                if (key.startsWith("__")) {
+                    continue;
                 }
+                result[key] = obj[key];
             }
-            if (Object.keys(result).length === 0) {
-                return null;
-            }
-            return CommonUtil.cloneValue(result);
         }
-        return null;
+        if (Object.keys(result).length === 0) {
+            return null;
+        }
+        return CommonUtil.cloneValue(result);
     }
     /**
      * 获取选中的结构
@@ -13896,7 +13952,7 @@ class ParagraphMeasure {
         }
     }
     arrangeInlineGroupElement(parentLine, ele) {
-        const { options, renderCtx } = this;
+        const { options, renderCtx, execute } = this;
         let render = this.createRenderObject(ele);
         //记录多行情况下的渲染对象，用于计算总长度，生成fill-null-space
         const inlineGroupRenders = [];
@@ -13932,7 +13988,7 @@ class ParagraphMeasure {
             isCloseToBody: parentLine.isCloseToBody,
             applyNewLine() {
                 parentLine.applyNewLine();
-                render = ele.createRenderObject({ options, renderCtx });
+                render = ele.createRenderObject({ options, renderCtx, execute });
                 parentLine.add(render);
                 inlineGroupRenders.push(render);
             },
@@ -14267,7 +14323,8 @@ class ParagraphMeasure {
         }
         return element.createRenderObject({
             options: this.options,
-            renderCtx: this.renderCtx
+            renderCtx: this.renderCtx,
+            execute: this.execute
         });
     }
 }
@@ -14426,8 +14483,9 @@ class DocumentArrange {
             this.pMeasure = new ParagraphMeasure(this.options, this.renderCtx, this.execute);
             const data = {
                 doc,
-                viewOptions: this.options,
+                options: this.options,
                 execute: this.execute,
+                renderCtx: this.renderCtx,
                 createParaFn: () => this.createDefaultPara()
             };
             this.reset(data);
@@ -14630,7 +14688,7 @@ class DocumentArrange {
         if (this.options.textRowLineMode && ele instanceof TableElement && ele.cacheRender) {
             const cacheRender = ele.cacheRender;
             clearChildrenRenderCache(ele);
-            textLineRenderMode(cacheRender, { options: this.options, renderCtx: this.renderCtx });
+            textLineRenderMode(cacheRender, { options: this.options, renderCtx: this.renderCtx, execute: this.execute });
         }
     }
     getDocInnerRect(documentRender) {
@@ -14653,7 +14711,7 @@ class DocumentArrange {
         }
         const cloneRender = this.pMeasure.createRenderObject(render.element);
         cloneRender.setRenderWidth(render.rect.width);
-        if (render instanceof MuiltBlockLineRenderObject) {
+        if (render instanceof MultiBlockLineRenderObject) {
             let sumHeight = 0;
             const children = [...render.getItems()];
             let j = 0;
@@ -14662,7 +14720,7 @@ class DocumentArrange {
                 //sumHeight = ElementUtil.remeasure(cloneRender);
                 const calcBlockLineHeight = this.getBlockLineHeight(blockLine);
                 if (calcBlockLineHeight + sumHeight > limitHeight) {
-                    if (blockLine instanceof MuiltBlockLineRenderObject) {
+                    if (blockLine instanceof MultiBlockLineRenderObject) {
                         //限制的外框尺寸
                         const availHeight = limitHeight - sumHeight;
                         //限制的内框尺寸
@@ -15372,9 +15430,12 @@ class DocumentEvent {
             },
             mouseup: (evt) => {
                 this.mouseup(evt, ElementUtil.getMousePos(evt, scale));
+                this.mouseClickHandle(evt);
             },
             click: (evt) => {
-                this.mouseClickHandle(evt);
+                //nulltext 不触发 click 事件，暂且这么处理
+                //移到 mouseup 事件中处理
+                //this.mouseClickHandle(evt);
             },
             mousemove: (evt) => {
                 this.mousemove(evt, ElementUtil.getMousePos(evt, scale));
@@ -18668,103 +18729,56 @@ function getFocusTextSegment(selection) {
     let { startControl: element, startOffset: offset } = selection;
     if (!(element instanceof TextGroupElement))
         return false;
-    if (!supportSegment())
-        return false;
     const focusEle = element;
-    offset = offset + 1;
-    offset = offset > focusEle.textMeasures.length ? focusEle.textMeasures.length : offset;
-    //获取连续的字符
-    const items = [...getConsecutiveTextsByDirection(element), element, ...getConsecutiveTextsByDirection(element, false)];
-    const sortItems = getTextSortData(items);
-    const { index, text } = sortItems.reduce((prev, curr) => {
-        prev.text += curr.text;
-        if (prev.completed) {
-            return prev;
-        }
-        if (curr.item === focusEle) {
-            prev.index += offset;
-            prev.completed = true;
-        }
-        else {
-            prev.index += curr.item.textMeasures.length;
-        }
-        return prev;
-    }, { completed: false, index: 0, text: '' });
-    const { index: hitIndex, len: hitLen } = getHitSegment(text, index);
-    const matchSegment = sortItems.filter(item => (item.index <= hitIndex && item.endIndex > hitIndex) || (item.index <= hitIndex + hitLen && item.endIndex > hitIndex + hitLen));
-    const startSegment = matchSegment[0];
-    const endSegment = matchSegment[matchSegment.length - 1];
-    const startOffset = hitIndex - startSegment.index;
-    const endOffset = hitIndex + hitLen - endSegment.index;
-    const newRange = new SelectionRange();
-    newRange.setStart(startSegment.item, startOffset);
-    newRange.setEnd(endSegment.item, endOffset);
-    selection.addRange(newRange);
+    const focusText = focusEle.text;
+    if (!focusText) {
+        return false;
+    }
+    const [start, end] = tokenize(focusText, offset);
+    const range = new SelectionRange();
+    range.setStart(focusEle, start);
+    range.setEnd(focusEle, end + 1);
+    selection.addRange(range);
     return true;
 }
-/**
- * 进行分词
- * @param text
- * @param focusOffset
- */
-function getHitSegment(text, focusOffset) {
-    const segmenter = new Intl.Segmenter("zh-CN", { granularity: "word" });
-    const iterator1 = segmenter.segment(text)[Symbol.iterator]();
-    const segItems = Array.from(iterator1);
-    let index = 0;
-    for (let i = 0; i < segItems.length; i++) {
-        const segItem = segItems[i];
-        const currIndex = segItem.index;
-        const currLen = segItem.segment.length;
-        if (focusOffset > currIndex && focusOffset <= currLen + currIndex) {
-            return {
-                index,
-                len: currLen
-            };
+function tokenize(text, index) {
+    if (text.length === 0) {
+        return [0, 0]; // 处理空字符串的情况
+    }
+    const isChinese = (char) => {
+        return /^[\u4e00-\u9fa5]+$/.test(char);
+    };
+    const isEnglish = (char) => {
+        return /^[a-zA-Z]+$/.test(char);
+    };
+    const isNumeric = (char) => {
+        return /^[0-9]+$/.test(char);
+    };
+    let start = index;
+    let end = index;
+    // 向左查找开始位置
+    while (start > 0) {
+        if ((isChinese(text[start]) && isChinese(text[start - 1])) ||
+            (isEnglish(text[start]) && isEnglish(text[start - 1])) ||
+            (isNumeric(text[start]) && isNumeric(text[start - 1]))) {
+            start--;
+        }
+        else {
+            break;
         }
-        index += currLen;
     }
-    throw new Error('未获取到对应的分词词组');
-}
-function supportSegment() {
-    return typeof Intl.Segmenter === 'function';
-}
-/**
- * 根据前后顺序标识索引位
- * @param texts
- */
-function getTextSortData(texts) {
-    let index = 0;
-    const sortItems = [];
-    for (let i = 0; i < texts.length; i++) {
-        const item = texts[i];
-        const sortData = {
-            len: item.textMeasures.length,
-            index,
-            endIndex: index + item.textMeasures.length,
-            item,
-            text: item.text
-        };
-        sortItems.push(sortData);
-        index += sortData.len;
+    // 向右查找结束位置
+    while (end < text.length - 1) {
+        if ((isChinese(text[end]) && isChinese(text[end + 1])) ||
+            (isEnglish(text[end]) && isEnglish(text[end + 1])) ||
+            (isNumeric(text[end]) && isNumeric(text[end + 1]))) {
+            end++;
+        }
+        else {
+            break;
+        }
     }
-    return sortItems;
-}
-/**
- * 获取指定方向上连续的字符
- * @param element
- * @param prev
- */
-function getConsecutiveTextsByDirection(element, prev = true) {
-    let prevText = element;
-    const prevTexts = [];
-    const func = prev ? ElementUtil.getPrevSiblingElement : ElementUtil.getNextSiblingElement;
-    const addItem = prev ? prevTexts.unshift : prevTexts.push;
-    while ((prevText = func(prevText)) && prevText instanceof TextGroupElement) {
-        //addItem(prevText);
-        addItem.apply(prevTexts, [prevText]);
-    }
-    return prevTexts;
+    return [start, end];
 }
 
 /**
@@ -19329,7 +19343,7 @@ class DocumentSvg {
                 ns: 'http://www.w3.org/2000/svg',
                 attrs: {
                     stroke: 'none',
-                    fill: item.color ?? 'rgb(85,165,255)',
+                    fill: item.color ?? this.viewOptions.selectionColor,
                     'paint-order': 'stroke fill markers',
                     d: `M${item.x} ${item.y} L${item.x + item.width} ${item.y} L${item.x + item.width} ${item.y + item.height} L${item.x} ${item.y + item.height} Z`,
                     'fill-opacity': '0.5'
@@ -19448,7 +19462,7 @@ class EditorCalendarVNode {
             data: {
                 style: {
                     position: 'absolute',
-                    left: (position.x - 10) + 'px',
+                    left: (position.x) + 'px',
                     top: position.y + 5 + position.height + 'px',
                     'min-width': '100px',
                     'background-color': 'white',
@@ -19584,6 +19598,9 @@ class EditorCalendarVNode {
                                         on: {
                                             click: () => {
                                                 this.onClickDayItem(day.date);
+                                            },
+                                            dblclick: () => {
+                                                this.onSave();
                                             }
                                         }
                                     },
@@ -19641,12 +19658,7 @@ class EditorCalendarVNode {
                                     data: {
                                         on: {
                                             click: () => {
-                                                if (!this.selectedDate.value) {
-                                                    this.onSetValue.next(new Date());
-                                                }
-                                                else {
-                                                    this.onSetValue.next(moment__default["default"](this.selectedDate.value + ' ' + this.selectedTime.value).toDate());
-                                                }
+                                                this.onSave();
                                             }
                                         }
                                     },
@@ -19666,6 +19678,14 @@ class EditorCalendarVNode {
             ]
         };
     }
+    onSave() {
+        if (!this.selectedDate.value) {
+            this.onSetValue.next(new Date());
+        }
+        else {
+            this.onSetValue.next(moment__default["default"](this.selectedDate.value + ' ' + this.selectedTime.value).toDate());
+        }
+    }
     navigateToToday() {
         this.currYear.value = new Date().getFullYear();
         this.currMonth.value = new Date().getMonth();
@@ -20378,7 +20398,6 @@ class DocEditor {
     beforeRenderSubject = new Subject();
     afterRenderSubject = new Subject();
     onBeforeSetCursorSubject = new Subject();
-    contentChanged = new Subject();
     onPatchVNodeSubject = new Subject();
     selectionState;
     onDblClickEvent = new Subject();
@@ -20670,10 +20689,12 @@ class DocEditor {
     }
     loadDoc(data) {
         suppressTracking(() => {
-            this.adjustPageLayout();
-            this.elementReader.read(data);
-            this.refreshDocument();
-            this.historyMange.clear();
+            this.noEffectChange(() => {
+                this.adjustPageLayout();
+                this.elementReader.read(data);
+                this.refreshDocument();
+                this.historyMange.clear();
+            });
         });
     }
     /**
@@ -20691,7 +20712,6 @@ class DocEditor {
             suppressTracking(() => {
                 this.documentPaginator.rePages();
             });
-            this.contentChanged.next();
         }
         this.updateSelection();
         this.setCursor();
@@ -20718,6 +20738,7 @@ class DocEditor {
         ssChanged && this.documentEvent.invokeCursor(this.selectionState.startControl);
         this.documentSelection.clearSnapshot();
         this.documentSelection.takeSnapshot();
+        return ssChanged;
     }
     /**
      * 根据当前选区，更新待输入文本字体信息
@@ -20757,6 +20778,7 @@ class DocEditor {
         this.selectionState.cursorPos = cursorRect;
         const abPos = ElementUtil.cloneRect(cursorRect);
         this.setCursorPosition(abPos);
+        this.setCursorVisibility(true);
         //this.documentEvent.invokeCursor(startControl);
         return;
     }
@@ -20790,7 +20812,7 @@ class DocEditor {
     setCursorVisibility(visibility) {
         if (visibility) {
             //this.editInput.style.removeProperty('display');
-            this.editInput.focus();
+            this.editInput.focus({ preventScroll: true });
         }
     }
     hiddenInput(reset = true, pos = null) {
@@ -20812,7 +20834,6 @@ class DocEditor {
         this.editInput.style.height = position.height + 'px';
         this.editInput.style.width = "1.6px";
         this.editInput.readOnly = false;
-        this.setCursorVisibility(true);
         //判断光标位置是否被可见，如果不可见，需要将其设置到可见区域
         //TODO:暂时不做处理
         //this.setCursorInputStatus();
@@ -20848,7 +20869,7 @@ class DocEditor {
      * 文档点击事件
      */
     docClickHandle(evt) {
-        this.hiddenInput();
+        //this.hiddenInput();
         // this.setCursor();
         // this.updateSelection();
         this.refreshDocument();
@@ -21148,20 +21169,20 @@ class DocEditor {
         const startControl = this.selectionState.startControl;
         if (startControl instanceof TextGroupElement) {
             const selectedStyle = startControl.props.clone(null);
-            const selectionOverlayColor = this.viewOptions.selectionOverlaysColor;
-            this.viewOptions.selectionOverlaysColor = "rgba(0,58,140,0.8)";
+            const selectionColor = this.viewOptions.selectionColor;
+            this.viewOptions.selectionColor = "rgba(0,58,140,0.8)";
             const cancelToken = {};
             const sub = this.onClickEvent.subscribe(() => {
                 sub.unsubscribe();
                 this.setTextFormat(selectedStyle);
-                this.viewOptions.selectionOverlaysColor = selectionOverlayColor;
+                this.viewOptions.selectionColor = selectionColor;
                 if (cancelToken.onFinish) {
                     cancelToken.onFinish(null);
                 }
             });
             cancelToken.cancel = () => {
                 sub.unsubscribe();
-                this.viewOptions.selectionOverlaysColor = selectionOverlayColor;
+                this.viewOptions.selectionColor = selectionColor;
             };
             return cancelToken;
         }
@@ -21594,7 +21615,7 @@ class DocEditor {
                 const scaleFitContainer = {
                     sel: 'div#scale-fit-container',
                     data: {
-                        style: { overflow: 'hidden', height: '0px', }
+                        style: { height: '0px', }
                     },
                     children: [docContent]
                 };
@@ -21756,7 +21777,7 @@ class DocEditor {
                         data: {
                             style: {
                                 position: 'absolute',
-                                left: (position.x - 10) + 'px',
+                                left: (position.x) + 'px',
                                 top: position.y + 5 + position.height + 'px',
                             },
                             hook: {
@@ -21922,7 +21943,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.6";
+        return "2.2.8";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -22225,6 +22246,13 @@ class DocEditor {
             this.documentChange.appendText(text, this.docCtx.suggestions.currentMatchedText);
         }
     }
+    parser(code, returnProcess = false) {
+        const res = parser(code);
+        if (returnProcess) {
+            return addReturn(res);
+        }
+        return res;
+    }
 }
 
 /**
@@ -27778,7 +27806,7 @@ exports.LostCursorEvent = LostCursorEvent;
 exports.MarginProps = MarginProps;
 exports.MouseElementEvent = MouseElementEvent;
 exports.MousedownElementEvent = MousedownElementEvent;
-exports.MuiltBlockLineRenderObject = MuiltBlockLineRenderObject;
+exports.MultiBlockLineRenderObject = MultiBlockLineRenderObject;
 exports.OnceSubject = OnceSubject;
 exports.PSymbolElement = PSymbolElement;
 exports.PSymbolRenderObject = PSymbolRenderObject;