@hailin-zheng/editor-core 1.1.17 → 1.1.18

package/index.js

@@ -49,6 +49,9 @@ class ContentMenuItem {
  */
 class MouseElementEvent extends ElementEvent {
 }
+class InputElementEvent extends ElementEvent {
+    data;
+}
 class MousedownElementEvent extends ElementEvent {
 }
 class KeyboradElementEvent extends ElementEvent {
@@ -1437,7 +1440,7 @@ class ViewOptions {
     viewBackcolor = 'rgb(230,230,230)';
     paraSymbolColor = 'rgb(128,128,128)';
     dataGroupColor = 'rgb(0,80,179)';
-    defaultLineHeight = 1.5;
+    defaultLineHeight = 1;
     //新增-留痕块文本颜色
     trackInsColor = '#ff4d4f';
     //删除-留痕块文本颜色
@@ -1772,7 +1775,7 @@ class ParagraphProps extends INotifyPropertyChanged {
     //textProps!: TextProps;
     indent = 0;
     hanging = 0;
-    lineHeight = 1.5;
+    lineHeight = 1;
     textAlign = 'left';
     numberType = ParagraphNumberType.none;
     //段前距
@@ -1872,6 +1875,8 @@ class CheckBoxProps extends INotifyPropertyChanged {
     isChecked;
     //用于复选框分组
     groupName;
+    trueChar = '√';
+    falseChar = '×';
     clone(dest) {
         const clone = dest ?? new CheckBoxProps();
         super.cloneAttachedProperty(clone);
@@ -2047,7 +2052,6 @@ class DataEleBaseProps extends INotifyPropertyChanged {
     editable;
     deleteable;
     minLength;
-    type;
     underline;
     expression;
     hidden;
@@ -2066,7 +2070,6 @@ class DataEleBaseProps extends INotifyPropertyChanged {
         target.secretBrowse = source.secretBrowse;
         target.printable = source.printable;
         target.minLength = source.minLength;
-        target.type = source.type;
         target.underline = source.underline;
         target.expression = source.expression;
         target.hidden = source.hidden;
@@ -2078,7 +2081,6 @@ class DataEleBaseProps extends INotifyPropertyChanged {
         props["id"] = this.id;
         props["name"] = this.name;
         props["fieldName"] = this.fieldName;
-        props["type"] = this.type;
         if (this.caption) {
             props["caption"] = this.caption;
         }
@@ -2118,7 +2120,6 @@ class DataEleBaseProps extends INotifyPropertyChanged {
 class DataEleBaseTextProps extends DataEleBaseProps {
     constructor() {
         super();
-        super.type = 'text';
     }
     valueTextProps;
     nullText;
@@ -2134,7 +2135,6 @@ class DataEleBaseTextProps extends DataEleBaseProps {
     }
     getSerializeProps(options) {
         const props = {
-            type: this.type,
             valueTextProps: this.valueTextProps.getSerializeProps(options),
             nullText: this.nullText,
             nullTextProps: this.nullTextProps.getSerializeProps(options)
@@ -2164,7 +2164,6 @@ class DataEleBaseTextProps extends DataEleBaseProps {
 class DataEleListProps extends DataEleBaseTextProps {
     constructor() {
         super();
-        super.type = 'droplist';
     }
     options = [];
     dropDownStyle;
@@ -2230,16 +2229,23 @@ class CommProps extends INotifyPropertyChanged {
         };
     }
 }
+const trueChar = '✓';
+const falseChar = '×';
 class DataEleCheckProps extends DataEleBaseProps {
     constructor() {
         super();
-        super.type = 'check';
     }
+    border = true;
     size;
     checked;
     checkedValue = '';
     groupName;
     multiSelect = false;
+    drawStateChar = false;
+    trueChar = trueChar;
+    falseChar = falseChar;
+    trueStateColor = '#f00000';
+    falseStateColor = '#000000';
     clone(dest) {
         const clone = dest ?? new DataEleCheckProps();
         super.cloneBaseProps(clone);
@@ -2248,6 +2254,12 @@ class DataEleCheckProps extends DataEleBaseProps {
         clone.groupName = this.groupName;
         clone.multiSelect = this.multiSelect;
         clone.checkedValue = this.checkedValue;
+        clone.drawStateChar = this.drawStateChar;
+        clone.trueChar = this.trueChar;
+        clone.falseChar = this.falseChar;
+        clone.border = this.border;
+        clone.trueStateColor = this.trueStateColor;
+        clone.falseStateColor = this.falseStateColor;
         return clone;
     }
     getSerializeProps(options) {
@@ -2256,8 +2268,26 @@ class DataEleCheckProps extends DataEleBaseProps {
             size: this.size,
             groupName: this.groupName,
             multiSelect: this.multiSelect,
-            checkedValue: this.checkedValue
+            checkedValue: this.checkedValue,
         };
+        if (this.drawStateChar) {
+            props.drawStateChar = this.drawStateChar;
+        }
+        if (this.trueChar !== trueChar) {
+            props.trueChar = this.trueChar;
+        }
+        if (this.falseChar !== falseChar) {
+            props.falseChar = this.falseChar;
+        }
+        if (this.border) {
+            props.border = this.border;
+        }
+        if (this.trueStateColor !== '#f00000') {
+            props.trueStateColor = this.trueStateColor;
+        }
+        if (this.falseStateColor !== '#000000') {
+            props.falseStateColor = this.falseStateColor;
+        }
         this.getBaseProps(props, options);
         return props;
     }
@@ -2268,12 +2298,17 @@ class DataEleCheckProps extends DataEleBaseProps {
         this.groupName = props.groupName;
         this.multiSelect = props.multiSelect;
         this.checkedValue = props.checkedValue;
+        this.drawStateChar = props.drawStateChar;
+        this.trueChar = props.trueChar;
+        this.falseChar = props.falseChar;
+        this.trueStateColor = props.trueStateColor;
+        this.falseStateColor = props.falseStateColor;
+        this.border = props.border;
     }
 }
 class DataEleImageProps extends DataEleBaseProps {
     constructor() {
         super();
-        super.type = 'img';
     }
     width;
     height;
@@ -2307,10 +2342,6 @@ class DataEleImageProps extends DataEleBaseProps {
     }
 }
 class DataEleDateProps extends DataEleBaseTextProps {
-    constructor() {
-        super();
-        super.type = 'date';
-    }
     minValue;
     maxValue;
     format;
@@ -3137,7 +3168,7 @@ class DataElementRenderObject extends InlineGroupRenderObject {
                 bgColor = viewOptions.dataEleErrorBgColor;
             }
             if (bgColor) {
-                render.overlaysContext.fillRect(position.x, position.y - 2, this.rect.width, this.rect.height + 4, bgColor);
+                render.overlaysContext.fillRect(position.x, position.y, this.rect.width, this.rect.height, bgColor);
             }
             if (this.element.props.secretBrowse && viewOptions.secretBrowse) {
                 render.contentContext.ctx.filter = "blur(10px)";
@@ -3174,7 +3205,7 @@ class DataElementRenderObject extends InlineGroupRenderObject {
                 textProps.fontSize = 16;
                 textProps.fontName = viewOptions.defaultFontName;
                 textProps.color = '#fff';
-                const titleWidth = render.contentContext.measureText2(caption, textProps);
+                const titleWidth = render.contentContext.measureTextWidth(caption, textProps);
                 const x = position.x;
                 const y = position.y - 20;
                 render.contentContext.fillRect(x, y, titleWidth + 10, 20, 'blue');
@@ -4057,8 +4088,8 @@ class DocumentContainerRender extends BlockContainerRenderObject {
 }
 
 class TextGroupElement extends LeafElement {
-    //props: TextProps;
     textMeasures = [];
+    fontBoundingBox;
     isMeasure = false;
     constructor() {
         super('text');
@@ -4098,6 +4129,7 @@ class TextGroupElement extends LeafElement {
     createRenderObject(data) {
         if (!this.isMeasure || this.modifyFlag !== ModifyFlag$1.None || !this.cacheRender) {
             data.renderCtx.contentContext.measureTextUnits(this.textMeasures, this.props);
+            this.fontBoundingBox = data.renderCtx.contentContext.measureTextMetrics(this.props.getFont());
             this.isMeasure = true;
         }
         const render = new TextGroupRenderObject(this);
@@ -4171,10 +4203,7 @@ class TextGroupRenderObject extends LeafRenderObject {
         if (this.element.props.border) {
             render.contentContext.strokeRect(position.x, position.y, this.rect.width, this.rect.height);
         }
-        render.contentContext.drawTextUnits(this, position.x, position.y);
-        // if (this.element.isMouseenter) {
-        //     ctx.overlaysContext.strokeRect(position.x, position.y, this.rect.width, this.rect.height, CommonUtil.randomColor());
-        // }
+        render.contentContext.drawTextUnits(this, position.x, position.y, this.element.fontBoundingBox.fontBoundingBoxAscent);
     }
     constructor(element) {
         super(element);
@@ -4193,7 +4222,7 @@ class TextGroupRenderObject extends LeafRenderObject {
     }
     measure() {
         this.rect.width = this.textMeasures.reduce((prev, curr) => prev + curr.actualSize, 0);
-        this.rect.height = this.element.props.fontSize;
+        this.rect.height = this.element.fontBoundingBox.fontBoundingBoxAscent + this.element.fontBoundingBox.fontBoundingBoxDescent;
     }
 }
 class TextGroupFactory extends ElementFactory {
@@ -5590,10 +5619,15 @@ class TableUtil {
         }
         const remainWidth = tbWidth - sum;
         const ratio = remainWidth / percentSum;
+        let count = 0;
         for (let i = 0; i < percentCols.length; i++) {
             const width = percentCols[i];
             if (typeof width === 'string') {
                 percentCols[i] = Math.floor(Number.parseFloat(width) * ratio);
+                if (i === percentCols.length - 1) {
+                    percentCols[i] = remainWidth - count;
+                }
+                count += percentCols[i];
             }
         }
         return percentCols;
@@ -6237,7 +6271,6 @@ class ElementUtil {
         dest.secretBrowse = props.secretBrowse;
         dest.deleteable = props.deleteable;
         dest.underline = props.underline;
-        dest.type = props.type;
         dest.expression = props.expression;
         dest.hidden = props.hidden;
         return dest;
@@ -6308,9 +6341,9 @@ class ElementUtil {
     }
     static remeasureTableRow(rowRender, foreceColIndex = -1) {
         const rowEle = rowRender.element;
-        let maxCellHeight = rowEle.props.minHeight > 19 ? rowEle.props.minHeight : 19;
+        let maxCellHeight = rowEle.props.minHeight > 20 ? rowEle.props.minHeight : 20;
         //限制行最小高度
-        maxCellHeight = maxCellHeight < 19 ? 19 : maxCellHeight;
+        maxCellHeight = maxCellHeight < 20 ? 20 : maxCellHeight;
         //获取行内非纵向合并单元格的最高单元格高度
         for (let i = 0; i < rowRender.length; i++) {
             const cellRender = rowRender.getChild(i);
@@ -7770,7 +7803,7 @@ class PaintContent {
         this.ctx.fill();
         this.ctx.restore();
     }
-    drawTextUnits(textGroupRender, x, y) {
+    drawTextUnits(textGroupRender, x, y, baseLine) {
         const textEle = textGroupRender.element;
         const textProps = textEle.props;
         const { width, height } = textGroupRender.rect;
@@ -7793,12 +7826,10 @@ class PaintContent {
             this.drawHoriLine(x, y, width, textProps.color, 1);
         }
         let horX = 0;
-        let vertHeight = height - (height / 7);
+        let vertHeight = baseLine;
         if (textProps.vertAlign === 'superscript') {
             //到top
             vertHeight -= textProps.fontSize * 2 / 5;
-            //top在向上收缩 -top行间距
-            //vertHeight -= textProps.fontSize * this.getParaLineHeight(textEle) / 20
         }
         for (let i = 0; i < textGroupRender.textMeasures.length; i++) {
             const unit = textGroupRender.textMeasures[i];
@@ -7807,6 +7838,15 @@ class PaintContent {
         }
         this.ctx.restore();
     }
+    drawText2(str, font, color, x, y, width, height) {
+        const textMetrics = this.measureTextMetrics(font, str);
+        this.ctx.save();
+        this.ctx.fillStyle = color;
+        this.ctx.font = font;
+        let vertHeight = textMetrics.actualBoundingBoxAscent;
+        this.ctx.fillText(str, x + (width - (textMetrics.actualBoundingBoxLeft + textMetrics.actualBoundingBoxRight)) / 2 - textMetrics.actualBoundingBoxLeft, y + vertHeight + (height - (textMetrics.actualBoundingBoxAscent + textMetrics.actualBoundingBoxDescent)) / 2);
+        this.ctx.restore();
+    }
     getParaLineHeight(textEle) {
         const para = ElementUtil.getParentByType(textEle, ParagraphElement);
         if (!para) {
@@ -7817,10 +7857,23 @@ class PaintContent {
     measureText(text, textProps) {
         this.ctx.fillStyle = textProps.color;
         this.ctx.font = textProps.getFont();
-        const textMeasure = this.ctx.measureText(text);
-        return { width: textMeasure.width, height: textProps.fontSize };
+        const { width, fontBoundingBoxDescent, fontBoundingBoxAscent } = this.ctx.measureText(text);
+        return { width: width, height: fontBoundingBoxAscent + fontBoundingBoxDescent };
     }
-    measureText2(text, font) {
+    measureTextMetrics(font, str = 'M') {
+        this.ctx.font = font;
+        const textMetrics = this.ctx.measureText(str);
+        return {
+            fontBoundingBoxAscent: textMetrics.fontBoundingBoxAscent,
+            fontBoundingBoxDescent: textMetrics.fontBoundingBoxDescent,
+            actualBoundingBoxAscent: textMetrics.actualBoundingBoxAscent,
+            actualBoundingBoxDescent: textMetrics.actualBoundingBoxDescent,
+            actualBoundingBoxLeft: textMetrics.actualBoundingBoxLeft,
+            actualBoundingBoxRight: textMetrics.actualBoundingBoxRight,
+            width: textMetrics.width
+        };
+    }
+    measureTextWidth(text, font) {
         this.ctx.font = font.fontSize + 'px ' + font.fontName;
         return this.ctx.measureText(text).width;
     }
@@ -8655,11 +8708,22 @@ class DataElementCheckRenderObject extends LeafRenderObject {
     render(e) {
         const { render, position } = e;
         const element = this.element;
-        if (this.element.props.multiSelect) {
-            render.contentContext.drawCheckBox(position.x + 2, position.y, element.props.size, element.props.size, element.props.checked);
+        if (element.props.drawStateChar) {
+            const font = `${element.props.size - 2}px 微软雅黑`;
+            const str = element.props.checked ? element.props.trueChar : element.props.falseChar;
+            const color = element.props.checked ? element.props.trueStateColor : element.props.falseStateColor;
+            e.render.contentContext.drawText2(str, font, color, position.x, position.y, element.props.size, element.props.size);
+            if (element.props.border) {
+                e.render.contentContext.strokeRect(position.x + 2, position.y, element.props.size, element.props.size);
+            }
         }
         else {
-            render.contentContext.drawRadioBox(position.x + 2, position.y, element.props.size, element.props.size, element.props.checked);
+            if (element.props.multiSelect) {
+                render.contentContext.drawCheckBox(position.x + 2, position.y, element.props.size, element.props.size, element.props.checked);
+            }
+            else {
+                render.contentContext.drawRadioBox(position.x + 2, position.y, element.props.size, element.props.size, element.props.checked);
+            }
         }
     }
 }
@@ -8676,15 +8740,15 @@ class DataElementCheckFactory extends ElementFactory {
     createDataEleProps(dest, props) {
         const dataEleProps = dest;
         ElementUtil.readEleBaseProps(dataEleProps, props);
-        //dataEleProps.id = props.id ?? nanoid(5);
-        //dataEleProps.name = props.name;
-        //dataEleProps.caption = props.caption;
-        //dataEleProps.type = props.type;
         dataEleProps.checked = props.checked;
         dataEleProps.size = props.size;
         dataEleProps.groupName = props.groupName;
         dataEleProps.multiSelect = props.multiSelect ?? false;
         dataEleProps.checkedValue = props.checkedValue;
+        dataEleProps.drawStateChar = props.drawStateChar ?? false;
+        dataEleProps.trueChar = props.trueChar ?? trueChar;
+        dataEleProps.falseChar = props.falseChar ?? falseChar;
+        dataEleProps.border = props.border ?? true;
         return dataEleProps;
     }
 }
@@ -11316,6 +11380,7 @@ class ParagraphMeasure {
                 }
             },
             parent: null,
+            isCloseToBody,
             applyNewLine() {
                 createInnerLineFunc();
             },
@@ -11501,6 +11566,7 @@ class ParagraphMeasure {
                 parentLine.updateHeight(child);
             },
             parent: parentLine,
+            isCloseToBody: parentLine.isCloseToBody,
             applyNewLine() {
                 parentLine.applyNewLine();
                 render = ele.createRenderObject({ options, renderCtx });
@@ -11562,7 +11628,7 @@ class ParagraphMeasure {
     arrangeLeafRender(parentLine, render) {
         if (parentLine.lineWidth() + render.rect.width > parentLine.limitWidth) {
             if (render instanceof TextGroupRenderObject) {
-                const { firstItem, lastItem } = this.cutTextRender(render, parentLine.limitWidth - parentLine.lineWidth(), parentLine.lineWidth() === 0);
+                const { firstItem, lastItem } = this.cutTextRender(render, parentLine.limitWidth - parentLine.lineWidth(), parentLine.lineWidth() === 0, parentLine.isCloseToBody);
                 if (firstItem) {
                     parentLine.add(firstItem);
                 }
@@ -11570,6 +11636,10 @@ class ParagraphMeasure {
                     parentLine.applyNewLine();
                     this.arrangeLeafRender(parentLine, lastItem);
                 }
+                if (!firstItem && !lastItem) {
+                    parentLine.applyNewLine();
+                    this.arrangeLeafRender(parentLine, render);
+                }
             }
             else if (render instanceof FillNullSpaceRenderObject) {
                 const { firstItem, lastItem } = this.cutFillNullRender(render, parentLine.limitWidth - parentLine.lineWidth());
@@ -11609,7 +11679,7 @@ class ParagraphMeasure {
             }
         }
     }
-    cutTextRender(render, limitWidth, lineEmpty) {
+    cutTextRender(render, limitWidth, lineEmpty, isCloseToBody) {
         let sumWidth = 0;
         const cutRender = render.clone();
         cutRender.textMeasures.length = 0;
@@ -11623,13 +11693,13 @@ class ParagraphMeasure {
                 break;
             }
         }
-        // //后置标点处理
-        // i = this.patchHandlePostPunctuation(render, nextRender, i, inCloseBody, lineEmpty);
-        // //前置标点处理
-        // i = this.patchHandleLeadingPunctuation(render, i, lineEmpty);
-        // if (i <= 0) {
-        //     return {firstItem: null, lastItem: null};
-        // }
+        //后置标点处理
+        i = this.patchHandlePostPunctuation(render, i, isCloseToBody, lineEmpty);
+        //前置标点处理
+        i = this.patchHandleLeadingPunctuation(render, i, lineEmpty);
+        if (i <= 0) {
+            return { firstItem: null, lastItem: null };
+        }
         cutRender.textMeasures = render.textMeasures.splice(0, i);
         render.measure();
         cutRender.measure();
@@ -11639,6 +11709,7 @@ class ParagraphMeasure {
      * 处理前置标点,前置标点不能出现在末尾
      * @param render
      * @param i
+     * @param lineEmpty
      */
     patchHandleLeadingPunctuation(render, i, lineEmpty) {
         if (i === 1 && lineEmpty) {
@@ -11653,15 +11724,10 @@ class ParagraphMeasure {
      * 处理后置标点，后置标点不能出现在行首
      * @param render
      * @param i
+     * @param inCloseBody
      * @param lineEmpty
      */
-    patchHandlePostPunctuation(render, nextRender, i, inCloseBody, lineEmpty) {
-        if (i === render.textMeasures.length - 1) {
-            //紧跟着的字符包含后置标点
-            if (this.containerStartSymbolInTextStart(nextRender)) {
-                i--;
-            }
-        }
+    patchHandlePostPunctuation(render, i, inCloseBody, lineEmpty) {
         if (inCloseBody && this.containPostPunctuation(render.textMeasures[i]?.char)) {
             if (this.containPostPunctuation(render.textMeasures[i + 1]?.char)) {
                 i--;
@@ -13875,7 +13941,7 @@ class DocumentEvent {
         }
         const event = new GetTrackTipsEvent(this.docCtx);
         event.source = element;
-        DocumentEvent.invokeEvent('GetTrackTips', element, event, 'Bubbling', this.docCtx);
+        DocumentEvent.invokeEvent('GetTrackTips', element, event, 'Bubbling');
         if (event.trackTips) {
             this.trackTipsChanged.next({ pos: { ...this.currentPos }, tips: event.trackTips });
             this.prevTrackInfo = true;
@@ -13927,7 +13993,7 @@ class DocumentEvent {
             this.endHitInfo = this.startHitInfo;
             const mousedownEvent = new MousedownElementEvent(this.docCtx);
             mousedownEvent.source = startElement;
-            DocumentEvent.invokeEvent('ElementMousedown', startElement, mousedownEvent, 'All', this.docCtx);
+            DocumentEvent.invokeEvent('ElementMousedown', startElement, mousedownEvent, 'All');
         }
         else {
             this.clearHitInfo();
@@ -14060,7 +14126,7 @@ class DocumentEvent {
             //const { render: { renderPosition: { x: rx, y: ry } } } = this.currentMouseoverRender;
             //const rp = this.currentMouseoverRender?.absoluteRenderRect as Rect;
             const rp = ElementUtil.getRenderAbsolutePaintRect(cellRender);
-            rp.y -= this.viewOptions.pageOffset.y;
+            //rp.y -= this.viewOptions.pageOffset.y;
             const relativePos = { x: mousePos.x - rp.x, y: mousePos.y - rp.y };
             const isInCellBorder = CommonUtil.isInRectBorder(cellRender.rect, 2, relativePos);
             cursorType = ElementUtil.getBorderCursor(isInCellBorder.borderType);
@@ -14177,7 +14243,7 @@ class DocumentEvent {
             const startElement = this.startHitInfo.render.element;
             const mousedownEvent = new MousedownElementEvent(this.docCtx);
             mousedownEvent.source = startElement;
-            DocumentEvent.invokeEvent('ElementClick', startElement, mousedownEvent, "All", this.docCtx);
+            DocumentEvent.invokeEvent('ElementClick', startElement, mousedownEvent, "All");
             //this.refreshDocument();
         }
         const { startControl, startOffset, collapsed } = this.selectionState;
@@ -14189,7 +14255,7 @@ class DocumentEvent {
                 dropEvent.source = startControl;
                 dropEvent.sourceOffset = startOffset;
                 dropEvent.dragElement = this.focusedElement;
-                if (DocumentEvent.invokeEvent('ElementDrop', startControl, dropEvent, 'All', this.docCtx)) {
+                if (DocumentEvent.invokeEvent('ElementDrop', startControl, dropEvent, 'All')) {
                     return;
                 }
                 this.docCtx.docChange.moveElement(startControl, startOffset, this.focusedElement, this.startHitInfo.offset, this.selectionState);
@@ -14225,7 +14291,7 @@ class DocumentEvent {
         if (hitInfo) {
             docEvent.source = hitInfo.element;
             docEvent.sourceRender = hitInfo.render;
-            const res = DocumentEvent.invokeEvent('ElementDblClick', hitInfo.element, docEvent, 'All', this.docCtx);
+            const res = DocumentEvent.invokeEvent('ElementDblClick', hitInfo.element, docEvent, 'All');
             if (res) {
                 return;
             }
@@ -14406,7 +14472,7 @@ class DocumentEvent {
      * @param eventStage
      * @param docCtx
      */
-    static invokeEvent(type, sourceElement, event, eventStage, docCtx) {
+    static invokeEvent(type, sourceElement, event, eventStage) {
         const parents = ElementUtil.getParentElements(sourceElement);
         //先执行捕获阶段,在执行冒泡
         for (let i = parents.length - 1; i > -parents.length; i--) {
@@ -14940,7 +15006,7 @@ class DocumentInput {
             const evt = nodeEvt.sourceEvt;
             const keyEvent = new KeyboradElementEvent(this.docCtx);
             keyEvent.sourceEvent = evt;
-            if (DocumentEvent.invokeEvent('ElementKeyDown', this.docCtx.selectionState.startControl, keyEvent, 'Capture', this.docCtx)) {
+            if (DocumentEvent.invokeEvent('ElementKeyDown', this.docCtx.selectionState.startControl, keyEvent, 'Capture')) {
                 return;
             }
             if (evt.keyCode === 8) {
@@ -15067,7 +15133,13 @@ class DocumentChange {
             this.onInputBySelectRange(data);
             return;
         }
-        //判断是否需要创建新的留痕区域
+        const inputEvent = new InputElementEvent(this.docCtx);
+        inputEvent.data = data.data;
+        DocumentEvent.invokeEvent('ElementInput', startControl, inputEvent, 'All');
+        if (inputEvent.isCancel) {
+            return;
+        }
+        //判断是否需要创建新留痕区域
         if (enableTrackChanges && !this.isInCorrectTrackRegion(startControl, TrackRunTypeEnum.Inserted)) {
             this.newInputTrackChanges(data, startControl, startOffset);
             return;
@@ -15174,7 +15246,7 @@ class DocumentChange {
         }
     }
     /**
-     * 创建新的留痕块,并返回留痕块输入定位文本
+     * 创建新留痕块,并返回留痕块输入定位文本
      * @param startControl
      * @param startOffset
      * @param trackType
@@ -15330,7 +15402,7 @@ class DocumentChange {
         eventElement.source = startControl;
         eventElement.sourceEvent = evt;
         eventElement.sourceOffset = startOffset;
-        const res = DocumentEvent.invokeEvent('BackspaceKey', startControl, eventElement, 'Capture', this.docCtx);
+        const res = DocumentEvent.invokeEvent('BackspaceKey', startControl, eventElement, 'Capture');
         if (res && res.isCancel) {
             return;
         }
@@ -15353,7 +15425,7 @@ class DocumentChange {
         eventElement.source = startControl;
         eventElement.sourceEvent = evt;
         eventElement.sourceOffset = startOffset;
-        const res = DocumentEvent.invokeEvent('DeleteKey', startControl, eventElement, 'Capture', this.docCtx);
+        const res = DocumentEvent.invokeEvent('DeleteKey', startControl, eventElement, 'Capture');
         if (res && res.isCancel) {
             return;
         }
@@ -16112,6 +16184,25 @@ class DocumentChange {
             });
         }
     }
+    static setParaStyle(ss, setterFunc) {
+        if (ss.collapsed && ss.startControl) {
+            const para = ElementUtil.getParentByType(ss.startControl, ParagraphElement);
+            if (para) {
+                setterFunc(para.props);
+            }
+        }
+        else {
+            const range = ss.selectedRange;
+            if (!range) {
+                return;
+            }
+            RangeUtil.recursionTraversalRangeHandler(range, (itemRange) => {
+                if (itemRange.target instanceof ParagraphElement) {
+                    setterFunc(itemRange.target.props);
+                }
+            });
+        }
+    }
     /**
      * 复制
      * @param evt
@@ -20697,7 +20788,7 @@ class CanvasTextEditor extends AbsolutePanel {
         }
         const elementEvent = new ContextMenuElementEvent(this.docCtx);
         elementEvent.source = startControl;
-        DocumentEvent.invokeEvent('ElementContextMenu', startControl, elementEvent, 'All', this.docCtx);
+        DocumentEvent.invokeEvent('ElementContextMenu', startControl, elementEvent, 'All');
         const position = { x: evt.offsetX + 10, y: evt.offsetY, translateY: this.viewOptions.pageOffset.y };
         this.onContextMenuItemChanged.next({ pos: position, menus: elementEvent.menus });
     }
@@ -20863,14 +20954,16 @@ class CanvasTextEditor extends AbsolutePanel {
         return null;
     }
     /**
-     * 设置段落对齐
-     * @param align
+     * 设置段落样式
+     * @param newProps
      */
-    switchParaAlign(align) {
+    setParaStyle(newProps) {
         const setterFunc = (paraProps) => {
-            paraProps.textAlign = align;
+            Object.keys(newProps).forEach(key => {
+                paraProps[key] = newProps[key];
+            });
         };
-        DocumentChange.setParaAlign(this.selectionState, setterFunc);
+        DocumentChange.setParaStyle(this.selectionState, setterFunc);
     }
     combineCell() {
         TableUtil.mergeCells(this.selectionState);
@@ -21430,26 +21523,6 @@ class CanvasTextEditor extends AbsolutePanel {
     insertNewRow(tb, insertRowIndex) {
         return TableUtil.insertNewRow(tb, insertRowIndex);
     }
-    generatorDoc(data) {
-        //根据传入的参数，动态生成病情信息的结构化报告
-        const para = new ParagraphElement();
-        //创建患者姓名文本标签
-        const patNameLabel = new TextGroupElement();
-        patNameLabel.text = "患者姓名:";
-        //添加到段落中
-        para.addChild(patNameLabel);
-        //创建患者姓名数据元
-        const patNameDataEle = new DataElementText();
-        patNameDataEle.props.valueTextProps = new TextProps();
-        patNameDataEle.props.valueTextProps.fontName = '宋体';
-        patNameDataEle.props.valueTextProps.fontSize = 16;
-        //数据元赋值
-        patNameDataEle.setValue(data.patName);
-        //添加到段落中
-        para.addChild(patNameDataEle);
-        //添加到正文中
-        this.docCtx.document.bodyElement.addChild(para);
-    }
 }
 
 /**
@@ -21737,5 +21810,5 @@ function removeDuplicatesEvent(events) {
     return arr;
 }
 
-export { BlockContainerElement, BlockContainerRenderObject, BlockContentElement, BlockContentRenderObject, BlockLineRectRenderObject, BodyPartProps, BooleanEnum, BorderProps, BranchElement, BranchRenderObject, BreakElement, BreakFactory, BreakRenderObject, CanvasTextEditor, CheckBoxElement, CheckBoxFactory, CheckBoxProps, CheckBoxRenderObject, ColumnPatchUtil, CommContentBaseElement, CommContentBaseRenderObject, CommContentElement, CommContentProps, CommContentRenderObject, CommProps, CommentContentFactory, CommentElement, CommentFactory, CommentRenderObject, CommentsFactory, CommentsUtil, CommonUtil, CommsContainerElement, CommsContainerRenderObject, ContentMenuItem, ContextMenuElementEvent, DOMEventSource, DOMSubscription, DataDecorateElement, DataDecorateProps, DataDecorateRenderObject, DataEleBaseProps, DataEleBaseTextProps, DataEleCheckProps, DataEleDateProps, DataEleImageProps, DataEleListProps, DataEleMHProps, DataElementBarcode, DataElementBarcodeFactory, DataElementBarcodeProps, DataElementBarcodeRenderObject, DataElementBaseFactory, DataElementCheck, DataElementCheckFactory, DataElementCheckRenderObject, DataElementDate, DataElementDateFactory, DataElementDateRenderObject, DataElementGroupElement, DataElementGroupFactory, DataElementGroupProps, DataElementGroupRenderObject, DataElementImage, DataElementImgFactory, DataElementInlineGroup, DataElementLeaf, DataElementList, DataElementListFactory, DataElementListRenderObject, DataElementMH, DataElementMHFactory, DataElementRenderObject, DataElementText, DataElementTextFactory, DataElementTextRenderObject, DataImageRenderObject, DataRenderMH, DocMode, DocumentBodyElement, DocumentBodyFactory, DocumentBodyPartElement, DocumentBodyPartFactory, DocumentBodyPartRenderObject, DocumentBodyRenderObject, DocumentChange, DocumentCombine, DocumentComment, DocumentContainerRender, DocumentContext, DocumentCursor, DocumentElement, DocumentEvalFunc, DocumentEvent, DocumentFactory, DocumentFooterElement, DocumentFooterFactory, DocumentFooterRenderObject, DocumentHeaderElement, DocumentHeaderFactory, DocumentHeaderRenderObject, DocumentImagesBaseLoader, DocumentImagesLoader, DocumentInput, DocumentPaint, DocumentPrintOffscreen, DocumentPrintOffscreenBase, DocumentProps, DocumentRenderObject, DocumentSelection, DocumentTemplate, DropElementEvent, EditMode, EditorContext, Element, ElementEvent, ElementFactory, ElementPaint, ElementReader, ElementSerialize, ElementUtil, EventMap, EventSourceCore$1 as EventSourceCore, FillNullSpaceElement, FillNullSpaceRenderObject, GetTrackTipsEvent, GotCursorEvent, IDispose, INotifyPropertyChanged, InlineBlockContainer, InlineGroupElement, InlineGroupInputElement, InlineGroupRenderObject, InlineMuiltBlockLineRenderObject, IsInSideDataElement, IsInSideInlineGroupInputElement, KeyboradElementEvent, LeafElement, LeafRenderObject, LostCursorEvent, MarginProps, ModifyFlag$1 as ModifyFlag, MouseElementEvent, MousedownElementEvent, MuiltBlockLineRenderObject, OnceSubject, PSymbolElement, PSymbolRenderObject, PaddingProps, PageOptions, PaintContent, ParagraphElement, ParagraphFactory, ParagraphLineRectRenderObject, ParagraphNumberType, ParagraphProps, ParagraphRenderObject, PictureElement, PictureFactory, PictureProps, PictureRenderObject, RadioBoxElement, RadioBoxFactory, RadioBoxProps, RadioBoxRenderObject, RangeUtil, Rect, RenderContext, RenderObject, RenderObjectType, ResizeLeafRenderObject, RunElementFactory, SelectionOverlays, SelectionRange, SelectionState, Subject$1 as Subject, SubjectSubscription$1 as SubjectSubscription, Subscription$1 as Subscription, TableCellElement, TableCellFactory, TableCellProps, TableCellRenderObject, TableElement, TableFactory, TableProps, TableRenderObject, TableRowElement, TableRowFactory, TableRowProps, TableRowRenderObject, TableSplitCell, TableUtil, TextGroupElement, TextGroupFactory, TextGroupRenderObject, TextProps, TrackRunElement, TrackRunProps, TrackRunRenderObject, TrackRunTypeEnum, ValidateCondition, ValidateElement, ValidateProps, ValidateRenderObject, ViewOptions, clearChildrenRenderCache, createPrintTemplate, defaultParaHanging, deleteCurrentParagraph, documentPrint, drawDecorator, elementTypeEventHandler, fontMapFunc, fromEvent, getCalleeName, getFocusTextSegment, invokeTypeHandler, isDate, objectToString, onTableContextmenu, onceTask$1 as onceTask, parser, printDocOnContextmenu, printNodes, reactiveMap, runTextLineRender, setDataElementProps, setNotifyChangedCallback, targetMaps, textLineRenderMode, toRawType, toTypeString, validateDataEle, validateDataEleRenderObj, validateInlineInputRenderObj, watchChanged };
+export { BlockContainerElement, BlockContainerRenderObject, BlockContentElement, BlockContentRenderObject, BlockLineRectRenderObject, BodyPartProps, BooleanEnum, BorderProps, BranchElement, BranchRenderObject, BreakElement, BreakFactory, BreakRenderObject, CanvasTextEditor, CheckBoxElement, CheckBoxFactory, CheckBoxProps, CheckBoxRenderObject, ColumnPatchUtil, CommContentBaseElement, CommContentBaseRenderObject, CommContentElement, CommContentProps, CommContentRenderObject, CommProps, CommentContentFactory, CommentElement, CommentFactory, CommentRenderObject, CommentsFactory, CommentsUtil, CommonUtil, CommsContainerElement, CommsContainerRenderObject, ContentMenuItem, ContextMenuElementEvent, DOMEventSource, DOMSubscription, DataDecorateElement, DataDecorateProps, DataDecorateRenderObject, DataEleBaseProps, DataEleBaseTextProps, DataEleCheckProps, DataEleDateProps, DataEleImageProps, DataEleListProps, DataEleMHProps, DataElementBarcode, DataElementBarcodeFactory, DataElementBarcodeProps, DataElementBarcodeRenderObject, DataElementBaseFactory, DataElementCheck, DataElementCheckFactory, DataElementCheckRenderObject, DataElementDate, DataElementDateFactory, DataElementDateRenderObject, DataElementGroupElement, DataElementGroupFactory, DataElementGroupProps, DataElementGroupRenderObject, DataElementImage, DataElementImgFactory, DataElementInlineGroup, DataElementLeaf, DataElementList, DataElementListFactory, DataElementListRenderObject, DataElementMH, DataElementMHFactory, DataElementRenderObject, DataElementText, DataElementTextFactory, DataElementTextRenderObject, DataImageRenderObject, DataRenderMH, DocMode, DocumentBodyElement, DocumentBodyFactory, DocumentBodyPartElement, DocumentBodyPartFactory, DocumentBodyPartRenderObject, DocumentBodyRenderObject, DocumentChange, DocumentCombine, DocumentComment, DocumentContainerRender, DocumentContext, DocumentCursor, DocumentElement, DocumentEvalFunc, DocumentEvent, DocumentFactory, DocumentFooterElement, DocumentFooterFactory, DocumentFooterRenderObject, DocumentHeaderElement, DocumentHeaderFactory, DocumentHeaderRenderObject, DocumentImagesBaseLoader, DocumentImagesLoader, DocumentInput, DocumentPaint, DocumentPrintOffscreen, DocumentPrintOffscreenBase, DocumentProps, DocumentRenderObject, DocumentSelection, DocumentTemplate, DropElementEvent, EditMode, EditorContext, Element, ElementEvent, ElementFactory, ElementPaint, ElementReader, ElementSerialize, ElementUtil, EventMap, EventSourceCore$1 as EventSourceCore, FillNullSpaceElement, FillNullSpaceRenderObject, GetTrackTipsEvent, GotCursorEvent, IDispose, INotifyPropertyChanged, InlineBlockContainer, InlineGroupElement, InlineGroupInputElement, InlineGroupRenderObject, InlineMuiltBlockLineRenderObject, InputElementEvent, IsInSideDataElement, IsInSideInlineGroupInputElement, KeyboradElementEvent, LeafElement, LeafRenderObject, LostCursorEvent, MarginProps, ModifyFlag$1 as ModifyFlag, MouseElementEvent, MousedownElementEvent, MuiltBlockLineRenderObject, OnceSubject, PSymbolElement, PSymbolRenderObject, PaddingProps, PageOptions, PaintContent, ParagraphElement, ParagraphFactory, ParagraphLineRectRenderObject, ParagraphNumberType, ParagraphProps, ParagraphRenderObject, PictureElement, PictureFactory, PictureProps, PictureRenderObject, RadioBoxElement, RadioBoxFactory, RadioBoxProps, RadioBoxRenderObject, RangeUtil, Rect, RenderContext, RenderObject, RenderObjectType, ResizeLeafRenderObject, RunElementFactory, SelectionOverlays, SelectionRange, SelectionState, Subject$1 as Subject, SubjectSubscription$1 as SubjectSubscription, Subscription$1 as Subscription, TableCellElement, TableCellFactory, TableCellProps, TableCellRenderObject, TableElement, TableFactory, TableProps, TableRenderObject, TableRowElement, TableRowFactory, TableRowProps, TableRowRenderObject, TableSplitCell, TableUtil, TextGroupElement, TextGroupFactory, TextGroupRenderObject, TextProps, TrackRunElement, TrackRunProps, TrackRunRenderObject, TrackRunTypeEnum, ValidateCondition, ValidateElement, ValidateProps, ValidateRenderObject, ViewOptions, clearChildrenRenderCache, createPrintTemplate, defaultParaHanging, deleteCurrentParagraph, documentPrint, drawDecorator, elementTypeEventHandler, falseChar, fontMapFunc, fromEvent, getCalleeName, getFocusTextSegment, invokeTypeHandler, isDate, objectToString, onTableContextmenu, onceTask$1 as onceTask, parser, printDocOnContextmenu, printNodes, reactiveMap, runTextLineRender, setDataElementProps, setNotifyChangedCallback, targetMaps, textLineRenderMode, toRawType, toTypeString, trueChar, validateDataEle, validateDataEleRenderObj, validateInlineInputRenderObj, watchChanged };
 //# sourceMappingURL=index.js.map