@hailin-zheng/editor-core 2.1.28 → 2.2.0

package/med_editor/doc-editor.d.ts

@@ -1,12 +1,12 @@
 import { ContentMenuItem } from './framework/element-event-define';
 import { ElementReader } from './framework/element-reader';
-import { SelectionState } from './framework/document-selection';
+import { SelectionState } from './framework/selection/document-selection';
 import { BranchElement, Element, ICancelTokenFn, LeafElement, MarginProps, OrientType, PageLayoutMode, Position, Rect, SerializeProps, ViewOptions } from './framework/element-define';
 import { DataElementInlineGroup, DataElementLeaf, DocumentElement, ParagraphElement, TableCellElement, TableElement, TableRowElement } from './framework/impl';
 import { CellDiagonal, ParagraphNumberType, ParagraphProps, TextProps } from './framework/element-props';
 import { EditorContext } from './framework/document-context';
-import { ElementTrackManage } from './framework/element-trace-manage';
-import { Subject } from './framework/event-subject';
+import { ElementTrackManage } from './framework/history/element-trace-manage';
+import { Subject } from './framework/infrastructure/event-subject';
 import { init, VNode } from "snabbdom";
 import { IVNodeRenderFunc } from "./editor-core";
 import { DocRule } from "./doc-rule";
