@hailin-zheng/editor-core 2.2.2 → 2.2.4

package/med_editor/doc-editor.d.ts

@@ -1,7 +1,7 @@
 import { ContentMenuItem } from './framework/element-event-define';
 import { ElementReader } from './framework/element-reader';
 import { SelectionState } from './framework/selection/document-selection';
-import { BranchElement, Element, ICancelTokenFn, LeafElement, MarginProps, OrientType, PageLayoutMode, Position, Rect, SerializeProps, ViewOptions } from './framework/element-define';
+import { BlockContainerElement, Element, ICancelTokenFn, LeafElement, MarginProps, OrientType, PageLayoutMode, Position, Rect, SerializeProps, ViewOptions } from './framework/element-define';
 import { DataElementInlineGroup, DataElementLeaf, DocumentElement, ParagraphElement, TableCellElement, TableElement, TableRowElement } from './framework/impl';
 import { CellDiagonal, ParagraphNumberType, ParagraphProps, TextProps } from './framework/element-props';
 import { EditorContext } from './framework/document-context';
@@ -10,8 +10,10 @@ import { Subject } from './framework/infrastructure/event-subject';
 import { init, VNode } from "snabbdom";
 import { IVNodeRenderFunc } from "./editor-core";
 import { DocRule } from "./doc-rule";
