@hailin-zheng/editor-core 1.0.7 → 1.0.10

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

@@ -1,17 +1,21 @@
 import { Subject } from "rxjs";
-import { BranchElement, LeafElement } from "./element-define";
+import { BranchElement, LeafElement, Rect, Element, SelectionContentRange, Position } from "./element-define";
+import { HitEventInfo, HitRegion } from "./element-event-define";
 import { ElementUtil } from "./element-util";
 import { DocumentContainerRender } from "./impl/document/doc-container-impl";
 import { DocumentRenderObject } from "./impl/document/doc-impl";
-import { TextGroupElement } from "./impl/text/text-impl";
-import { DocumentBodyElement } from "@/med_editor/framework/impl/document/doc-body-impl";
+import { TextGroupElement, TextGroupRenderObject } from "./impl/text/text-impl";
+import { RenderObject } from "./render-define";
+import { DocumentBodyElement } from "./impl/document/doc-body-impl";
+
 export class DocumentSelection {
     constructor() {
         this.selectionState = new SelectionState();
     }
-    selectionState;
-    snapshotSelectionState;
-    setSelectionState(hitInfo) {
+
+    selectionState: SelectionState;
+    snapshotSelectionState!: SelectionState | null;
+    setSelectionState(hitInfo: { startHitInfo: HitEventInfo, endHitInfo: HitEventInfo }): void {
         const { startHitInfo, endHitInfo } = hitInfo;
         this.selectionState.clear();
         this.selectionState.startHitInfo = startHitInfo;
@@ -22,16 +26,16 @@ export class DocumentSelection {
         startRange.setStart(startHitInfo.element, startHitInfo.offset);
         if (endHitInfo) {
             startRange.setEnd(endHitInfo.element, endHitInfo.offset);
-        }
-        else {
+        } else {
             startRange.setEnd(startHitInfo.element, startHitInfo.offset);
         }
         this.selectionState.addRange(startRange);
     }
+
     /**
     * 获取选区共同的祖先控件
     */
-    static getAncestorCommonControl(startControl, endControl) {
+    static getAncestorCommonControl(startControl: LeafElement, endControl: LeafElement): BranchElement {
         const startNestParents = this.getNestParents(startControl.parent);
         const ancestorCommonControl = this.getCommonParenet(endControl.parent, startNestParents);
         if (!ancestorCommonControl) {
@@ -39,18 +43,21 @@ export class DocumentSelection {
         }
         return ancestorCommonControl;
     }
+
     /**
      * 获取向上的嵌套父级节点集合
-     * @param control
-     * @param array
+     * @param control 
+     * @param array 
      */
-    static getNestParents(control) {
+    static getNestParents(control: BranchElement | null): Array<BranchElement> {
         if (control) {
             return [control, ...this.getNestParents(control.parent)];
         }
         return [];
+
     }
-    static getCommonParenet(control, array) {
+
+    static getCommonParenet(control: BranchElement | null, array: Array<BranchElement>): BranchElement | null {
         if (!control) {
             return null;
         }
@@ -59,7 +66,8 @@ export class DocumentSelection {
         }
         return this.getCommonParenet(control?.parent, array);
     }
-    updateSelectionState() {
+
+    updateSelectionState(): boolean {
         if (this.compareSelectionEquals()) {
             return false;
         }
@@ -80,25 +88,31 @@ export class DocumentSelection {
             this.selectionState.addRange(clone);
         }
         this.selectionState.editable = range.editable;
-        this.selectionState.startControl = range.startControl;
+
+        this.selectionState.startControl = range.startControl as LeafElement;
         this.selectionState.startOffset = range.startOffset;
         this.selectionState.startControlIndex = ElementUtil.getControlIndex(range.startControl);
-        this.selectionState.endControl = range.endControl;
+
+        this.selectionState.endControl = range.endControl as LeafElement;
         this.selectionState.endOffset = range.endOffset;
         this.selectionState.endControlIndex = ElementUtil.getControlIndex(range.endControl);
+
         this.selectionState.ancestorCommonControl = DocumentSelection.getAncestorCommonControl(this.selectionState.startControl, this.selectionState.endControl);
+
         this.selectionState.enableTrackChanges = this.getEnableTrackChanges(range.startControl);
         return true;
     }
+
     /**
      * 获取当前选区区域内是否支持留痕
      * @private
      */
-    getEnableTrackChanges(ele) {
+    private getEnableTrackChanges(ele: Element): boolean {
         const body = ElementUtil.getParentByType(ele, DocumentBodyElement);
         return body?.trackChanges || false;
     }
-    compareSelectionEquals() {
+
+    private compareSelectionEquals(): boolean {
         const range = this.selectionState.range;
         const snap = this.snapshotSelectionState;
         if (snap && range) {
@@ -109,11 +123,12 @@ export class DocumentSelection {
         }
         return false;
     }
+
     /**
      * 转换选区内容
      * 处理结束选区在开始选区之前
      */
-    transformRange() {
+    private transformRange(): void {
         let range = this.selectionState.range;
         if (!range) {
             return;
@@ -131,7 +146,7 @@ export class DocumentSelection {
         }
         range = this.selectionState.range;
         if (!range) {
-            throw new Error('range is null');
+            throw new Error('range is null')
         }
         range.calcRange();
         if ((range.startControl === range.endControl && range.startOffset > range.endOffset)) {
@@ -141,52 +156,59 @@ export class DocumentSelection {
         }
         range.calcRange();
     }
-    takeSnapshot() {
+
+    takeSnapshot(): void {
         this.snapshotSelectionState = this.selectionState.clone();
     }
-    clearSnapshot() {
+
+    clearSnapshot(): void {
         this.snapshotSelectionState = null;
     }
+
 }
+
 export class SelectionState {
-    get startControl() {
-        return this._startControl;
+    get startControl(): LeafElement {
+        return this._startControl as LeafElement;
     }
-    set startControl(value) {
+
+    set startControl(value: LeafElement | null) {
         this._startControl = value;
     }
-    get endControl() {
-        return this._endControl;
+
+    get endControl(): LeafElement {
+        return this._endControl as LeafElement;
     }
-    set endControl(value) {
+
+    set endControl(value: LeafElement | null) {
         this._endControl = value;
     }
-    onChangedEvent = new Subject();
-    startControlIndex;
-    startOffset;
-    endControlIndex;
-    endOffset;
+    onChangedEvent: Subject<void> = new Subject();
+    startControlIndex!: number;
+    startOffset!: number;
+    endControlIndex!: number;
+    endOffset!: number;
     get collapsed() {
         const { startControlIndex, startOffset, endControlIndex, endOffset } = this;
         return !(startControlIndex !== endControlIndex || (startControlIndex === endControlIndex && startOffset !== endOffset));
     }
-    _startControl;
-    _endControl;
-    ancestorCommonControl;
-    range;
-    startHitInfo;
-    selectedRange;
-    editable = true;
-    renderContainer;
-    cursorPos;
+    private _startControl!: LeafElement | null;
+    private _endControl!: LeafElement | null;
+    ancestorCommonControl!: BranchElement | null;
+    range!: SelectionRange | null;
+    startHitInfo!: HitEventInfo | null;
+    selectedRange!: SelectionContentRange | null;
+    editable: boolean = true;
+    renderContainer!: DocumentContainerRender;
+    cursorPos!: Rect | null;
     //选区重新计算，触发函数
-    afterSelectionChanged = null;
+    afterSelectionChanged: ((newVal: SelectionState) => boolean) | null = null;
     //当前选区的上下文是否支持留痕修改
-    enableTrackChanges = false;
+    enableTrackChanges: boolean = false;
     constructor() {
         this.clear();
     }
-    clear() {
+    clear(): void {
         this.range = null;
         this.startOffset = -1;
         this.endOffset = -1;
@@ -198,25 +220,28 @@ export class SelectionState {
         this.selectedRange = null;
         this.cursorPos = null;
     }
-    addRange(range) {
+
+    addRange(range: SelectionRange): void {
         this.clear();
         this.range = range;
         this.onChangedEvent.next();
     }
-    resetRange(startControl, startOffset) {
+    resetRange(startControl: Element, startOffset: number): SelectionRange {
         const range = new SelectionRange();
         range.setStart(startControl, startOffset);
         range.setEnd(startControl, startOffset);
         this.addRange(range);
         return range;
     }
-    surround(ele) {
+
+    surround(ele: Element): void {
         const range = new SelectionRange();
         range.setStart(ele, 0);
         range.setEnd(ele, -1);
         this.addRange(range);
     }
-    clone() {
+
+    clone(): SelectionState {
         const clone = new SelectionState();
         clone._startControl = this._startControl;
         clone.startOffset = this.startOffset;
@@ -228,63 +253,69 @@ export class SelectionState {
         clone.selectedRange = this.selectedRange;
         return clone;
     }
+
+
 }
+
+
+
 export class SelectionRange {
-    startControl;
-    startOffset;
-    endControl;
-    endOffset;
-    editable = true;
-    setStart(control, offset) {
+    startControl!: Element;
+    startOffset!: number;
+    endControl!: Element;
+    endOffset!: number;
+    editable: boolean = true;
+    setStart(control: Element, offset: number): void {
         this.startControl = control;
         this.startOffset = offset;
     }
-    setEnd(control, offset) {
+    setEnd(control: Element, offset: number): void {
         this.endControl = control;
         this.endOffset = offset;
     }
-    calcStart() {
+
+    private calcStart(): void {
         const res = this.setInfo(this.startControl, this.startOffset);
         this.setStart(res.control, res.offset);
     }
-    calcEnd() {
+
+    private calcEnd(): void {
         const res = this.setInfo(this.endControl, this.endOffset);
         this.setEnd(res.control, res.offset);
     }
-    calcRange() {
+
+    calcRange(): void {
         this.calcStart();
         this.calcEnd();
     }
-    setInfo(control, offset) {
+
+    private setInfo(control: Element, offset: number): { control: LeafElement, offset: number } {
         if (control instanceof LeafElement) {
             if (control instanceof TextGroupElement) {
                 offset = offset === -1 ? control.text.length : offset;
             }
             offset = offset === -1 ? 1 : offset;
             return { control, offset };
-        }
-        else if (control instanceof BranchElement) {
+        } else if (control instanceof BranchElement) {
             if (offset > control.length) {
                 throw new Error('超索引');
             }
             if (offset === control.length) {
                 const child = control.getChild(offset - 1);
                 return this.setInfo(child, 1);
-            }
-            else if (offset === -1) {
+            } else if (offset === -1) {
                 const child = control.getChild(control.length - 1);
                 return this.setInfo(child, -1);
-            }
-            else {
+            } else {
                 const child = control.getChild(offset);
                 return this.setInfo(child, 0);
             }
-        }
-        else {
+        } else {
             throw new Error('未实现');
         }
     }
-    clone() {
+
+    clone(): SelectionRange {
         const clone = new SelectionRange();
         clone.startControl = this.startControl;
         clone.startOffset = this.startOffset;
@@ -292,29 +323,31 @@ export class SelectionRange {
         clone.endOffset = this.endOffset;
         return clone;
     }
+
 }
+
 export class DocumentCursor {
-    static getElementCursorPos(ele, offset, hitRegion, docNum) {
+    static getElementCursorPos(ele: LeafElement, offset: number, hitRegion: HitRegion | undefined, docNum: number): { render: RenderObject, rect: Rect } {
         if (hitRegion === 'body' || hitRegion === 'review') {
             return this.getElementRenderPos(ele, offset, ele.paintRenders);
-        }
-        else if (hitRegion === 'footer' || hitRegion === 'header') {
+        } else if (hitRegion === 'footer' || hitRegion === 'header') {
             const docContainer = ElementUtil.getParentRender(ele.paintRenders[0], DocumentContainerRender);
             if (!docContainer) {
-                throw new Error('docContainer is null');
+                throw new Error('docContainer is null')
             }
-            const docRender = docContainer.getChild(docNum);
+            const docRender = docContainer.getChild(docNum) as DocumentRenderObject;
             const currDocPaintRenders = ele.paintRenders.filter(item => ElementUtil.getParentRender(item, DocumentRenderObject) === docRender);
             return this.getElementRenderPos(ele, offset, currDocPaintRenders);
         }
         debugger;
-        throw new Error('未找到元素偏移量对应的光标位置');
+        throw new Error('未找到元素偏移量对应的光标位置')
     }
-    static getElementRenderPos(ele, offset, paints) {
+
+    private static getElementRenderPos(ele: LeafElement, offset: number, paints: Array<RenderObject>): { render: RenderObject, rect: Rect } {
         if (ele instanceof TextGroupElement) {
             let count = 0;
             for (let i = 0; i < paints.length; i++) {
-                const paintRender = paints[i];
+                const paintRender = paints[i] as TextGroupRenderObject;
                 let horX = 0;
                 if (paintRender.textMeasures.length + count < offset) {
                     count += paintRender.textMeasures.length;
@@ -322,7 +355,7 @@ export class DocumentCursor {
                 }
                 for (let i = 0; i <= paintRender.textMeasures.length; i++) {
                     if (count === offset || (i === 0 && count + 0.5 === offset)) {
-                        const rect = ElementUtil.getRenderAbsolutePaintRect(paintRender, { x: 0, y: 0 });
+                        const rect = ElementUtil.getRenderAbsolutePaintRect(paintRender, { x: 0, y: 0 })
                         //上标、下标位置处理
                         if (['superscript', 'subscript'].indexOf(ele.props.vertAlign) >= 0) {
                             rect.height -= ele.props.fontSize / 2;
@@ -334,25 +367,23 @@ export class DocumentCursor {
                         return {
                             render: paintRender,
                             rect
-                        };
+                        }
                     }
                     count++;
                     horX += paintRender.textMeasures[i].actualSize;
                 }
             }
-        }
-        else {
+        } else {
             const paintRender = paints[0];
-            const rect = ElementUtil.getRenderAbsolutePaintRect(paintRender, { x: 0, y: 0 });
+            const rect = ElementUtil.getRenderAbsolutePaintRect(paintRender, { x: 0, y: 0 })
             if (offset === 1) {
                 rect.x += rect.width;
             }
             return {
                 render: paintRender,
                 rect
-            };
+            }
         }
-        throw new Error('未能定位到元素位置');
+        throw new Error('未能定位到元素位置')
     }
 }
-//# sourceMappingURL=document-selection.js.map

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

@@ -4,8 +4,9 @@ import { DocumentBodyElement } from "./impl/document/doc-body-impl";
 import { DocumentFooterElement } from "./impl/document/doc-footer-impl";
 import { DocumentHeaderElement } from "./impl/document/doc-header-impl";
 import { DocumentElement } from "./impl/document/doc-impl";
+
 export class DocumentTemplate {
-    static createA4Doc() {
+    static createA4Doc(): DocumentElement {
         const doc = new DocumentElement();
         doc.props = new DocumentProps();
         doc.props.width = 210;
@@ -16,5 +17,4 @@ export class DocumentTemplate {
         doc.addChild(new DocumentFooterElement());
         return doc;
     }
-}
-//# sourceMappingURL=document-template.js.map
+}

package/src/med_editor/framework/document-textline-mode.ts

@@ -0,0 +1,34 @@
+import { BranchElement, ViewOptions, Element } from "./element-define";
+import { ElementUtil } from "./element-util";
+import { TableElement, textLineRenderMode } from "./impl/table/table-impl";
+import { RenderContenxtType } from "./render-context";
+import { BlockContainerRenderObject, RenderObject } from "./render-define";
+
+/**
+* 文字行渲染模式
+用于医嘱打印模式
+*/
+export function runTextLineRender(ele: Element, options: ViewOptions, renderCtx: RenderContenxtType): void {
+    if (!options.textRowLineMode) {
+        return;
+    }
+    if (ele instanceof TableElement) {
+        textLineRenderMode(ele, options, renderCtx);
+        remeasureParentRenders(ele.measureRender)
+        return;
+    }
+    if (ele instanceof BranchElement) {
+        for (let i = 0; i < ele.length; i++) {
+            runTextLineRender(ele.getChild(i), options, renderCtx);
+        }
+    }
+}
+
+function remeasureParentRenders(render: RenderObject | null): void {
+    if (!render) {
+        return
+    }
+    ElementUtil.remeasure(render as BlockContainerRenderObject)
+    remeasureParentRenders(render.parent)
+
+}