@hailin-zheng/editor-core 2.2.20 → 2.2.21

package/med_editor/doc-editor.d.ts

@@ -50,6 +50,7 @@ export declare class DocEditor {
     private editInput;
     private scrollContainer;
     onKeyDownEvent: Subject<KeyboardEvent>;
+    private searchPanel;
     constructor(svgContainer: HTMLElement);
     private createCanvasContext;
     private renderRoot;
@@ -164,7 +165,7 @@ export declare class DocEditor {
      * @param evt
      */
     onContextMenu(evt: MouseEvent): void;
-    resetViewer(type?: 'demand' | 'force' | undefined): void;
+    resetViewer(): void;
     /**
      * 缩放视图
      * @param scale

package/med_editor/doc-rule.d.ts

@@ -12,35 +12,163 @@ export declare class DocRule {
     private docCtx;
     private options;
     private ruleHeight;
+    private thumbWidth;
     private thumbX;
     private mouseDownPos;
-    private indentThumbPoints;
-    private hangThumbPoints;
     private mouseDownThumbType;
     viewOptions: ViewOptions;
     ss: SelectionState;
-    private nodes;
     constructor(docCtx: EditorContext);
     destroy(): void;
     setRuleOptions(options: RuleOptions): void;
-    private fillRectSvg;
-    private drawIndentThumbSvg;
-    private drawHangThumbSvg;
-    private drawLineSvg;
-    private drawTextSvg;
     refreshRuleSvg(): IVNodeRenderFunc;
-    private canvasMousedown;
-    private getMousePos;
-    private canvasMousemove;
-    private canvasMouseup;
-    private pointInPoly;
-    /**
-     * 绘制
-     */
-    private drawRuleSvg;
+    getRuleSVG(): any;
     private getRuleMarksPos;
     private getCurrPara;
-    private setParentMarksPosSvg;
-    private drawCellMarkSvg;
+    private drawCellMark;
+    /**
+    * 绘制首行缩进thumb
+    * @returns
+    */
+    createTopThumb(): {
+        sel: string;
+        data: {
+            on: {
+                mousedown: (evt: any) => void;
+            };
+            style: {
+                left: string;
+            };
+        };
+        children: {
+            sel: string;
+            data: {};
+            children: {
+                sel: string;
+                data: {
+                    ns: string;
+                    attrs: {
+                        width: number;
+                        height: number;
+                        viewBox: string;
+                        fill: string;
+                        "stroke-width": number;
+                    };
+                };
+                children: ({
+                    sel: string;
+                    data: {
+                        ns: string;
+                        attrs: {
+                            stroke: string;
+                            fill: string;
+                        };
+                    };
+                    children: {
+                        sel: string;
+                        data: {
+                            ns: string;
+                            attrs: {
+                                d: string;
+                                stroke: string;
+                            };
+                        };
+                    }[];
+                } | {
+                    sel: string;
+                    data: {
+                        ns: string;
+                        attrs: {
+                            stroke: string;
+                            fill: string;
+                        };
+                    };
+                    children: {
+                        sel: string;
+                        data: {
+                            ns: string;
+                            attrs: {
+                                d: string;
+                                fill: string;
+                                "vector-effect": string;
+                            };
+                        };
+                    }[];
+                })[];
+            }[];
+        }[];
+    };
+    /**
+     * 绘制悬挂缩进thumb
+     * @returns
+     */
+    createLeftThumb(): {
+        sel: string;
+        data: {
+            on: {
+                mousedown: (evt: MouseEvent) => void;
+            };
+            style: {
+                left: string;
+            };
+        };
+        children: {
+            sel: string;
+            data: {};
+            children: {
+                sel: string;
+                data: {
+                    ns: string;
+                    attrs: {
+                        width: number;
+                        height: number;
+                        viewBox: string;
+                        fill: string;
+                        "stroke-width": number;
+                    };
+                };
+                children: ({
+                    sel: string;
+                    data: {
+                        ns: string;
+                        attrs: {
+                            stroke: string;
+                            fill: string;
+                        };
+                    };
+                    children: {
+                        sel: string;
+                        data: {
+                            ns: string;
+                            attrs: {
+                                d: string;
+                                stroke: string;
+                            };
+                        };
+                    }[];
+                } | {
+                    sel: string;
+                    data: {
+                        ns: string;
+                        attrs: {
+                            stroke: string;
+                            fill: string;
+                        };
+                    };
+                    children: {
+                        sel: string;
+                        data: {
+                            ns: string;
+                            attrs: {
+                                d: string;
+                                fill: string;
+                                "vector-effect": string;
+                            };
+                        };
+                    }[];
+                })[];
+            }[];
+        }[];
+    };
 }
 export {};

package/med_editor/framework/code-interpreter/dynamic-execute.d.ts

@@ -7,6 +7,7 @@ export declare class DynamicExecute {
     current?: Element;
     depItems?: Map<string, RefCtxValue>;
     constructor(doc: BranchElement, ss: SelectionState);
+    create(): DynamicExecute;
     setCurrentCtx(ele: Element, depItems: Map<string, RefCtxValue>): void;
     clearCurrentCtx(): void;
     cacheList: ReturnType<DocumentContext['getDataElementModelList']>;

package/med_editor/framework/doc-layout/paragraph-arrange.d.ts

@@ -1,13 +1,16 @@
 import { LeafRenderObject, RenderObject } from "../render-define";
 import { FillNullSpaceRenderObject, ParagraphElement, ParagraphRenderObject, TextGroupRenderObject } from "../impl";
-import { Element, InlineGroupElement, LeafElement, ViewOptions } from "../element-define";
+import { Element, ICreateRenderData, InlineGroupElement, LeafElement, ViewOptions } from "../element-define";
 import { RenderContextType } from "../render-context";
 import { DynamicExecute } from "../code-interpreter/dynamic-execute";
+import { EditorContext } from "../document-context";
 export declare class ParagraphMeasure {
-    options: ViewOptions;
+    docCtx: EditorContext;
     renderCtx: RenderContextType;
     execute: DynamicExecute;
-    constructor(options: ViewOptions, renderCtx: RenderContextType, execute: DynamicExecute);
+    options: ViewOptions;
+    createData: ICreateRenderData;
+    constructor(docCtx: EditorContext, renderCtx: RenderContextType, execute: DynamicExecute);
     /**
      * 段落排版：
      * 1.当前段落不存在项目符号，按照缩进和悬挂处理

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

@@ -321,7 +321,7 @@ export declare class DocumentChange {
      * 移除空行内标签
      * @param ele
      */
-    removeEmtpyInlineBlock(ele: Element): void;
+    removeEmptyInlineBlock(ele: Element): void;
     /**
      * 插入Tab制表位
      */

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

@@ -33,7 +33,7 @@ export declare class EditorContext {
      * 编辑器文档刷新后回调(DOM渲染完成后回调)
      * @param cb
      */
-    onNextView(cb?: (() => void)): void;
+    onNextView(cb?: VoidFunction): void;
     get document(): DocumentElement;
     set document(value: DocumentElement);
     clear(): void;
@@ -71,7 +71,6 @@ export declare class DocumentContext {
         includeChildren: boolean;
     }): Array<DataElementInlineGroup | DataElementLeaf>;
     getControlById(id: string): DataElementInlineGroup | DataElementLeaf;
-    isDataEle(ele: Element): boolean;
     getControlByName(name: string): DataElementInlineGroup | DataElementLeaf;
     /**
      * 获取数据元值集合
@@ -126,6 +125,7 @@ interface DataEleBaseModel {
     id: string;
     name: string;
     fieldName: string;
+    caption: string;
     getValue: () => any;
     setValue: (val: any) => void;
 }

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

@@ -74,6 +74,7 @@ export declare abstract class Element<P extends object = any> {
     disposed: boolean;
     loaded: boolean;
     visibleExpr?: IParserExpress;
+    effectExpr?: IParserExpress;
     attribute?: ElementAttribute;
     private _parent;
     get parent(): BranchElement;
@@ -176,6 +177,7 @@ export interface SelectionContentRange {
     isFullSelected: boolean;
     startOffset: number;
     endOffset: number;
+    rangeColor?: string;
     selectedChildren: Array<SelectionContentRange>;
 }
 /**
@@ -285,8 +287,6 @@ export declare class ViewOptions {
     virtualViewMode: boolean;
     trackInsColor: string;
     trackDelColor: string;
-    showLineRect: boolean;
-    showCharRect: boolean;
     showTabChar: boolean;
     showSpaceChar: boolean;
     showLineBreak: boolean;
@@ -294,7 +294,6 @@ export declare class ViewOptions {
     devMode: boolean;
     showParaSymbol: boolean;
     showDebug: boolean;
-    resourceMode: 'lazy' | 'immediate';
     secretBrowse: boolean;
     chineseLayout: boolean;
     enableTrackHistory: boolean;
@@ -341,7 +340,7 @@ export declare class ViewOptions {
     textRowLineMode: boolean;
     editUser: DocUser;
     trackChangePeriod: number;
-    onChange: Subject<'demand' | 'force'>;
+    onChange: Subject<void>;
     printMode: 'normal' | 'continuation';
     enableSuggestions: boolean;
     constructor();
@@ -410,6 +409,7 @@ export interface ICreateRenderData {
     options: ViewOptions;
     renderCtx: RenderContextType;
     execute: DynamicExecute;
+    onNextView: (cb: VoidFunction) => void;
 }
 export interface FontBoundingBox {
     fontBoundingBoxAscent: number;
@@ -431,5 +431,6 @@ export interface IParserExpress {
 }
 export interface ElementAttribute {
     visibleExpr?: string;
+    effectExpr?: string;
 }
 export {};

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

@@ -86,7 +86,7 @@ export declare class CheckBoxProps extends INotifyPropertyChanged {
     getSerializeProps(viewOptions: ViewOptions): {
         size: number;
         isChecked: boolean;
-        groupName: string | null;
+        groupName: string;
     };
 }
 export declare class RadioBoxProps extends INotifyPropertyChanged {
@@ -338,5 +338,6 @@ export declare class BodyPartProps extends INotifyPropertyChanged {
 export interface SelectionEffectObject {
     selectionEleSets: Map<Element, SelectionContentRange>;
     commRangeSets: Map<Element, SelectionContentRange>;
+    otherRangeSets: Map<Element, Array<SelectionContentRange>>;
 }
 export {};

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

@@ -8,7 +8,7 @@ export declare class ElementSerialize {
      */
     static serialize(element: Element, viewOptions: ViewOptions): SerializeProps | null;
     static serializeString(element: Element, options?: {
-        all: boolean;
+        includeRunDel: boolean;
     }): string;
     static serializeObject(obj: object | undefined | null): any;
     /**

package/med_editor/framework/impl/data-element/data-element-base-impl.d.ts

@@ -57,7 +57,7 @@ export declare abstract class DataElementInlineGroup<P extends DataEleBaseProps
     beginMeasure(data: IBeginMeasureData): void;
     private parserExpress;
     /**
-     * 解析可见性表达式
+     * 解析表达式
      * @param ele
      * @param execute
      * @private

package/med_editor/framework/impl/document/doc-impl.d.ts

@@ -7,6 +7,7 @@ import { DocumentFooterElement } from "./doc-footer-impl";
 import { SelectionState } from "../../selection/document-selection";
 import { CommentElement } from "../comments/comment-element-impl";
 import { EditorContext } from "../../document-context";
+import { Subject } from "../../infrastructure/event-subject";
 export declare class DocumentElement extends BlockContainerElement<DocumentProps> {
     viewOptions: ViewOptions;
     bodyElement: DocumentBodyElement;
@@ -46,6 +47,12 @@ export declare class DocumentElement extends BlockContainerElement<DocumentProps
      * 清除所有批注
      */
     clearAllComms(): void;
+    onRefreshEvent: Subject<void>;
+    /**
+     * 元素内容或者属性发生改变，需要根据当前节点所在的树路径，设置脏标记，同时触发渲染
+     * @param ele
+     */
+    invokeChange(ele: Element): void;
 }
 export declare class DocumentRenderObject extends BlockContainerRenderObject {
     constructor(ele: Element);

package/med_editor/framework/search/search-panel.d.ts

@@ -0,0 +1,31 @@
+import { DocEditor } from 'src/med_editor/doc-editor';
+import { TextGroupElement } from '../impl';
+import { SelectionContentRange } from '../element-define';
+export declare class SearchPanel {
+    private editor;
+    searchQuery: string;
+    currentIndex: number;
+    totalMatches: number;
+    searchResults: searchResult[];
+    searchRangeColor: string;
+    currentRangeColor: string;
+    inputRef: HTMLInputElement;
+    state: 'close' | 'open';
+    constructor(editor: DocEditor);
+    render(): import("snabbdom").VNode;
+    searchNext(): void;
+    searchPrevious(): void;
+    nagivateToShow(): void;
+    onKeydown(e: KeyboardEvent): void;
+    searchInDocument(e: KeyboardEvent): any[];
+    clear(): void;
+    destroy(): void;
+    findMatches(inputString: string, pattern: string): number[];
+    switchVisible(): void;
+}
+interface searchResult {
+    index: number;
+    ele: TextGroupElement;
+    range?: SelectionContentRange;
+}
+export {};

package/med_editor/framework/selection/selection-overlays.d.ts

@@ -1,17 +1,21 @@
 import { SelectionState } from "./document-selection";
 import { Element, SelectionContentRange } from "../element-define";
+import { SelectionEffectObject } from "../element-props";
 /**
  * 用于处理选区拖蓝
  */
-export declare class SelectionOverlays {
+export declare class SelectionOverlays implements SelectionEffectObject {
     private selectionState;
     private selectionRange;
     selectionEleSets: Map<Element, SelectionContentRange>;
     commRangeSets: Map<Element, SelectionContentRange>;
+    otherRangeSets: Map<Element, SelectionContentRange[]>;
     constructor(selectionState: SelectionState);
     getSelectionTreeData(): void;
     private convertSelectRangeToSet;
     static addToSets(range: SelectionContentRange, set: Map<Element, SelectionContentRange>): void;
+    addToOtherRangeSets(range: SelectionContentRange): void;
+    clearOtherRangeSets(): void;
     /**
      * 添加到批注集合
      * @param range

package/med_editor/framework/util/common-util.d.ts

@@ -71,6 +71,7 @@ export declare class CommonUtil {
     static btoa(str: string): string;
     static isEqual(a: any, b: any): boolean;
     static getValue(val: any, defaultValue: any): any;
+    static getKeyCombination(event: KeyboardEvent): string;
 }
 declare type AnyFunction = (...args: any[]) => any;
 export {};

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

@@ -285,12 +285,15 @@ export declare class ElementUtil {
     /**
      * 递归向前寻找最近的元素
      * @param currElement
-     * @param inPara  是否在同一段落中寻找
-     * @param forCursor 查找结果是否用于光标定位
      * @param viewOptions
      * @returns
      */
-    static getRecursionPrevSiblingElement(currElement: Element | null, inPara: boolean | undefined, forCursor: boolean | undefined, viewOptions: ViewOptions): LeafElement | null;
+    static getRecursionPrevSiblingElement(currElement: Element | null, viewOptions: ViewOptions): CursorPositionInfo | null;
+    /**
+     * 递归元素里面向前寻找可以定位的元素
+     */
+    static getRecursionSiblingElementCursorPosition(ele: Element, viewOptions: ViewOptions, direction: 'left' | 'right'): CursorPositionInfo | null;
+    static getElementPositionCursor(ele: LeafElement, viewOptions: ViewOptions, direction: 'left' | 'right'): CursorPositionInfo | null;
     /**
      * 循环向前寻找可定位的数据元
      * @param currElement
@@ -299,7 +302,7 @@ export declare class ElementUtil {
     /**
      * 递归向后寻找最近的元素
      */
-    static getRecursionNextSiblingElement(currElement: Element | null, inPara: boolean | undefined, forCursor: boolean | undefined, viewOptions: ViewOptions): LeafElement | null;
+    static getRecursionNextSiblingElement(currElement: Element | null, viewOptions: ViewOptions): CursorPositionInfo | null;
     /**
      * 获取行内最大渲染单元格高度，主要处理纵向合并单元格问题
      * @param row
@@ -379,10 +382,10 @@ export declare class ElementUtil {
      */
     static getDataElement(ele: Element): DataElementInlineGroup | null;
     /**
-    * 向上查找类型为数据元的父级
-    * @param ele
-    * @returns
-    */
+     * 向上查找类型为数据元的父级
+     * @param ele
+     * @returns
+     */
     static getDataGroupElement(ele: Element): DataElementGroupElement | null;
     static getOSPlatform(): 'Windows' | 'Mac' | 'Linux';
     static getCheckboxPath(x: number, y: number, width: number, height: number): Array<Position>;
@@ -413,5 +416,13 @@ export declare class ElementUtil {
     static getEleAttribute(ele: Element, attr: string): any;
     static removeEleAttribute(ele: Element, attr: string): void;
     static getMatchItems(item: Element, predicate: (item: Element) => boolean): Element<any>[];
+    static isDataEle(ele: Element): boolean;
+}
+/**
+ * 用于光标定位的信息
+ */
+interface CursorPositionInfo {
+    ele: LeafElement;
+    offset: number;
 }
 export {};

package/package.json

@@ -4,7 +4,7 @@
     "author": "hailin-zheng",
     "private": false,
     "license": "ISC",
-    "version": "2.2.20",
+    "version": "2.2.21",
     "scripts": {},
     "dependencies": {
         "moment": "^2.29.3",
@@ -16,4 +16,4 @@
         "snabbdom-to-html": "^7.1.0",
         "jsbarcode": "^3.11.5"
     }
-}
+}