@hailin-zheng/editor-core 1.0.7 → 1.0.10

package/{lib/framework/impl/document/doc-impl.js → src/med_editor/framework/impl/document/doc-impl.ts}

@@ -1,26 +1,34 @@
-import { BlockContainerElement, DocMode, ElementFactory, PaddingProps } from "@/med_editor/framework/element-define";
+import { BlockContainerElement, DocMode, Element, ElementFactory, MarginProps, PaddingProps, readElementProps, Rect, SerializeProps, ViewOptions } from "../../element-define";
 import { DocumentProps, TextProps } from '../../element-props';
-import { BlockContainerRenderObject } from "@/med_editor/framework/render-define";
-import { ElementUtil } from "@/med_editor/framework/element-util";
-import { documentPrint } from "@/med_editor/framework/document-print";
-import { CommonUtil } from "@/med_editor/framework/common-util";
-export class DocumentElement extends BlockContainerElement {
+import { RenderContenxtType } from "../../render-context";
+import { DocumentBodyElement } from "./doc-body-impl";
+import { DocumentHeaderElement } from "./doc-header-impl";
+import { BlockContainerRenderObject, RenderObject } from "../../render-define";
+import { ElementUtil } from "../../element-util";
+import { DocumentFooterElement } from "./doc-footer-impl";
+import { ContextMenuElementEvent } from "../../element-event-define";
+import { documentPrint } from "../../document-print";
+import { CommsContainerElement } from "../comments/comments-container-impl";
+import { CommonUtil } from "../../common-util";
+import { SelectionState } from "../../document-selection";
+
+export class DocumentElement extends BlockContainerElement<DocumentProps> {
     //props: DocumentProps;
-    viewOptions;
-    bodyElement;
-    headerElement;
-    footerElement;
-    commentsContainerElement;
-    headerEditState = false;
+    viewOptions!: ViewOptions;
+    bodyElement!: DocumentBodyElement;
+    headerElement!: DocumentHeaderElement;
+    footerElement!: DocumentFooterElement;
+    commentsContainerElement!: CommsContainerElement;
+    headerEditState: boolean = false;
     constructor() {
         super('doc');
         this.props = new DocumentProps();
-        this.addEvent('ElementContextMenu', (cevt) => {
-            cevt.menus.push({ icon: 'Print', caption: '打印所有页', eventObj: { onClick: (evt) => { documentPrint.print(cevt.selectionState, this.viewOptions, cevt.ctx); } } });
-            cevt.menus.push({ icon: 'Print', caption: '打印当前页', eventObj: { onClick: (evt) => { documentPrint.printCurrPage(cevt.selectionState, this.viewOptions, cevt.ctx); } } });
+        this.addEvent<ContextMenuElementEvent>('ElementContextMenu', (cevt) => {
+            cevt.menus.push({ icon: 'Print', caption: '打印所有页', eventObj: { onClick: (evt) => { documentPrint.print(cevt.selectionState, this.viewOptions, cevt.ctx) } } });
+            cevt.menus.push({ icon: 'Print', caption: '打印当前页', eventObj: { onClick: (evt) => { documentPrint.printCurrPage(cevt.selectionState, this.viewOptions, cevt.ctx) } } });
         }, true);
     }
-    createRenderObject(options) {
+    createRenderObject(options: ViewOptions): DocumentRenderObject {
         const { width: docPixelsWidth, height: docPixelsHeight } = this.viewOptions.docPageSettings;
         const docRenderObject = new DocumentRenderObject(this);
         docRenderObject.rect.width = docPixelsWidth;
@@ -42,28 +50,31 @@ export class DocumentElement extends BlockContainerElement {
         docRenderObject.margin.top = options.docSpace;
         return docRenderObject;
     }
-    serialize() {
+
+    serialize(): SerializeProps {
         return {
             type: 'doc',
             props: {
                 ...this.props.getSerializeProps()
             }
-        };
+        }
     }
-    clone() {
+
+    clone(): DocumentElement {
         const clone = new DocumentElement();
-        this.props.clone(clone.props);
+        this.props.clone(clone.props)
         for (let i = 0; i < this.length; i++) {
             clone.addChild(this.getChild(i).clone(true));
         }
         return clone;
     }
+
     /**
      * 更新页边距
-     * @param marginProps
+     * @param marginProps 
      */
-    updateMargin(marginProps, unit = 'cm') {
-        const { top, bottom, left, right } = marginProps;
+    updateMargin(marginProps: Partial<MarginProps>, unit: 'mm' | 'cm' = 'cm'): void {
+        const { top, bottom, left, right } = marginProps as MarginProps;
         const paddig = this.props.padding;
         const ratio = unit === 'cm' ? 10 : 1;
         paddig.top = top * ratio;
@@ -71,10 +82,11 @@ export class DocumentElement extends BlockContainerElement {
         paddig.left = left * ratio;
         paddig.right = right * ratio;
     }
+
     /**
      * 切换开启页眉页脚编辑功能
      */
-    switchPageHeaderEditor(ss, ele) {
+    switchPageHeaderEditor(ss: SelectionState, ele: Element | null): void {
         if (this.viewOptions.docMode !== DocMode.Design) {
             return;
         }
@@ -83,8 +95,7 @@ export class DocumentElement extends BlockContainerElement {
             this.footerElement.disableClick = false;
             this.bodyElement.disableClick = true;
             this.headerEditState = true;
-        }
-        else if (this.headerEditState && (!ele || ele === this.bodyElement)) {
+        } else if (this.headerEditState && (!ele || ele === this.bodyElement)) {
             this.headerElement.disableClick = true;
             this.footerElement.disableClick = true;
             this.bodyElement.disableClick = false;
@@ -94,20 +105,22 @@ export class DocumentElement extends BlockContainerElement {
         this.refreshView();
     }
 }
+
+
 export class DocumentRenderObject extends BlockContainerRenderObject {
-    constructor(ele) {
+    constructor(ele: Element) {
         super(ele);
     }
-    headerLine;
-    footerLine;
-    beginRender(ctx, position) {
+    headerLine!: number;
+    footerLine!: number;
+    beginRender(ctx: RenderContenxtType, position: { x: number; y: number; }): void {
         const { width: docWidth, height: docHeight } = ctx.viewOptions.docPageSettings;
         ctx.overlaysContext.fillRect(position.x, position.y, docWidth, this.rect.height, 'white', 5, 'black');
         // if (ctx.drawMode === 'view') {
         //     ctx.contentContext.strokeRect(position.x, position.y, docWidth, this.rect.height, 'black', 0.5);
         // }
     }
-    endRender(ctx, position) {
+    endRender(ctx: RenderContenxtType, position: { x: number; y: number; }): void {
         const textP = new TextProps();
         textP.color = "rgb(0,0,0)";
         textP.fontName = '楷体';
@@ -131,18 +144,19 @@ export class DocumentRenderObject extends BlockContainerRenderObject {
         ctx.overlaysContext.strokeLines([{ x: paddingPos.x + lineWidth, y: paddingPos.y }, paddingPos, { x: paddingPos.x, y: paddingPos.y + lineWidth }], drawLineWidth);
         this.drawWatermark(ctx, position);
     }
+
     /**
      * 绘制水印
-     * @param ctx
-     * @param position
+     * @param ctx 
+     * @param position 
      */
-    drawWatermark(ctx, position) {
+    private drawWatermark(ctx: RenderContenxtType, position: { x: number; y: number; }): void {
         if (ctx.viewOptions.watermark) {
             const watermark = ctx.viewOptions.watermark;
             ctx.contentContext.ctx.save();
             ctx.contentContext.ctx.translate(position.x, position.y);
             const { width, height } = this.rect;
-            const degrees = Math.atan(height / width) * 180 / Math.PI;
+            const degrees = Math.atan(height / width) * 180 / Math.PI
             ctx.contentContext.ctx.rotate(degrees * Math.PI / 180);
             ctx.contentContext.ctx.globalAlpha = 0.3;
             const d = Math.sqrt(width * width + height * height);
@@ -150,17 +164,18 @@ export class DocumentRenderObject extends BlockContainerRenderObject {
             textProps.color = "rgb(0,0,0)";
             textProps.fontName = '楷体';
             textProps.fontSize = 60;
-            const textWidth = ctx.contentContext.measureText(watermark, textProps).width;
+            const textWidth = ctx.contentContext.measureText(watermark, textProps).width
             const x = d / 2 - textWidth / 2;
-            ctx.contentContext.ctx.font = textProps.getFont();
+            ctx.contentContext.ctx.font = textProps.getFont()
             ctx.contentContext.ctx.fillText(watermark, x, 30);
             ctx.contentContext.ctx.restore();
         }
     }
+
     /**
      * 绘制文档页码
      */
-    drawDocPageNum(ctx, position) {
+    drawDocPageNum(ctx: RenderContenxtType, position: { x: number; y: number; }): void {
         const pageWidth = ctx.viewOptions.docPageSettings.width;
         const pageIndex = this.getIndex() + 1;
         const str = CommonUtil.parseText(ctx.viewOptions.pageNumFormat, { index: pageIndex, count: this.parent.length });
@@ -170,11 +185,12 @@ export class DocumentRenderObject extends BlockContainerRenderObject {
         textProps.fontSize = 14;
         textProps.fontStyle = 'italic';
         const size = ctx.contentContext.measureText(str, textProps);
-        const alignCenterX = position.x + Math.ceil(pageWidth / 2) - Math.ceil(size.width / 2);
+        const alignCenterX = position.x + Math.ceil(pageWidth / 2) - Math.ceil(size.width / 2)
         const paintY = position.y + this.rect.height - size.height - 5;
         ctx.contentContext.drawText(str, textProps, alignCenterX, paintY, size.width, size.height);
     }
-    clone() {
+
+    clone(): RenderObject {
         const cloneRender = new DocumentRenderObject(this.element);
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
         cloneRender.headerLine = this.headerLine;
@@ -185,13 +201,14 @@ export class DocumentRenderObject extends BlockContainerRenderObject {
         return cloneRender;
     }
 }
-export class DocumentFactory extends ElementFactory {
-    match(type) {
+
+export class DocumentFactory extends ElementFactory<DocumentProps> {
+    match(type: string): boolean {
         return type === 'doc';
     }
-    createElement(data, renderCtx) {
+    createElement(data: readElementProps<DocumentProps>, renderCtx: RenderContenxtType): Element {
         const documentElement = new DocumentElement();
-        const props = data.props;
+        const props = data.props as DocumentProps;
         const docProps = documentElement.props;
         docProps.width = props.width;
         docProps.height = props.height;
@@ -205,5 +222,5 @@ export class DocumentFactory extends ElementFactory {
         docProps.orient = props.orient ?? 'portrait';
         return documentElement;
     }
+
 }
-//# sourceMappingURL=doc-impl.js.map

package/{lib/framework/impl/media-formula/menstrual-history.js → src/med_editor/framework/impl/media-formula/menstrual-history.ts}

@@ -1,20 +1,22 @@
-import { CommonUtil } from "@/med_editor/framework/common-util";
-import { ElementFactory } from "../../element-define";
+import { CommonUtil } from "../../common-util";
+import { ViewOptions, Element, SerializeProps, ElementFactory, readElementProps, Rect } from "../../element-define";
 import { DataEleMHProps, TextProps } from "../../element-props";
 import { ElementUtil } from "../../element-util";
-import { LeafRenderObject } from "../../render-define";
+import { RenderContenxtType } from "../../render-context";
+import { LeafRenderObject, RenderObject } from "../../render-define";
 import { DataElementLeaf } from "../data-element/data-element-base-impl";
+
 /**
  * 月经史
  */
-export class DataElementMH extends DataElementLeaf {
+export class DataElementMH extends DataElementLeaf<DataEleMHProps> {
     //props!: DataEleMHProps;
     constructor() {
-        super('data-ele-mh');
+        super('data-ele-mh')
         this.props = new DataEleMHProps();
         //this.addPropValueChangedSub(this.props);
     }
-    setValue(val) {
+    setValue(val: DataEleMHProps | string | null): void {
         if (typeof val === 'string' && val) {
             const items = val.split(';');
             if (items.length >= 4) {
@@ -24,8 +26,7 @@ export class DataElementMH extends DataElementLeaf {
                 this.props[mhLayoutItem.bottom.prop] = items[2];
                 this.props[mhLayoutItem.right.prop] = items[3];
             }
-        }
-        else if (typeof val === 'object') {
+        } else if (typeof val === 'object') {
             this.props.age = val?.age ?? '';
             this.props.days = val?.days ?? '';
             this.props.cycles = val?.cycles ?? '';
@@ -33,11 +34,13 @@ export class DataElementMH extends DataElementLeaf {
             this.props.closeAge = val?.closeAge ?? '';
         }
     }
+
     getValue() {
         const layoutItem = getMHItem(this.props.kind);
         return `${this.props[layoutItem.left.prop]};${this.props[layoutItem.top.prop]};${this.props[layoutItem.bottom.prop]};${this.props[layoutItem.right.prop]}`;
     }
-    createRenderObject(options, renderCtx) {
+
+    createRenderObject(options: ViewOptions, renderCtx: RenderContenxtType): RenderObject<Element> | null {
         const render = new DataRenderMH(this);
         const measure = renderMH(this, renderCtx, { x: 0, y: 0 }, false);
         if (measure) {
@@ -46,52 +49,67 @@ export class DataElementMH extends DataElementLeaf {
         }
         return render;
     }
-    serialize(viewOptions) {
+    serialize(viewOptions: ViewOptions): SerializeProps | null {
         return {
             type: this.type,
             props: this.props.getSerializeProps(viewOptions)
-        };
+        }
     }
-    clone(data) {
+    clone(data: boolean): Element {
         const element = new DataElementMH();
         this.props.clone(element.props);
         return element;
     }
-    getCurrentLayoutItem() {
+
+    getCurrentLayoutItem(): MHLayoutType {
         return getMHItem(this.props.kind);
     }
+
+}
+
+type MHLayoutType = {
+    [key in 'left' | 'top' | 'right' | 'bottom']: {
+        tip: '初潮年龄' | '行经期天数' | '末次月经时间' | '月经周期天数' | '闭经年龄',
+        prop: 'age' | 'days' | 'cycles' | 'lastDate' | 'closeAge'
+    }
 }
-const mhLayoutItems = [
+
+const mhLayoutItems: Array<MHLayoutType> = [
     { left: { tip: '初潮年龄', prop: 'age' }, top: { tip: '行经期天数', prop: 'days' }, right: { tip: '末次月经时间', prop: 'lastDate' }, bottom: { tip: '月经周期天数', prop: 'cycles' } },
     { left: { tip: '初潮年龄', prop: 'age' }, top: { tip: '闭经年龄', prop: 'closeAge' }, right: { tip: '末次月经时间', prop: 'lastDate' }, bottom: { tip: '行经期天数', prop: 'days' } },
     { left: { tip: '闭经年龄', prop: 'closeAge' }, top: { tip: '行经期天数', prop: 'days' }, right: { tip: '末次月经时间', prop: 'lastDate' }, bottom: { tip: '月经周期天数', prop: 'cycles' } },
     { left: { tip: '初潮年龄', prop: 'age' }, top: { tip: '月经周期天数', prop: 'cycles' }, right: { tip: '末次月经时间', prop: 'lastDate' }, bottom: { tip: '行经期天数', prop: 'days' } },
     { left: { tip: '初潮年龄', prop: 'age' }, top: { tip: '闭经年龄', prop: 'closeAge' }, right: { tip: '末次月经时间', prop: 'lastDate' }, bottom: { tip: '月经周期天数', prop: 'cycles' } }
-];
-function getMHItem(kind) {
+]
+
+
+function getMHItem(kind: string): MHLayoutType {
     kind = kind ?? 'A';
     kind = kind.toUpperCase();
     let kindIndex = ['A', 'B', 'C', 'D', 'E'].indexOf(kind);
     kindIndex = kindIndex < 0 ? 0 : kindIndex;
     return mhLayoutItems[kindIndex];
 }
-export class DataRenderMH extends LeafRenderObject {
-    render(ctx, position) {
+
+export class DataRenderMH extends LeafRenderObject<DataElementMH> {
+    render(ctx: RenderContenxtType, position: { x: number; y: number; }): void {
         renderMH(this.element, ctx, position, true);
     }
-    clone() {
+
+    clone(): RenderObject<Element> {
         const clone = new DataRenderMH(this.element);
         clone.rect = ElementUtil.cloneRect(this.rect);
         return clone;
     }
 }
-export class DataElementMHFactory extends ElementFactory {
-    match(type) {
-        return type === 'data-ele-mh';
+
+export class DataElementMHFactory extends ElementFactory<DataEleMHProps> {
+    match(type: string): boolean {
+        return type === 'data-ele-mh'
     }
-    createElement(data, renderCtx) {
+    createElement(data: readElementProps<DataEleMHProps>, renderCtx: RenderContenxtType): Element {
         const ele = new DataElementMH();
-        ElementUtil.readEleBaseProps(ele.props, data.props);
+        ElementUtil.readEleBaseProps(ele.props, data.props as DataEleMHProps);
         ele.props.age = data.props?.age ?? '';
         ele.props.cycles = data.props?.cycles ?? '';
         ele.props.days = data.props?.days ?? '';
@@ -100,10 +118,12 @@ export class DataElementMHFactory extends ElementFactory {
         ele.props.kind = data.props?.kind ?? 'A';
         return ele;
     }
+
 }
-function renderMH(element, ctx, position, isPaint) {
+
+function renderMH(element: DataElementMH, ctx: RenderContenxtType, position: { x: number; y: number; }, isPaint: boolean): { width: number, height: number } | void {
     let { x, y } = position;
-    const defaultTextProps = new TextProps();
+    const defaultTextProps = new TextProps()
     const paddingVer = 2;
     const paddingHor = 5;
     defaultTextProps.fontSize = 12;
@@ -114,30 +134,31 @@ function renderMH(element, ctx, position, isPaint) {
     const top = CommonUtil.getEmptyValue(element.props[currentLayout.top.prop], currentLayout.top.tip);
     const bottom = CommonUtil.getEmptyValue(element.props[currentLayout.bottom.prop], currentLayout.bottom.tip);
     const right = CommonUtil.getEmptyValue(element.props[currentLayout.right.prop], currentLayout.right.tip);
-    const leftRect = ctx.contentContext.measureText(left, defaultTextProps);
-    const topRect = ctx.contentContext.measureText(top, defaultTextProps);
-    const bottomRect = ctx.contentContext.measureText(bottom, defaultTextProps);
-    const rightRect = ctx.contentContext.measureText(right, defaultTextProps);
+    const leftRect = ctx.contentContext.measureText(left, defaultTextProps)
+    const topRect = ctx.contentContext.measureText(top, defaultTextProps)
+    const bottomRect = ctx.contentContext.measureText(bottom, defaultTextProps)
+    const rightRect = ctx.contentContext.measureText(right, defaultTextProps)
     let height = topRect.height + bottomRect.height;
-    const middleWidth = Math.max(topRect.width, bottomRect.width);
+    const middleWidth = Math.max(topRect.width, bottomRect.width)
     let width = leftRect.width + middleWidth + rightRect.width;
     if (!isPaint) {
-        return { width: width + paddingHor * 2, height: height + paddingVer * 2 };
+        return { width: width + paddingHor * 2, height: height + paddingVer * 2 }
     }
     x += paddingHor;
     y += paddingVer;
     //年龄
-    ctx.contentContext.drawText(left, defaultTextProps, x, y + (height - leftRect.height) / 2, leftRect.width, leftRect.height);
+    ctx.contentContext.drawText(left, defaultTextProps, x, y + (height - leftRect.height) / 2, leftRect.width, leftRect.height)
     x += leftRect.width;
     //天数
     ctx.contentContext.drawText(top, defaultTextProps, x + (middleWidth - topRect.width) / 2, y - 2, topRect.width, topRect.height);
     //分割线
-    ctx.contentContext.drawLine(x, y + topRect.height, middleWidth);
+    ctx.contentContext.drawLine(x, y + topRect.height, middleWidth)
     //周期
     ctx.contentContext.drawText(bottom, defaultTextProps, x + (middleWidth - bottomRect.width) / 2, y + topRect.height + 2, bottomRect.width, bottomRect.height);
     //末次时间
     x += middleWidth;
-    ctx.contentContext.drawText(right, defaultTextProps, x, y + (height - leftRect.height) / 2, rightRect.width, rightRect.height);
+    ctx.contentContext.drawText(right, defaultTextProps, x, y + (height - leftRect.height) / 2, rightRect.width, rightRect.height)
+
     if (ctx.drawMode === 'view') {
         let { x, y } = position;
         width = width + paddingHor * 2;
@@ -150,4 +171,5 @@ function renderMH(element, ctx, position, isPaint) {
         ctx.contentContext.strokeLines([{ x: x - lineWidth, y }, { x, y }, { x, y: y + height }, { x: x - lineWidth, y: y + height }], 1, paintColor);
     }
 }
-//# sourceMappingURL=menstrual-history.js.map
+
+

package/{lib/framework/impl/paragraph/p-impl.js → src/med_editor/framework/impl/paragraph/p-impl.ts}

@@ -1,8 +1,22 @@
-import { BlockContentElement, ElementFactory } from "@/med_editor/framework/element-define";
-import { ParagraphProps } from "@/med_editor/framework/element-props";
-import { ElementUtil } from "@/med_editor/framework/element-util";
-import { BlockLineRectRenderObject, MuiltBlockLineRenderObject } from "@/med_editor/framework/render-define";
-export class ParagraphElement extends BlockContentElement {
+import {
+    BlockContentElement,
+    ElementFactory,
+    Element,
+    SerializeProps,
+    ViewOptions,
+    readElementProps
+} from "../../element-define";
+import { ContextMenuElementEvent } from "../../element-event-define";
+import { ParagraphProps } from "../../element-props";
+import { ElementUtil } from "../../element-util";
+import { RenderContenxtType } from "../../render-context";
+import {
+    BlockLineRectRenderObject,
+    MuiltBlockLineRenderObject,
+    RenderObject
+} from "../../render-define";
+
+export class ParagraphElement extends BlockContentElement<ParagraphProps> {
     //props: ParagraphProps;
     constructor() {
         super('p');
@@ -15,15 +29,15 @@ export class ParagraphElement extends BlockContentElement {
                     if (this.props.numberType >= 0) {
                         this.props.numberType = -1;
                         evt.isCancel = true;
-                    }
-                    else if (this.props.indent) {
+                    } else if (this.props.indent) {
                         this.props.indent = 0;
                         evt.isCancel = true;
                     }
                 }
             }
+
         }, true);
-        this.addEvent('ElementContextMenu', (evt) => {
+        this.addEvent<ContextMenuElementEvent>('ElementContextMenu', (evt) => {
             const { selectionState } = evt;
             evt.menus.push({
                 icon: 'DeleteTable', caption: '删除段落', eventObj: {
@@ -33,8 +47,7 @@ export class ParagraphElement extends BlockContentElement {
                         const nextFocusableEle = ElementUtil.getRecursionNextSiblingElement(psymbol, false, true);
                         if (nextFocusableEle) {
                             selectionState.resetRange(nextFocusableEle, 0);
-                        }
-                        else {
+                        } else {
                             selectionState.clear();
                         }
                         this.remove();
@@ -44,19 +57,22 @@ export class ParagraphElement extends BlockContentElement {
             });
         });
     }
-    createRenderObject() {
+
+    createRenderObject(): ParagraphRenderObject {
         const paraRender = new ParagraphRenderObject(this);
         return paraRender;
     }
-    serialize(viewOptions) {
+
+    serialize(viewOptions: ViewOptions): SerializeProps {
         return {
             type: 'p',
             props: {
                 ...this.props.getSerializeProps(viewOptions)
             }
-        };
+        }
     }
-    clone(data) {
+
+    clone(data: boolean): Element {
         const clone = new ParagraphElement();
         this.props.clone(clone.props);
         if (data) {
@@ -66,26 +82,32 @@ export class ParagraphElement extends BlockContentElement {
         }
         return clone;
     }
-    static createElement() {
+
+    static createElement(): ParagraphElement {
         return new ParagraphElement();
     }
+
 }
+
 export class ParagraphRenderObject extends MuiltBlockLineRenderObject {
-    beginRender(ctx, position) {
+    beginRender(ctx: RenderContenxtType, position: { x: number; y: number; }): void {
     }
-    endRender(ctx, position) {
+
+    endRender(ctx: RenderContenxtType, position: { x: number; y: number; }): void {
         this.drawProjectNumber(ctx);
     }
+
+
     /**
      * 绘制项目符号
      */
-    drawProjectNumber(ctx) {
-        const paraElement = this.element;
+    drawProjectNumber(ctx: RenderContenxtType): void {
+        const paraElement = this.element as ParagraphElement;
         if (paraElement.props.numberType >= 0) {
             if (paraElement.paintRenders.indexOf(this) > 0) {
                 return;
             }
-            const firstLine = this.getChild(0);
+            const firstLine = this.getChild(0) as ParagraphLineRectRenderObject;
             if (!firstLine) {
                 debugger;
             }
@@ -99,10 +121,12 @@ export class ParagraphRenderObject extends MuiltBlockLineRenderObject {
             });
             const numberSymbolY = firstInlinePaintPos.y + Math.ceil(firstInline.rect.height / 2);
             //ctx.contentContext.drawText(str, textProps, firstInlinePaintPos.x - paraElement.paraProps.indent, numberSymbolY, 14, 14);
-            ctx.contentContext.fillCircular(firstInlinePaintPos.x - paraElement.props.indent + 2, numberSymbolY, 4);
+            ctx.contentContext.fillCircular(firstInlinePaintPos.x - paraElement.props.indent + 2, numberSymbolY, 4)
         }
     }
-    clone() {
+
+
+    clone(): RenderObject {
         const cloneRender = new ParagraphRenderObject(this.element);
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
         for (let i = 0; i < this.length; i++) {
@@ -110,17 +134,22 @@ export class ParagraphRenderObject extends MuiltBlockLineRenderObject {
         }
         return cloneRender;
     }
-    createLineRect() {
+
+    createLineRect(): ParagraphLineRectRenderObject {
         const lineRect = new ParagraphLineRectRenderObject(this.element);
         lineRect.rect.maxWidth = this.rect.maxWidth;
         return lineRect;
     }
+
+
 }
-export class ParagraphFactory extends ElementFactory {
-    match(type) {
+
+export class ParagraphFactory extends ElementFactory<ParagraphProps> {
+    match(type: string): boolean {
         return type === 'p';
     }
-    createElement(data, renderCtx) {
+
+    createElement(data: readElementProps<ParagraphProps>, renderCtx: RenderContenxtType): Element {
         const paraElement = new ParagraphElement();
         const props = data.props;
         paraElement.props.indent = props?.indent ?? 0;
@@ -133,18 +162,24 @@ export class ParagraphFactory extends ElementFactory {
         return paraElement;
     }
 }
+
 /**
  * 段落行框
  */
 export class ParagraphLineRectRenderObject extends BlockLineRectRenderObject {
-    beginRender(ctx, position) {
+
+    beginRender(ctx: RenderContenxtType, position: { x: number; y: number; }): void {
         //console.log('绘制段落行-begin');
+
     }
-    endRender(ctx, position) {
+
+    endRender(ctx: RenderContenxtType, position: { x: number; y: number; }): void {
         //console.log('绘制段落行-end');
         //ctx.strokeRect(position.x, position.y, this.rect.width, this.rect.height);
     }
-    clone() {
+
+
+    clone(): RenderObject {
         const cloneRender = new ParagraphLineRectRenderObject(this.element);
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
         for (let i = 0; i < this.length; i++) {
@@ -153,4 +188,3 @@ export class ParagraphLineRectRenderObject extends BlockLineRectRenderObject {
         return cloneRender;
     }
 }
-//# sourceMappingURL=p-impl.js.map