@hailin-zheng/editor-core 1.1.16 → 1.1.18

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

@@ -48,7 +48,7 @@ export declare class DocumentChange {
      */
     newInputTrackChanges(data: InputData, startControl: LeafElement, startOffset: number): void;
     /**
-     * 创建新的留痕块,并返回留痕块输入定位文本
+     * 创建新留痕块,并返回留痕块输入定位文本
      * @param startControl
      * @param startOffset
      * @param trackType
@@ -218,6 +218,7 @@ export declare class DocumentChange {
     static setTextStyle(ss: SelectionState, setterFunc: (text: TextGroupElement) => void): void;
     private static recursionSetRangeTextStyle;
     static setParaAlign(ss: SelectionState, setterFunc: (tp: ParagraphProps) => void): void;
+    static setParaStyle(ss: SelectionState, setterFunc: (tp: ParagraphProps) => void): void;
     /**
      * 复制
      * @param evt

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

@@ -92,7 +92,7 @@ export declare class DocumentContext {
      * 获取留痕块元素列表
      */
     getTrackElements(): Array<TrackRunElement>;
-    getTrackElmeentById(id: string): TrackRunElement | null;
+    getTrackElementById(id: string): TrackRunElement | null;
     /**
      * 获取留痕块内数据
      */
@@ -107,6 +107,7 @@ export declare class DocumentContext {
     /**
      * 当前上下文执行默认绑定
      * @param data
+     * @param predicateKey
      */
     bindDataValues(data: string | Object | Array<{
         key: string;

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

@@ -151,7 +151,7 @@ export declare class DocumentEvent {
      * @param eventStage
      * @param docCtx
      */
-    static invokeEvent(type: EventTypes, sourceElement: Element, event: ElementEvent, eventStage: EventStage, docCtx: EditorContext): ElementEvent | null;
+    static invokeEvent(type: EventTypes, sourceElement: Element, event: ElementEvent, eventStage: EventStage): ElementEvent | null;
     /**
      * 发布当前的点击信息
      */

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

@@ -357,4 +357,8 @@ export interface ICreateRenderData {
     options: ViewOptions;
     renderCtx: RenderContextType;
 }
+export interface FontBoundingBox {
+    fontBoundingBoxAscent: number;
+    fontBoundingBoxDescent: number;
+}
 export {};

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

@@ -3,7 +3,7 @@ import { LeafRenderObject, RenderObject } from "./render-define";
 import { EditorContext } from "./document-context";
 import { TrackRunTypeEnum } from "./impl/text/track-run-impl";
 export declare type EventStage = 'All' | 'Capture' | 'Bubbling';
-export declare type EventTypes = 'ElementMousedown' | 'ElementMousemove' | 'ElementClick' | 'ElementDblClick' | 'ElementMouseEnter' | 'ElementMouseLeave' | 'BackspaceKey' | 'DeleteKey' | 'ElementShown' | 'ElementContextMenu' | 'GotCursor' | 'LostCursor' | 'ElementKeyDown' | 'ElementDrop' | 'ElementTabKey' | 'GetTrackTips';
+export declare type EventTypes = 'ElementMousedown' | 'ElementMousemove' | 'ElementClick' | 'ElementDblClick' | 'ElementMouseEnter' | 'ElementMouseLeave' | 'BackspaceKey' | 'DeleteKey' | 'ElementShown' | 'ElementContextMenu' | 'GotCursor' | 'LostCursor' | 'ElementKeyDown' | 'ElementDrop' | 'ElementTabKey' | 'GetTrackTips' | 'ElementInput';
 export declare type HitRegion = 'header' | 'body' | 'footer' | 'review';
 export interface HitEventInfo {
     relativeRect: Rect;
@@ -57,6 +57,9 @@ export declare class ContentMenuItem {
  */
 export declare class MouseElementEvent extends ElementEvent {
 }
+export declare class InputElementEvent extends ElementEvent {
+    data: string;
+}
 export declare class MousedownElementEvent extends ElementEvent {
 }
 export declare class KeyboradElementEvent extends ElementEvent {

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

@@ -79,6 +79,8 @@ export declare class CheckBoxProps extends INotifyPropertyChanged {
     size: number;
     isChecked: boolean;
     groupName: string | null;
+    trueChar: string;
+    falseChar: string;
     clone(dest: CheckBoxProps): CheckBoxProps;
     getSerializeProps(viewOptions: ViewOptions): {
         size: number;
@@ -120,6 +122,7 @@ export declare type CellMergeType = 'col-merge' | 'row-merge';
 export declare type VMergeType = 'restart' | 'continue';
 export declare type HMergeType = 'restart' | 'continue';
 export declare type VerticalAlign = 'top' | 'middle' | 'bottom';
+export declare type CellDiagonal = 'main' | 'sub' | 'all' | null;
 export declare class TableCellProps extends INotifyPropertyChanged {
     vMerge: VMergeType | null;
     hMerge: HMergeType | null;
@@ -128,7 +131,7 @@ export declare class TableCellProps extends INotifyPropertyChanged {
     /**
      * 对角线
      */
-    diagonal: 'main' | 'sub' | null;
+    diagonal: CellDiagonal;
     clone(dest: TableCellProps): TableCellProps;
     getSerializeProps(options: ViewOptions): any;
 }
@@ -162,7 +165,6 @@ export declare class DataEleBaseProps extends INotifyPropertyChanged {
     editable: boolean;
     deleteable: boolean;
     minLength: number;
-    type: DataEleTypes;
     underline: boolean;
     expression: string;
     hidden: boolean;
@@ -218,13 +220,21 @@ export declare class CommProps extends INotifyPropertyChanged {
         markType: "start" | "end";
     };
 }
+export declare const trueChar = "\u2713";
+export declare const falseChar = "\u00D7";
 export declare class DataEleCheckProps extends DataEleBaseProps {
     constructor();
+    border: boolean;
     size: number;
     checked: boolean;
     checkedValue: string;
     groupName: string;
     multiSelect: boolean;
+    drawStateChar: boolean;
+    trueChar: string;
+    falseChar: string;
+    trueStateColor: string;
+    falseStateColor: string;
     clone(dest: DataEleCheckProps | null): DataEleCheckProps;
     getSerializeProps(options: ViewOptions): any;
     updateProps(props: DataEleCheckProps): void;
@@ -240,7 +250,6 @@ export declare class DataEleImageProps extends DataEleBaseProps {
     updateProps(props: DataEleImageProps): void;
 }
 export declare class DataEleDateProps extends DataEleBaseTextProps {
-    constructor();
     minValue?: Date;
     maxValue?: Date;
     format?: string;

package/med_editor/framework/impl/picture/RectEle.d.ts

@@ -0,0 +1,49 @@
+import { ElementFactory, ICreateRenderData, LeafElement, readElementProps, SerializeProps, ViewOptions } from "../../element-define";
+import { IRenderData, LeafRenderObject, RenderObject } from "../../render-define";
+interface RectProps {
+    width: number;
+    height: number;
+    bgColor: string;
+}
+export declare class RectElement extends LeafElement<RectProps> {
+    constructor();
+    /**
+     * 克隆方法，支持复制操作等
+     * @param data
+     */
+    clone(data: boolean): RectElement;
+    /**
+     * 创建渲染元素
+     * @param data
+     */
+    createRenderObject(data: ICreateRenderData): RenderObject | null;
+    /**
+     * 序列化
+     * @param viewOptions
+     */
+    serialize(viewOptions: ViewOptions): SerializeProps | null;
+}
+export declare class RectRenderObject extends LeafRenderObject<RectElement> {
+    /**
+     * 克隆当前对象
+     */
+    clone(): RenderObject;
+    /**
+     * 渲染绘制到视图
+     * @param e
+     */
+    render(e: IRenderData): void;
+}
+export declare class RectElementFactory extends ElementFactory<RectProps> {
+    /**
+     * 读取并创建元素
+     * @param data
+     */
+    createElement(data: readElementProps<RectProps>): RectElement;
+    /**
+     * 是否匹配当前工程处理
+     * @param type
+     */
+    match(type: string): boolean;
+}
+export {};

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

@@ -20,6 +20,11 @@ export declare class TableCellElement extends BlockContainerElement<TableCellPro
 }
 export declare class TableCellRenderObject extends InlineMuiltBlockLineRenderObject {
     render(e: IRenderData): void;
+    /**
+     * 绘制对角线
+     * @private
+     */
+    private renderDiagonal;
     clone(): RenderObject;
 }
 export declare class TableCellFactory extends ElementFactory<TableCellProps> {

package/med_editor/framework/impl/table/table-util.d.ts

@@ -2,6 +2,7 @@ import { SelectionState } from "../../document-selection";
 import { TableCellElement } from "./table-cell-impl";
 import { TableElement } from "./table-impl";
 import { TableRowElement } from "./table-row-impl";
+import { CellDiagonal } from "../../element-props";
 export declare class TableUtil {
     static canDeleteTable(ss: SelectionState): boolean;
     /**
@@ -92,6 +93,12 @@ export declare class TableUtil {
      * @param insertRowIndex
      */
     static insertRow(ss: SelectionState, insertRowIndex: number): TableRowElement;
+    /**
+     * 在指定位置插入新行
+     * @param tb
+     * @param insertRowIndex
+     */
+    static insertNewRow(tb: TableElement, insertRowIndex: number): TableRowElement;
     /**
      * 在下方插入行
      */
@@ -133,7 +140,7 @@ export declare class TableUtil {
      * @param diagonal
      * @returns
      */
-    static setTableCellDiagonal(ss: SelectionState, diagonal: 'main' | 'sub'): void;
+    static setTableCellDiagonal(ss: SelectionState, diagonal: CellDiagonal): void;
     /**
      * 将当前表格截断成两个相邻的表格
      * @param tb
@@ -153,6 +160,7 @@ export declare class TableUtil {
      * 计算表格列,用于新增表格的时候生成列
      */
     static calcTableColsWidth(cols: Array<string | number>, tbWidth: number): Array<number>;
+    static setTableCellBgColorAtSelection(ss: SelectionState, bgColor: string): void;
 }
 export interface ITableSelectedRegion {
     startRow: number;

package/med_editor/framework/impl/text/text-impl.d.ts

@@ -1,9 +1,10 @@
 import { TextProps } from "../../element-props";
 import { IRenderData, LeafRenderObject, RenderObject } from "../../render-define";
-import { LeafElement, ElementFactory, Element, SerializeProps, ViewOptions, ICreateRenderData } from "../../element-define";
+import { LeafElement, ElementFactory, Element, SerializeProps, ViewOptions, ICreateRenderData, FontBoundingBox } from "../../element-define";
 import { TextUnits } from "../../render-context";
 export declare class TextGroupElement extends LeafElement<TextProps> {
     textMeasures: Array<TextUnits>;
+    fontBoundingBox: FontBoundingBox;
     isMeasure: boolean;
     constructor();
     set text(val: string);

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

@@ -35,17 +35,19 @@ export declare class ParagraphMeasure {
     private arrangeInlineItems;
     arrangeLeafElement(parentLine: MeasureLine, ele: LeafElement): void;
     arrangeLeafRender(parentLine: MeasureLine, render: LeafRenderObject): void;
-    cutTextRender(render: TextGroupRenderObject, limitWidth: number, lineEmpty: boolean): ICutLineData;
+    cutTextRender(render: TextGroupRenderObject, limitWidth: number, lineEmpty: boolean, isCloseToBody: any): ICutLineData;
     /**
      * 处理前置标点,前置标点不能出现在末尾
      * @param render
      * @param i
+     * @param lineEmpty
      */
     private patchHandleLeadingPunctuation;
     /**
      * 处理后置标点，后置标点不能出现在行首
      * @param render
      * @param i
+     * @param inCloseBody
      * @param lineEmpty
      */
     private patchHandlePostPunctuation;
@@ -77,6 +79,7 @@ interface MeasureLine {
     applyNewLine(): void;
     applyNewPara(): void;
     parent: MeasureLine | null;
+    isCloseToBody: boolean;
     arrange(): void;
 }
 interface ICutLineData {

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

@@ -54,13 +54,23 @@ export declare class PaintContent {
     clear(): void;
     drawText(text: string, textProps: TextProps, x: number, y: number, width: number, height: number): void;
     fillCircular(x: number, y: number, r: number, color?: string): void;
-    drawTextUnits(textGroupRender: TextGroupRenderObject, x: number, y: number): void;
+    drawTextUnits(textGroupRender: TextGroupRenderObject, x: number, y: number, baseLine: number): void;
+    drawText2(str: string, font: string, color: string, x: number, y: number, width: number, height: number): void;
     getParaLineHeight(textEle: TextGroupElement): number;
     measureText(text: string, textProps: TextProps): {
         width: number;
         height: number;
     };
-    measureText2(text: string, font: {
+    measureTextMetrics(font: string, str?: string): {
+        fontBoundingBoxAscent: number;
+        fontBoundingBoxDescent: number;
+        width: number;
+        actualBoundingBoxAscent: number;
+        actualBoundingBoxDescent: number;
+        actualBoundingBoxLeft: number;
+        actualBoundingBoxRight: number;
+    };
+    measureTextWidth(text: string, font: {
         fontSize: number;
         fontName: string;
     }): number;

package/med_editor/texteditor.d.ts

@@ -1,9 +1,9 @@
 import { ContentMenuItem } from './framework/element-event-define';
 import { ElementReader } from './framework/element-reader';
 import { SelectionState } from './framework/document-selection';
-import { BranchElement, Element, ICancelTokenFn, LeafElement, MarginProps, OrientType, PageLayoutMode, Position, Rect, TextAlign, ViewOptions } from './framework/element-define';
-import { DataElementInlineGroup, DataElementLeaf, DocumentElement } from './framework/impl';
-import { ParagraphNumberType, ParagraphProps, TextProps } from './framework/element-props';
+import { BranchElement, Element, ICancelTokenFn, LeafElement, MarginProps, OrientType, PageLayoutMode, Position, Rect, 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';
 import { ElementTrackManage } from './framework/element-trace-manage';
 import { Subject } from './framework/event-subject';
@@ -185,10 +185,10 @@ export declare class CanvasTextEditor extends AbsolutePanel {
      */
     enableFormatBrush(): ICancelTokenFn | null;
     /**
-     * 设置段落对齐
-     * @param align
+     * 设置段落样式
+     * @param newProps
      */
-    switchParaAlign(align: TextAlign): void;
+    setParaStyle(newProps: Partial<ParagraphProps>): void;
     combineCell(): void;
     /**
      * 切换当前段落项目符号状态
@@ -308,16 +308,79 @@ export declare class CanvasTextEditor extends AbsolutePanel {
      * @private
      */
     private drawCaret;
-    private generatorDoc;
     /**
-     * 设置关键字
-     * 匹配用户输入的关键字，回调到应用业务中处理
+     * 获取当前光标位置所在的段落
      */
-    setKeywords(keys: Array<string>, cb: (item: string) => void): void;
+    getParagraphAtCursor(): ParagraphElement | null;
     /**
-     * 注册编辑器格式读取器
+     * 获取当前光标位置的表格
      */
-    registerReaderFactory(handler: IReaderManager): void;
+    getTableAtCursor(): TableElement | null;
+    /**
+     * 获取当前光标位置的表格行
+     */
+    getTableRowAtCursor(): TableRowElement | null;
+    /**
+     * 获取当前光标位置的单元格
+     */
+    getTableCellAtCursor(): TableCellElement | null;
+    /**
+     * 当前光标处上方插入新行
+     */
+    insertRowAboveAtCursor(): void;
+    /**
+     * 当前光标处下方插入新行
+     */
+    insertRowBelowAtCursor(): void;
+    /**
+     * 当前光标处右方插入新列
+     */
+    insertColToRightAtCursor(): void;
+    /**
+     * 当前光标处左方插入新列
+     */
+    insertColToLeftAtCursor(): void;
+    /**
+     * 移除当前光标处的行
+     */
+    removeCurrRowAtCursor(): void;
+    /**
+     * 移除当前光标处的列
+     */
+    removeCurrColAtCursor(): void;
+    /**
+     * 合并单元格
+     */
+    mergeCellsBySelection(): void;
+    /**
+     * 拆分单元格
+     * @param rows
+     * @param cols
+     */
+    splitCell(rows: number, cols: number): void;
+    /**
+     * 删除当前光标所在的表格
+     */
+    removeTableAtCursor(): void;
+    /**
+     * 设置单元格对角线
+     * @param diagonal
+     */
+    setCellDiagonal(diagonal: CellDiagonal): void;
+    /**
+     * 设置选区范围内的单元格背景颜色
+     */
+    setTableCellBgColorAtSelection(color: string): void;
+    /**
+     * 还原光标处已合并的单元格
+     */
+    restoreMergeCellsAtCursor(): void;
+    /**
+     * 表格在指定位置插入新行
+     * @param tb
+     * @param insertRowIndex
+     */
+    insertNewRow(tb: TableElement, insertRowIndex: number): TableRowElement;
 }
 export interface IReaderManager {
 }

package/package.json

@@ -4,7 +4,7 @@
     "author": "hailin-zheng",
     "private": false,
     "license": "ISC",
-    "version": "1.1.16",
+    "version": "1.1.18",
     "scripts": {},
     "dependencies": {
         "bwip-js": "^3.0.5",