@hailin-zheng/editor-core 2.1.18 → 2.1.20

package/med_editor/framework/impl/document/doc-impl.d.ts

@@ -3,16 +3,15 @@ import { DocumentProps } from '../../element-props';
 import { RenderContextType } from "../../render-context";
 import { DocumentBodyElement } from "./doc-body-impl";
 import { DocumentHeaderElement } from "./doc-header-impl";
-import { BlockContainerRenderObject, IEditorVNodeOptions, IRenderData, RenderObject } from "../../render-define";
+import { BlockContainerRenderObject, IEditorVNodeOptions, RenderObject } from "../../render-define";
 import { DocumentFooterElement } from "./doc-footer-impl";
-import { CommsContainerElement } from "../comments/comments-container-impl";
 import { SelectionState } from "../../document-selection";
+import { CommentElement } from "../comments/comment-element-impl";
 export declare class DocumentElement extends BlockContainerElement<DocumentProps> {
     viewOptions: ViewOptions;
     bodyElement: DocumentBodyElement;
     headerElement: DocumentHeaderElement;
     footerElement: DocumentFooterElement;
-    commentsContainerElement: CommsContainerElement;
     headerEditState: boolean;
     constructor();
     createRenderObject(): DocumentRenderObject;
@@ -27,12 +26,30 @@ export declare class DocumentElement extends BlockContainerElement<DocumentProps
      * 切换开启页眉页脚编辑功能
      */
     switchPageHeaderEditor(ss: SelectionState, ele: Element | null): void;
+    markPairs: Array<{
+        id: string;
+        start?: CommentElement;
+        end?: CommentElement;
+    }>;
+    /**
+     * 清除所有的批注标识组合
+     */
+    clearMarkItems(): void;
+    identifyCommMark(markElement: CommentElement): void;
+    /**
+     * 根据id，移除批注标记以及批注内容
+     * @param id
+     */
+    removeCommMark(id: string): void;
+    /**
+     * 清除所有批注
+     */
+    clearAllComms(): void;
 }
 export declare class DocumentRenderObject extends BlockContainerRenderObject {
     constructor(ele: Element);
     headerLine: number;
     footerLine: number;
-    render(e: IRenderData): void;
     /**
      * 打印模式检查
      * 如果是续打模式，需要进行裁剪打印范围，页眉页脚都不需要打印

package/med_editor/framework/impl/index.d.ts

@@ -36,3 +36,4 @@ export * from './table/table-split-cell-patch';
 export * from './table/table-util';
 export * from './text/text-impl';
 export * from './text/track-run-impl';
+export * from './svg/svg-impl';

package/med_editor/framework/impl/media-formula/menstrual-history.d.ts

@@ -1,6 +1,6 @@
 import { ViewOptions, Element, SerializeProps, ElementFactory, readElementProps, ICreateRenderData } from "../../element-define";
 import { DataEleMHProps } from "../../element-props";
-import { IEditorVNodeOptions, IRenderData, LeafRenderObject, RenderObject } from "../../render-define";
+import { IEditorVNodeOptions, LeafRenderObject, RenderObject } from "../../render-define";
 import { DataElementLeaf } from "../data-element/data-element-base-impl";
 /**
  * 月经史
@@ -21,7 +21,6 @@ declare type MHLayoutType = {
     };
 };
 export declare class DataRenderMH extends LeafRenderObject<DataElementMH> {
-    render(e: IRenderData): void;
     exportHTML(event: IEditorVNodeOptions): any;
     clone(): RenderObject<Element>;
 }

package/med_editor/framework/impl/media-formula/permanent-teeth.d.ts

@@ -1,6 +1,6 @@
 import { ICreateRenderData, LeafElement, ViewOptions, Element, SerializeProps, ElementFactory, readElementProps } from "../../element-define";
 import { INotifyPropertyChanged } from "../../element-props";
-import { IEditorVNodeOptions, IRenderData, LeafRenderObject, RenderObject } from "../../render-define";
+import { IEditorVNodeOptions, LeafRenderObject, RenderObject } from "../../render-define";
 /**
  * 恒牙牙位图
  */
@@ -11,7 +11,6 @@ export declare class PermanentTeethElement extends LeafElement<PermanentTeethPro
     serialize(viewOptions: ViewOptions): SerializeProps | null;
 }
 export declare class PermanentTeethRenderObject extends LeafRenderObject<PermanentTeethElement> {
-    render(e: IRenderData): void;
     clone(): RenderObject;
     exportHTML(event: IEditorVNodeOptions): any;
 }

