@hailin-zheng/editor-core 2.2.6 → 2.2.8

package/med_editor/doc-editor.d.ts

@@ -34,7 +34,6 @@ export declare class DocEditor {
         result: boolean;
         ss: SelectionState;
     }>;
-    contentChanged: Subject<void>;
     onPatchVNodeSubject: Subject<void>;
     selectionState: SelectionState;
     onDblClickEvent: Subject<Event>;
@@ -479,6 +478,7 @@ export declare class DocEditor {
      */
     private renderSuggestions;
     insertSuggestion(suggestion: ISuggestionData): void;
+    parser(code: string, returnProcess?: boolean): string;
 }
 export interface IReaderManager {
 }

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

@@ -2,6 +2,7 @@ import { ElementEvent, EventTypes } from "./element-event-define";
 import { RenderContextType } from "./render-context";
 import { CursorType, LeafRenderObject, RenderObject } from "./render-define";
 import { Subject, Subscription } from "./infrastructure/event-subject";
+import { DynamicExecute } from "./code-interpreter/dynamic-execute";
 export declare class Rect {
     x: number;
     y: number;
@@ -73,7 +74,7 @@ export declare abstract class Element<P extends object = any> {
     disableClick: boolean;
     disposed: boolean;
     loaded: boolean;
-    visibleExpr?: IVisibleExpression;
+    visibleExpr?: IParserExpress;
     attribute?: ElementAttribute;
     private _parent;
     get parent(): BranchElement;
@@ -251,12 +252,16 @@ export declare class ViewOptions {
     defaultColor: string;
     currentFontSize: number;
     currentFontName: string;
-    selectionOverlaysColor: string;
-    dataEleOverlaysColor: string;
+    selectionColor: string;
+    dataDecoratorNormalColor: string;
+    dataDecoratorMouseEnterColor: string;
+    dataDecoratorFocusedColor: string;
+    dataEleEmptyBgColor: string;
+    dataEleMouseEnterBgColor: string;
+    dataEleReadOnlyBgColor: string;
     dataEleFocusedBgColor: string;
+    dataEleNormalBgColor: string;
     dataEleErrorBgColor: string;
-    dataEleReadOnlyOverlayColor: string;
-    dataEleOutlineColor: string;
     viewBackcolor: string;
     paraSymbolColor: string;
     dataGroupColor: string;
@@ -267,7 +272,6 @@ export declare class ViewOptions {
     showLineRect: boolean;
     showCharRect: boolean;
     dataEleDecoratorMode: 'none' | 'outline' | 'overlay';
-    dataEleDecoratorColor: string;
     showTabChar: boolean;
     showSpaceChar: boolean;
     showLineBreak: boolean;
@@ -381,13 +385,15 @@ declare type IVoidFn = () => void;
 export declare function onceTask(fn: IVoidFn): IVoidFn;
 export interface IBeginMeasureData {
     doc: BranchElement;
-    viewOptions: ViewOptions;
-    execute: object;
+    options: ViewOptions;
+    execute: DynamicExecute;
+    renderCtx: RenderContextType;
     createParaFn: () => Element;
 }
 export interface ICreateRenderData {
     options: ViewOptions;
     renderCtx: RenderContextType;
+    execute: DynamicExecute;
 }
 export interface FontBoundingBox {
     fontBoundingBoxAscent: number;
@@ -402,7 +408,7 @@ export interface RefCtxValue {
  * 需要实现一个可见性表达式的类型，控制目标元素的可见性(sourceElement),targetElement为影响元素，影响元素可能为多个
  * 例如:sourceElement.visible= targetElement1.value==="1" && targetElement2.value===2等
  */
-export interface IVisibleExpression {
+export interface IParserExpress {
     compliedCode: string;
     func: Function;
     depItems: Map<string, RefCtxValue>;

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

@@ -196,6 +196,10 @@ export interface DataEleListOption {
 export declare class DataEleListProps extends DataEleBaseTextProps {
     constructor();
     options: Array<DataEleListOption>;
+    /**
+     * 是否保存选项到病历文件里面
+     */
+    saveOptions: boolean;
     dropDownStyle: 'DropDownList' | 'DropDown';
     /**
      * 是否允许多选
@@ -312,12 +316,9 @@ export declare class ValidateProps {
     msg: string;
     clone(dest: ValidateProps | null): ValidateProps;
 }
-export declare class DataElementGroupProps extends INotifyPropertyChanged {
-    id: string;
-    name: string;
-    hidden: boolean;
+export declare class DataElementGroupProps extends DataEleBaseProps {
     clone(dest: DataElementGroupProps | null): void;
-    getSerializeProps(): NullableType<DataElementGroupProps>;
+    getSerializeProps(options: ViewOptions): NullableType<DataEleBaseProps>;
 }
 export declare class DataElementBarcodeProps {
     type: 'ena13' | 'code128' | 'code39' | 'qrcode';

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

@@ -10,7 +10,7 @@ export declare class ElementSerialize {
     static serializeString(element: Element, options?: {
         all: boolean;
     }): string;
-    static serializeAttribute(element: Element): any;
+    static serializeObject(obj: object | undefined | null): any;
     /**
      * 获取选中的结构
      * @param ss

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

@@ -1,5 +1,6 @@
-import { BlockContainerElement, Element, ElementFactory, IBeginMeasureData, readElementProps, SerializeProps } from "../../element-define";
-import { IEditorVNodeOptions, MuiltBlockLineRenderObject, RenderObject } from "../../render-define";
+import { BlockContainerElement, Element, ElementFactory, IBeginMeasureData, NullableType, readElementProps, SerializeProps, ViewOptions } from "../../element-define";
+import { DataEleBaseProps } from "../../element-props";
+import { IEditorVNodeOptions, MultiBlockLineRenderObject, RenderObject } from "../../render-define";
 /**
  * 数据块容器,包裹多个段落
  */
@@ -7,10 +8,10 @@ export declare class DataContainerElement extends BlockContainerElement<DataCont
     constructor();
     createRenderObject(): DataContainerRenderObject;
     beginMeasure(data: IBeginMeasureData): void;
-    serialize(): SerializeProps;
+    serialize(viewOptions: ViewOptions): SerializeProps | null;
     clone(data: boolean): DataContainerElement;
 }
-export declare class DataContainerRenderObject extends MuiltBlockLineRenderObject<DataContainerElement> {
+export declare class DataContainerRenderObject extends MultiBlockLineRenderObject<DataContainerElement> {
     clone(cloneData?: boolean): RenderObject;
     exportSVG(event: IEditorVNodeOptions): any;
 }
@@ -18,8 +19,7 @@ export declare class DataContainerFactory extends ElementFactory<DataContainerPr
     match(type: string): boolean;
     createElement(data: readElementProps<DataContainerProps>): Element<any>;
 }
-export declare class DataContainerProps {
-    caption: string;
-    id: string;
-    name: string;
+export declare class DataContainerProps extends DataEleBaseProps {
+    clone(dest: DataContainerProps | null): void;
+    getSerializeProps(options: ViewOptions): NullableType<DataEleBaseProps>;
 }

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

@@ -1,8 +1,9 @@
-import { Element, ElementFactory, IBeginMeasureData, InlineGroupElement, LeafElement } from "../../element-define";
+import { Element, ElementFactory, IBeginMeasureData, ICreateRenderData, InlineGroupElement, LeafElement } from "../../element-define";
 import { IEditorVNodeOptions, InlineGroupRenderObject, RenderObject } from "../../render-define";
 import { GotCursorEvent } from "../../element-event-define";
 import { DataEleBaseProps, TextProps } from "../../element-props";
 import { DataDecorateElement } from "./data-decorate-impl";
+import { DynamicExecute } from "../../code-interpreter/dynamic-execute";
 /**
  * 所有的数据元继承上述两个抽象类
  */
@@ -54,6 +55,21 @@ export declare abstract class DataElementInlineGroup<P extends DataEleBaseProps
     validate(): string;
     private expressFn;
     beginMeasure(data: IBeginMeasureData): void;
+    private parserExpress;
+    /**
+     * 解析可见性表达式
+     * @param ele
+     * @param execute
+     * @private
+     */
+    parseEleExpression(data: ICreateRenderData): void;
+    /**
+     * 元素可见行求值
+     * @param ele
+     * @param executeCtx
+     * @private
+     */
+    evalEleExpr(executeCtx: DynamicExecute): void;
     /**
      * 数据元发生更改后，进行数据验证
      */

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

@@ -1,10 +1,10 @@
-import { Element, SerializeProps, ViewOptions } from "../../element-define";
+import { Element, ICreateRenderData, SerializeProps, ViewOptions } from "../../element-define";
 import { DataEleBaseTextProps } from "../../element-props";
 import { RenderObject } from "../../render-define";
 import { DataElementBaseFactory, DataElementInlineGroup, DataElementRenderObject } from "./data-element-base-impl";
 export declare class DataElementText extends DataElementInlineGroup<DataEleBaseTextProps> {
     constructor();
-    createRenderObject(): RenderObject;
+    createRenderObject(data: ICreateRenderData): RenderObject;
     serialize(viewOptions: ViewOptions): SerializeProps & any;
     clone(data: boolean): DataElementText;
     setValue(val: any): void;

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

@@ -1,6 +1,6 @@
 import { BlockContainerElement, Element, ElementFactory, IBeginMeasureData, SerializeProps } from "../../element-define";
 import { MouseElementEvent } from "../../element-event-define";
-import { IEditorVNodeOptions, MuiltBlockLineRenderObject, RenderObject } from "../../render-define";
+import { IEditorVNodeOptions, MultiBlockLineRenderObject, RenderObject } from "../../render-define";
 export declare class DocumentBodyElement extends BlockContainerElement {
     constructor();
     createRenderObject(): DocumentBodyRenderObject;
@@ -9,7 +9,7 @@ export declare class DocumentBodyElement extends BlockContainerElement {
     clone(data: boolean): DocumentBodyElement;
     beginMeasure(data: IBeginMeasureData): void;
 }
-export declare class DocumentBodyRenderObject extends MuiltBlockLineRenderObject {
+export declare class DocumentBodyRenderObject extends MultiBlockLineRenderObject {
     clone(cloneData?: boolean): RenderObject;
     exportSVG(event: IEditorVNodeOptions): any;
 }

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

@@ -1,5 +1,5 @@
 import { BlockContainerElement, SerializeProps, Element, readElementProps, ElementFactory } from "../../element-define";
-import { IEditorVNodeOptions, MuiltBlockLineRenderObject, RenderObject } from "../../render-define";
+import { IEditorVNodeOptions, MultiBlockLineRenderObject, RenderObject } from "../../render-define";
 import { BodyPartProps } from "../../element-props";
 /**
  * 用于合并病程录,每个part包含每份病程录body
@@ -12,7 +12,7 @@ export declare class DocumentBodyPartElement extends BlockContainerElement<BodyP
     serialize(): SerializeProps;
     clone(data: boolean): DocumentBodyPartElement;
 }
-export declare class DocumentBodyPartRenderObject extends MuiltBlockLineRenderObject {
+export declare class DocumentBodyPartRenderObject extends MultiBlockLineRenderObject {
     clone(cloneData?: boolean): RenderObject;
     exportSVG(event: IEditorVNodeOptions): any;
 }

package/med_editor/framework/impl/paragraph/p-impl.d.ts

@@ -1,7 +1,7 @@
 import { BlockContentElement, Element, ElementFactory, readElementProps, SerializeProps, ViewOptions } from "../../element-define";
 import { ParagraphProps } from "../../element-props";
 import { RenderContextType } from "../../render-context";
-import { BlockLineRectRenderObject, IEditorVNodeOptions, IRenderData, MuiltBlockLineRenderObject, RenderObject } from "../../render-define";
+import { BlockLineRectRenderObject, IEditorVNodeOptions, IRenderData, MultiBlockLineRenderObject, RenderObject } from "../../render-define";
 export declare class ParagraphElement extends BlockContentElement<ParagraphProps> {
     constructor();
     /**
@@ -15,7 +15,7 @@ export declare class ParagraphElement extends BlockContentElement<ParagraphProps
     clone(data: boolean): Element;
     static createElement(): ParagraphElement;
 }
-export declare class ParagraphRenderObject extends MuiltBlockLineRenderObject<ParagraphElement> {
+export declare class ParagraphRenderObject extends MultiBlockLineRenderObject<ParagraphElement> {
     /**
      * 绘制项目符号
      */

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

@@ -1,6 +1,6 @@
 import { BlockContainerElement, Element, ElementFactory, IBeginMeasureData, ICreateRenderData, SerializeProps, ViewOptions } from "../../element-define";
 import { TableProps } from "../../element-props";
-import { IEditorVNodeOptions, MuiltBlockLineRenderObject, RenderObject } from "../../render-define";
+import { IEditorVNodeOptions, MultiBlockLineRenderObject, RenderObject } from "../../render-define";
 export declare class TableElement extends BlockContainerElement<TableProps> {
     private _actualColsProps;
     constructor();
@@ -28,7 +28,7 @@ export declare class TableElement extends BlockContainerElement<TableProps> {
     beginMeasure(data: IBeginMeasureData): void;
     serialize(options: ViewOptions): SerializeProps;
 }
-export declare class TableRenderObject extends MuiltBlockLineRenderObject<TableElement> {
+export declare class TableRenderObject extends MultiBlockLineRenderObject<TableElement> {
     setRenderWidth(maxWidth: number): void;
     private exportTableBorder;
     clone(): RenderObject;

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

@@ -1,6 +1,6 @@
 import { BlockContainerElement, Element, ElementFactory, IBeginMeasureData, readElementProps, SerializeProps, ViewOptions } from "../../element-define";
 import { TableRowProps } from "../../element-props";
-import { MuiltBlockLineRenderObject, RenderObject } from "../../render-define";
+import { MultiBlockLineRenderObject, RenderObject } from "../../render-define";
 export declare const RowMinHeight = 20;
 export declare class TableRowElement extends BlockContainerElement<TableRowProps> {
     constructor();
@@ -15,7 +15,7 @@ export declare class TableRowElement extends BlockContainerElement<TableRowProps
     clone(data: boolean): Element;
     static createRow(cols: number): TableRowElement;
 }
-export declare class TableRowRenderObject extends MuiltBlockLineRenderObject<TableRowElement> {
+export declare class TableRowRenderObject extends MultiBlockLineRenderObject<TableRowElement> {
     remeasureState: boolean;
     hasMergeCells: boolean | undefined;
     minHeight: number;

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

@@ -1,4 +1,4 @@
-import { Rect, Element, MarginProps, PaddingProps, Position, ViewOptions } from './element-define';
+import { Rect, Element, MarginProps, PaddingProps, Position, ViewOptions, BranchElement } from './element-define';
 import { RenderContext, RenderContextType } from './render-context';
 import { EditorContext } from "./document-context";
 /**
@@ -69,8 +69,7 @@ export interface IRenderData {
 export declare abstract class BlockContentRenderObject<T extends Element = Element> extends BranchRenderObject<T> {
     setRenderWidth(maxWidth: number): void;
 }
-export declare abstract class InlineGroupRenderObject<T extends Element = Element> extends BranchRenderObject<T> {
-    paintPos: Position;
+export declare abstract class InlineGroupRenderObject<T extends BranchElement = BranchElement> extends BranchRenderObject<T> {
 }
 /**
  * 包含块级渲染元素的容器元素,例如body、table-cell等
@@ -81,18 +80,18 @@ export declare abstract class BlockContainerRenderObject<T extends Element = Ele
 /**
  * 多级 ‘BlockLineRectRenderObject’ 包裹元素，例如 p、table
  */
-export declare abstract class MuiltBlockLineRenderObject<T extends Element = Element> extends BlockContentRenderObject<T> {
+export declare abstract class MultiBlockLineRenderObject<T extends Element = Element> extends BlockContentRenderObject<T> {
 }
 /**
  * 容器-子内容为多个行内块级元素，例如table-row
  */
-export declare abstract class InlineBlockContainer extends MuiltBlockLineRenderObject {
+export declare abstract class InlineBlockContainer extends MultiBlockLineRenderObject {
 }
 /**
  * 服务于table-cell
  * 可被多级拆分的元素
  */
-export declare abstract class InlineMuiltBlockLineRenderObject<T extends Element = Element> extends MuiltBlockLineRenderObject<T> {
+export declare abstract class InlineMuiltBlockLineRenderObject<T extends Element = Element> extends MultiBlockLineRenderObject<T> {
 }
 /**
  * 最小不可分割单位的块级行框，例如 p-line

package/med_editor/framework/vnode/editor-calendar-vnode.d.ts

@@ -21,6 +21,7 @@ export declare class EditorCalendarVNode {
     private renderDropContainer;
     private resizePosition;
     renderDay(): EditorVNodeObject | null;
+    onSave(): void;
     navigateToToday(): void;
     onClickDayYearPart(): void;
     onClickDayItem(day: string): void;

package/package.json

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