@hailin-zheng/editor-core 1.1.1 → 1.1.3

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

@@ -1,6 +1,6 @@
 import { DocumentPaint } from "./document-paint";
 import { SelectionState } from "./document-selection";
-import { LeafElement, Rect, Element, Position, ViewOptions } from "./element-define";
+import { Element, LeafElement, Position, Rect, ViewOptions } from "./element-define";
 import { ElementEvent, EventStage, EventTypes, HitEventInfo, HitRegion, ITrackTips, MouseElementEvent } from "./element-event-define";
 import { BorderType, CursorType, RenderObject } from "./render-define";
 import { EditorContext } from "./document-context";

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

@@ -239,6 +239,8 @@ export declare class ViewOptions {
     defaultColor: string;
     selectionOverlaysColor: string;
     dataEleOverlaysColor: string;
+    dataEleFocusedBgColor: string;
+    dataEleErrorBgColor: string;
     dataEleReadOnlyOverlayColor: string;
     dataEleOutlineColor: string;
     viewBackcolor: string;
@@ -263,6 +265,7 @@ export declare class ViewOptions {
     trackHistoryMaxLength: number;
     enableDyExpression: boolean;
     showRule: boolean;
+    enableDataEleInputValidate: boolean;
     private _fullPageView;
     get fullPageView(): boolean;
     set fullPageView(value: boolean);

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

@@ -33,7 +33,9 @@ export declare class DOMSubscription<T> extends Subscription<T> {
 }
 export declare class Subject<T> extends EventSourceCore<T> {
     subscribe(listener: (data: T) => void): Subscription;
-    onceSubscribe(listener: (data: T) => void): Subscription;
+}
+export declare class OnceSubject<T> extends Subject<T> {
+    subscribe(listener: (data: T) => void): Subscription;
 }
 export declare class SubjectSubscription extends Subscription {
     listener: (data: any) => void;

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

@@ -42,6 +42,7 @@ export declare abstract class InlineGroupInputElement<P extends object = any> ex
 export declare abstract class DataElementInlineGroup<P extends DataEleBaseProps = DataEleBaseProps & {
     valueTextProps: TextProps;
 }> extends InlineGroupInputElement<P> {
+    errorTip: string;
     constructor(type: string);
     onGotCursorEvent(evt: GotCursorEvent): void;
     abstract setValue(val: any): void;
@@ -53,6 +54,10 @@ export declare abstract class DataElementInlineGroup<P extends DataEleBaseProps
     validate(): string;
     private expressFn;
     beginMeasure(data: IBeginMeasureData): void;
+    /**
+     * 数据元发生更改后，进行数据验证
+     */
+    onChangedValidate(): void;
 }
 export declare abstract class DataElementRenderObject<T extends DataElementInlineGroup = DataElementInlineGroup> extends InlineGroupRenderObject<T> {
     render(e: IRenderData): void;

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

@@ -10,10 +10,9 @@ export declare class DataElementGroupElement extends InlineGroupInputElement<Dat
     serialize(viewOptions: ViewOptions): SerializeProps | null;
 }
 export declare class DataElementGroupRenderObject extends InlineGroupRenderObject<DataElementGroupElement> {
-    paintPos: Position;
     render(e: IRenderData): void;
     private getCurrentParaGroupRenders;
-    pagePaintCompleted(e: IRenderData): void;
+    paintDecorate(e: IRenderData): void;
     endRender(ctx: RenderContextType, position: Position): void;
     clone(): RenderObject;
 }

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

@@ -28,6 +28,7 @@ export declare class ParagraphMeasure {
     private setAlignJustify;
     arrange(parentLine: MeasureLine, ele: Element): void;
     arrangeInlineGroupElement(parentLine: MeasureLine, ele: InlineGroupElement): void;
+    private arrangeInlineItems;
     arrangeLeafElement(parentLine: MeasureLine, ele: LeafElement): void;
     arrangeLeafRender(parentLine: MeasureLine, render: LeafRenderObject): void;
     cutTextRender(render: TextGroupRenderObject, limitWidth: number, lineEmpty: boolean): ICutLineData;

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

@@ -1,6 +1,6 @@
 import { Position, Rect } from "./element-define";
 import { TextProps } from "./element-props";
-import { Subject } from "./event-subject";
+import { OnceSubject } from "./event-subject";
 import { TextGroupElement, TextGroupRenderObject } from "./impl/text/text-impl";
 export interface TextUnits {
     sourceSize: number;
@@ -11,6 +11,7 @@ export interface IRenderContextContract {
     contentContext: PaintContent;
     overlaysContext: PaintContent;
     mainContext: PaintContent;
+    onRenderCompleted: OnceSubject<void>;
     drawMode: 'view' | 'print';
     clear(): void;
     commit(pageSetting: ISetCanvasPageProps, pageOffset: Position): void;
@@ -31,7 +32,7 @@ export declare class RenderContext implements IRenderContextContract {
     drawMode: 'view' | 'print';
     contentOffCanvas: HTMLCanvasElement;
     overlayOffCanvas: HTMLCanvasElement;
-    onRenderCompleted: Subject<RenderContext>;
+    onRenderCompleted: OnceSubject<void>;
     constructor(mainContext: PaintContent);
     pageSetting: ISetCanvasPageProps;
     pageRect: Rect;

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

@@ -70,6 +70,7 @@ export declare abstract class BlockContentRenderObject<T extends Element = Eleme
     setRenderWidth(maxWidth: number): void;
 }
 export declare abstract class InlineGroupRenderObject<T extends Element = Element> extends BranchRenderObject<T> {
+    paintPos: Position;
 }
 /**
  * 包含块级渲染元素的容器元素,例如body、table-cell等

package/med_editor/texteditor.d.ts

@@ -7,7 +7,7 @@ import { ParagraphNumberType, ParagraphProps, TextProps } from './framework/elem
 import { EditorContext } from './framework/document-context';
 import { ElementTrackManage } from './framework/element-trace-manage';
 import { Subject } from './framework/event-subject';
-import { IRenderData, NodeItems } from "../controls/Node";
+import { IArrangeEvent, IMeasureEvent, IRenderData, NodeItems, Size } from "../controls/Node";
 import { Menu } from "../controls/Menu";
 /**
  * Node宽度定义
@@ -66,6 +66,11 @@ export declare class CanvasTextEditor extends NodeItems {
      * @returns
      */
     private refreshDocument;
+    /**
+     * 计算选区内容对象
+     * @private
+     */
+    private updateSelection;
     /**
      * 刷新绘制文档
      * @param rePaint
@@ -298,6 +303,8 @@ export declare class CanvasTextEditor extends NodeItems {
      * @private
      */
     private drawCaret;
+    measureOverride(e: IMeasureEvent, availableSize: Size): Size;
+    protected arrangeOverride(e: IArrangeEvent, finalSize: Size): Size;
 }
 export declare type EditorCurrentPos = {
     pos: Position;

package/package.json

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