package/med_editor/framework/impl/paragraph/p-impl.d.ts

@@ -16,7 +16,6 @@ export declare class ParagraphElement extends BlockContentElement<ParagraphProps
     static createElement(): ParagraphElement;
 }
 export declare class ParagraphRenderObject extends MuiltBlockLineRenderObject<ParagraphElement> {
-    render(e: IRenderData): void;
     /**
      * 绘制项目符号
      */
@@ -34,7 +33,6 @@ export declare class ParagraphLineRectRenderObject extends BlockLineRectRenderOb
     baseTopLine: number;
     baseBottomLine: number;
     startX: number;
-    render(e: IRenderData): void;
     clone(): RenderObject;
     exportHTML(event: IEditorVNodeOptions): any;
 }

package/med_editor/framework/impl/picture/RectEle.d.ts

@@ -1,5 +1,5 @@
 import { ElementFactory, ICreateRenderData, LeafElement, readElementProps, SerializeProps, ViewOptions } from "../../element-define";
-import { IRenderData, LeafRenderObject, RenderObject } from "../../render-define";
+import { LeafRenderObject, RenderObject } from "../../render-define";
 interface RectProps {
     width: number;
     height: number;
@@ -28,11 +28,6 @@ export declare class RectRenderObject extends LeafRenderObject<RectElement> {
      * 克隆当前对象
      */
     clone(): RenderObject;
-    /**
-     * 渲染绘制到视图
-     * @param e
-     */
-    render(e: IRenderData): void;
 }
 export declare class RectElementFactory extends ElementFactory<RectProps> {
     /**

package/med_editor/framework/impl/picture/image-impl.d.ts

@@ -1,7 +1,6 @@
 import { Element, ElementFactory, ImgLoadStatus, LeafElement, ResizeLeafRenderObject, SerializeProps, ViewOptions } from "../../element-define";
 import { PictureProps } from "../../element-props";
-import { IEditorVNodeOptions, IRenderData, LeafRenderObject, RenderObject } from "../../render-define";
-import { EditorContext } from "../../document-context";
+import { IEditorVNodeOptions, LeafRenderObject, RenderObject } from "../../render-define";
 interface IResizeElement {
     resizeable: boolean;
 }
@@ -12,14 +11,10 @@ export declare class PictureElement extends LeafElement<PictureProps> implements
     createRenderObject(): LeafRenderObject;
     serialize(options: ViewOptions): SerializeProps;
     clone(data: boolean): Element;
-    loadImage(ctx: EditorContext): void;
     destroy(): void;
 }
-export declare class PictureRenderObject extends ResizeLeafRenderObject {
-    render(e: IRenderData): void;
+export declare class PictureRenderObject extends ResizeLeafRenderObject<PictureElement> {
     clone(): RenderObject;
-    pagePaintCompleted(e: Omit<IRenderData, "nextRender">): void;
-    private drawResizeCircle;
     exportHTML(event: IEditorVNodeOptions): any;
 }
 export declare class PictureFactory extends ElementFactory<PictureProps> {

package/med_editor/framework/impl/radio/radio-impl.d.ts

@@ -1,6 +1,6 @@
 import { ElementFactory, LeafElement, SerializeProps } from "../../element-define";
 import { RadioBoxProps } from "../../element-props";
-import { IRenderData, LeafRenderObject, RenderObject } from "../../render-define";
+import { LeafRenderObject, RenderObject } from "../../render-define";
 export declare class RadioBoxElement extends LeafElement<RadioBoxProps> {
     constructor();
     createRenderObject(): RadioBoxRenderObject;
@@ -13,6 +13,5 @@ export declare class RadioBoxFactory extends ElementFactory<RadioBoxProps> {
     createElement(data: any): RadioBoxElement;
 }
 export declare class RadioBoxRenderObject extends LeafRenderObject<RadioBoxElement> {
-    render(e: IRenderData): void;
     clone(cloneData?: boolean): RenderObject;
 }

package/med_editor/framework/impl/svg/svg-impl.d.ts

@@ -0,0 +1,20 @@
+import { Element, ElementFactory, LeafElement, ResizeLeafRenderObject, SerializeProps, ViewOptions } from "../../element-define";
+import { IEditorVNodeOptions, LeafRenderObject, RenderObject } from "../../render-define";
+import { SVGProps } from "../../element-props";
+export declare class SVGElement extends LeafElement<SVGProps> {
+    resizeable: boolean;
+    constructor();
+    createRenderObject(): LeafRenderObject;
+    serialize(options: ViewOptions): SerializeProps;
+    clone(data: boolean): Element;
+    destroy(): void;
+}
+export declare class SVGRenderObject extends ResizeLeafRenderObject<SVGElement> {
+    clone(): RenderObject;
+    private drawResizeCircle;
+    exportHTML(event: IEditorVNodeOptions): any;
+}
+export declare class SVGFactory extends ElementFactory<SVGElement> {
+    match(type: string): boolean;
+    createElement(data: any): Element;
+}

package/med_editor/framework/impl/symbol/br-symbol-impl.d.ts

@@ -1,5 +1,5 @@
 import { Element, ElementFactory, LeafElement, SerializeProps } from "../../element-define";
-import { IEditorVNodeOptions, IRenderData, LeafRenderObject, RenderObject } from "../../render-define";
+import { IEditorVNodeOptions, LeafRenderObject, RenderObject } from "../../render-define";
 import { TextProps } from "../../element-props";
 export declare class BreakElement extends LeafElement {
     textProps: TextProps;
@@ -9,7 +9,6 @@ export declare class BreakElement extends LeafElement {
     clone(): Element;
 }
 export declare class BreakRenderObject extends LeafRenderObject<BreakElement> {
-    render(e: IRenderData): void;
     exportHTML(event: IEditorVNodeOptions): any;
     clone(): RenderObject;
 }

package/med_editor/framework/impl/symbol/p-symbol-impl.d.ts

@@ -1,5 +1,5 @@
 import { Element, LeafElement, SerializeProps } from "../../element-define";
-import { IEditorVNodeOptions, IRenderData, LeafRenderObject, RenderObject } from "../../render-define";
+import { IEditorVNodeOptions, LeafRenderObject, RenderObject } from "../../render-define";
 import { TextProps } from "../../element-props";
 export declare class PSymbolElement extends LeafElement {
     textProps: TextProps;
@@ -11,7 +11,6 @@ export declare class PSymbolElement extends LeafElement {
     getSelfLength(pure: boolean): number;
 }
 export declare class PSymbolRenderObject extends LeafRenderObject<PSymbolElement> {
-    render(e: IRenderData): void;
     exportHTML(event: IEditorVNodeOptions): any;
     clone(): RenderObject;
 }

package/med_editor/framework/impl/symbol/page-br-symbol-impl.d.ts

@@ -1,5 +1,5 @@
 import { Element, ElementFactory, LeafElement, SerializeProps } from "../../element-define";
-import { IRenderData, LeafRenderObject, RenderObject } from "../../render-define";
+import { LeafRenderObject, RenderObject } from "../../render-define";
 import { TextProps } from "../../element-props";
 /**
  * 强制分页符号
@@ -12,7 +12,6 @@ export declare class PageBreakElement extends LeafElement {
     clone(): Element;
 }
 export declare class PageBreakRenderObject extends LeafRenderObject<PageBreakElement> {
-    render(e: IRenderData): void;
     clone(): RenderObject;
 }
 export declare class PageBreakFactory extends ElementFactory<null> {

package/med_editor/framework/impl/symbol/tab-symbol-impl.d.ts

@@ -1,5 +1,5 @@
 import { Element, ElementFactory, LeafElement, SerializeProps } from "../../element-define";
-import { IRenderData, LeafRenderObject, RenderObject } from "../../render-define";
+import { LeafRenderObject, RenderObject } from "../../render-define";
 export declare class TabElement extends LeafElement {
     constructor();
     createRenderObject(): LeafRenderObject;
@@ -7,7 +7,6 @@ export declare class TabElement extends LeafElement {
     clone(): Element;
 }
 export declare class TabRenderObject extends LeafRenderObject<TabElement> {
-    render(e: IRenderData): void;
     clone(): RenderObject;
 }
 export declare class TabFactory extends ElementFactory<null> {

package/med_editor/framework/impl/table/table-cell-impl.d.ts

@@ -1,6 +1,6 @@
 import { BlockContainerElement, Element, ElementFactory, IBeginMeasureData, ICreateRenderData, readElementProps, SerializeProps, ViewOptions } from "../../element-define";
 import { TableCellProps } from "../../element-props";
-import { IEditorVNodeOptions, InlineMuiltBlockLineRenderObject, IRenderData, RenderObject } from "../../render-define";
+import { IEditorVNodeOptions, InlineMuiltBlockLineRenderObject, RenderObject } from "../../render-define";
 export declare class TableCellElement extends BlockContainerElement<TableCellProps> {
     constructor();
     beginMeasure(data: IBeginMeasureData): void;
@@ -19,7 +19,6 @@ export declare class TableCellElement extends BlockContainerElement<TableCellPro
     static createCell(): TableCellElement;
 }
 export declare class TableCellRenderObject extends InlineMuiltBlockLineRenderObject<TableCellElement> {
-    render(e: IRenderData): void;
     /**
      * 绘制对角线
      * @private

package/med_editor/framework/impl/table/table-impl.d.ts

@@ -1,6 +1,6 @@
 import { BlockContainerElement, Element, ElementFactory, IBeginMeasureData, ICreateRenderData, SerializeProps, ViewOptions } from "../../element-define";
 import { TableProps } from "../../element-props";
-import { IEditorVNodeOptions, IRenderData, MuiltBlockLineRenderObject, RenderObject } from "../../render-define";
+import { IEditorVNodeOptions, MuiltBlockLineRenderObject, RenderObject } from "../../render-define";
 export declare class TableElement extends BlockContainerElement<TableProps> {
     private _actualColsProps;
     constructor();
@@ -30,7 +30,6 @@ export declare class TableElement extends BlockContainerElement<TableProps> {
 }
 export declare class TableRenderObject extends MuiltBlockLineRenderObject<TableElement> {
     setRenderWidth(maxWidth: number): void;
-    render(e: IRenderData): void;
     private exportTableBorder;
     clone(): RenderObject;
     exportHTML(event: IEditorVNodeOptions): any;

package/med_editor/framework/impl/table/table-row-impl.d.ts

@@ -1,6 +1,6 @@
 import { BlockContainerElement, Element, ElementFactory, IBeginMeasureData, readElementProps, SerializeProps, ViewOptions } from "../../element-define";
 import { TableRowProps } from "../../element-props";
-import { IRenderData, MuiltBlockLineRenderObject, RenderObject } from "../../render-define";
+import { MuiltBlockLineRenderObject, RenderObject } from "../../render-define";
 export declare class TableRowElement extends BlockContainerElement<TableRowProps> {
     constructor();
     beginMeasure(data: IBeginMeasureData): void;
@@ -17,7 +17,6 @@ export declare class TableRowElement extends BlockContainerElement<TableRowProps
 export declare class TableRowRenderObject extends MuiltBlockLineRenderObject<TableRowElement> {
     remeasureState: boolean;
     hasMergeCells: boolean | undefined;
-    render(e: IRenderData): void;
     clone(): RenderObject;
 }
 export declare class TableRowFactory extends ElementFactory<TableRowProps> {

package/med_editor/framework/impl/text/text-impl.d.ts

@@ -1,5 +1,5 @@
 import { TextProps } from "../../element-props";
-import { IEditorVNodeOptions, IRenderData, LeafRenderObject, RenderObject } from "../../render-define";
+import { IEditorVNodeOptions, LeafRenderObject, RenderObject } from "../../render-define";
 import { LeafElement, ElementFactory, Element, SerializeProps, ViewOptions, ICreateRenderData } from "../../element-define";
 import { TextUnits } from "../../render-context";
 export declare class TextGroupElement extends LeafElement<TextProps> {
@@ -23,7 +23,6 @@ export declare class TextGroupElement extends LeafElement<TextProps> {
 }
 export declare class TextGroupRenderObject extends LeafRenderObject<TextGroupElement> {
     textMeasures: Array<TextUnits>;
-    render(e: IRenderData): void;
     constructor(element: TextGroupElement);
     clone(): RenderObject;
     measure(): void;

package/med_editor/framework/impl/text/track-run-impl.d.ts

@@ -1,5 +1,5 @@
 import { InlineGroupElement, SerializeProps, ViewOptions, Element, ElementFactory, readElementProps, ICreateRenderData } from "../../element-define";
-import { IEditorVNodeOptions, InlineGroupRenderObject, IRenderData, RenderObject } from "../../render-define";
+import { IEditorVNodeOptions, InlineGroupRenderObject, RenderObject } from "../../render-define";
 import { TrackRunProps } from "../../element-props";
 export declare enum TrackRunTypeEnum {
     Inserted = "ins-run",
@@ -16,7 +16,6 @@ export declare class TrackRunElement extends InlineGroupElement<TrackRunProps> {
 }
 export declare class TrackRunRenderObject extends InlineGroupRenderObject<TrackRunElement> {
     constructor(ele: TrackRunElement);
-    render(e: IRenderData): void;
     exportHTML(event: IEditorVNodeOptions): any;
     private createChangeTips;
     private getTipsDate;

package/med_editor/framework/range-util.d.ts

@@ -2,7 +2,7 @@ import { BranchElement, Element, LeafElement, SelectionContentRange } from "./el
 import { TableElement } from "./impl/table/table-impl";
 import { SelectionState } from './document-selection';
 export declare class RangeUtil {
-    static getSelctionRange(startControl: LeafElement, startOffset: number, endControl: LeafElement, endOffset: number, ancestorCommonControl: BranchElement): SelectionContentRange;
+    static getSectionRange(startControl: LeafElement, startOffset: number, endControl: LeafElement, endOffset: number, ancestorCommonControl: BranchElement): SelectionContentRange;
     static getCollapsedRange(startControl: LeafElement, startOffset: number, endOffset: number, ancestorCommonControl: BranchElement): SelectionContentRange;
     /**
      * 获取表格选区的内容

package/med_editor/framework/render-define.d.ts

@@ -16,7 +16,6 @@ export declare abstract class RenderObject<T extends Element = Element> {
     disableClick: boolean;
     constructor(element: T);
     abstract clone(): RenderObject;
-    pagePaintCompleted(e: Omit<IRenderData, 'nextRender'>): void;
     destroy(): void;
     /**
      * 获取内容区域框体
@@ -31,7 +30,6 @@ export declare abstract class RenderObject<T extends Element = Element> {
      */
     updateRenderHeight(innerRect: Rect | number): void;
     getIndex(): number;
-    abstract render(e: IRenderData): void;
     exportHTML(event: IEditorVNodeOptions): any;
 }
 export declare type ElementExportTypes = 'svg';

package/med_editor/framework/selection-overlays.d.ts

@@ -6,7 +6,8 @@ import { Element, SelectionContentRange } from "./element-define";
 export declare class SelectionOverlays {
     private selectionState;
     private selectionRange;
-    selectedSets: Map<Element, SelectionContentRange>;
+    selectionEleSets: Map<Element, SelectionContentRange>;
+    commRangeSets: Map<Element, SelectionContentRange>;
     constructor(selectionState: SelectionState);
     getSelectionTreeData(): void;
     private convertSelectRangeToSet;
@@ -15,8 +16,9 @@ export declare class SelectionOverlays {
      * 添加到批注集合
      * @param range
      * @param set
+     * @param rangeColor 用以显示批注区间的颜色
      */
-    static addToCommentSets(range: SelectionContentRange, set: Map<Element, SelectionContentRange>): void;
+    static addToCommentSets(range: SelectionContentRange, set: Map<Element, SelectionContentRange>, rangeColor: string): void;
     /**
      * 修正开始选区内容
      * 1.如果当前选区开始于表格内容，结束选区位于表格外，则需要开始选区内容重定位到单元格第一个元素

package/package.json

@@ -4,7 +4,7 @@
     "author": "hailin-zheng",
     "private": false,
     "license": "ISC",
-    "version": "2.1.18",
+    "version": "2.1.20",
     "scripts": {},
     "dependencies": {
         "moment": "^2.29.3",

package/med_editor/framework/document-images-loader.d.ts

@@ -1,20 +0,0 @@
-import { IImageLoader, ImageSourceItem } from "./document-context";
-import { ImgLoadStatus } from "./element-define";
-export declare abstract class DocumentImagesBaseLoader implements IImageLoader {
-    images: Array<ImageSourceItem>;
-    clear(): void;
-    loadImage(src: string, onCallback: (status: ImgLoadStatus) => void): void;
-    abstract createRequestImage(url: string): Promise<void>;
-    invokeImgLoad(src: string, status: ImgLoadStatus, data: any): void;
-    getLoadTasks(): Array<Promise<void>>;
-    getImage(src: string): HTMLImageElement | undefined;
-    /**
-     * 判断图片是否都已经加载完毕
-     * 用于打印时判断，如果当前图片没有加载完毕就打印，图片是打印不出来
-     * @returns
-     */
-    imagesLoadCompleted(): boolean;
-}
-export declare class DocumentImagesLoader extends DocumentImagesBaseLoader {
-    createRequestImage(url: string): Promise<void>;
-}