@hailin-zheng/editor-core 2.1.20 → 2.1.21

package/med_editor/framework/ast-parser.d.ts

@@ -1,3 +1,4 @@
 import { Node } from "acorn";
-export declare function parser(code: string): string;
+export declare function parser(code: string, objects?: Array<string>): string;
+export declare function addReturn(code: string): string;
 export declare function getCalleeName(node: Node): string;

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

@@ -61,6 +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 isConstructor(f: any): boolean;
     static toArray<T>(item: Array<T> | T): Array<T>;
     static removeChild(ele: HTMLElement): void;
@@ -68,6 +69,7 @@ export declare class CommonUtil {
     static isIntersect(rect1: Rect, rect2: Rect): boolean;
     static debounce<F extends AnyFunction>(fn: F, wait: number): (...args: Parameters<F>) => void;
     static btoa(str: string): string;
+    static isEqual(a: any, b: any): boolean;
 }
 declare type AnyFunction = (...args: any[]) => any;
 export {};

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

@@ -3,12 +3,16 @@ import { EditorContext } from "./document-context";
 import { RenderContextType } from "./render-context";
 import { DocumentRenderObject, ParagraphElement, TableCellRenderObject, TableRenderObject, TableRowRenderObject } from "./impl";
 import { BlockContentRenderObject, BranchRenderObject } from "./render-define";
