@hailin-zheng/editor-core 2.1.18 → 2.1.19

package/med_editor/doc-editor.d.ts

@@ -44,6 +44,7 @@ export declare class DocEditor {
     onDestroy: Subject<void>;
     beforeNodePatch: Subject<void>;
     afterNodePatch: Subject<void>;
+    private eventBus;
     private editInput;
     private scrollContainer;
     constructor(svgContainer: HTMLElement);
@@ -434,6 +435,7 @@ export declare class DocEditor {
     version(): string;
     switchPageHeaderEditor(): void;
     getTextContent(): string;
+    emit(event: string, args: any): void;
 }
 export interface IReaderManager {
 }

package/med_editor/editor-core.d.ts

@@ -1,9 +1,13 @@
 import { EditorVNodeObject } from "./framework/render-define";
+import { SelectionState } from "./framework/document-selection";
 export declare type EditorContext = {
     onChange: () => void;
+    emit: (event: string, ...args: any[]) => void;
+    selectionState: SelectionState;
 };
 export declare let activeEditorContext: EditorContext | null;
 export declare function setActiveEditorContext(ctx: EditorContext | null): void;
+export declare function getActiveEditorContext(): EditorContext | null;
 export declare type IVNodeRenderFunc = {
     render: () => EditorVNodeObject | null;
 };

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

@@ -37,6 +37,7 @@ export declare class CommonUtil {
     static resharpPoints(points: Array<Position>): Array<Position>;
     static getOffsetX(node: HTMLElement): number;
     static randomColor(): string;
+    static randomRgbColor(opacity?: number): string;
     /**
      * 判断一个数值是否在另一个数值的增益区间中
      * @param val

package/med_editor/framework/document-arrange.d.ts

@@ -1,13 +1,15 @@
 import { Element, IBeginMeasureData, ViewOptions } from "./element-define";
 import { EditorContext } from "./document-context";
 import { RenderContextType } from "./render-context";
-import { CommsContainerRenderObject, DocumentRenderObject, ParagraphElement, TableCellRenderObject, TableRenderObject, TableRowRenderObject } from "./impl";
+import { DocumentRenderObject, ParagraphElement, TableCellRenderObject, TableRenderObject, TableRowRenderObject } from "./impl";
 import { BlockContentRenderObject, BranchRenderObject } from "./render-define";
+import { SelectionEffectObject } from "./element-props";
 export declare class DocumentArrange {
     docCtx: EditorContext;
     renderCtx: RenderContextType;
+    seo: SelectionEffectObject;
     options: ViewOptions;
-    constructor(docCtx: EditorContext, renderCtx: RenderContextType);
+    constructor(docCtx: EditorContext, renderCtx: RenderContextType, seo: SelectionEffectObject);
     /**
      * 测量排版过程
      * 1.先测量排版页眉、页脚
@@ -18,7 +20,6 @@ export declare class DocumentArrange {
      * 3.2完成页体子内容测量，并分页切分
      */
     measureDoc(): Array<DocumentRenderObject>;
-    commentsRender: CommsContainerRenderObject;
     private arrangeDoc;
     private createEmptyBodyRender;
     private measureControl;
@@ -36,7 +37,6 @@ export declare class DocumentArrange {
      * 切割渲染元素
      * @param tbRender 被切割的对象
      * @param limitHeight
-     * @param addFunc
      * @returns
      */
     cutTable(tbRender: TableRenderObject, limitHeight: number): BlockContentRenderObject | null;
@@ -66,6 +66,11 @@ export declare class DocumentArrange {
     identifyComment(ele: Element): void;
     private cacheDoc;
     cacheDocRenders(docs: Array<DocumentRenderObject>): void;
+    /**
+     * 生成批注区间信息
+     * @param renderTree
+     */
+    generateCommRange(): void;
     cacheRenders(renderTree: BranchRenderObject): void;
     /**
      * 缓存批注标志

package/med_editor/framework/document-context.d.ts

@@ -15,7 +15,6 @@ export declare class EditorContext {
     cursorRect: Rect | null;
     private _document;
     syncRefresh: () => void;
-    imageLoader: IImageLoader;
     dynamicFunc: DocumentEvalFunc;
     docChange: DocumentChange;
     clearPrevDocCb: (() => void) | null;
@@ -55,13 +54,6 @@ export interface ImageSourceItem {
     ele: HTMLImageElement;
     loadStatus: ImgLoadStatus;
 }
-export interface IImageLoader {
-    clear(): void;
-    loadImage(src: string, onCallback: (status: ImgLoadStatus) => void): void;
-    getImage(src: string): HTMLImageElement | undefined;
-    imagesLoadCompleted(): boolean;
-    getLoadTasks(): Array<Promise<void>>;
-}
 /**
  * 文档上下文
  */

package/med_editor/framework/document-paint.d.ts

@@ -1,22 +1,22 @@
 import { ElementPaint } from "./element-paint";
 import { DocumentRenderObject } from "./impl";
 import { RenderContextType } from "./render-context";
-import { Element, SelectionContentRange } from "./element-define";
 import { DocumentContainerRender } from "./impl";
 import { EditorContext } from "./document-context";
 import { ElementMeasure } from "./element-measure";
 import { ElementRenderCut } from "./element-render-cut";
+import { SelectionEffectObject } from "./element-props";
 export declare class DocumentPaint {
     private renderContext;
     private docCtx;
-    private selectedSets;
+    private seo;
     elementMeasure: ElementMeasure;
     elementRenderCut: ElementRenderCut;
     elementPaint: ElementPaint;
     docPages: Array<DocumentRenderObject>;
     docContainer: DocumentContainerRender;
     private viewOptions;
-    constructor(renderContext: RenderContextType, docCtx: EditorContext, selectedSets: Map<Element, SelectionContentRange>);
+    constructor(renderContext: RenderContextType, docCtx: EditorContext, seo: SelectionEffectObject);
     rePages(): void;
     /**
      * 文档页面显示布局

package/med_editor/framework/document-print-offscreen.d.ts

@@ -26,21 +26,21 @@ export declare abstract class DocumentPrintOffscreenBase {
     beforePrint: Subject<void>;
     afterPrint: Subject<void>;
     constructor();
-    print(data: any | DocumentElement, ranges?: Array<number> | null): Promise<void>;
+    print(data: any | DocumentElement, ranges?: Array<number> | null): void;
     /**
      * 续打
      */
     printForContinuation(data: any | DocumentElement, options: {
         startY: number;
         startDocIndex: number;
-    }): Promise<void>;
-    getPrintNodes(data: any | DocumentElement, ranges?: Array<number> | null): Promise<Array<string>>;
+    }): void;
+    getPrintNodes(data: any | DocumentElement, ranges?: Array<number> | null): Array<string>;
     Encode64(str: any): string;
     /**
      * 读取数据，排版
      * @param data
      */
-    private prepare;
+    prepare(data: any | DocumentElement): void;
     getSvgNodes(docRenders: Array<DocumentRenderObject>, printRanges?: Array<number> | null): Array<string>;
     abstract createCanvas(width: number, height: number): {
         canvas: HTMLCanvasElement;

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

@@ -1,16 +1,18 @@
-import { Element, Position, Rect, SelectionContentRange, ViewOptions } from "./element-define";
+import { Position, Rect, ViewOptions } from "./element-define";
 import { DocumentRenderObject } from "./impl";
 import { EditorVNodeObject, RenderObject } from "./render-define";
 import { RenderContext } from "./render-context";
+import { SelectionEffectObject } from "./element-props";
 export declare class DocumentSvg {
     viewOptions: ViewOptions;
-    selectedSets: Map<Element, SelectionContentRange>;
+    sso: SelectionEffectObject;
     renderCtx: RenderContext;
     highlights: Array<EditorVNodeObject>;
     mode: 'view' | 'print';
     pagePos: Position;
-    constructor(viewOptions: ViewOptions, selectedSets: Map<Element, SelectionContentRange>, renderCtx: RenderContext);
-    getVNode(render: RenderObject, selectionRects: Array<Rect>, parentPos: Position): EditorVNodeObject | Array<EditorVNodeObject> | null | string;
+    constructor(viewOptions: ViewOptions, sso: SelectionEffectObject, renderCtx: RenderContext);
+    getVNode(render: RenderObject, selectionRects: Array<SelectionMaskRect>, parentPos: Position): EditorVNodeObject | Array<EditorVNodeObject> | null | string;
+    createSelectionRect(render: RenderObject, selectionRects: Array<SelectionMaskRect>, currPos: Rect): void;
     getHTMLVNode(docRenders: Array<DocumentRenderObject>): Array<EditorVNodeObject>;
     /**
      * 判断当前元素是否在视窗内
@@ -24,3 +26,7 @@ export declare class DocumentSvg {
     changeTips: Array<EditorVNodeObject>;
     addChangeTips(tipVNode: EditorVNodeObject): void;
 }
+interface SelectionMaskRect extends Rect {
+    color?: string;
+}
+export {};

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

@@ -300,9 +300,7 @@ export declare class ViewOptions {
      */
     get ContentWidth(): number;
     docSpace: number;
-    private _showReviewWindow;
-    get showReviewWindow(): boolean;
-    set showReviewWindow(value: boolean);
+    showReviewWindow: boolean;
     reviewWindowWidth: number;
     private _scale;
     get scale(): number;

package/med_editor/framework/element-props.d.ts

@@ -1,4 +1,4 @@
-import { NullableType, OrientType, PaddingProps, TextAlign, ViewOptions } from "./element-define";
+import { Element, NullableType, OrientType, PaddingProps, SelectionContentRange, TextAlign, ViewOptions } from "./element-define";
 import { TrackRunTypeEnum } from "./impl/text/track-run-impl";
 export declare type TextVertAlign = 'superscript' | 'subscript';
 export declare abstract class INotifyPropertyChanged {
@@ -208,18 +208,28 @@ export declare class CommContentProps extends INotifyPropertyChanged {
     createId: string;
     createName: string;
     createDate: Date;
+    text: string;
     clone(dest: CommContentProps): CommContentProps;
     getSerializeProps(viewOptions: ViewOptions): {
         id: string;
+        text: string;
     };
 }
 export declare class CommProps extends INotifyPropertyChanged {
     id: string;
     markType: "start" | "end";
+    text: string;
+    userId: string;
+    userName: string;
+    date: string;
     clone(dest: CommProps): CommProps;
     getSerializeProps(viewOptions: ViewOptions): {
         id: string;
         markType: "start" | "end";
+        text: string;
+        userId: string;
+        userName: string;
+        date: string;
     };
 }
 export declare const trueChar = "\u2713";
@@ -323,4 +333,8 @@ export declare class BodyPartProps extends INotifyPropertyChanged {
     partId: string;
     getSerializeProps(viewOptions: ViewOptions): any;
 }
+export interface SelectionEffectObject {
+    selectionEleSets: Map<Element, SelectionContentRange>;
+    commRangeSets: Map<Element, SelectionContentRange>;
+}
 export {};

package/med_editor/framework/element-reader.d.ts

@@ -9,6 +9,11 @@ export declare class ElementReader {
     private initFactory;
     read(data: any | DocumentElement): void;
     setDocument(document: DocumentElement): void;
-    readElement(data: any): Element;
+    readElement(data: any, strictMode?: boolean): Element | null;
+    /**
+     * 读取扩展属性
+     * @param data
+     * @param element
+     */
     readExtendsProps(data: any, element: Element): void;
 }

package/med_editor/framework/event-subject.d.ts

@@ -1,3 +1,4 @@
+declare type EventHandler<T = void> = (data: T) => void;
 /**
  * 订阅者
  */
@@ -45,3 +46,11 @@ export declare class SubjectSubscription extends Subscription {
     unsubscribe(): void;
 }
 export declare function fromEvent<T extends Event>(dom: Node, type: string): DOMEventSource<T>;
+export declare class EventBus {
+    private subs;
+    on(event: string, handler: EventHandler): void;
+    off(event: string): void;
+    emit(event: string, data: any): void;
+    clear(): void;
+}
+export {};

package/med_editor/framework/impl/comments/comment-element-impl.d.ts

@@ -2,6 +2,7 @@ import { Element, ElementFactory, LeafElement, readElementProps, SerializeProps,
 import { CommProps } from "../../element-props";
 import { IEditorVNodeOptions, IRenderData, LeafRenderObject, RenderObject } from "../../render-define";
 export declare class CommentElement extends LeafElement<CommProps> {
+    color: string;
     constructor();
     createRenderObject(): RenderObject;
     serialize(viewOptions: ViewOptions): SerializeProps | null;
@@ -11,6 +12,12 @@ export declare class CommentRenderObject extends LeafRenderObject<CommentElement
     render(e: IRenderData): void;
     exportHTML(event: IEditorVNodeOptions): any;
     clone(): RenderObject;
+    private createCommentTips;
+    /**
+     * 显示批注范围
+     * @private
+     */
+    private showCommentRange;
 }
 export declare class CommentFactory extends ElementFactory<CommProps> {
     match(type: string): boolean;

package/med_editor/framework/impl/comments/comments-container-impl.d.ts

@@ -1,32 +1,12 @@
 import { BlockContainerElement, Element, ElementFactory, ICreateRenderData, SelectionContentRange, SerializeProps, ViewOptions } from "../../element-define";
 import { BlockContainerRenderObject, IEditorVNodeOptions, IRenderData, RenderObject } from "../../render-define";
-import { CommContentElement, CommentRangeStatus } from "./comment-content-impl";
-import { CommentElement, CommentRenderObject } from "./comment-element-impl";
+import { CommentRangeStatus } from "./comment-content-impl";
+import { CommentRenderObject } from "./comment-element-impl";
 export declare class CommsContainerElement extends BlockContainerElement {
     constructor();
     createRenderObject(data: ICreateRenderData): RenderObject;
     serialize(viewOptions: ViewOptions): SerializeProps;
     clone(data: boolean): Element;
-    markPairs: Array<{
-        id: string;
-        start?: CommentElement;
-        end?: CommentElement;
-    }>;
-    /**
-     * 清除所有的批注标识组合
-     */
-    clearMarkItems(): void;
-    identifyCommMark(markElement: CommentElement): void;
-    /**
-     * 根据id，移除批注标记以及批注内容
-     * @param id
-     */
-    removeCommMark(id: string): void;
-    /**
-     * 清除所有批注
-     */
-    clearAllComms(): void;
-    getCommContent(id: string): CommContentElement | null;
 }
 export declare class CommsContainerRenderObject extends BlockContainerRenderObject {
     isMeasureComm: boolean;

package/med_editor/framework/impl/data-element/data-element-image-impl.d.ts

@@ -2,7 +2,6 @@ import { Element, ElementFactory, ImgLoadStatus, readElementProps, ResizeLeafRen
 import { DataEleImageProps } from "../../element-props";
 import { IEditorVNodeOptions, IRenderData, LeafRenderObject, RenderObject } from "../../render-define";
 import { DataElementLeaf } from "./data-element-base-impl";
-import { EditorContext } from "../../document-context";
 export declare class DataElementImage extends DataElementLeaf<DataEleImageProps> {
     status: ImgLoadStatus;
     resizeable: boolean;
@@ -10,7 +9,6 @@ export declare class DataElementImage extends DataElementLeaf<DataEleImageProps>
     createRenderObject(): LeafRenderObject;
     serialize(options: ViewOptions): SerializeProps;
     clone(data: boolean): Element;
-    loadImage(ctx: EditorContext): void;
     destroy(): void;
     setValue(val: any): void;
     getValue(): string;

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

@@ -5,14 +5,13 @@ import { DocumentBodyElement } from "./doc-body-impl";
 import { DocumentHeaderElement } from "./doc-header-impl";
 import { BlockContainerRenderObject, IEditorVNodeOptions, IRenderData, 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,6 +26,25 @@ 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);

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";
 interface IResizeElement {
     resizeable: boolean;
 }
@@ -12,7 +11,6 @@ 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 {

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/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.19",
     "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>;
-}