@hailin-zheng/editor-core 2.1.19 → 2.1.21

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

@@ -1,6 +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 { IEditorVNodeOptions, LeafRenderObject, RenderObject } from "../../render-define";
 interface IResizeElement {
     resizeable: boolean;
 }
@@ -13,11 +13,8 @@ export declare class PictureElement extends LeafElement<PictureProps> implements
     clone(data: boolean): Element;
     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/paragraph-arrange.d.ts

@@ -2,10 +2,12 @@ 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";
 export declare class ParagraphMeasure {
     options: ViewOptions;
     renderCtx: RenderContextType;
-    constructor(options: ViewOptions, renderCtx: RenderContextType);
+    execute: DynamicExecute;
+    constructor(options: ViewOptions, renderCtx: RenderContextType, execute: DynamicExecute);
     /**
      * 段落排版：
      * 1.当前段落不存在项目符号，按照缩进和悬挂处理
@@ -69,6 +71,21 @@ export declare class ParagraphMeasure {
      * 获取段落行渲染单位个数,字符需要计算为字符长度
      */
     private getRenderUnitLength;
+    /**
+     * 解析可见性表达式
+     * @param ele
+     * @param execute
+     * @private
+     */
+    parseVisibleExpression(ele: Element, execute: DynamicExecute): void;
+    /**
+     * 元素可见行求值
+     * @param ele
+     * @param executeCtx
+     * @private
+     */
+    evalVisibleExpr(ele: Element, executeCtx: DynamicExecute): boolean;
+    createRenderObject<T extends Element>(element: T): ReturnType<T['createRenderObject']>;
 }
 interface MeasureLine {
     add(child: RenderObject): void;

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/package.json

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

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

@@ -1,94 +0,0 @@
-import { Element, IBeginMeasureData, InlineGroupElement, ViewOptions } from "./element-define";
-import { FillNullSpaceRenderObject } from "./impl";
-import { DocumentElement, DocumentRenderObject } from "./impl";
-import { ParagraphElement, ParagraphLineRectRenderObject, ParagraphRenderObject } from "./impl";
-import { TextGroupRenderObject } from "./impl";
-import { RenderContextType } from "./render-context";
-import { InlineGroupRenderObject, RenderObject } from "./render-define";
-import { EditorContext } from "./document-context";
-interface ICutLineData {
-    firstItem: RenderObject | null;
-    lastItem: RenderObject | null;
-    br?: boolean;
-}
-/**
- * 测量阶段，生成Render-UI
- */
-export declare class ElementMeasure {
-    docCtx: EditorContext;
-    renderCtx: RenderContextType;
-    options: ViewOptions;
-    constructor(docCtx: EditorContext, renderCtx: RenderContextType);
-    measureDocument(document: DocumentElement): DocumentRenderObject;
-    measureControl(element: Element, maxWidth: number): RenderObject | null;
-    /**
-     * 生成段落 UI 树
-     * @param para
-     * @param render
-     */
-    measureParagraph(para: ParagraphElement, render: ParagraphRenderObject): void;
-    /**
-     * 根据段落UI元素，进行排列
-     * @param render
-     * @param paragraph
-     * @param renderObjects
-     */
-    measureInnerParagraph(render: ParagraphRenderObject, paragraph: ParagraphElement, renderObjects: Array<RenderObject>): void;
-    /**
-     * 获取段落行布局横向坐标起始位置，被段落text-align影响
-     */
-    getParaLineRectStartX(counter: number, paraLineIndex: number, paraElement: ParagraphElement, paraRenderObject: ParagraphRenderObject, paraLineRender: ParagraphLineRectRenderObject): number;
-    /**
-     * 设置两端对齐
-     * @param render
-     * @param count
-     * @param spaceWidth
-     */
-    private setAlignJustify;
-    /**
-     * 获取段落行渲染单位个数,字符需要计算为字符长度
-     */
-    private getRenderUnitLength;
-    getInlineGroupRenderItem(item: InlineGroupElement): RenderObject | null;
-    cutRenderItem(render: RenderObject, nextRender: RenderObject, limitWidth: number, lineEmpty: boolean, inCloseBody: boolean): ICutLineData;
-    cutTextRender(render: TextGroupRenderObject, nextRender: RenderObject, limitWidth: number, lineEmpty: boolean, inCloseBody: boolean): ICutLineData;
-    /**
-     * 处理前置标点,前置标点不能出现在末尾
-     * @param render
-     * @param i
-     */
-    private patchHandleLeadingPunctuation;
-    /**
-     * 处理后置标点，后置标点不能出现在行首
-     * @param render
-     * @param i
-     * @param lineEmpty
-     */
-    private patchHandlePostPunctuation;
-    /**
-     * 是否包含后置标点
-     * @param str
-     * @returns
-     */
-    private containPostPunctuation;
-    private containLeadingPunctuation;
-    /**
-     * 文本开头是否包含后置标点
-     * @param render
-     * @returns
-     */
-    private containerStartSymbolInTextStart;
-    cutFillNullRender(render: FillNullSpaceRenderObject, limitWidth: number): ICutLineData;
-    /**
-     * 行内编组元素超出行内可用空间，需要根据剩余空间长度进行截断
-     */
-    cutInlineGroupRenderItem(render: InlineGroupRenderObject, limitWidth: number, emptyLine: boolean, inCloseBody: boolean): ICutLineData;
-    /**
-     * 修改测量完毕后的元素状态
-     * @param ele
-     */
-    setMeasureCompletedModifyFlag(ele: Element): void;
-    clearPaintCache(ele: Element, data: IBeginMeasureData): void;
-    endMeasures(ele: Element): void;
-}
-export {};

package/med_editor/framework/element-render-cut.d.ts

@@ -1,59 +0,0 @@
-import { DocumentBodyRenderObject, DocumentElement, DocumentRenderObject, TableCellRenderObject, TableRenderObject, TableRowRenderObject } from "./impl";
-import { RenderContextType } from "./render-context";
-import { BlockContentRenderObject } from "./render-define";
-import { Rect, ViewOptions } from "./element-define";
-export declare class ElementRenderCut {
-    private options;
-    private renderContext;
-    constructor(options: ViewOptions, renderContext: RenderContextType);
-    cutPage(documentRender: DocumentRenderObject, documentElement: DocumentElement): Array<DocumentRenderObject>;
-    private getDocInnerRect;
-    getFullViewDocRender(documentRender: DocumentRenderObject, documentElement: DocumentElement): Array<DocumentRenderObject>;
-    createEmptyBodyRender(bodyRender: DocumentBodyRenderObject, limitRect: Rect): {
-        emptyBody: DocumentBodyRenderObject;
-        innerRect: Rect & {
-            prevMargin: number;
-        } & {
-            maxHeight: number;
-            maxWidth: number;
-        };
-    };
-    /**
-     * 切割渲染元素
-     * @param render 被切割的对象
-     * @param limitHeight
-     * @returns
-     */
-    cutRenderItem(render: BlockContentRenderObject, limitHeight: number): BlockContentRenderObject | null;
-    /**
-     * 切割渲染元素
-     * @param tbRender 被切割的对象
-     * @param limitHeight
-     * @param addFunc
-     * @returns
-     */
-    cutTable(tbRender: TableRenderObject, limitHeight: number): BlockContentRenderObject | null;
-    cutRowRenderItem(render: TableRowRenderObject, limitHeight: number): TableRowRenderObject | null;
-    /**
-     * 标记合并单元格所在行需要重新计算
-     * @param cellRender
-     * @private
-     */
-    private markMergeRowRenderDirty;
-    /**
-     * 修复->已经截断的合并单元格要向下移动到合适的位置
-     * @param tbRender
-     * @param cutRows
-     * @returns
-     */
-    private fixCutTable;
-    /**
-     * 校验当前是否是一个完整的行，没有Null单元格，检查当前是否还需要向下合并
-     * @param row
-     */
-    private checkFullRow;
-    private existsCellRender;
-    private getBlockLineHeight;
-    getRowInsertCellIndex(sourceCell: TableCellRenderObject, destRow: TableRowRenderObject): number;
-    private getHeaderRows;
-}