+import { DynamicExecute } from "./dynamic-execute";
+import { ParagraphMeasure } from "./paragraph-arrange";
 import { SelectionEffectObject } from "./element-props";
 export declare class DocumentArrange {
     docCtx: EditorContext;
     renderCtx: RenderContextType;
     seo: SelectionEffectObject;
     options: ViewOptions;
+    execute: DynamicExecute;
+    pMeasure: ParagraphMeasure;
     constructor(docCtx: EditorContext, renderCtx: RenderContextType, seo: SelectionEffectObject);
     /**
      * 测量排版过程
@@ -24,7 +28,6 @@ export declare class DocumentArrange {
     private createEmptyBodyRender;
     private measureControl;
     private processTableTextLineMode;
-    private createRenderObject;
     private getDocInnerRect;
     /**
      * 切割渲染元素

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

@@ -3,13 +3,11 @@ import { DocumentRenderObject } from "./impl";
 import { RenderContextType } from "./render-context";
 import { DocumentContainerRender } from "./impl";
 import { EditorContext } from "./document-context";
-import { ElementMeasure } from "./element-measure";
 import { SelectionEffectObject } from "./element-props";
 export declare class DocumentPaint {
     private renderContext;
     private docCtx;
     private seo;
-    elementMeasure: ElementMeasure;
     elementPaint: ElementPaint;
     docPages: Array<DocumentRenderObject>;
     docContainer: DocumentContainerRender;

package/med_editor/framework/{dynamic-executer.d.ts → dynamic-execute.d.ts}

@@ -1,10 +1,14 @@
-import { BranchElement } from "./element-define";
+import { BranchElement, Element, RefCtxValue } from "./element-define";
 import { SelectionState } from "./document-selection";
 import { DataCheckEleModel, DataInputEleModel, DataLeafEleModel, DocumentContext } from "./document-context";
-export declare class DynamicContextParser {
+export declare class DynamicExecute {
     doc: BranchElement;
     ss: SelectionState;
+    current?: Element;
+    depItems?: Map<string, RefCtxValue>;
     constructor(doc: BranchElement, ss: SelectionState);
+    setCurrentCtx(ele: Element, depItems: Map<string, RefCtxValue>): void;
+    clearCurrentCtx(): void;
     cacheList: ReturnType<DocumentContext['getDataElementModelList']>;
     getControlById(id: string): DataCheckEleModel | DataInputEleModel | DataLeafEleModel | undefined;
     getObject(id: string): RefCtxValue;
@@ -17,8 +21,3 @@ export declare class DynamicContextParser {
     Number(val: any): number;
     TableData(tableId: string, startRow: number, startCol: number, endRow: number, endCol: number): Array<string>;
 }
-interface RefCtxValue {
-    get value(): any;
-    set value(val: any);
-}
-export {};

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

@@ -11,6 +11,7 @@ export declare class Rect {
 export interface SerializeProps {
     type: string;
     props?: any;
+    attribute?: any;
     children?: Array<SerializeProps>;
     complete?: boolean;
 }
@@ -71,6 +72,8 @@ export declare abstract class Element<P extends object = any> {
     disableClick: boolean;
     disposed: boolean;
     loaded: boolean;
+    visibleExpr?: IVisibleExpression;
+    attribute?: ElementAttribute;
     private _parent;
     get parent(): BranchElement;
     set parent(val: BranchElement);
@@ -278,6 +281,7 @@ export declare class ViewOptions {
     ruleHeight: number;
     printHeaderFooterLine: boolean;
     showEnterSymbol: boolean;
+    enableVisibleExpression: boolean;
     get fullPageView(): boolean;
     set fullPageView(value: boolean);
     mmToPixelsRatio: number;
@@ -333,6 +337,19 @@ export declare class BorderProps {
     constructor(width?: number, color?: string, style?: string);
     clone(): BorderProps;
 }
+/**
+ * 克隆元素的基本属性
+ * @param ele
+ * @param target
+ */
+export declare function cloneElementBase(ele: Element, target: Element): any;
+/**
+ * 克隆元素的子元素
+ * @param ele
+ * @param target
+ * @param data
+ */
+export declare function cloneChildren(ele: BranchElement, target: BranchElement, data: boolean): void;
 export declare abstract class IDispose {
     abstract destroy(): void;
 }
@@ -359,7 +376,7 @@ export declare function onceTask(fn: IVoidFn): IVoidFn;
 export interface IBeginMeasureData {
     doc: BranchElement;
     viewOptions: ViewOptions;
-    parser: object;
+    execute: object;
     createParaFn: () => Element;
 }
 export interface ICreateRenderData {
@@ -370,4 +387,21 @@ export interface FontBoundingBox {
     fontBoundingBoxAscent: number;
     fontBoundingBoxDescent: number;
 }
+export interface RefCtxValue {
+    get value(): any;
+    set value(val: any);
+    get ref(): any;
+}
+/**
+ * 需要实现一个可见性表达式的类型，控制目标元素的可见性(sourceElement),targetElement为影响元素，影响元素可能为多个
+ * 例如:sourceElement.visible= targetElement1.value==="1" && targetElement2.value===2等
+ */
+export interface IVisibleExpression {
+    compliedCode: string;
+    func: Function;
+    depItems: Map<string, RefCtxValue>;
+}
+export interface ElementAttribute {
+    visibleExpr?: string;
+}
 export {};

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

@@ -10,6 +10,7 @@ export declare class ElementReader {
     read(data: any | DocumentElement): void;
     setDocument(document: DocumentElement): void;
     readElement(data: any, strictMode?: boolean): Element | null;
+    readAttribute(data: any, ele: Element): void;
     /**
      * 读取扩展属性
      * @param data

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

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

package/med_editor/framework/element-trace-manage.d.ts

@@ -34,6 +34,11 @@ export declare class ElementTrackManage {
      * @private
      */
     private mergeOps;
+    /**
+     * 将对某个元素的最近两次的属性修改合并为一次，ops为当前记录的修改，比较上次的修改，如果为对同一个元素的修改，则合并
+     * @private
+     */
+    private mergeFormatOps;
     private getSelection;
     /**
      * 执行撤销

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

@@ -398,5 +398,8 @@ export declare class ElementUtil {
     static setDataElemEndFocus(ss: {
         resetRange: (ele: any, offset: any) => void;
     }, ele: DataElementInlineGroup): void;
+    static setEleAttribute(ele: Element, attr: string, value: any): void;
+    static getEleAttribute(ele: Element, attr: string): any;
+    static removeEleAttribute(ele: Element, attr: string): void;
 }
 export {};

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

@@ -21,6 +21,7 @@ export * from './document/doc-header-impl';
 export * from './document/doc-footer-impl';
 export * from './document/doc-impl';
 export * from "./media-formula/menstrual-history";
+export * from "./media-formula/permanent-teeth";
 export * from './paragraph/p-impl';
 export * from './picture/image-impl';
 export * from './radio/radio-impl';

package/med_editor/framework/impl/media-formula/permanent-teeth.d.ts

@@ -1,11 +1,14 @@
-import { ICreateRenderData, LeafElement, ViewOptions, Element, SerializeProps, ElementFactory, readElementProps } from "../../element-define";
+import { ICreateRenderData, ViewOptions, Element, SerializeProps, ElementFactory, readElementProps } from "../../element-define";
 import { INotifyPropertyChanged } from "../../element-props";
 import { IEditorVNodeOptions, LeafRenderObject, RenderObject } from "../../render-define";
+import { DataElementLeaf } from "../data-element/data-element-base-impl";
 /**
  * 恒牙牙位图
  */
-export declare class PermanentTeethElement extends LeafElement<PermanentTeethProps> {
+export declare class PermanentTeethElement extends DataElementLeaf<PermanentTeethProps> {
     constructor();
+    setValue(val: PermanentTeethProps | string): void;
+    getValue(): string;
     clone(data: boolean): Element;
     createRenderObject(data: ICreateRenderData): RenderObject | null;
     serialize(viewOptions: ViewOptions): SerializeProps | null;

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

@@ -2,10 +2,12 @@ import { LeafRenderObject, RenderObject } from "./render-define";
 import { FillNullSpaceRenderObject, ParagraphElement, ParagraphRenderObject, TextGroupRenderObject } from "./impl";
 import { Element, InlineGroupElement, LeafElement, ViewOptions } from "./element-define";
 import { RenderContextType } from "./render-context";
+import { DynamicExecute } from "./dynamic-execute";
 export declare class ParagraphMeasure {
     options: ViewOptions;
     renderCtx: RenderContextType;
-    constructor(options: ViewOptions, renderCtx: RenderContextType);
+    execute: DynamicExecute;
+    constructor(options: ViewOptions, renderCtx: RenderContextType, execute: DynamicExecute);
     /**
      * 段落排版：
      * 1.当前段落不存在项目符号，按照缩进和悬挂处理
@@ -69,6 +71,21 @@ export declare class ParagraphMeasure {
      * 获取段落行渲染单位个数,字符需要计算为字符长度
      */
     private getRenderUnitLength;
+    /**
+     * 解析可见性表达式
+     * @param ele
+     * @param execute
+     * @private
+     */
+    parseVisibleExpression(ele: Element, execute: DynamicExecute): void;
+    /**
+     * 元素可见行求值
+     * @param ele
+     * @param executeCtx
+     * @private
+     */
+    evalVisibleExpr(ele: Element, executeCtx: DynamicExecute): boolean;
+    createRenderObject<T extends Element>(element: T): ReturnType<T['createRenderObject']>;
 }
 interface MeasureLine {
     add(child: RenderObject): void;

package/package.json

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

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

@@ -1,94 +0,0 @@
-import { Element, IBeginMeasureData, InlineGroupElement, ViewOptions } from "./element-define";
-import { FillNullSpaceRenderObject } from "./impl";
-import { DocumentElement, DocumentRenderObject } from "./impl";
-import { ParagraphElement, ParagraphLineRectRenderObject, ParagraphRenderObject } from "./impl";
-import { TextGroupRenderObject } from "./impl";
-import { RenderContextType } from "./render-context";
-import { InlineGroupRenderObject, RenderObject } from "./render-define";
-import { EditorContext } from "./document-context";
-interface ICutLineData {
-    firstItem: RenderObject | null;
-    lastItem: RenderObject | null;
-    br?: boolean;
-}
-/**
- * 测量阶段，生成Render-UI
- */
-export declare class ElementMeasure {
-    docCtx: EditorContext;
-    renderCtx: RenderContextType;
-    options: ViewOptions;
-    constructor(docCtx: EditorContext, renderCtx: RenderContextType);
-    measureDocument(document: DocumentElement): DocumentRenderObject;
-    measureControl(element: Element, maxWidth: number): RenderObject | null;
-    /**
-     * 生成段落 UI 树
-     * @param para
-     * @param render
-     */
-    measureParagraph(para: ParagraphElement, render: ParagraphRenderObject): void;
-    /**
-     * 根据段落UI元素，进行排列
-     * @param render
-     * @param paragraph
-     * @param renderObjects
-     */
-    measureInnerParagraph(render: ParagraphRenderObject, paragraph: ParagraphElement, renderObjects: Array<RenderObject>): void;
-    /**
-     * 获取段落行布局横向坐标起始位置，被段落text-align影响
-     */
-    getParaLineRectStartX(counter: number, paraLineIndex: number, paraElement: ParagraphElement, paraRenderObject: ParagraphRenderObject, paraLineRender: ParagraphLineRectRenderObject): number;
-    /**
-     * 设置两端对齐
-     * @param render
-     * @param count
-     * @param spaceWidth
-     */
-    private setAlignJustify;
-    /**
-     * 获取段落行渲染单位个数,字符需要计算为字符长度
-     */
-    private getRenderUnitLength;
-    getInlineGroupRenderItem(item: InlineGroupElement): RenderObject | null;
-    cutRenderItem(render: RenderObject, nextRender: RenderObject, limitWidth: number, lineEmpty: boolean, inCloseBody: boolean): ICutLineData;
-    cutTextRender(render: TextGroupRenderObject, nextRender: RenderObject, limitWidth: number, lineEmpty: boolean, inCloseBody: boolean): ICutLineData;
-    /**
-     * 处理前置标点,前置标点不能出现在末尾
-     * @param render
-     * @param i
-     */
-    private patchHandleLeadingPunctuation;
-    /**
-     * 处理后置标点，后置标点不能出现在行首
-     * @param render
-     * @param i
-     * @param lineEmpty
-     */
-    private patchHandlePostPunctuation;
-    /**
-     * 是否包含后置标点
-     * @param str
-     * @returns
-     */
-    private containPostPunctuation;
-    private containLeadingPunctuation;
-    /**
-     * 文本开头是否包含后置标点
-     * @param render
-     * @returns
-     */
-    private containerStartSymbolInTextStart;
-    cutFillNullRender(render: FillNullSpaceRenderObject, limitWidth: number): ICutLineData;
-    /**
-     * 行内编组元素超出行内可用空间，需要根据剩余空间长度进行截断
-     */
-    cutInlineGroupRenderItem(render: InlineGroupRenderObject, limitWidth: number, emptyLine: boolean, inCloseBody: boolean): ICutLineData;
-    /**
-     * 修改测量完毕后的元素状态
-     * @param ele
-     */
-    setMeasureCompletedModifyFlag(ele: Element): void;
-    clearPaintCache(ele: Element, data: IBeginMeasureData): void;
-    endMeasures(ele: Element): void;
-}
-export {};

package/med_editor/framework/element-render-cut.d.ts

@@ -1,59 +0,0 @@
-import { DocumentBodyRenderObject, DocumentElement, DocumentRenderObject, TableCellRenderObject, TableRenderObject, TableRowRenderObject } from "./impl";
-import { RenderContextType } from "./render-context";
-import { BlockContentRenderObject } from "./render-define";
-import { Rect, ViewOptions } from "./element-define";
-export declare class ElementRenderCut {
-    private options;
-    private renderContext;
-    constructor(options: ViewOptions, renderContext: RenderContextType);
-    cutPage(documentRender: DocumentRenderObject, documentElement: DocumentElement): Array<DocumentRenderObject>;
-    private getDocInnerRect;
-    getFullViewDocRender(documentRender: DocumentRenderObject, documentElement: DocumentElement): Array<DocumentRenderObject>;
-    createEmptyBodyRender(bodyRender: DocumentBodyRenderObject, limitRect: Rect): {
-        emptyBody: DocumentBodyRenderObject;
-        innerRect: Rect & {
-            prevMargin: number;
-        } & {
-            maxHeight: number;
-            maxWidth: number;
-        };
-    };
-    /**
-     * 切割渲染元素
-     * @param render 被切割的对象
-     * @param limitHeight
-     * @returns
-     */
-    cutRenderItem(render: BlockContentRenderObject, limitHeight: number): BlockContentRenderObject | null;
-    /**
-     * 切割渲染元素
-     * @param tbRender 被切割的对象
-     * @param limitHeight
-     * @param addFunc
-     * @returns
-     */
-    cutTable(tbRender: TableRenderObject, limitHeight: number): BlockContentRenderObject | null;
-    cutRowRenderItem(render: TableRowRenderObject, limitHeight: number): TableRowRenderObject | null;
-    /**
-     * 标记合并单元格所在行需要重新计算
-     * @param cellRender
-     * @private
-     */
-    private markMergeRowRenderDirty;
-    /**
-     * 修复->已经截断的合并单元格要向下移动到合适的位置
-     * @param tbRender
-     * @param cutRows
-     * @returns
-     */
-    private fixCutTable;
-    /**
-     * 校验当前是否是一个完整的行，没有Null单元格，检查当前是否还需要向下合并
-     * @param row
-     */
-    private checkFullRow;
-    private existsCellRender;
-    private getBlockLineHeight;
-    getRowInsertCellIndex(sourceCell: TableCellRenderObject, destRow: TableRowRenderObject): number;
-    private getHeaderRows;
-}