@@ -35,10 +35,8 @@ export declare class DocEditor {
     contentChanged: Subject<void>;
     onPatchVNodeSubject: Subject<void>;
     selectionState: SelectionState;
-    onContextMenuItemChanged: Subject<EditorContextProps>;
     onDblClickEvent: Subject<Event>;
     onClickEvent: Subject<Event>;
-    onScrollViewEvent: Subject<number>;
     onDocChangedEvent: Subject<void>;
     onBeforeRefreshDocument: Subject<void>;
     onDocViewSizeChanged: Subject<void>;
@@ -224,7 +222,7 @@ export declare class DocEditor {
     setParaStyle(newProps: Partial<ParagraphProps>): void;
     /**
      * 设置段落样式
-     * @param newProps
+     * @param setterFunc
      */
     setParaStyleByFn(setterFunc: (paraProps: ParagraphProps) => void): void;
     combineCell(): void;
@@ -416,6 +414,11 @@ export declare class DocEditor {
      */
     private tipContainer;
     getVNode(): IVNodeRenderFunc;
+    /**
+     * 更新提示区域布局宽度，根据渲染的节点，判断是否需要设置提示区域宽度
+     * @private
+     */
+    private updateTipLayoutWidth;
     /**
      * 更新留痕提示框位置在文档渲染后
      * @private
@@ -443,6 +446,7 @@ export declare class DocEditor {
     getTextContent(): string;
     emit(event: string, args: any): void;
     createResizableElement(): VNode;
+    private readDocChangeLog;
 }
 export interface IReaderManager {
 }

package/med_editor/doc-rule.d.ts

@@ -1,4 +1,4 @@
-import { SelectionState } from "./framework/document-selection";
+import { SelectionState } from "./framework/selection/document-selection";
 import { ViewOptions } from "./framework/element-define";
 import { EditorContext } from "./framework/document-context";
 import { IVNodeRenderFunc } from "./editor-core";

package/med_editor/editor-core.d.ts

@@ -1,5 +1,5 @@
 import { EditorVNodeObject } from "./framework/render-define";
-import { SelectionState } from "./framework/document-selection";
+import { SelectionState } from "./framework/selection/document-selection";
 export declare type EditorContext = {
     onChange: () => void;
     emit: (event: string, ...args: any[]) => void;

package/med_editor/framework/{document-eval-func.d.ts → code-interpreter/document-eval-func.d.ts}

@@ -1,4 +1,4 @@
-import { EditorContext } from "./document-context";
+import { EditorContext } from "../document-context";
 export declare class DocumentEvalFunc {
     docCtx: EditorContext;
     constructor(docCtx: EditorContext);

package/med_editor/framework/{dynamic-execute.d.ts → code-interpreter/dynamic-execute.d.ts}

@@ -1,6 +1,6 @@
-import { BranchElement, Element, RefCtxValue } from "./element-define";
-import { SelectionState } from "./document-selection";
-import { DataCheckEleModel, DataInputEleModel, DataLeafEleModel, DocumentContext } from "./document-context";
+import { BranchElement, Element, RefCtxValue } from "../element-define";
+import { SelectionState } from "../selection/document-selection";
+import { DataCheckEleModel, DataInputEleModel, DataLeafEleModel, DocumentContext } from "../document-context";
 export declare class DynamicExecute {
     doc: BranchElement;
     ss: SelectionState;

package/med_editor/framework/{document-arrange.d.ts → doc-layout/document-arrange.d.ts}

@@ -1,11 +1,11 @@
-import { Element, IBeginMeasureData, ViewOptions } from "./element-define";
-import { EditorContext } from "./document-context";
-import { RenderContextType } from "./render-context";
-import { DocumentRenderObject, ParagraphElement, TableCellRenderObject, TableRenderObject, TableRowRenderObject } from "./impl";
-import { BlockContentRenderObject, BranchRenderObject } from "./render-define";
-import { DynamicExecute } from "./dynamic-execute";
+import { Element, IBeginMeasureData, ViewOptions } from "../element-define";
+import { EditorContext } from "../document-context";
+import { RenderContextType } from "../render-context";
+import { DocumentRenderObject, ParagraphElement, TableCellRenderObject, TableRenderObject, TableRowRenderObject } from "../impl";
+import { BlockContentRenderObject, BranchRenderObject } from "../render-define";
+import { DynamicExecute } from "../code-interpreter/dynamic-execute";
 import { ParagraphMeasure } from "./paragraph-arrange";
-import { SelectionEffectObject } from "./element-props";
+import { SelectionEffectObject } from "../element-props";
 export declare class DocumentArrange {
     docCtx: EditorContext;
     renderCtx: RenderContextType;
@@ -75,11 +75,6 @@ export declare class DocumentArrange {
      */
     generateCommRange(): void;
     cacheRenders(renderTree: BranchRenderObject): void;
-    /**
-     * 缓存批注标志
-     * @private
-     */
-    private cacheCommsRender;
     endMeasures(ele: Element): void;
     createDefaultPara(): ParagraphElement;
 }

package/med_editor/framework/{paragraph-arrange.d.ts → doc-layout/paragraph-arrange.d.ts}

@@ -1,8 +1,8 @@
-import { LeafRenderObject, RenderObject } from "./render-define";
-import { FillNullSpaceRenderObject, ParagraphElement, ParagraphRenderObject, TextGroupRenderObject } from "./impl";
-import { Element, InlineGroupElement, LeafElement, ViewOptions } from "./element-define";
-import { RenderContextType } from "./render-context";
-import { DynamicExecute } from "./dynamic-execute";
+import { LeafRenderObject, RenderObject } from "../render-define";
+import { FillNullSpaceRenderObject, ParagraphElement, ParagraphRenderObject, TextGroupRenderObject } from "../impl";
+import { Element, InlineGroupElement, LeafElement, ViewOptions } from "../element-define";
+import { RenderContextType } from "../render-context";
+import { DynamicExecute } from "../code-interpreter/dynamic-execute";
 export declare class ParagraphMeasure {
     options: ViewOptions;
     renderCtx: RenderContextType;

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

@@ -1,5 +1,5 @@
 import { DocumentInput, InputData } from "./document-input-cursor";
-import { SelectionState } from "./document-selection";
+import { SelectionState } from "./selection/document-selection";
 import { Element, LeafElement, SelectionContentRange } from "./element-define";
 import { ParagraphElement, TableElement, TextGroupElement, TrackRunTypeEnum } from "./impl";
 import { ParagraphNumberType, ParagraphProps, TextProps } from "./element-props";

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

@@ -1,6 +1,6 @@
-import { DocumentEvalFunc } from "./document-eval-func";
-import { SelectionState } from "./document-selection";
-import { BranchElement, Element, ElementHandler, ImgLoadStatus, Rect, RefreshType, ViewOptions } from "./element-define";
+import { DocumentEvalFunc } from "./code-interpreter/document-eval-func";
+import { SelectionState } from "./selection/document-selection";
+import { BranchElement, Element, ElementHandler, Rect, RefreshType, ViewOptions } from "./element-define";
 import { ElementEvent, EventTypes } from "./element-event-define";
 import { DataElementValueStruct } from "./element-serialize";
 import { DataElementCheck, DataElementInlineGroup, DataElementLeaf, DocumentElement, TrackRunElement, TrackRunTypeEnum } from "./impl";
@@ -18,9 +18,9 @@ export declare class EditorContext {
     dynamicFunc: DocumentEvalFunc;
     docChange: DocumentChange;
     clearPrevDocCb: (() => void) | null;
-    paintedCallback: (() => void) | null;
+    nextViewFn: (() => void) | null;
     constructor(selectionState: SelectionState, viewOptions: ViewOptions);
-    setPaintedCallback(cb: (() => void) | null): void;
+    onNextView(cb: (() => void) | null): void;
     get document(): DocumentElement;
     set document(value: DocumentElement);
     clear(): void;
@@ -47,13 +47,6 @@ export declare class EditorContext {
     replaceDataElement(oldDataElement: DataElementLeaf | DataElementInlineGroup, newElement: DataElementLeaf | DataElementInlineGroup, ss: SelectionState): void;
     get refreshType(): RefreshType | null;
 }
-export interface ImageSourceItem {
-    src: string;
-    task: Promise<void>;
-    cbs: Array<(status: ImgLoadStatus) => void>;
-    ele: HTMLImageElement;
-    loadStatus: ImgLoadStatus;
-}
 /**
  * 文档上下文
  */

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

@@ -1,13 +1,12 @@
 import { DocumentPaginator } from "./document-paginator";
-import { SelectionState } from "./document-selection";
-import { Element, ICancelTokenFn, LeafElement, Position, Rect, ViewOptions } from "./element-define";
+import { SelectionState } from "./selection/document-selection";
+import { Element, LeafElement, Position, Rect, ViewOptions } from "./element-define";
 import { ElementEvent, EventStage, EventTypes, HitEventInfo, HitRegion, ITrackTips, MouseElementEvent } from "./element-event-define";
 import { DataElementInlineGroup, DataElementLeaf, DocumentRenderObject } from "./impl";
 import { BorderType, CursorType, RenderObject } from "./render-define";
 import { EditorContext } from "./document-context";
-import { Subject, Subscription } from "./event-subject";
+import { Subject, Subscription } from "./infrastructure/event-subject";
 import { DocumentInput } from "./document-input-cursor";
-import { NodeCore } from "../../controls/Node";
 interface EdgeRenderInfo {
     renderElement: Element;
     relativePos: Position;
@@ -243,16 +242,6 @@ export declare class DocumentEvent {
      */
     getHitRegion(docEvent: MouseElementEvent): HitRegion | null;
     private onKeydown;
-    /**
-     * 开启打印区域
-     */
-    startPrintArea(editor: NodeCore): ICancelTokenFn;
-    clicks: number;
-    timeout: any;
-    /**
-     * 处理三击事件
-     */
-    handleTripleClick(): void;
     /**
      * 获取当前光标所在的数据元
      * @returns

package/med_editor/framework/document-input-cursor.d.ts

@@ -1,6 +1,6 @@
 import { LeafElement } from "./element-define";
 import { EditorContext } from "./document-context";
-import { Subject } from "./event-subject";
+import { Subject } from "./infrastructure/event-subject";
 export interface ICompositionStartInfo {
     element: LeafElement;
     offset: number;

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

@@ -1,6 +1,5 @@
-import { DocumentRenderObject } from "./impl";
+import { DocumentContainerRender, DocumentRenderObject } from "./impl";
 import { RenderContextType } from "./render-context";
-import { DocumentContainerRender } from "./impl";
 import { EditorContext } from "./document-context";
 import { SelectionEffectObject } from "./element-props";
 /**
@@ -17,7 +16,6 @@ export declare class DocumentPaginator {
     rePages(): void;
     /**
      * 文档页面显示布局
-     * @param pages
      */
     layoutPages(): void;
     /**
@@ -40,8 +38,4 @@ export declare class DocumentPaginator {
     };
     getDocPages(): Array<DocumentRenderObject>;
     getDocContainer(): DocumentContainerRender;
-    /***
-     * 设置审阅区间样式痕迹
-     */
-    private setCommRangeMark;
 }

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

@@ -1,6 +1,6 @@
-import { Position, Rect, ViewOptions } from "./element-define";
+import { Position, ViewOptions } from "./element-define";
 import { DocumentRenderObject } from "./impl";
-import { EditorVNodeObject, RenderObject } from "./render-define";
+import { EditorVNodeObject } from "./render-define";
 import { RenderContext } from "./render-context";
 import { SelectionEffectObject } from "./element-props";
 export declare class DocumentSvg {
@@ -11,8 +11,8 @@ export declare class DocumentSvg {
     mode: 'view' | 'print';
     pagePos: Position;
     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;
+    private getVNode;
+    private createSelectionRect;
     getHTMLVNode(docRenders: Array<DocumentRenderObject>): Array<EditorVNodeObject>;
     /**
      * 判断当前元素是否在视窗内
@@ -25,8 +25,12 @@ export declare class DocumentSvg {
     getCounter(key: string): number;
     changeTips: Array<EditorVNodeObject>;
     addChangeTips(tipVNode: EditorVNodeObject): void;
+    /**
+     * 合并段落行选区
+     * @param parentMaskRect
+     * @param currMaskRect
+     * @param currPos
+     * @private
+     */
+    private combineParaLineSelection;
 }
-interface SelectionMaskRect extends Rect {
-    color?: string;
-}
-export {};

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

@@ -1,7 +1,7 @@
 import { ElementEvent, EventTypes } from "./element-event-define";
 import { RenderContextType } from "./render-context";
 import { CursorType, LeafRenderObject, RenderObject } from "./render-define";
-import { Subject, Subscription } from "./event-subject";
+import { Subject, Subscription } from "./infrastructure/event-subject";
 export declare class Rect {
     x: number;
     y: number;
@@ -135,8 +135,8 @@ export declare abstract class BranchElement<P extends object = any> extends Elem
     getChildIndex(child: Element): number;
     getChildLength(): number;
     getSelfLength(pure: boolean): number;
-    treeFilter(predicate: (item: Element, index: number) => boolean): Array<Element>;
-    treeFind(predicate: (item: Element, index: number) => boolean): Element | null;
+    treeFilter(predicate: (item: Element) => boolean): Array<Element>;
+    treeFind(predicate: (item: Element) => boolean): Element | null;
     pubOnChange(selfChange: pubChangeType): void;
 }
 export declare function clearChildrenRenderCache(ele: BranchElement): void;
@@ -300,13 +300,7 @@ export declare class ViewOptions {
     pageLayoutMode: PageLayoutMode;
     defaultIndent: number;
     get contentWidth(): number;
-    /**
-     * 内容区域的高度
-     * 同时限定canvas的最小宽度
-     */
-    get ContentWidth(): number;
     docSpace: number;
-    showReviewWindow: boolean;
     reviewWindowWidth: number;
     private _scale;
     get scale(): number;

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

@@ -1,7 +1,7 @@
 import { Element, LeafElement, Rect } from "./element-define";
 import { LeafRenderObject, RenderObject } from "./render-define";
 import { EditorContext } from "./document-context";
-import { TrackRunTypeEnum } from "./impl/text/track-run-impl";
+import { type TrackRunTypeEnum } from "./impl";
 export declare type EventStage = 'All' | 'Capture' | 'Bubbling';
 export declare type EventTypes = 'ElementMousedown' | 'ElementMousemove' | 'ElementClick' | 'ElementDblClick' | 'ElementMouseEnter' | 'ElementMouseLeave' | 'BackspaceKey' | 'DeleteKey' | 'ElementShown' | 'ElementContextMenu' | 'GotCursor' | 'LostCursor' | 'ElementKeyDown' | 'ElementDrop' | 'ElementTabKey' | 'GetTrackTips' | 'ElementInput' | 'ElementCopy' | 'ElementPaste';
 export declare type HitRegion = 'header' | 'body' | 'footer' | 'review';
@@ -41,7 +41,7 @@ export declare class ElementEvent {
     shift: boolean;
     ctrl: boolean;
     buttons: number;
-    get selectionState(): import("./document-selection").SelectionState;
+    get selectionState(): import("./selection/document-selection").SelectionState;
 }
 export interface MenuListener {
     [listener: string]: <T extends Event>(evt: T) => void;

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

@@ -1,5 +1,5 @@
 import { Element, NullableType, OrientType, PaddingProps, SelectionContentRange, TextAlign, ViewOptions } from "./element-define";
-import { TrackRunTypeEnum } from "./impl/text/track-run-impl";
+import { type TrackRunTypeEnum } from "./impl";
 export declare type TextVertAlign = 'superscript' | 'subscript';
 export declare abstract class INotifyPropertyChanged {
     abstract getSerializeProps(viewOptions: ViewOptions): any;

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

@@ -1,4 +1,4 @@
-import { SelectionState } from "./document-selection";
+import { SelectionState } from "./selection/document-selection";
 import { BranchElement, Element, SerializeProps, ViewOptions } from "./element-define";
 export declare class ElementSerialize {
     /**

package/med_editor/framework/{element-trace-manage.d.ts → history/element-trace-manage.d.ts}

@@ -1,5 +1,5 @@
-import { EditorContext } from './document-context';
-import { Element } from './element-define';
+import { EditorContext } from '../document-context';
+import { Element } from '../element-define';
 import { DeleteEleOpsDelta, DeleteTextOpsDelta, FormatOpsDelta, InsertOpsDelta, InsertTextOpsDelta, opsTrackModel } from './element-trace-tracking';
 declare type HistoryCommand = 'undo' | 'redo';
 declare type HistoryChanges = {
@@ -95,6 +95,7 @@ export declare class ElementTrackManage {
      */
     updateProps(currProps: object, newProps: object): void;
     getControl<T extends Element>(index: number, pure?: boolean): T;
+    getControlIndex(control: Element): number;
 }
 interface SelectionLog {
     startIndex: number;

package/med_editor/framework/{element-trace-tracking.d.ts → history/element-trace-tracking.d.ts}

@@ -1,4 +1,4 @@
-import { Element } from "./element-define";
+import { Element } from "../element-define";
 /**
  * 插入元素
  */
@@ -81,7 +81,7 @@ export declare function formatEle(ele: Element, props: object): void;
  * @param newValue
  */
 export declare function logUpdateEleProps(ele: Element, p: string | symbol | number, oldValue: any, newValue: any): void;
-export declare function generatePatch(doc: Element): Array<opsTrackModel>;
+export declare function generatePatch(doc: Element, clear?: boolean): Array<opsTrackModel>;
 /**
  * 清除变更的数据
  */

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

@@ -4,7 +4,7 @@ import { DocumentBodyElement } from "./doc-body-impl";
 import { DocumentHeaderElement } from "./doc-header-impl";
 import { BlockContainerRenderObject, IEditorVNodeOptions, RenderObject } from "../../render-define";
 import { DocumentFooterElement } from "./doc-footer-impl";
-import { SelectionState } from "../../document-selection";
+import { SelectionState } from "../../selection/document-selection";
 import { CommentElement } from "../comments/comment-element-impl";
 export declare class DocumentElement extends BlockContainerElement<DocumentProps> {
     viewOptions: ViewOptions;
@@ -59,16 +59,6 @@ export declare class DocumentRenderObject extends BlockContainerRenderObject {
      * 绘制版权信息
      */
     private drawCopyRight;
-    /**
-     * 绘制文档边距线
-     */
-    private drawMarginLine;
-    /**
-     * 绘制水印
-     * @param ctx
-     * @param position
-     */
-    private drawWatermark;
     clone(): RenderObject;
     private exportPageNumHTML;
     exportSVG(event: IEditorVNodeOptions): any;

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

@@ -1,6 +1,5 @@
 export * from './checkbox/checkbox-impl';
 export * from './comments/comment-content-impl';
-export * from './comments/comments-util';
 export * from './comments/comment-element-impl';
 export * from './comments/comments-container-impl';
 export * from './comments/validate-msg-impl';

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

@@ -1,4 +1,4 @@
-import { SelectionState } from "../../document-selection";
+import { SelectionState } from "../../selection/document-selection";
 /**
  * 拆分单元格
  * 蜀道难，难于上青天；拆分单元格，头发秃，精神衰，眼睛昏，身体废。

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

@@ -1,4 +1,4 @@
-import { SelectionState } from "../../document-selection";
+import { SelectionState } from "../../selection/document-selection";
 import { Element } from "../../element-define";
 import { TableCellElement } from "./table-cell-impl";
 import { TableElement } from "./table-impl";

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

@@ -1,4 +1,4 @@
-import { InlineGroupElement, SerializeProps, ViewOptions, Element, ElementFactory, readElementProps, ICreateRenderData } from "../../element-define";
+import { Element, ElementFactory, ICreateRenderData, InlineGroupElement, readElementProps, SerializeProps, ViewOptions } from "../../element-define";
 import { IEditorVNodeOptions, InlineGroupRenderObject, RenderObject } from "../../render-define";
 import { TrackRunProps } from "../../element-props";
 export declare enum TrackRunTypeEnum {
@@ -17,7 +17,7 @@ export declare class TrackRunElement extends InlineGroupElement<TrackRunProps> {
 export declare class TrackRunRenderObject extends InlineGroupRenderObject<TrackRunElement> {
     constructor(ele: TrackRunElement);
     exportSVG(event: IEditorVNodeOptions): any;
-    private createChangeTips;
+    private createModifyTips;
     clone(): RenderObject;
 }
 export declare class RunElementFactory extends ElementFactory<TrackRunProps> {

package/med_editor/framework/{document-print-offscreen.d.ts → print/document-print-offscreen.d.ts}

@@ -1,11 +1,11 @@
-import { EditorContext } from "./document-context";
-import { DocumentPaginator } from "./document-paginator";
-import { ViewOptions } from "./element-define";
-import { ElementReader } from "./element-reader";
-import { DocumentElement, DocumentRenderObject } from "./impl/document/doc-impl";
-import { IRenderContextContract, RenderContext } from "./render-context";
-import { Subject } from "./event-subject";
-import { EditorVNodeObject } from "./render-define";
+import { EditorContext } from "../document-context";
+import { DocumentPaginator } from "../document-paginator";
+import { ViewOptions } from "../element-define";
+import { ElementReader } from "../element-reader";
+import { DocumentElement, DocumentRenderObject } from "../impl/document/doc-impl";
+import { IRenderContextContract, RenderContext } from "../render-context";
+import { Subject } from "../infrastructure/event-subject";
+import { EditorVNodeObject } from "../render-define";
 interface IAfterRenderEvent {
     index: number;
     renderCtx: IRenderContextContract;

package/med_editor/framework/{document-print.d.ts → print/document-print.d.ts}

@@ -1,4 +1,4 @@
-import { OrientType } from "./element-define";
+import { OrientType } from "../element-define";
 export declare function createPrintTemplate({ width, height, orient }: PrintPaperOptions): string;
 declare type PrintPaperOptions = {
     width: number;

package/med_editor/framework/{document-selection.d.ts → selection/document-selection.d.ts}

@@ -1,8 +1,8 @@
-import { BranchElement, Element, LeafElement, Rect, SelectionContentRange } from "./element-define";
-import { HitEventInfo, HitRegion } from "./element-event-define";
-import { DocumentContainerRender } from "./impl/document/doc-container-impl";
-import { RenderObject } from "./render-define";
-import { Subject } from "./event-subject";
+import { BranchElement, Element, LeafElement, Rect, SelectionContentRange } from "../element-define";
+import { HitEventInfo, HitRegion } from "../element-event-define";
+import { DocumentContainerRender } from "../impl/document/doc-container-impl";
+import { RenderObject } from "../render-define";
+import { Subject } from "../infrastructure/event-subject";
 export declare class DocumentSelection {
     constructor();
     selectionState: SelectionState;

package/med_editor/framework/{range-util.d.ts → selection/range-util.d.ts}

@@ -1,5 +1,5 @@
-import { BranchElement, Element, LeafElement, SelectionContentRange } from "./element-define";
-import { TableElement } from "./impl/table/table-impl";
+import { BranchElement, Element, LeafElement, SelectionContentRange } from "../element-define";
+import { TableElement } from "../impl/table/table-impl";
 export declare class RangeUtil {
     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 → selection/selection-overlays.d.ts}

@@ -1,5 +1,5 @@
 import { SelectionState } from "./document-selection";
-import { Element, SelectionContentRange } from "./element-define";
+import { Element, SelectionContentRange } from "../element-define";
 /**
  * 用于处理选区拖蓝
  */

package/med_editor/framework/util/adjust-viewport-elements.d.ts

@@ -0,0 +1,12 @@
+interface Viewport {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    scale: number;
+}
+/**
+ * 调整页面提示框位置，使其在视窗内的位置合理
+ */
+export declare function adjustViewportElements(tipContainer: any, viewPort: Viewport): void;
+export {};

package/med_editor/framework/{common-util.d.ts → util/common-util.d.ts}

@@ -1,5 +1,5 @@
-import { Rect } from "./element-define";
-import { BorderType } from "./render-define";
+import { Rect } from "../element-define";
+import { BorderType } from "../render-define";
 interface Position {
     x: number;
     y: number;

package/med_editor/framework/{document-segmenter.d.ts → util/document-segmenter.d.ts}

@@ -1,2 +1,2 @@
-import { SelectionState } from "./document-selection";
+import { SelectionState } from "../selection/document-selection";
 export declare function getFocusTextSegment(selection: SelectionState): boolean;

package/med_editor/framework/{element-util.d.ts → util/element-util.d.ts}

@@ -1,15 +1,15 @@
-import { EditorContext } from "./document-context";
-import { BranchElement, Element, LeafElement, Position, Rect, SelectionContentRange, ViewOptions } from "./element-define";
-import { HitRegion } from "./element-event-define";
-import { DataEleBaseProps, TextProps } from "./element-props";
-import { DataElementInlineGroup } from "./impl/data-element/data-element-base-impl";
-import { ParagraphElement, ParagraphLineRectRenderObject } from "./impl/paragraph/p-impl";
-import { TableCellRenderObject } from "./impl/table/table-cell-impl";
-import { TableElement, TableRenderObject } from "./impl/table/table-impl";
-import { TableRowRenderObject } from "./impl/table/table-row-impl";
-import { TextGroupElement, TextGroupRenderObject } from "./impl/text/text-impl";
-import { TrackRunElement, TrackRunTypeEnum } from "./impl/text/track-run-impl";
-import { BlockContainerRenderObject, BlockContentRenderObject, BorderType, BranchRenderObject, CursorType, InlineGroupRenderObject, LeafRenderObject, RenderObject } from "./render-define";
+import { EditorContext } from "../document-context";
+import { BranchElement, Element, LeafElement, Position, Rect, SelectionContentRange, ViewOptions } from "../element-define";
+import { HitRegion } from "../element-event-define";
+import { DataEleBaseProps, TextProps } from "../element-props";
+import { DataElementInlineGroup } from "../impl/data-element/data-element-base-impl";
+import { ParagraphElement, ParagraphLineRectRenderObject } from "../impl/paragraph/p-impl";
+import { TableCellRenderObject } from "../impl/table/table-cell-impl";
+import { TableElement, TableRenderObject } from "../impl/table/table-impl";
+import { TableRowRenderObject } from "../impl/table/table-row-impl";
+import { TextGroupElement, TextGroupRenderObject } from "../impl/text/text-impl";
+import { TrackRunElement, TrackRunTypeEnum } from "../impl/text/track-run-impl";
+import { BlockContainerRenderObject, BlockContentRenderObject, BorderType, BranchRenderObject, CursorType, InlineGroupRenderObject, LeafRenderObject, RenderObject } from "../render-define";
 declare type PAIR = {
     x: number;
     y: number;
@@ -405,5 +405,6 @@ export declare class ElementUtil {
     static setEleAttribute(ele: Element, attr: string, value: any): void;
     static getEleAttribute(ele: Element, attr: string): any;
     static removeEleAttribute(ele: Element, attr: string): void;
+    static getMatchItems(item: Element, predicate: (item: Element) => boolean): Element<any>[];
 }
 export {};

package/med_editor/framework/{editor-calendar-vnode.d.ts → vnode/editor-calendar-vnode.d.ts}

@@ -1,7 +1,7 @@
-import { EditorVNodeObject } from "./render-define";
-import { Subject } from "./event-subject";
-import { ISignal } from "../editor-core";
-import { Rect, ViewOptions } from "./element-define";
+import { EditorVNodeObject } from "../render-define";
+import { Subject } from "../infrastructure/event-subject";
+import { ISignal } from "../../editor-core";
+import { Rect, ViewOptions } from "../element-define";
 /**
  * 渲染日历虚拟节点处理类
  */

package/package.json

@@ -4,7 +4,7 @@
     "author": "hailin-zheng",
     "private": false,
     "license": "ISC",
-    "version": "2.1.28",
+    "version": "2.2.0",
     "scripts": {},
     "dependencies": {
         "moment": "^2.29.3",
@@ -16,4 +16,4 @@
         "snabbdom-to-html": "^7.1.0",
         "jsbarcode": "^3.11.5"
     }
-}
+}

package/controls/ButtonBase.d.ts

@@ -1,10 +0,0 @@
-import { IMeasureEvent, IRenderData, Size } from "./Node";
-import { TextBase } from "./TextBase";
-export declare class ButtonBase extends TextBase {
-    constructor();
-    render(e: IRenderData): void;
-}
-export declare class Button extends ButtonBase {
-    measureOverride(e: IMeasureEvent, availableSize: Size): Size;
-    render(e: IRenderData): void;
-}

package/controls/Canvas.d.ts

@@ -1,7 +0,0 @@
-import { AbsolutePanel, IRenderData } from "./Node";
-/**
- * 采用绝对布局系统的容器
- */
-export declare class Canvas extends AbsolutePanel {
-    render(e: IRenderData): void;
-}