@hailin-zheng/editor-core 2.2.6 → 2.2.7

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;
@@ -381,13 +382,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 +405,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/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/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.7",
     "scripts": {},
     "dependencies": {
         "moment": "^2.29.3",
@@ -16,4 +16,4 @@
         "snabbdom-to-html": "^7.1.0",
         "jsbarcode": "^3.11.5"
     }
-}
+}