@hailin-zheng/editor-core 1.0.32 → 1.0.35

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

@@ -1,6 +1,6 @@
-import { InlineGroupElement, Position, SerializeProps, ViewOptions, Element, ElementFactory, readElementProps } from "../../element-define";
-import { RenderContenxtType } from "../../render-context";
-import { InlineGroupRenderObject, RenderObject } from "../../render-define";
+import { InlineGroupElement, SerializeProps, ViewOptions, Element, ElementFactory, readElementProps } from "../../element-define";
+import { RenderContextType } from "../../render-context";
+import { InlineGroupRenderObject, IRenderData, RenderObject } from "../../render-define";
 import { TrackRunProps } from "../../element-props";
 export declare enum TrackRunTypeEnum {
     Inserted = "ins-run",
@@ -10,18 +10,17 @@ declare type NullableType<T> = T | null;
 export declare class TrackRunElement extends InlineGroupElement<TrackRunProps> {
     constructor(trackType: TrackRunTypeEnum);
     clone(data: boolean): Element;
-    createRenderObject(options: ViewOptions, renderCtx: RenderContenxtType): NullableType<RenderObject>;
+    createRenderObject(options: ViewOptions, renderCtx: RenderContextType): NullableType<RenderObject>;
     serialize(viewOptions: ViewOptions): SerializeProps | null;
     split(index: number): TrackRunElement | null;
 }
 export declare class TrackRunRenderObject extends InlineGroupRenderObject<TrackRunElement> {
     constructor(ele: TrackRunElement);
-    beginRender(ctx: RenderContenxtType, position: Position): void;
+    render(e: IRenderData): void;
     clone(): RenderObject;
-    endRender(ctx: RenderContenxtType, position: Position): void;
 }
 export declare class RunElementFactory extends ElementFactory<TrackRunProps> {
-    createElement(data: readElementProps<TrackRunProps>, renderCtx: RenderContenxtType): TrackRunElement;
+    createElement(data: readElementProps<TrackRunProps>, renderCtx: RenderContextType): TrackRunElement;
     match(type: string): boolean;
 }
 export {};

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

@@ -1,5 +1,4 @@
-import { EditorContext } from "./document-context";
-import { Position, ViewOptions } from "./element-define";
+import { Position } from "./element-define";
 import { TextProps } from "./element-props";
 import { TextGroupElement, TextGroupRenderObject } from "./impl/text/text-impl";
 export interface TextUnits {
@@ -7,43 +6,43 @@ export interface TextUnits {
     actualSize: number;
     char: string;
 }
-export declare type RenderContenxtType = {
+export interface IRenderContextContract {
     contentContext: PaintContent;
     overlaysContext: PaintContent;
+    mainContext: PaintContent;
     drawMode: 'view' | 'print';
     clear(): void;
-    viewOptions: ViewOptions;
-    docCtx: EditorContext;
-    commit(pageSetting: {
-        width: number;
-        height: number;
-    } | null): void;
+    commit(pageSetting: ISetCanvasPageProps): void;
+    init(pageSetting: ISetCanvasPageProps): void;
+    tran(effect: () => void): void;
+    update(pageSetting: ISetCanvasPageProps): void;
+}
+export declare type RenderContextType = IRenderContextContract;
+export declare type ISetCanvasPageProps = {
+    width: number;
+    height: number;
+    scale: number;
 };
-export declare class RenderContenxt {
-    mainCtx: CanvasRenderingContext2D;
-    viewOptions: ViewOptions;
-    docCtx: EditorContext;
+export declare class RenderContext implements IRenderContextContract {
+    readonly mainContext: PaintContent;
     contentContext: PaintContent;
     overlaysContext: PaintContent;
     drawMode: 'view' | 'print';
     private contentOffCanvas;
     private overlayOffCanvas;
-    constructor(mainCtx: CanvasRenderingContext2D, viewOptions: ViewOptions, docCtx: EditorContext);
-    private createNativeCanvas;
-    setCanvasProps(pageSetting?: {
-        width: number;
-        height: number;
-    } | null): void;
+    constructor(mainContext: PaintContent);
+    init(pageSetting: ISetCanvasPageProps): void;
+    /**
+     * 更新绘制画布大小
+     */
+    update(pageSetting: ISetCanvasPageProps): void;
     clear(): void;
-    commit(pageSetting?: {
-        width: number;
-        height: number;
-    } | null): void;
+    commit(pageSetting: ISetCanvasPageProps): void;
+    tran(effect: () => void): void;
 }
 export declare class PaintContent {
     ctx: CanvasRenderingContext2D;
-    private viewOptions;
-    constructor(ctx: CanvasRenderingContext2D, viewOptions: ViewOptions);
+    constructor(ctx: CanvasRenderingContext2D);
     init(): void;
     setGlobalAlpha(alpha: number): void;
     getGlobalAlpha(): number;
@@ -60,26 +59,30 @@ export declare class PaintContent {
     clearRect(x: number, y: number, width: number, height: number): void;
     save(): void;
     restore(): void;
+    scale(ratio: number): void;
+    /**
+     * 包装任务执行：save->exec->restore
+     * @param effect
+     */
+    tran(effect: () => void): void;
     strokeRect(x: number, y: number, width: number, height: number, strokeColor?: string, strokeWidth?: number): void;
-    drawLine(x: number, y: number, width: number, lineColor?: string, lineWidth?: number): void;
+    /**
+     * 绘制水平线
+     * @param x
+     * @param y
+     * @param width
+     * @param lineColor
+     * @param lineWidth
+     */
+    drawHoriLine(x: number, y: number, width: number, lineColor?: string, lineWidth?: number): void;
     fillRect(x: number, y: number, width: number, height: number, fillColor?: string, shadowBlur?: number, shadowColor?: string): void;
     strokeLines(lines: Array<Position>, width?: number, strokeColor?: string): void;
     fillLines(lines: Array<Position>, width?: number, fillColor?: string): void;
     drawCheckBox(x: number, y: number, width: number, height: number, isChecked: boolean): void;
     drawRadioBox(x: number, y: number, width: number, height: number, isChecked: boolean): void;
-    /**
-     * 绘制图片
-     * @param image
-     * @param sx image的矩形（裁剪）选择框的左上角 X 轴坐标
-     * @param sy image的矩形（裁剪）选择框的左上角 Y 轴坐标
-     * @param sWidth image的矩形（裁剪）选择框的宽度
-     * @param sHeight image的矩形（裁剪）选择框的高度
-     * @param dx image的左上角在目标canvas上 X 轴坐标
-     * @param dy image的左上角在目标canvas上 Y 轴坐标
-     * @param dWidth image在目标canvas上绘制的宽度
-     * @param dHeight image在目标canvas上绘制的高度
-     */
-    drawImage(image: HTMLImageElement, sx: number, sy: number, sWidth: number, sHeight: number, dx: number, dy: number, dWidth: number, dHeight: number): void;
+    drawImage(image: CanvasImageSource, sx: number, sy: number): void;
+    drawImage(image: CanvasImageSource, sx: number, sy: number, sw: number, sh: number): void;
+    drawImage(image: CanvasImageSource, sx: number, sy: number, sw: number, sh: number, dx: number, dy: number, dw: number, dh: number): void;
     drawDashLine(points: Array<Position>, lineDash: Array<number>, lineColor?: string, lineWidth?: number): void;
     roundRect(x: number, y: number, width: number, height: number, radius: number | {
         tl: number;

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

@@ -1,5 +1,6 @@
 import { Rect, Element, MarginProps, PaddingProps, Position } from './element-define';
-import { RenderContenxtType } from './render-context';
+import { RenderContextType } from './render-context';
+import { EditorContext } from "./document-context";
 /**
  * 定义组件的UI形式的渲染
  */
@@ -15,32 +16,28 @@ export declare abstract class RenderObject<T extends Element = Element> {
     disableClick: boolean;
     constructor(element: T);
     abstract clone(): RenderObject;
-    pagePaintCompleted(ctx: RenderContenxtType, position: Position): void;
+    pagePaintCompleted(e: Omit<IRenderData, 'nextRender'>): void;
     destroy(): void;
     /**
     * 获取内容区域框体
     * @param render
     * @returns
     */
-    getInnnerRect(): Rect;
+    getInnerRect(): Rect;
     getInnerMaxWidth(): number;
     /**
-    * 根据内框内容高度，更新外框框体高度
-    * @param render
-    * @param innerRect
-    */
+     * 根据内框内容高度，更新外框框体高度
+     * @param innerRect
+     */
     updateRenderHeight(innerRect: Rect | number): void;
     getIndex(): number;
+    abstract render(e: IRenderData): void;
 }
 /**
  * 叶子节点渲染元素
  */
 export declare abstract class LeafRenderObject<T extends Element = Element> extends RenderObject<T> {
     constructor(element: T | null);
-    abstract render(ctx: RenderContenxtType, position: {
-        x: number;
-        y: number;
-    }): void;
 }
 /**
  * 枝干节点渲染元素
@@ -57,10 +54,14 @@ export declare abstract class BranchRenderObject<T extends Element = Element> ex
     get length(): number;
     getChild<T extends RenderObject = RenderObject>(index: number): T;
     getChildIndex(child: RenderObject): number;
-    abstract beginRender(ctx: RenderContenxtType, position: Position): void;
-    abstract endRender(ctx: RenderContenxtType, position: Position): void;
     destroy(): void;
 }
+export interface IRenderData {
+    render: RenderContextType;
+    position: Position;
+    docCtx: EditorContext;
+    nextRender: () => void;
+}
 /**
  * 块级渲染元素
  */

package/med_editor/texteditor.d.ts

@@ -1,22 +1,19 @@
 import { ContentMenuItem } from './framework/element-event-define';
 import { ElementReader } from './framework/element-reader';
-import { Subject } from 'rxjs';
 import { SelectionState } from './framework/document-selection';
-import { BranchElement, Element, ICancelTokenFn, LeafElement, MarginProps, OrientType, Position, TextAlign, ViewOptions } from './framework/element-define';
-import { DataElementInlineGroup, DataElementLeaf } from './framework/impl';
+import { BranchElement, Element, ICancelTokenFn, LeafElement, MarginProps, OrientType, Position, Rect, TextAlign, ViewOptions } from './framework/element-define';
+import { DataElementInlineGroup, DataElementLeaf, DocumentElement } from './framework/impl';
 import { ParagraphProps, TextProps } from './framework/element-props';
 import { EditorContext } from './framework/document-context';
-import { DocumentElement } from './framework/impl';
+import { ElementTrackManage } from './framework/element-trace-manage';
+import { Subject } from './framework/event-subject';
 export declare class CanvasTextEditor {
     private docScroll;
     private holdSpace;
     private ruleCanvas;
     private editCanvasContainer;
     private editCanvas;
-    private editInput;
-    private editCursor;
     private cursorWrapper;
-    private scaleContainer;
     private contentCtx;
     viewOptions: ViewOptions;
     docCtx: EditorContext;
@@ -30,19 +27,18 @@ export declare class CanvasTextEditor {
     private documentChange;
     private selectionOverlays;
     private docRule;
-    private docHistory;
     private eventMap;
+    historyMange: ElementTrackManage;
     selectionChanged: Subject<SelectionState>;
     beforeRenderSubject: Subject<void>;
     afterRenderSubject: Subject<void>;
     selectionState: SelectionState;
     onContextMenuItemChanged: Subject<EditorContenxtProps>;
-    onShowDataElementEditPanelEvent: Subject<EditorPanelProps>;
     onDblClickEvent: Subject<Event>;
     onClickEvent: Subject<Event>;
     onScrollViewEvent: Subject<number>;
     onDocChangedEvent: Subject<void>;
-    constructor(docScroll: HTMLDivElement, holdSpace: HTMLDivElement, ruleCanvas: HTMLCanvasElement, editCanvasContainer: HTMLDivElement, editCanvas: HTMLCanvasElement, editInput: HTMLInputElement, editCursor: HTMLSpanElement, cursorWrapper: HTMLDivElement, scaleContainer: HTMLDivElement);
+    constructor(docScroll: HTMLDivElement, holdSpace: HTMLDivElement, ruleCanvas: HTMLCanvasElement, editCanvasContainer: HTMLDivElement, editCanvas: HTMLCanvasElement, editInput: HTMLInputElement, editCursor: HTMLSpanElement, cursorWrapper: HTMLDivElement);
     /**
      * 设置标尺
      */
@@ -50,7 +46,6 @@ export declare class CanvasTextEditor {
     createDocViewer(): void;
     measureMMToPixs(): number;
     flushTask: (() => void) | null;
-    flushTaskThen: Array<(() => void)>;
     private trackChangeState;
     flushToSchedule(): void;
     /**
@@ -65,16 +60,34 @@ export declare class CanvasTextEditor {
     noEffectChange(fn: () => void): void;
     loadDoc(data: any | DocumentElement): void;
     /**
-     * 更新文档容器高度尺寸
+     * 更新滚动高度
+     * 1.文档内容高度
+     * 2.文档缩放值
      */
-    updateDocumentContainerSize(): void;
+    setScrollSize(): void;
     scrollView(evt: Event): void;
+    /**
+     * 刷新文档，重新测量并设置光标等
+     * @returns
+     */
     private refreshDocument;
+    /**
+     * 刷新绘制文档
+     * TODO:选区改变时，直接调用该方法
+     * @param rePaint
+     */
+    private refreshView;
     private hitInfoChanged;
     /**
      * 设置光标
      */
     private setCursor;
+    /**
+     * 将相对坐标位置转换为绝对坐标位
+     * 由于缩放，导致绝对位置=相对位置*scale
+     * @param pos
+     */
+    transToAbsolutePos<T extends Position | Rect>(pos: T): T;
     /**
      * 判断是否光标可以设置接受编辑
      * @returns
@@ -134,34 +147,36 @@ export declare class CanvasTextEditor {
      * @param scale
      * @returns
      */
-    scaleView(scale: number): number;
+    scale(scale: number): void;
+    /**
+     * 缩放视图
+     * @param scale
+     * @returns
+     */
+    private _scaleView;
+    private updateRenderCtx;
     getContainerHeight(): {
         height: number;
         width: number;
     };
-    setCanvasProps(): void;
     /**
      * 在当前位置插入表格
-     * @param row
-     * @param col
+     * @param rows
+     * @param cols
      */
     insertTable(rows: number, cols: number): void;
     /**
      * 打印所有文档
      */
     printAllPages(): void;
-    /**
-     * 导出所有页到base64
-     */
-    exportAllPagesToBase64(fileName: string): void;
-    exportPDF(): void;
+    getPrintNodes(): Array<HTMLCanvasElement>;
     /**
      * 清除文档
      */
     clearDoc(): void;
     /**
      * 新建文档
-     * @param options
+     * @param doc
      */
     createNewDoc(doc?: DocumentElement | null): void;
     destroy(): void;
@@ -171,47 +186,11 @@ export declare class CanvasTextEditor {
      */
     getSelectionTextGroupProps(): TextProps | null;
     getSelectionParaProps(): ParagraphProps | null;
-    /**
-     * 设置文本字体大小
-     * @param fontSize
-     * @returns
-     */
-    setTextFontSize(fontSize: number): void;
-    /**
-     * 设置文本颜色
-     * @param color \
-     */
-    setTextColor(color: string): void;
-    /**
-     * 设置文本字体名称
-     * @param font
-     */
-    setTextFont(font: string): void;
-    /**
-     * 应用选中文本格式,用于批量设置格式,例如：格式刷
-     * @param newStyle
-     */
-    applyStyle(newStyle: TextProps): void;
+    setTextFormat(newProps: Partial<TextProps>): void;
     /**
      * 开启格式刷
      */
     enableFormatBrush(): ICancelTokenFn | null;
-    /**
-     * 设置文本背景颜色
-     * @param color
-     */
-    setTextBackColor(color: string): void;
-    /**
-     * 切换文本加粗、下划线、删除等文本样式
-     * @param isEffective
-     * @param style
-     * @param matchValue
-     */
-    switchTextStyle<P extends keyof TextProps, V extends TextProps[P]>(isEffective: boolean, style: P, matchValue: V, defaultValue?: any): void;
-    /**
-     * 修改字间距
-     */
-    setLetterSpace(letterSpace: number): void;
     /**
      * 设置段落对齐
      * @param align
@@ -306,6 +285,9 @@ export declare class CanvasTextEditor {
      * @returns
      */
     insertElement(targetElement: Element, targetOffset: number, destEleArray: Array<Element>): Element | null;
+    showHistory(): void;
+    getControlById(index: number): Element<any> | null;
+    getControlId(ele: Element): number;
 }
 export declare type EditorCurrentPos = {
     pos: Position;

package/package.json

@@ -4,21 +4,11 @@
     "author": "hailin-zheng",
     "private": false,
     "license": "ISC",
-    "version": "1.0.32",
+    "version": "1.0.35",
     "scripts": {},
     "dependencies": {
         "bwip-js": "^3.0.5",
-        "file-saver": "^2.0.5",
-        "jspdf": "^2.5.1",
         "moment": "^2.29.3",
-        "nanoid": "^3.1.30",
-        "rxjs": "^6.6.7"
-    },
-    "devDependencies": {
-        "@types/bwip-js": "^3.0.0",
-        "@types/file-saver": "^2.0.5",
-        "@types/node": "^17.0.23",
-        "@types/resize-observer-browser": "^0.1.6",
-        "typescript": "^4.5.4"
+        "nanoid": "^3.1.30"
     }
 }

package/lib/index-cjs.d.ts

@@ -1,34 +0,0 @@
-export * from './med_editor/doc-ruler';
-export * from './med_editor/texteditor';
-export * from './med_editor/framework/common-util';
-export * from './med_editor/framework/document-change';
-export * from './med_editor/framework/document-combine';
-export * from './med_editor/framework/document-comment';
-export * from './med_editor/framework/document-context';
-export * from './med_editor/framework/document-eval-func';
-export * from './med_editor/framework/document-event';
-export * from './med_editor/framework/document-history';
-export * from './med_editor/framework/document-images-loader';
-export * from './med_editor/framework/document-input-cursor';
-export * from './med_editor/framework/document-paint';
-export * from './med_editor/framework/document-print';
-export * from './med_editor/framework/document-print-offscreen';
-export * from './med_editor/framework/document-segmenter';
-export * from './med_editor/framework/document-selection';
-export * from './med_editor/framework/document-template';
-export * from './med_editor/framework/document-textline-mode';
-export * from './med_editor/framework/element-define';
-export * from './med_editor/framework/element-event-define';
-export * from './med_editor/framework/element-measure';
-export * from './med_editor/framework/element-paint';
-export * from './med_editor/framework/element-props';
-export * from './med_editor/framework/element-reader';
-export * from './med_editor/framework/element-render-cut';
-export * from './med_editor/framework/element-serialize';
-export * from './med_editor/framework/element-util';
-export * from './med_editor/framework/notify';
-export * from './med_editor/framework/range-util';
-export * from './med_editor/framework/render-context';
-export * from './med_editor/framework/render-define';
-export * from './med_editor/framework/selection-overlays';
-export * from './med_editor/framework/impl';

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

@@ -1,26 +0,0 @@
-import { Subject } from "rxjs";
-import { EditorContext } from "./document-context";
-import { ElementReader } from "./element-reader";
-export interface DocumentHistoryItem {
-    content: any;
-    time: Date;
-}
-/**
- * 支持文档重做和撤销的类
- */
-export declare class DocumentHistory {
-    docCtx: EditorContext;
-    reader: ElementReader;
-    task: Promise<void>;
-    constructor(docCtx: EditorContext, reader: ElementReader, onDocChangedEvent: Subject<void>);
-    private _undoStack;
-    private _index;
-    maxLength: number;
-    generateHistoryItem(): void;
-    get index(): number;
-    get canUndo(): boolean;
-    get canRedo(): boolean;
-    undo(): void;
-    redo(): void;
-    clear(): void;
-}