@hailin-zheng/editor-core 2.2.7 → 2.2.9

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
@@ -1538,12 +1537,19 @@ class BranchElement extends Element {
         }
         return len;
     }
-    treeFilter(predicate) {
+    treeFilter(predicate, options) {
+        if (!options) {
+            options = { includeChildren: true };
+        }
         const items = [];
         for (let i = 0; i < this.length; i++) {
             const item = this.getChild(i);
             if (predicate(item)) {
                 items.push(item);
+                //已经匹配节点，不需要匹配当前元素的子节点
+                if (!options.includeChildren) {
+                    continue;
+                }
             }
             if (item instanceof BranchElement) {
                 items.push(...item.treeFilter(predicate));
@@ -1726,12 +1732,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 +1762,6 @@ class ViewOptions {
     showCharRect;
     //数据元交互修饰模式
     dataEleDecoratorMode = 'outline';
-    dataEleDecoratorColor = '#ddd';
     showTabChar;
     showSpaceChar;
     showLineBreak;
@@ -2862,15 +2877,7 @@ class ValidateProps {
         return clone;
     }
 }
-class DataElementGroupProps extends DataEleBaseProps {
-    clone(dest) {
-        const clone = dest ?? new DataElementGroupProps();
-        super.cloneBaseProps(clone);
-    }
-    getSerializeProps(options) {
-        const props = {};
-        return this.getBaseProps(props, options);
-    }
+class DataElementGroupProps extends DataEleBaseTextProps {
 }
 class DataElementBarcodeProps {
     type = 'code128';
@@ -2929,7 +2936,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() {
@@ -2955,6 +2962,14 @@ class DataDecorateRenderObject extends LeafRenderObject {
         // 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 = '';
@@ -2968,7 +2983,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
@@ -3134,7 +3149,7 @@ class ParagraphElement extends BlockContentElement {
         return new ParagraphElement();
     }
 }
-class ParagraphRenderObject extends MuiltBlockLineRenderObject {
+class ParagraphRenderObject extends MultiBlockLineRenderObject {
     /**
      * 绘制项目符号
      */
@@ -3683,7 +3698,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
             ]
         };
     }
@@ -3721,11 +3736,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;
         };
@@ -3744,6 +3758,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,
                 }
@@ -4131,68 +4146,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
+    //         }));
+    //     }
+    // }
 }
 /**
  * 渲染数据源验证错误提示框
@@ -4297,30 +4329,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 {
@@ -4362,7 +4370,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);
@@ -4661,7 +4669,7 @@ class TableRowElement extends BlockContainerElement {
         return tr;
     }
 }
-class TableRowRenderObject extends MuiltBlockLineRenderObject {
+class TableRowRenderObject extends MultiBlockLineRenderObject {
     //被截断的行是否需要重新计算高度
     remeasureState = true;
     //当前行是否存在合并单元格
@@ -4891,9 +4899,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;
     }
 }
@@ -6160,7 +6166,7 @@ class TableElement extends BlockContainerElement {
         };
     }
 }
-class TableRenderObject extends MuiltBlockLineRenderObject {
+class TableRenderObject extends MultiBlockLineRenderObject {
     setRenderWidth(maxWidth) {
         super.setRenderWidth(maxWidth);
     }
@@ -8640,7 +8646,62 @@ class DataElementDateFactory extends DataElementBaseFactory {
     }
 }
 
-class DataElementGroupElement extends InlineGroupInputElement {
+class BreakElement extends LeafElement {
+    textProps;
+    constructor() {
+        super('br');
+        this.textProps = new TextProps();
+        this.textProps.fontSize = 14;
+        this.textProps.fontName = '宋体';
+        this.textProps.color = '#595959';
+    }
+    createRenderObject() {
+        const symbol = new BreakRenderObject(this);
+        symbol.rect.height = 14;
+        symbol.rect.width = 7;
+        return symbol;
+    }
+    serialize() {
+        return {
+            type: 'br',
+            props: {}
+        };
+    }
+    clone() {
+        const clone = new BreakElement();
+        cloneElementBase(this, clone);
+        return clone;
+    }
+}
+class BreakRenderObject extends LeafRenderObject {
+    exportSVG(event) {
+        if (!event.options.showEnterSymbol || event.mode === 'print') {
+            return null;
+        }
+        return ElementUtil.createSvgText('↓', { 'dominant-baseline': 'hanging',
+            'font-family': 'Courier',
+            'font-size': this.rect.height,
+            x: this.rect.x + 4,
+            y: this.rect.y,
+            fill: 'green' });
+    }
+    clone() {
+        const render = new BreakRenderObject(this.element);
+        render.rect = ElementUtil.cloneRect(this.rect);
+        return render;
+    }
+}
+class BreakFactory extends ElementFactory {
+    match(type) {
+        return type === 'br';
+    }
+    createElement(data) {
+        const ele = new BreakElement();
+        return ele;
+    }
+}
+
+class DataElementGroupElement extends DataElementInlineGroup {
     constructor() {
         super('data-group');
         this.props = new DataElementGroupProps();
@@ -8653,6 +8714,38 @@ class DataElementGroupElement extends InlineGroupInputElement {
             this.refreshView();
         });
     }
+    setValue(val) {
+        if (val === null || val === undefined) {
+            val = '';
+        }
+        if (this.getValue() === val) {
+            return;
+        }
+        this.pubOnChange('self');
+        this.clearInnerItems();
+        if (typeof val !== 'string') {
+            val += '';
+        }
+        if (val) {
+            const items = val.split('<br/>');
+            if (items.length) {
+                items.forEach((item, index) => {
+                    const valueText = new TextGroupElement();
+                    this.props.valueTextProps.clone(valueText.props);
+                    valueText.text = item + '';
+                    this.addChild(valueText, this.length - 1);
+                    if (index < items.length - 1) {
+                        const brElement = new BreakElement();
+                        this.addChild(brElement, this.length - 1);
+                    }
+                });
+            }
+        }
+        this.onChangedValidate();
+    }
+    getValue() {
+        return ElementSerialize.serializeString(this, { all: false });
+    }
     clone(data) {
         return super.cloneSelf(data, DataElementGroupElement);
     }
@@ -8688,9 +8781,18 @@ class DataElementGroupFactory extends DataElementBaseFactory {
     createElement(data) {
         const props = data.props;
         const ele = new DataElementGroupElement();
-        ElementUtil.readEleBaseProps(ele.props, props);
+        this.createDataEleProps(ele.props, props);
         return ele;
     }
+    createDataEleProps(dest, props) {
+        const dataEleProps = dest;
+        ElementUtil.readEleBaseProps(dataEleProps, props);
+        dataEleProps.nullText = props.nullText;
+        dataEleProps.nullTextProps = ElementUtil.readTextProps(null, props.nullTextProps, this.options);
+        dataEleProps.valueTextProps = ElementUtil.readTextProps(null, props.valueTextProps, this.options);
+        dataEleProps.dataType = props.dataType;
+        return dataEleProps;
+    }
 }
 
 class DataElementImage extends DataElementLeaf {
@@ -8932,61 +9034,6 @@ class DataElementListFactory extends DataElementBaseFactory {
     }
 }
 
-class BreakElement extends LeafElement {
-    textProps;
-    constructor() {
-        super('br');
-        this.textProps = new TextProps();
-        this.textProps.fontSize = 14;
-        this.textProps.fontName = '宋体';
-        this.textProps.color = '#595959';
-    }
-    createRenderObject() {
-        const symbol = new BreakRenderObject(this);
-        symbol.rect.height = 14;
-        symbol.rect.width = 7;
-        return symbol;
-    }
-    serialize() {
-        return {
-            type: 'br',
-            props: {}
-        };
-    }
-    clone() {
-        const clone = new BreakElement();
-        cloneElementBase(this, clone);
-        return clone;
-    }
-}
-class BreakRenderObject extends LeafRenderObject {
-    exportSVG(event) {
-        if (!event.options.showEnterSymbol || event.mode === 'print') {
-            return null;
-        }
-        return ElementUtil.createSvgText('↓', { 'dominant-baseline': 'hanging',
-            'font-family': 'Courier',
-            'font-size': this.rect.height,
-            x: this.rect.x + 4,
-            y: this.rect.y,
-            fill: 'green' });
-    }
-    clone() {
-        const render = new BreakRenderObject(this.element);
-        render.rect = ElementUtil.cloneRect(this.rect);
-        return render;
-    }
-}
-class BreakFactory extends ElementFactory {
-    match(type) {
-        return type === 'br';
-    }
-    createElement(data) {
-        const ele = new BreakElement();
-        return ele;
-    }
-}
-
 class DataElementText extends DataElementInlineGroup {
     //props: DataEleBaseTextProps;
     constructor() {
@@ -9117,33 +9164,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);
@@ -9168,24 +9205,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);
+    }
 }
 
 /**
@@ -9271,7 +9305,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);
@@ -10647,10 +10681,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;
     }
@@ -10674,20 +10708,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);
     }
     /**
      * 获取选中的结构
@@ -13335,8 +13372,8 @@ class DocumentContext {
         const dataEleList = this.ctx.treeFilter(item => validateDataEle(item));
         return dataEleList.map(item => item.props.id);
     }
-    getControlInstanceList() {
-        return this.ctx.treeFilter(item => validateDataEle(item));
+    getControlInstanceList(options) {
+        return this.ctx.treeFilter(item => validateDataEle(item), options);
     }
     getControlById(id) {
         return this.ctx.treeFind(item => validateDataEle(item) && item['props']['id'] === id);
@@ -13359,8 +13396,9 @@ class DocumentContext {
      * 获取数据元结构以及get\set闭包调用函数
      * @returns
      */
-    getDataElementModelList() {
-        const dataEleList = this.ctx.treeFilter(item => validateDataEle(item) || item instanceof DataElementInlineGroup);
+    getDataElementModelList(options) {
+        const dataEleList = this.ctx.treeFilter(item => validateDataEle(item), options);
+        //数据元、数据组
         const dataInlineGroups = dataEleList.filter(item => item instanceof DataElementInlineGroup);
         const dataLeafs = dataEleList.filter(item => item instanceof DataElementLeaf);
         //复选框数据元
@@ -13369,7 +13407,7 @@ class DocumentContext {
         const dataOtherLeafValues = CommonUtil.removeUnionSet(dataLeafs, dataCheckList).map(item => ({
             id: item.props.id,
             name: item.props.name,
-            fieldName: item.props.field,
+            fieldName: item.props.fieldName,
             item,
             getValue: () => {
                 return item.getValue();
@@ -14714,7 +14752,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;
@@ -14723,7 +14761,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;
                         //限制的内框尺寸
@@ -15433,9 +15471,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));
@@ -18729,103 +18770,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];
 }
 
 /**
@@ -19390,7 +19384,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'
@@ -20785,6 +20779,7 @@ class DocEditor {
         ssChanged && this.documentEvent.invokeCursor(this.selectionState.startControl);
         this.documentSelection.clearSnapshot();
         this.documentSelection.takeSnapshot();
+        return ssChanged;
     }
     /**
      * 根据当前选区，更新待输入文本字体信息
@@ -20824,6 +20819,7 @@ class DocEditor {
         this.selectionState.cursorPos = cursorRect;
         const abPos = ElementUtil.cloneRect(cursorRect);
         this.setCursorPosition(abPos);
+        this.setCursorVisibility(true);
         //this.documentEvent.invokeCursor(startControl);
         return;
     }
@@ -20857,7 +20853,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) {
@@ -20879,7 +20875,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();
@@ -20915,7 +20910,7 @@ class DocEditor {
      * 文档点击事件
      */
     docClickHandle(evt) {
-        this.hiddenInput();
+        //this.hiddenInput();
         // this.setCursor();
         // this.updateSelection();
         this.refreshDocument();
@@ -21215,20 +21210,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;
         }
@@ -21989,7 +21984,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.7";
+        return "2.2.9";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -27852,7 +27847,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;