@hailin-zheng/editor-core 1.0.60 → 1.0.62

package/index.js

@@ -1416,6 +1416,7 @@ class ViewOptions {
     viewBackcolor = 'rgb(230,230,230)';
     paraSymbolColor = 'rgb(128,128,128)';
     dataGroupColor = 'rgb(0,80,179)';
+    defaultLineHeight = 1.3;
     //新增-留痕块文本颜色
     trackInsColor = '#ff4d4f';
     //删除-留痕块文本颜色
@@ -1462,6 +1463,8 @@ class ViewOptions {
     pageNumOffset = 0;
     //页排版模式：单页模式、多页模式、适应页宽模式
     pageLayoutMode = 'singlePage';
+    //默认tab缩进的量
+    defaultIndent = 20;
     //内容区宽度，受审阅窗口宽度影响
     get contentWidth() {
         if (this.showReviewWindow) {
@@ -1724,6 +1727,12 @@ class TextProps extends INotifyPropertyChanged {
             && this.border === props.border;
     }
 }
+var ParagraphNumberType;
+(function (ParagraphNumberType) {
+    ParagraphNumberType[ParagraphNumberType["none"] = -1] = "none";
+    ParagraphNumberType[ParagraphNumberType["ul"] = 0] = "ul";
+    ParagraphNumberType[ParagraphNumberType["ol"] = 1] = "ol";
+})(ParagraphNumberType || (ParagraphNumberType = {}));
 class ParagraphProps extends INotifyPropertyChanged {
     //段落默认的文本属性
     //textProps!: TextProps;
@@ -1731,7 +1740,7 @@ class ParagraphProps extends INotifyPropertyChanged {
     hanging = 0;
     lineHeight = 1.3;
     textAlign = 'left';
-    numberType = -1;
+    numberType = ParagraphNumberType.none;
     pageBreak = false;
     clone(dest = null) {
         const clone = dest ?? new ParagraphProps();
@@ -1753,13 +1762,13 @@ class ParagraphProps extends INotifyPropertyChanged {
         if (this.hanging) {
             props["hanging"] = this.hanging;
         }
-        if (this.lineHeight && this.lineHeight !== 1.3) {
+        if (this.lineHeight && this.lineHeight !== viewOptions.defaultLineHeight) {
             props["lineHeight"] = this.lineHeight;
         }
         if (this.textAlign && this.textAlign !== "left") {
             props["textAlign"] = this.textAlign;
         }
-        if (this.numberType !== -1) {
+        if (this.numberType !== ParagraphNumberType.none) {
             props["numberType"] = this.numberType;
         }
         if (this.pageBreak) {
@@ -2369,6 +2378,13 @@ class ValidateProps {
     id;
     title;
     msg;
+    clone(dest) {
+        const clone = dest ?? new ValidateProps();
+        clone.id = this.id;
+        clone.title = this.title;
+        clone.msg = this.msg;
+        return clone;
+    }
 }
 class DataElementGroupProps {
     id;
@@ -3291,6 +3307,19 @@ class ParagraphElement extends BlockContentElement {
                 }
             }
         }, true);
+        this.addEvent('ElementKeyDown', evt => {
+            //当前存在缩进，点击tab
+            if (evt.sourceEvent.keyCode === 9) {
+                const { startControl, startOffset } = evt.selectionState;
+                if (startOffset === 0 && startControl === this.getChild(0)) {
+                    const defaultIndent = evt.ctx.viewOptions.defaultIndent;
+                    let increaseValue = evt.sourceEvent.shiftKey ? -defaultIndent : defaultIndent;
+                    this.props.indent += increaseValue;
+                    evt.isCancel = true;
+                    evt.sourceEvent.preventDefault();
+                }
+            }
+        }, true);
     }
     /**
      * 设置样式
@@ -3338,25 +3367,39 @@ class ParagraphRenderObject extends MuiltBlockLineRenderObject {
      */
     drawProjectNumber(ctx, viewOptions) {
         const paraElement = this.element;
-        if (paraElement.props.numberType >= 0) {
+        if (paraElement.props.numberType !== ParagraphNumberType.none) {
             if (paraElement.paintRenders.indexOf(this) > 0) {
                 return;
             }
             const firstLine = this.getChild(0);
-            if (!firstLine) {
-                debugger;
-            }
             const firstInline = firstLine.getChild(0);
-            if (!firstInline) {
-                debugger;
-            }
             const firstInlinePaintPos = ElementUtil.getRenderAbsolutePaintPos(firstInline, {
                 x: 0,
                 y: -viewOptions.translateY
             });
-            const numberSymbolY = firstInlinePaintPos.y + Math.ceil(firstInline.rect.height / 2);
-            //ctx.contentContext.drawText(str, textProps, firstInlinePaintPos.x - paraElement.paraProps.indent, numberSymbolY, 14, 14);
-            ctx.contentContext.fillCircular(firstInlinePaintPos.x - paraElement.props.indent + 2, numberSymbolY, 4);
+            if (paraElement.props.numberType === ParagraphNumberType.ul) {
+                const numberSymbolY = firstInlinePaintPos.y + Math.ceil(firstInline.rect.height / 2);
+                ctx.contentContext.fillCircular(firstInlinePaintPos.x - paraElement.props.indent + 2, numberSymbolY, 4);
+            }
+            else if (paraElement.props.numberType === ParagraphNumberType.ol) {
+                const parent = paraElement.parent;
+                let i = paraElement.getIndex() - 1;
+                for (; i >= 0; i--) {
+                    if (parent.getChild(i) instanceof ParagraphElement) {
+                        //紧挨上面的段落
+                        const prevSiblingPara = parent.getChild(i);
+                        if (prevSiblingPara.props.numberType !== paraElement.props.numberType || prevSiblingPara.props.indent !== paraElement.props.indent) {
+                            break;
+                        }
+                    }
+                }
+                const olText = (paraElement.getIndex() - i) + '.';
+                const textProps = new TextProps();
+                textProps.color = '#000';
+                textProps.fontSize = firstInline.rect.height - 4;
+                textProps.fontName = '宋体';
+                ctx.contentContext.drawText(olText, textProps, firstInlinePaintPos.x - paraElement.props.indent + 2, firstInlinePaintPos.y + 2, 40, textProps.fontSize);
+            }
         }
     }
     clone() {
@@ -3384,7 +3427,7 @@ class ParagraphFactory extends ElementFactory {
         paraElement.props.hanging = props?.hanging ?? 0;
         paraElement.props.textAlign = props?.textAlign ?? 'left';
         paraElement.props.numberType = props?.numberType ?? -1;
-        paraElement.props.lineHeight = props?.lineHeight ?? 1.3;
+        paraElement.props.lineHeight = props?.lineHeight ?? this.options.defaultLineHeight;
         paraElement.props.pageBreak = props?.pageBreak ?? false;
         return paraElement;
     }
@@ -7035,7 +7078,14 @@ class CommContentElement extends CommContentBaseElement {
         };
     }
     clone(data) {
-        throw new Error('不支持');
+        const clone = new CommContentElement();
+        this.props.clone(clone.props);
+        if (data) {
+            for (let i = 0; i < this.length; i++) {
+                clone.addChild(this.getChild(i).clone(true));
+            }
+        }
+        return clone;
     }
 }
 class CommContentRenderObject extends CommContentBaseRenderObject {
@@ -7051,7 +7101,10 @@ class CommContentRenderObject extends CommContentBaseRenderObject {
         });
         const commMarkLinePos = ElementUtil.getParaLinePos(this.commMarkRender.render, commMarkPos);
         commMarkPos.y = commMarkLinePos.y + 2;
-        const docRenderPos = ElementUtil.getRenderAbsolutePaintPos(docRender, { x: 0, y: -e.docCtx.viewOptions.translateY });
+        const docRenderPos = ElementUtil.getRenderAbsolutePaintPos(docRender, {
+            x: 0,
+            y: -e.docCtx.viewOptions.translateY
+        });
         const marginLeft = commMarkPos.x - docRenderPos.x - docRender.padding.left;
         const marginRight = e.docCtx.viewOptions.docPageSettings.width - marginLeft - docRender.padding.right * 2;
         e.render.overlaysContext.drawDashLine([commMarkPos, {
@@ -7248,7 +7301,14 @@ class ValidateElement extends CommContentBaseElement {
         return null;
     }
     clone(data) {
-        throw new Error("Method not implemented.");
+        const clone = new ValidateElement();
+        this.props.clone(clone.props);
+        if (data) {
+            for (let i = 0; i < this.length; i++) {
+                clone.addChild(this.getChild(i).clone(true));
+            }
+        }
+        return clone;
     }
     setContent(content) {
         this.clearItems();
@@ -10065,7 +10125,7 @@ class ElementMeasure {
             const innerLineRect = innerLineRects[i];
             innerLineRect.rect.x = this.getParaLineRectStartX(innerLineRects.length, i, paragraph, render, innerLineRect);
             //限制最大行高
-            const maxLineHeight = Math.floor(14 * 1.3);
+            const maxLineHeight = paragraph.props.lineHeight !== this.options.defaultLineHeight ? 100 : Math.floor(14 * 2);
             //fillLineHeight填充行高
             let fillLineHeight = Math.ceil(innerLineRect.rect.height * (paragraph.props.lineHeight - 1));
             fillLineHeight = fillLineHeight > maxLineHeight ? maxLineHeight : fillLineHeight;
@@ -11656,63 +11716,6 @@ class DocumentPaint {
     }
 }
 
-/**
- * 段落行
- */
-class ParaLineElement extends LeafElement {
-    constructor() {
-        super('p-line');
-        this.props = new ParaLineProps();
-    }
-    clone(data) {
-        const clone = new ParaLineElement();
-        this.props.clone(clone.props);
-        return clone;
-    }
-    createRenderObject(options, renderCtx) {
-        const render = new ParaLineRenderObject(this);
-        render.rect.width = 9999;
-        return render;
-    }
-    serialize(viewOptions) {
-        return {
-            type: this.type,
-            props: {
-                ...this.props
-            }
-        };
-    }
-}
-class ParaLineRenderObject extends LeafRenderObject {
-    clone() {
-        const clone = new ParaLineRenderObject(this.element);
-        clone.rect = ElementUtil.cloneRect(this.rect);
-        return clone;
-    }
-    render(e) {
-        const { render, position } = e;
-        render.contentContext.drawHoriLine(position.x, position.y, this.parent.rect.width, 'black', 1);
-    }
-}
-class ParaLineElementFactory extends ElementFactory {
-    createElement(data, renderCtx) {
-        const ele = new ParaLineElement();
-        ele.props.lineType = data.props?.lineType ?? 'solid';
-        return ele;
-    }
-    match(type) {
-        return type === 'p-line';
-    }
-}
-class ParaLineProps {
-    lineType = 'solid';
-    clone(dest) {
-        const clone = dest ?? new ParaLineProps();
-        clone.lineType = this.lineType;
-        return clone;
-    }
-}
-
 class ElementReader {
     docCtx;
     renderCtx;
@@ -11754,7 +11757,6 @@ class ElementReader {
         this.addFactory(RunElementFactory);
         this.addFactory(DataElementGroupFactory);
         this.addFactory(DocumentBodyPartFactory);
-        this.addFactory(ParaLineElementFactory);
         // this.registerReadFunc<TrackRunProps>('ins-run', (data) => {
         //     const props = new TrackRunProps(data.type);
         //     props.userId = data.userId;
@@ -14434,12 +14436,12 @@ class DocumentChange {
         }
         const para = ElementUtil.getParentByType(startControl, ParagraphElement);
         const format = {};
-        if (para.props.numberType >= 0) {
-            format.numberType = -1;
+        if (para.props.numberType !== ParagraphNumberType.none) {
+            format.numberType = ParagraphNumberType.none;
             format.indent = 0;
         }
         else {
-            format.numberType = 0;
+            format.numberType = ParagraphNumberType.ul;
             format.indent = 15;
         }
         para.setFormat(format);
@@ -16658,27 +16660,6 @@ class CanvasTextEditor {
         }
         this.flushToSchedule();
     }
-    test2() {
-        //获取文档上下文
-        const docEleCtx = this.docCtx.getCtx(this.docCtx.document);
-        //获取年龄数据元
-        const dataEle = docEleCtx.getControlById('1493477712134672386');
-        //获取要隐藏的数据组
-        const dataGroup = docEleCtx.ctx.treeFind((item) => item instanceof DataElementGroupElement);
-        //侦听数据元更改时间
-        dataEle.onChangeSubject.subscribe((e) => {
-            //在文档重新排版、绘制前，获取最终的指定节点的内容
-            const beforeRefreshSub = this.onBeforeRefreshDocument.subscribe((e2) => {
-                console.log('内容发生改变，隐藏数据组');
-                //获取年龄数据元输入的值
-                const age = Number.parseInt(dataEle.getValue());
-                //年龄大于20，隐藏数据元
-                dataGroup.props.hidden = age > 20;
-                //取消订阅事件
-                beforeRefreshSub.unsubscribe();
-            });
-        });
-    }
 }
 
 /**
@@ -16962,5 +16943,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, DocRule, 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, ElementMeasure, ElementPaint, ElementReader, ElementRenderCut, ElementSerialize, ElementUtil, EventMap, EventSourceCore, FillNullSpaceElement, FillNullSpaceRenderObject, GetTrackTipsEvent, GotCursorEvent, IDispose, INotifyPropertyChanged, InlineBlockContainer, InlineGroupElement, InlineGroupInputElement, InlineGroupRenderObject, InlineMuiltBlockLineRenderObject, IsInSideDataElement, IsInSideInlineGroupInputElement, KeyboradElementEvent, LeafElement, LeafRenderObject, LostCursorEvent, MarginProps, ModifyFlag, MouseElementEvent, MousedownElementEvent, MuiltBlockLineRenderObject, PSymbolElement, PSymbolRenderObject, PaddingProps, PageOptions, PaintContent, ParagraphElement, ParagraphFactory, ParagraphLineRectRenderObject, ParagraphProps, ParagraphRenderObject, PictureElement, PictureFactory, PictureProps, PictureRenderObject, RadioBoxElement, RadioBoxFactory, RadioBoxProps, RadioBoxRenderObject, RangeUtil, Rect, RenderContext, RenderObject, RenderObjectType, ResizeLeafRenderObject, RunElementFactory, SelectionOverlays, SelectionRange, SelectionState, Subject, SubjectSubscription, 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, createPrintTemplate, deleteCurrentParagraph, documentPrint, elementTypeEventHandler, fontMapFunc, fromEvent, getFocusTextSegment, invokeTypeHandler, isDate, objectToString, onTableContextmenu, onceTask, 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, DocRule, 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, ElementMeasure, ElementPaint, ElementReader, ElementRenderCut, ElementSerialize, ElementUtil, EventMap, EventSourceCore, FillNullSpaceElement, FillNullSpaceRenderObject, GetTrackTipsEvent, GotCursorEvent, IDispose, INotifyPropertyChanged, InlineBlockContainer, InlineGroupElement, InlineGroupInputElement, InlineGroupRenderObject, InlineMuiltBlockLineRenderObject, IsInSideDataElement, IsInSideInlineGroupInputElement, KeyboradElementEvent, LeafElement, LeafRenderObject, LostCursorEvent, MarginProps, ModifyFlag, MouseElementEvent, MousedownElementEvent, MuiltBlockLineRenderObject, 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, SubjectSubscription, 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, createPrintTemplate, deleteCurrentParagraph, documentPrint, elementTypeEventHandler, fontMapFunc, fromEvent, getFocusTextSegment, invokeTypeHandler, isDate, objectToString, onTableContextmenu, onceTask, printDocOnContextmenu, printNodes, reactiveMap, runTextLineRender, setDataElementProps, setNotifyChangedCallback, targetMaps, textLineRenderMode, toRawType, toTypeString, validateDataEle, validateDataEleRenderObj, validateInlineInputRenderObj, watchChanged };
 //# sourceMappingURL=index.js.map