+import { ISuggestionData, ISuggestionProvider } from './framework/suggestions/input-suggestions';
 export declare class DocEditor {
     private svgContainer;
+    __v_skip: boolean;
     private contentCtx;
     viewOptions: ViewOptions;
     docCtx: EditorContext;
@@ -43,14 +45,17 @@ export declare class DocEditor {
     onDestroy: Subject<void>;
     beforeNodePatch: Subject<void>;
     afterNodePatch: Subject<void>;
+    onTextChanged: Subject<void>;
+    onSuggestionsProcess: Subject<ISuggestionProvider>;
     private eventBus;
     private editInput;
     private scrollContainer;
+    onKeyDownEvent: Subject<KeyboardEvent>;
     constructor(svgContainer: HTMLElement);
     private createCanvasContext;
     private renderRoot;
     private updateViewOption;
-    private adjustPageLayout;
+    adjustPageLayout(): void;
     private destroyDOM;
     createDocViewer(): void;
     measureMMToPixs(): number;
@@ -78,11 +83,16 @@ export declare class DocEditor {
      * @private
      */
     private updateSelection;
+    /**
+     * 根据当前选区，更新待输入文本字体信息
+     * @private
+     */
+    private updateInputFont;
     private hitInfoChanged;
     /**
      * 设置光标
      */
-    private setCursor;
+    setCursor(): void;
     private getCursorRect;
     /**
      * 设置虚拟光标的可见性
@@ -174,6 +184,7 @@ export declare class DocEditor {
      * @param cols
      */
     insertTable(rows: number, cols: number): TableElement;
+    insertLayoutContainer(ele: BlockContainerElement): void;
     /**
      * 插入软换行符
      */
@@ -242,7 +253,7 @@ export declare class DocEditor {
     /**
      * 插入批注
      */
-    insertComment(): void;
+    insertComment(text: string): void;
     /**
      * 清除所有批注
      */
@@ -278,7 +289,10 @@ export declare class DocEditor {
      * 是否可以恢复
      */
     canRedo(): boolean;
-    switchTrackChanges(eleCtx?: BranchElement | null): void;
+    /**
+     * 切换文档留痕开关
+     */
+    switchTrackChanges(): void;
     get trackTipsChanged(): Subject<{
         pos: Position;
         tips: import("./framework/element-event-define").ITrackTips;
@@ -447,6 +461,24 @@ export declare class DocEditor {
     emit(event: string, args: any): void;
     createResizableElement(): VNode;
     private readDocChangeLog;
+    /**
+     * 处理候选词
+     * @private
+     */
+    private processSuggestionsHandle;
+    createAutoCompleteOptions(): void;
+    private processKeyDownEvent;
+    /**
+     * 处理候选词，键盘选择定位
+     * @private
+     */
+    private onSuggestionsKeydown;
+    /**
+     * 渲染联想、候选词
+     * @private
+     */
+    private renderSuggestions;
+    insertSuggestion(suggestion: ISuggestionData): void;
 }
 export interface IReaderManager {
 }

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

@@ -1,6 +1,6 @@
 import { DocumentInput, InputData } from "./document-input-cursor";
 import { SelectionState } from "./selection/document-selection";
-import { Element, LeafElement, SelectionContentRange } from "./element-define";
+import { BlockContainerElement, Element, LeafElement, SelectionContentRange } from "./element-define";
 import { ParagraphElement, TableElement, TextGroupElement, TrackRunTypeEnum } from "./impl";
 import { ParagraphNumberType, ParagraphProps, TextProps } from "./element-props";
 import { ElementReader } from "./element-reader";
@@ -18,6 +18,7 @@ export declare class DocumentChange {
     private viewOptions;
     constructor(eleReader: ElementReader, docCtx: EditorContext, docComment: DocumentComment, documentInput: DocumentInput);
     newInput(data: InputData): void;
+    private correctInputEle;
     /**
      * 选中区域后进行输入
      * 需要处理将选中的区域删除后，进行输入的情况
@@ -142,6 +143,11 @@ export declare class DocumentChange {
      */
     private updateDeletedTrackText;
     private getNextTrackInputElement;
+    /**
+     * 创建一个待输入的文本元素
+     * @private
+     */
+    private createNewInputText;
     private getNextTrackElement;
     /**
      * 删除元素并定位光标
@@ -167,6 +173,11 @@ export declare class DocumentChange {
      * @returns
      */
     insertTable(tb: TableElement): void;
+    /**
+     * 插入布局容器，比如表格、数据容器等
+     * @param ele
+     */
+    insertLayoutContainer(ele: BlockContainerElement): void;
     /**
      * 分割当前段落用于插入表格或者粘贴的内容
      * @param insertItems 分割后插入的内容，内容需要是block或者表格对象
@@ -264,6 +275,14 @@ export declare class DocumentChange {
      * @param text
      */
     private pastePlainText;
+    /**
+     * 向当前光标追加文本
+     * @param appendStr
+     * @param inputOffset
+     * @param replaceLength
+     * @private
+     */
+    appendText(appendStr: string, replaceText: string): void;
     /**
      * 设置当前段落项目符号类型
      */
@@ -271,7 +290,7 @@ export declare class DocumentChange {
     /**
      * 插入批注
      */
-    insertComment(): void;
+    insertComment(text: string): void;
     validate(): boolean;
     /**
      * 移除空字符串

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

@@ -4,6 +4,8 @@ import { ElementEvent, EventTypes } from "./element-event-define";
 import { DataElementValueStruct } from "./element-serialize";
 import { DataElementCheck, DataElementInlineGroup, DataElementLeaf, DocumentElement, TrackRunElement, TrackRunTypeEnum } from "./impl";
 import { DocumentChange } from "./document-change";
+import { Subject } from "./infrastructure/event-subject";
+import { DocInputSuggestions } from "./suggestions/input-suggestions";
 /**
  * 当前打开的文档的上下文信息，当前文档所有的属性设置都暴露在上下文中
  */
@@ -19,6 +21,8 @@ export declare class EditorContext {
     nextViewFns: Array<() => void>;
     commentFlag: boolean;
     trackFlag: boolean;
+    suggestions: DocInputSuggestions;
+    onKeyDownEvent: Subject<KeyboardEvent>;
     constructor(selectionState: SelectionState, viewOptions: ViewOptions);
     onNextView(cb: (() => void) | null): void;
     get document(): DocumentElement;
@@ -41,6 +45,7 @@ export declare class EditorContext {
      * 替换数据元
      */
     replaceDataElement(oldDataElement: DataElementLeaf | DataElementInlineGroup, newElement: DataElementLeaf | DataElementInlineGroup, ss: SelectionState): void;
+    currentRefreshType: RefreshType | null;
     get refreshType(): RefreshType | null;
     adaptiveScale(): number;
 }

package/med_editor/framework/document-input-cursor.d.ts

@@ -7,8 +7,8 @@ export interface ICompositionStartInfo {
 }
 export interface InputData {
     composition?: boolean;
-    compositionStartInfo?: ICompositionStartInfo;
-    prevInputData?: string;
+    compositionStartInfo: ICompositionStartInfo;
+    prevInputDataLength?: number;
     data: string;
 }
 /**
@@ -17,25 +17,14 @@ export interface InputData {
 export declare class DocumentInput {
     private docCtx;
     onInputEvent: Subject<InputData>;
-    onBackspaceEvent: Subject<KeyboardEvent>;
-    onDeleteEvent: Subject<KeyboardEvent>;
-    onEnterEvent: Subject<void>;
-    onLeftEvent: Subject<void>;
-    onRightEvent: Subject<void>;
     onCopyEvent: Subject<ClipboardEvent>;
     onCutEvent: Subject<ClipboardEvent>;
     onPasteEvent: Subject<ClipboardEvent>;
-    onInsertBr: Subject<void>;
-    onSelectAllEvent: Subject<void>;
-    onHomeEvent: Subject<void>;
-    onEndEvent: Subject<void>;
-    onUpEvent: Subject<void>;
-    onDownEvent: Subject<void>;
-    onTabKeyEvent: Subject<void>;
+    onKeyDownEvent: Subject<KeyboardEvent>;
     constructor(docCtx: EditorContext);
     composition: boolean;
     inputTargetStrPosition: number;
-    inputTargetStr: undefined | string;
+    inputTargetStrLength: number;
     inputEle: any;
     correctInputEle(ele: any, str: string | undefined, pos: number): void;
     getEventListener(): Object;

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

@@ -15,6 +15,7 @@ export interface SerializeProps {
     children?: Array<SerializeProps>;
     complete?: boolean;
 }
+export declare const TEXT_HEIGHT_FACTOR = 1.4;
 /**
  * 刷新类型
  * 刷新外观，不需要进行测量，直接进入绘制
@@ -239,6 +240,7 @@ export declare type OrientType = 'landscape' | 'portrait';
 export declare type PageLayoutMode = 'singlePage' | 'multiPage' | 'fit-page';
 export declare class ViewOptions {
     copyRightInfo: string;
+    trialVersion: boolean;
     watermark?: string;
     drawLineRectColor: string;
     drawCharRectColor: string;
@@ -247,6 +249,8 @@ export declare class ViewOptions {
     editorVersion: string;
     defaultFontSize: number;
     defaultColor: string;
+    currentFontSize: number;
+    currentFontName: string;
     selectionOverlaysColor: string;
     dataEleOverlaysColor: string;
     dataEleFocusedBgColor: string;
@@ -284,6 +288,7 @@ export declare class ViewOptions {
     printHeaderFooterLine: boolean;
     showEnterSymbol: boolean;
     enableVisibleExpression: boolean;
+    shapeRendering: string;
     get fullPageView(): boolean;
     set fullPageView(value: boolean);
     mmToPixelsRatio: number;
@@ -308,6 +313,7 @@ export declare class ViewOptions {
     docMode: DocMode;
     private _showTrackChanges;
     private _showTrackChangesTip;
+    enableTrackChanges: boolean;
     get showTrackChanges(): boolean;
     set showTrackChanges(value: boolean);
     get showTrackChangesTip(): boolean;
@@ -317,6 +323,7 @@ export declare class ViewOptions {
     trackChangePeriod: number;
     onChange: Subject<'demand' | 'force'>;
     printMode: 'normal' | 'continuation';
+    enableSuggestions: boolean;
     constructor();
 }
 export declare class MarginProps {

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

@@ -43,13 +43,10 @@ export declare class ElementEvent {
     buttons: number;
     get selectionState(): import("./selection/document-selection").SelectionState;
 }
-export interface MenuListener {
-    [listener: string]: <T extends Event>(evt: T) => void;
-}
 export declare class ContentMenuItem {
-    icon: string;
     caption: string;
-    eventObj: MenuListener;
+    checked?: boolean;
+    click?: () => void;
     subItems?: Array<ContentMenuItem>;
 }
 /**

package/med_editor/framework/element-type-handler.d.ts

@@ -5,5 +5,4 @@ import { ElementHandler } from "./element-define";
  * @param evt
  */
 export declare const deleteCurrentParagraph: ElementHandler<ContextMenuElementEvent>;
-export declare const setDataElementProps: ElementHandler<ContextMenuElementEvent>;
 export declare const onTableContextmenu: ElementHandler<ContextMenuElementEvent>;

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

@@ -0,0 +1,25 @@
+import { BlockContainerElement, Element, ElementFactory, IBeginMeasureData, readElementProps, SerializeProps } from "../../element-define";
+import { IEditorVNodeOptions, MuiltBlockLineRenderObject, RenderObject } from "../../render-define";
+/**
+ * 数据块容器,包裹多个段落
+ */
+export declare class DataContainerElement extends BlockContainerElement<DataContainerProps> {
+    constructor();
+    createRenderObject(): DataContainerRenderObject;
+    beginMeasure(data: IBeginMeasureData): void;
+    serialize(): SerializeProps;
+    clone(data: boolean): DataContainerElement;
+}
+export declare class DataContainerRenderObject extends MuiltBlockLineRenderObject<DataContainerElement> {
+    clone(cloneData?: boolean): RenderObject;
+    exportSVG(event: IEditorVNodeOptions): any;
+}
+export declare class DataContainerFactory extends ElementFactory<DataContainerProps> {
+    match(type: string): boolean;
+    createElement(data: readElementProps<DataContainerProps>): Element<any>;
+}
+export declare class DataContainerProps {
+    caption: string;
+    id: string;
+    name: string;
+}

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

@@ -2,7 +2,6 @@ import { BlockContainerElement, Element, ElementFactory, IBeginMeasureData, Seri
 import { MouseElementEvent } from "../../element-event-define";
 import { IEditorVNodeOptions, MuiltBlockLineRenderObject, RenderObject } from "../../render-define";
 export declare class DocumentBodyElement extends BlockContainerElement {
-    trackChanges: boolean;
     constructor();
     createRenderObject(): DocumentBodyRenderObject;
     serialize(): SerializeProps;

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

@@ -63,6 +63,7 @@ export declare class DocumentRenderObject extends BlockContainerRenderObject {
     private exportPageNumHTML;
     exportSVG(event: IEditorVNodeOptions): any;
     private exportPageCornerHTML;
+    private exportCopyRight;
 }
 export declare class DocumentFactory extends ElementFactory<DocumentProps> {
     match(type: string): boolean;

package/med_editor/framework/impl/index.d.ts

@@ -12,6 +12,7 @@ export * from './data-element/data-element-group-impl';
 export * from './data-element/data-element-image-impl';
 export * from './data-element/data-element-list-impl';
 export * from './data-element/data-element-text-impl';
+export * from './data-element/data-container-impl';
 export * from './decorate/fill-null-space-imple';
 export * from './document/doc-body-impl';
 export * from './document/doc-body-part-impl';

package/med_editor/framework/impl/table/table-split-cell.d.ts

@@ -1,4 +1,5 @@
 import { SelectionState } from "../../selection/document-selection";
+import { TableElement } from "./table-impl";
 /**
  * 拆分单元格
  * 蜀道难，难于上青天；拆分单元格，头发秃，精神衰，眼睛昏，身体废。
@@ -81,12 +82,12 @@ export declare class TableSplitCell {
      * @param rowIndex
      * @param colIndex
      */
-    private static getVMergeRowsCount;
+    static getVMergeRowsCount(tb: TableElement, rowIndex: number, colIndex: number): number;
     /**
      * 获取纵向合并的行数
      * @param tb
      * @param rowIndex
      * @param colIndex
      */
-    private static getHMergeColsCount;
+    static getHMergeColsCount(tb: TableElement, rowIndex: number, colIndex: number): number;
 }

package/med_editor/framework/infrastructure/event-subject.d.ts

@@ -11,6 +11,7 @@ export declare abstract class Subscription<T = any> {
 export declare abstract class EventSourceCore<T> {
     protected closed: boolean;
     subs: Array<Subscription>;
+    state: 'pause' | 'running';
     next(data?: T): void;
     protected addSub(sub: Subscription): void;
     protected removeSub(sub: Subscription): void;

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

@@ -28,11 +28,7 @@ export declare class DocumentSelection {
      * @private
      */
     updateSelectionState(): boolean;
-    /**
-     * 获取当前选区区域内是否支持留痕
-     * @private
-     */
-    private getEnableTrackChanges;
+    isSelectionChanged(): boolean;
     /**
      * 转换选区内容
      * 处理结束选区在开始选区之前
@@ -61,7 +57,6 @@ export declare class SelectionState {
     editable: boolean;
     renderContainer: DocumentContainerRender;
     cursorPos: Rect | null;
-    enableTrackChanges: boolean;
     constructor();
     destroy(): void;
     clear(): void;

package/med_editor/framework/suggestions/input-suggestions.d.ts

@@ -0,0 +1,29 @@
+import { TextGroupElement } from "../impl";
+/**
+ * 处理文档输入联想
+ */
+export declare class DocInputSuggestions {
+    currentInputTextGroup: TextGroupElement | undefined;
+    currentMatchedText: string;
+    currentInputOffset: number;
+    suggestionsList: Array<ISuggestionData>;
+    prepareSuggestions: Array<ISuggestionData>;
+    selectedIndex: number;
+    clear(): void;
+    destroy(): void;
+}
+/**
+ * 联想词数据
+ */
+export interface ISuggestionData {
+    label: string;
+    value?: string;
+    desc?: string;
+    action?: (data: ISuggestionData) => void;
+}
+export interface ISuggestionProvider {
+    filterSuggestions: Array<ISuggestionData>;
+    inputTextGroup: TextGroupElement;
+    inputOffset: number;
+    findText: string;
+}

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

@@ -61,7 +61,7 @@ export declare class CommonUtil {
     static getNowDiffSeconds(date: Date | string): number;
     static isDate(str: string): boolean;
     static cloneValue(val: any): any;
-    static cloneDeep<T>(source: T, visited?: WeakMap<object, any>): T;
+    static cloneDeep<T extends object>(source: T, visited?: WeakMap<object, any>): T;
     static isConstructor(f: any): boolean;
     static toArray<T>(item: Array<T> | T): Array<T>;
     static removeChild(ele: HTMLElement): void;

package/package.json

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