@hailin-zheng/editor-core 1.0.8 → 1.0.9

package/{lib/framework/impl/data-element/data-element-date-impl.js → src/med_editor/framework/impl/data-element/data-element-date-impl.ts}

@@ -1,27 +1,33 @@
-import { ElementFactory } from "../../element-define";
+import { Element, ElementFactory, SerializeProps, ViewOptions } from "../../element-define";
 import { DataEleDateProps } from "../../element-props";
 import { ElementUtil } from "../../element-util";
+import { RenderContenxtType } from "../../render-context";
+import { RenderObject } from "../../render-define";
 import { ElementSerialize } from "../../element-serialize";
 import { TextGroupElement } from "../text/text-impl";
 import { DataElementInlineGroup, DataElementRenderObject } from "./data-element-base-impl";
-import moment from 'moment';
-export class DataElementDate extends DataElementInlineGroup {
+import moment from 'moment'
+
+export class DataElementDate extends DataElementInlineGroup<DataEleDateProps> {
     constructor() {
         super('data-ele-date');
         this.props = new DataEleDateProps();
     }
-    createRenderObject() {
+
+    createRenderObject(): RenderObject {
         return new DataElementDateRenderObject(this);
     }
-    serialize(viewOptions) {
+
+    serialize(viewOptions: ViewOptions): SerializeProps & any {
         return {
             type: this.type,
             props: {
                 ...this.props.getSerializeProps(viewOptions)
             }
-        };
+        }
     }
-    clone(data) {
+
+    clone(data: boolean): DataElementDate {
         const clone = new DataElementDate();
         this.props.clone(clone.props);
         if (data) {
@@ -35,7 +41,9 @@ export class DataElementDate extends DataElementInlineGroup {
         }
         return clone;
     }
-    setValue(val) {
+
+
+    setValue(val: Date | string): void {
         const format = this.props.format ?? 'YYYY-MM-DD';
         const date = moment(val, format);
         if (!date.isValid()) {
@@ -53,10 +61,12 @@ export class DataElementDate extends DataElementInlineGroup {
         this.addChild(valueText, this.length - 1);
         this.beginMeasure();
     }
-    getValue() {
-        return ElementSerialize.serializeString(this);
+
+    getValue(): string {
+        return ElementSerialize.serializeString(this)
     }
-    validate() {
+
+    validate(): string {
         let res = super.validate();
         if (res) {
             return res;
@@ -68,12 +78,15 @@ export class DataElementDate extends DataElementInlineGroup {
         }
         return '';
     }
+
 }
-export class DataElementDateRenderObject extends DataElementRenderObject {
-    constructor(element) {
+
+
+export class DataElementDateRenderObject extends DataElementRenderObject<DataElementDate> {
+    constructor(element: DataElementDate) {
         super(element);
     }
-    clone() {
+    clone(): RenderObject {
         const cloneRender = new DataElementDateRenderObject(this.element);
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
         for (let i = 0; i < this.length; i++) {
@@ -81,19 +94,22 @@ export class DataElementDateRenderObject extends DataElementRenderObject {
         }
         return cloneRender;
     }
+
 }
-export class DataElementDateFactory extends ElementFactory {
-    match(type) {
-        return type === "data-ele-date";
+
+export class DataElementDateFactory extends ElementFactory<DataEleDateProps> {
+    match(type: string): boolean {
+        return type === "data-ele-date"
     }
-    createElement(data, renderCtx) {
-        const props = data.props;
+    createElement(data: any, renderCtx: RenderContenxtType): Element {
+        const props = data.props as DataEleDateProps;
         const ele = new DataElementDate();
         this.createDataEleProps(ele.props, props);
         return ele;
     }
-    createDataEleProps(dest, props) {
-        const dataEleProps = dest;
+
+    createDataEleProps(dest: DataEleDateProps, props: DataEleDateProps): DataEleDateProps {
+        const dataEleProps: DataEleDateProps = dest;
         ElementUtil.readEleBaseProps(dataEleProps, props);
         //dataEleProps.id = props.id ?? nanoid(5);
         //dataEleProps.name = props.name;
@@ -107,5 +123,6 @@ export class DataElementDateFactory extends ElementFactory {
         dataEleProps.valueTextProps = ElementUtil.readTextProps(null, props.valueTextProps, this.options);
         return dataEleProps;
     }
+
+
 }
-//# sourceMappingURL=data-element-date-impl.js.map

package/{lib/framework/impl/data-element/data-element-group-impl.js → src/med_editor/framework/impl/data-element/data-element-group-impl.ts}

@@ -1,22 +1,25 @@
 import { InlineGroupInputElement } from "./data-element-base-impl";
-import { InlineGroupRenderObject } from "../../render-define";
-import { ElementFactory } from "../../element-define";
+import { InlineGroupRenderObject, RenderObject } from "../../render-define";
+import { RenderContenxtType } from "../../render-context";
+import { SerializeProps, ViewOptions, Element, ElementFactory, Position } from "../../element-define";
 import { DataElementGroupProps } from "../../element-props";
 import { ElementUtil } from "../../element-util";
+import { ContextMenuElementEvent } from "../../element-event-define";
 import { ElementSerialize } from "../../element-serialize";
 import { ParagraphRenderObject } from "../paragraph/p-impl";
 import { CommonUtil } from "../../common-util";
-export class DataElementGroupElement extends InlineGroupInputElement {
+
+export class DataElementGroupElement extends InlineGroupInputElement<DataElementGroupProps>{
     constructor() {
         super('data-group');
         this.props = new DataElementGroupProps();
-        this.addEvent('ElementContextMenu', (evt) => {
+        this.addEvent<ContextMenuElementEvent>('ElementContextMenu', (evt) => {
             if (evt.ctx.viewOptions.devMode) {
                 evt.menus.push({
                     icon: '获取数据组值', caption: '获取数据组值', eventObj: {
                         onClick: () => {
-                            const str = ElementSerialize.serializeString(this, { all: false });
-                            alert(str);
+                            const str = ElementSerialize.serializeString(this, { all: false })
+                            alert(str)
                         }
                     }
                 });
@@ -31,7 +34,7 @@ export class DataElementGroupElement extends InlineGroupInputElement {
             this.refreshView();
         });
     }
-    clone(data) {
+    clone(data: boolean): Element {
         const clone = new DataElementGroupElement();
         this.props.clone(clone.props);
         if (data) {
@@ -45,36 +48,45 @@ export class DataElementGroupElement extends InlineGroupInputElement {
         }
         return clone;
     }
-    createRenderObject(options, renderCtx) {
+
+    createRenderObject(options: ViewOptions, renderCtx: RenderContenxtType): RenderObject | null {
         return new DataElementGroupRenderObject(this);
     }
-    serialize(viewOptions) {
+
+    serialize(viewOptions: ViewOptions): SerializeProps | null {
         return {
             type: this.type,
             props: {
                 ...this.props.getSerializeProps()
             }
-        };
+        }
     }
+
 }
-export class DataElementGroupRenderObject extends InlineGroupRenderObject {
-    paintPos;
-    beginRender(ctx, position) {
+
+
+export class DataElementGroupRenderObject extends InlineGroupRenderObject<DataElementGroupElement> {
+    paintPos!: Position;
+    beginRender(ctx: RenderContenxtType, position: Position): void {
         //ctx.contentContext.fillRect(position.x, position.y, this.rect.width, this.rect.height, 'yellow');
         this.paintPos = position;
+
     }
-    getCurrentParaGroupRenders() {
-        const renders = [];
-        const currParaRender = ElementUtil.getParentRender(this, ParagraphRenderObject);
+
+    private getCurrentParaGroupRenders(): DataElementGroupRenderObject[] {
+        const renders: DataElementGroupRenderObject[] = [];
+        const currParaRender = ElementUtil.getParentRender(this, ParagraphRenderObject) as ParagraphRenderObject;
         for (let i = 0; i < this.element.paintRenders.length; i++) {
-            const paraRender = ElementUtil.getParentRender(this.element.paintRenders[i], ParagraphRenderObject);
+            const paraRender = ElementUtil.getParentRender(this.element.paintRenders[i], ParagraphRenderObject) as ParagraphRenderObject;
             if (paraRender === currParaRender) {
-                renders.push(this.element.paintRenders[i]);
+                renders.push(this.element.paintRenders[i] as DataElementGroupRenderObject);
             }
         }
         return renders;
     }
-    pagePaintCompleted(ctx, position) {
+
+
+    pagePaintCompleted(ctx: RenderContenxtType, position: Position): void {
         const canPaint = this.element.isMouseenter || this.element.isFocused;
         if (canPaint && this.element.paintRenders.indexOf(this) === 0) {
             const currParaRenders = this.getCurrentParaGroupRenders();
@@ -82,11 +94,12 @@ export class DataElementGroupRenderObject extends InlineGroupRenderObject {
             if (currParaRenders.length > 1) {
                 const secondGroupRenderPos = currParaRenders[1].paintPos;
                 if (secondGroupRenderPos.x + currParaRenders[1].rect.width > this.paintPos.x) {
-                    const leftPoints = [];
-                    const rightPoints = [];
+                    const leftPoints: Array<Position> = [];
+                    const rightPoints: Array<Position> = [];
                     for (let i = 0; i < currParaRenders.length; i++) {
                         const groupRender = currParaRenders[i];
                         const groupRenderPos = groupRender.paintPos;
+
                         leftPoints.push({ x: groupRenderPos.x, y: groupRenderPos.y - verOffset });
                         rightPoints.push({ x: groupRenderPos.x + groupRender.rect.width, y: groupRenderPos.y - verOffset });
                         leftPoints.push({ x: groupRenderPos.x, y: groupRenderPos.y + groupRender.rect.height + verOffset * 2 });
@@ -103,10 +116,16 @@ export class DataElementGroupRenderObject extends InlineGroupRenderObject {
                 ctx.overlaysContext.strokeRect(render.paintPos.x, render.paintPos.y - verOffset, render.rect.width, render.rect.height + verOffset * 2, ctx.viewOptions.dataGroupColor);
             }
         }
+
     }
-    endRender(ctx, position) {
+
+
+
+    endRender(ctx: RenderContenxtType, position: Position): void {
+
     }
-    clone() {
+
+    clone(): RenderObject {
         const cloneRender = new DataElementGroupRenderObject(this.element);
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
         for (let i = 0; i < this.length; i++) {
@@ -115,16 +134,17 @@ export class DataElementGroupRenderObject extends InlineGroupRenderObject {
         return cloneRender;
     }
 }
-export class DataElementGroupFactory extends ElementFactory {
-    match(type) {
-        return type === "data-group";
+
+export class DataElementGroupFactory extends ElementFactory<DataElementGroupProps> {
+    match(type: string): boolean {
+        return type === "data-group"
     }
-    createElement(data, renderCtx) {
-        const props = data.props;
+    createElement(data: any, renderCtx: RenderContenxtType): Element {
+        const props = data.props as DataElementGroupProps;
         const ele = new DataElementGroupElement();
         ele.props.id = props.id;
         ele.props.name = props.name;
         return ele;
     }
+
 }
-//# sourceMappingURL=data-element-group-impl.js.map

package/{lib/framework/impl/data-element/data-element-image-impl.js → src/med_editor/framework/impl/data-element/data-element-image-impl.ts}

@@ -1,65 +1,72 @@
-import { ElementFactory, ResizeLeafRenderObject } from "../../element-define";
+import { Element, ElementFactory, ImgLoadStatus, LeafElement, Position, readElementProps, ResizeLeafRenderObject, SerializeProps, ViewOptions } from "../../element-define";
 import { DataEleImageProps } from "../../element-props";
 import { ElementUtil } from "../../element-util";
+import { RenderContenxtType } from "../../render-context";
+import { LeafRenderObject, RenderObject } from "../../render-define";
 import { DataElementLeaf } from "./data-element-base-impl";
-export class DataElementImage extends DataElementLeaf {
+
+export class DataElementImage extends DataElementLeaf<DataEleImageProps> {
     //props: DataEleImageProps;
-    status = 'no';
-    resizeable = true;
+    status: ImgLoadStatus = 'no';
+    resizeable: boolean = true;
     constructor() {
         super('data-ele-img');
         this.props = new DataEleImageProps();
         //this.addPropValueChangedSub(this.props);
-        this.cursorType = 'move';
+        this.cursorType = 'move'
         this.focusable = true;
     }
-    createRenderObject() {
+    createRenderObject(): LeafRenderObject {
         const render = new DataImageRenderObject(this);
         render.rect.width = this.props.width + 2;
         render.rect.height = this.props.height + 2;
         return render;
     }
-    serialize(options) {
+    serialize(options: ViewOptions): SerializeProps {
         return {
             type: 'data-ele-img',
             props: {
                 ...this.props.getSerializeProps(options)
             }
-        };
+        }
     }
-    clone(data) {
+    clone(data: boolean): Element {
         const clone = new DataElementImage();
         this.props.clone(clone.props);
         return clone;
     }
-    loadImage(ctx) {
+
+    loadImage(ctx: RenderContenxtType): void {
         if (this.status === 'no') {
             this.status = 'loading';
-            const onCallback = (status) => {
+            const onCallback = (status: ImgLoadStatus) => {
                 this.status = status;
                 if (status === 'completed') {
                     this.refreshView();
                 }
-            };
+            }
             ctx.docCtx.imageLoader.loadImage(this.props.src, onCallback);
         }
     }
-    destroy() {
+    destroy(): void {
         super.destroy();
     }
-    setValue(val) {
+
+    setValue(val: any): void {
         if (this.getValue() === val) {
             return;
         }
-        this.props.src = val;
+        this.props.src = val as string;
     }
-    getValue() {
+
+    getValue(): string {
         return this.props.src;
     }
 }
+
 export class DataImageRenderObject extends ResizeLeafRenderObject {
-    render(ctx, position) {
-        const dataImgElement = this.element;
+    render(ctx: RenderContenxtType, position: { x: number; y: number; }): void {
+        const dataImgElement = this.element as DataElementImage;
         const picProps = dataImgElement.props;
         if (dataImgElement.status === 'no') {
             dataImgElement.loadImage(ctx);
@@ -85,12 +92,13 @@ export class DataImageRenderObject extends ResizeLeafRenderObject {
             ctx.contentContext.strokeLines([{ x: x - lineWidth, y }, { x, y }, { x, y: y + height }, { x: x - lineWidth, y: y + height }], 1, paintColor);
         }
     }
-    clone() {
+    clone(): RenderObject {
         const clone = new DataImageRenderObject(this.element);
         clone.rect = ElementUtil.cloneRect(this.rect);
         return clone;
     }
-    pagePaintCompleted(ctx, pos) {
+
+    pagePaintCompleted(ctx: RenderContenxtType, pos: Position): void {
         if (this.element.isFocused) {
             const { width, height } = this.rect;
             ctx.contentContext.strokeRect(pos.x, pos.y, this.rect.width, this.rect.height, '#1890ff', 0.5);
@@ -104,7 +112,8 @@ export class DataImageRenderObject extends ResizeLeafRenderObject {
             this.drawResizeCircle(ctx, pos.x + width, pos.y + (Math.floor(height / 2)));
         }
     }
-    drawResizeCircle(ctx, x, y) {
+
+    private drawResizeCircle(ctx: RenderContenxtType, x: number, y: number): void {
         const ctxNative = ctx.contentContext.ctx;
         ctxNative.save();
         ctxNative.fillStyle = '#69c0ff';
@@ -115,12 +124,14 @@ export class DataImageRenderObject extends ResizeLeafRenderObject {
         ctxNative.restore();
     }
 }
-export class DataElementImgFactory extends ElementFactory {
-    match(type) {
+
+
+export class DataElementImgFactory extends ElementFactory<DataEleImageProps> {
+    match(type: string): boolean {
         return type === 'data-ele-img';
     }
-    createElement(data, renderCtx) {
-        const props = data.props;
+    createElement(data: readElementProps<DataEleImageProps>, renderCtx: RenderContenxtType): Element {
+        const props = data.props as DataEleImageProps;
         const pic = new DataElementImage();
         ElementUtil.readEleBaseProps(pic.props, props);
         //pic.props.id = props.id ?? nanoid(5);
@@ -134,4 +145,3 @@ export class DataElementImgFactory extends ElementFactory {
         return pic;
     }
 }
-//# sourceMappingURL=data-element-image-impl.js.map

package/{lib/framework/impl/data-element/data-element-list-impl.js → src/med_editor/framework/impl/data-element/data-element-list-impl.ts}

@@ -1,27 +1,33 @@
-import { ElementFactory } from "../../element-define";
-import { DataEleListProps } from "../../element-props";
+import { Element, ElementFactory, readElementProps, SerializeProps, ViewOptions } from "../../element-define";
+import { DataEleListProps, DataEleBaseTextProps } from "../../element-props";
 import { ElementUtil } from "../../element-util";
+import { RenderContenxtType } from "../../render-context";
+import { RenderObject } from "../../render-define";
 import { ElementSerialize } from "../../element-serialize";
 import { TextGroupElement } from "../text/text-impl";
 import { DataElementInlineGroup, DataElementRenderObject } from "./data-element-base-impl";
-export class DataElementList extends DataElementInlineGroup {
+
+export class DataElementList extends DataElementInlineGroup<DataEleListProps> {
     //props: DataEleListProps;
     constructor() {
         super('data-ele-list');
         this.props = new DataEleListProps();
     }
-    createRenderObject() {
+
+    createRenderObject(): RenderObject {
         return new DataElementListRenderObject(this);
     }
-    serialize(viewOptions) {
+
+    serialize(viewOptions: ViewOptions): SerializeProps & any {
         return {
             type: this.type,
             props: {
                 ...this.props.getSerializeProps(viewOptions)
             }
-        };
+        }
     }
-    clone(data) {
+
+    clone(data: boolean): DataElementList {
         const clone = new DataElementList();
         this.props.clone(clone.props);
         if (data) {
@@ -35,7 +41,8 @@ export class DataElementList extends DataElementInlineGroup {
         }
         return clone;
     }
-    setValue(vals) {
+
+    setValue(vals: string[]): void {
         if (this.getValue() === vals.join(';')) {
             return;
         }
@@ -48,15 +55,14 @@ export class DataElementList extends DataElementInlineGroup {
                 if (option) {
                     const valueText = new TextGroupElement();
                     this.props.valueTextProps.clone(valueText.props);
-                    const splitSymbol = i < vals.length - 1 ? ';' : '';
+                    const splitSymbol = i < vals.length - 1 ? ';' : ''
                     valueText.text = option.value + splitSymbol;
                     this.addChild(valueText, this.length - 1);
                 }
             }
-        }
-        else {
+        } else {
             if (vals.length > 1) {
-                console.warn('当前下拉框是单选模式,不能传入多个值');
+                console.warn('当前下拉框是单选模式,不能传入多个值')
             }
             const val = vals[0];
             const option = this.props.options.find(item => item.code === val);
@@ -69,30 +75,32 @@ export class DataElementList extends DataElementInlineGroup {
         }
         this.beginMeasure();
     }
-    getValue() {
+
+    getValue(): string {
         const values = ElementSerialize.serializeString(this);
         if (!values) {
             return '';
         }
         const valueItems = values.split(';');
-        const valueCode = [];
+        const valueCode: Array<string> = [];
         for (const valueItem of valueItems) {
             const option = this.props.options.find(item => item.value === valueItem);
             if (option) {
-                valueCode.push(option.code);
-            }
-            else {
-                valueCode.push(option + '');
+                valueCode.push(option.code)
+            } else {
+                valueCode.push(option + '')
             }
         }
-        return valueCode.join(';');
+        return valueCode.join(';')
     }
 }
-export class DataElementListRenderObject extends DataElementRenderObject {
-    constructor(element) {
+
+
+export class DataElementListRenderObject extends DataElementRenderObject<DataElementList> {
+    constructor(element: DataElementList) {
         super(element);
     }
-    clone() {
+    clone(): RenderObject {
         const cloneRender = new DataElementListRenderObject(this.element);
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
         for (let i = 0; i < this.length; i++) {
@@ -100,19 +108,22 @@ export class DataElementListRenderObject extends DataElementRenderObject {
         }
         return cloneRender;
     }
+
 }
-export class DataElementListFactory extends ElementFactory {
-    match(type) {
-        return type === "data-ele-list";
+
+export class DataElementListFactory extends ElementFactory<DataEleListProps> {
+    match(type: string): boolean {
+        return type === "data-ele-list"
     }
-    createElement(data, renderCtx) {
-        const props = data.props;
+    createElement(data: readElementProps<DataEleListProps>, renderCtx: RenderContenxtType): Element {
+        const props = data.props as DataEleListProps;
         const ele = new DataElementList();
         this.createDataEleProps(ele.props, props);
         return ele;
     }
-    createDataEleProps(dest, props) {
-        const dataEleProps = dest;
+
+    createDataEleProps(dest: DataEleListProps, props: DataEleListProps): DataEleBaseTextProps {
+        const dataEleProps: DataEleListProps = dest;
         ElementUtil.readEleBaseProps(dataEleProps, props);
         //dataEleProps.id = props.id ?? nanoid(5);
         //dataEleProps.name = props.name;
@@ -127,5 +138,5 @@ export class DataElementListFactory extends ElementFactory {
         dataEleProps.dropDownStyle = props.dropDownStyle;
         return dataEleProps;
     }
+
 }
-//# sourceMappingURL=data-element-list-impl.js.map