ht-emr 0.6.6 → 0.6.7

package/dist/src/editor/core/command/Command.d.ts

@@ -159,10 +159,8 @@ export declare class Command {
     setMacroValueList: CommandAdapt['setMacroValueList'];
     updateMacroProperties: CommandAdapt['updateMacroProperties'];
     locationMacro: CommandAdapt['locationMacro'];
-    insertLogicTemplate: CommandAdapt['insertLogicTemplate'];
-    updateLogicTemplate: CommandAdapt['updateLogicTemplate'];
-    getLogicTemplateList: CommandAdapt['getLogicTemplateList'];
     insertSubTemplate: CommandAdapt['insertSubTemplate'];
+    updateSubTemplate: CommandAdapt['updateSubTemplate'];
     expandSubTemplate: CommandAdapt['expandSubTemplate'];
     collapseSubTemplate: CommandAdapt['collapseSubTemplate'];
     toggleSubTemplate: CommandAdapt['toggleSubTemplate'];

package/dist/src/editor/core/command/CommandAdapt.d.ts

@@ -13,7 +13,7 @@ import { DeepRequired } from '../../interface/Common';
 import { IGetControlValueOption, IGetControlValueResult, ILocationControlOption, IRemoveControlOption, ISetControlExtensionOption, ISetControlHighlightOption, ISetControlProperties, ISetControlValueOption } from '../../interface/Control';
 import { IAppendElementListOption, IDrawImagePayload, IForceUpdateOption, IGetImageOption, IGetValueOption, IPainterOption } from '../../interface/Draw';
 import { IEditorData, IEditorHTML, IEditorOption, IFormModeTraceOption, IEditorResult, IEditorText, IFocusOption, ISetValueOption, IUpdateOption } from '../../interface/Editor';
-import { IDeleteElementByIdOption, IElement, IElementPosition, IGetElementByIdOption, IInsertLogicTemplateOption, IGetMacroValueOption, IImageCaption, IImageCrop, IInsertElementListOption, ILogicTemplateConfig, IMacroValueResult, ISetMacroValueOption, IUpdateElementByIdOption, IUpdateLogicTemplateOption, IUpdateMacroPropertiesOption } from '../../interface/Element';
+import { IDeleteElementByIdOption, IElement, IElementPosition, IGetElementByIdOption, IGetMacroValueOption, IImageCaption, IImageCrop, IInsertElementListOption, IMacroValueResult, ISetMacroValueOption, IUpdateElementByIdOption, IUpdateMacroPropertiesOption, IUpdateSubTemplateOption } from '../../interface/Element';
 import { ICopyOption, IPasteOption, IPositionContextByEventOption, IPositionContextByEventResult } from '../../interface/Event';
 import { IMargin } from '../../interface/Margin';
 import { IRange, RangeContext } from '../../interface/Range';
@@ -250,13 +250,6 @@ export declare class CommandAdapt {
      * Location macro element
      */
     locationMacro(payload: IGetMacroValueOption): void;
-    /**
-     * 插入逻辑模板内容
-     * Insert logic template content
-     */
-    insertLogicTemplate(payload: IInsertLogicTemplateOption): void;
-    updateLogicTemplate(payload: IUpdateLogicTemplateOption): void;
-    getLogicTemplateList(): ILogicTemplateConfig[];
     /**
      * 插入子模板元素
      * Insert sub template element
@@ -266,9 +259,16 @@ export declare class CommandAdapt {
         label: string;
         /** 子模板ID（引用的模板ID） */
         templateId: string;
+        /** 子模板内容 */
+        content?: IElement[];
+        /** 匹配条件 */
+        conditions?: IElement['subTemplateConditions'];
+        /** 条件关系 */
+        relation?: IElement['subTemplateRelation'];
         /** 是否提交历史 */
         isSubmitHistory?: boolean;
     }): void;
+    updateSubTemplate(payload: IUpdateSubTemplateOption): void;
     /**
      * 展开子模板
      * Expand sub template
@@ -278,7 +278,7 @@ export declare class CommandAdapt {
         /** 子模板元素ID */
         id?: string;
         /** 子模板内容 */
-        content: IElement[];
+        content?: IElement[];
         /** 是否提交历史 */
         isSubmitHistory?: boolean;
     }): void;

package/dist/src/editor/core/draw/Draw.d.ts

@@ -291,7 +291,9 @@ export declare class Draw {
      * @private
      */
     private hideTextFieldWhitespace;
-    private applyLogicTemplateVisibility;
+    private getSubTemplateRuntimeEndIndex;
+    private syncSubTemplateExpandedState;
+    private applySubTemplateRuntimeState;
     /**
      * 更新TextField占位符和前后缀的可见性
      *

package/dist/src/editor/dataset/constant/Element.d.ts

@@ -13,7 +13,6 @@ export declare const LIST_CONTEXT_ATTR: Array<keyof IElement>;
 export declare const CONTROL_CONTEXT_ATTR: Array<keyof IElement>;
 export declare const CONTROL_STYLE_ATTR: Array<keyof IControlStyle>;
 export declare const AREA_CONTEXT_ATTR: Array<keyof IElement>;
-export declare const LOGIC_TEMPLATE_CONTEXT_ATTR: Array<keyof IElement>;
 export declare const EDITOR_ELEMENT_CONTEXT_ATTR: Array<keyof IElement>;
 export declare const TEXTLIKE_ELEMENT_TYPE: ElementType[];
 export declare const IMAGE_ELEMENT_TYPE: ElementType[];

package/dist/src/editor/index.d.ts

@@ -1,6 +1,6 @@
 import './assets/css/index.css';
 import { IEditorData, IEditorOption, IEditorResult, IFormModeTraceOption } from './interface/Editor';
-import { IElement, IInsertLogicTemplateOption, IMacroConfig, IMacroElement, IGetMacroValueOption, ILogicTemplateCondition, ILogicTemplateConfig, IMacroValueResult, ISetMacroValueOption, IUpdateLogicTemplateOption, IUpdateMacroPropertiesOption, ISubTemplateElement } from './interface/Element';
+import { IElement, IMacroConfig, IMacroElement, IGetMacroValueOption, ITemplateCondition, ITemplateConditionRelation, ITemplateConditionSource, IMacroValueResult, ISetMacroValueOption, IUpdateMacroPropertiesOption, ISubTemplateElement, IUpdateSubTemplateOption } from './interface/Element';
 import { Command } from './core/command/Command';
 import { Listener } from './core/listener/Listener';
 import { RowFlex } from './dataset/enum/Row';
@@ -118,4 +118,4 @@ export default class Editor {
 export { splitText, createDomFromElementList, getElementListByHTML, getTextFromElementList };
 export { EDITOR_COMPONENT, LETTER_CLASS, INTERNAL_CONTEXT_MENU_KEY, INTERNAL_SHORTCUT_KEY, EDITOR_CLIPBOARD };
 export { Editor, RowFlex, VerticalAlign, EditorZone, EditorMode, ElementType, ControlType, EditorComponent, PageMode, RenderMode, ImageDisplay, Command, KeyMap, BlockType, PaperDirection, TableBorder, TdBorder, TdSlash, MaxHeightRatio, NumberType, TitleLevel, ListType, ListStyle, WordBreak, ControlIndentation, ControlComponent, BackgroundRepeat, BackgroundSize, TextDecorationStyle, LineNumberType, LocationPosition, AreaMode, ControlState, FlexDirection, WatermarkType };
-export type { IElement, IEditorData, IEditorOption, IEditorResult, IFormModeTraceOption, IContextMenuContext, IRegisterContextMenu, IWatermark, INavigateInfo, IBlock, ILang, ICatalog, ICatalogItem, IRange, IRangeStyle, IBadge, IGetElementListByHTMLOption, IMacroConfig, IMacroElement, IGetMacroValueOption, IMacroValueResult, ISetMacroValueOption, IUpdateMacroPropertiesOption, ILogicTemplateCondition, ILogicTemplateConfig, IInsertLogicTemplateOption, IUpdateLogicTemplateOption, ISubTemplateElement };
+export type { IElement, IEditorData, IEditorOption, IEditorResult, IFormModeTraceOption, IContextMenuContext, IRegisterContextMenu, IWatermark, INavigateInfo, IBlock, ILang, ICatalog, ICatalogItem, IRange, IRangeStyle, IBadge, IGetElementListByHTMLOption, IMacroConfig, IMacroElement, IGetMacroValueOption, IMacroValueResult, ISetMacroValueOption, IUpdateMacroPropertiesOption, ITemplateCondition, ITemplateConditionRelation, ITemplateConditionSource, ISubTemplateElement, IUpdateSubTemplateOption };

package/dist/src/editor/interface/Element.d.ts

@@ -256,33 +256,15 @@ export interface IReusableItemElement {
     /** 复用项目配置 */
     reusableItemConfig?: IReusableItemConfig;
 }
-export type ILogicTemplateConditionSource = 'all' | 'control' | 'macro';
-export type ILogicTemplateRelation = 'and' | 'or';
-export interface ILogicTemplateCondition {
+export type ITemplateConditionSource = 'all' | 'control' | 'macro';
+export type ITemplateConditionRelation = 'and' | 'or';
+export interface ITemplateCondition {
     /** 匹配字段标签 */
     label: string;
     /** 正则表达式 */
     regex: string;
     /** 字段来源，默认 all */
-    source?: ILogicTemplateConditionSource;
-}
-export interface ILogicTemplateConfig {
-    /** 逻辑模板组 ID */
-    id?: string;
-    /** 逻辑模板名称 */
-    label?: string;
-    /** 逻辑模板引用模板 ID */
-    templateId?: string;
-    /** 条件关系，默认 and */
-    relation?: ILogicTemplateRelation;
-    /** 显示条件列表 */
-    conditions?: ILogicTemplateCondition[];
-}
-export interface ILogicTemplateElement {
-    /** 逻辑模板配置 */
-    logicTemplate?: ILogicTemplateConfig;
-    /** 运行时隐藏状态，不参与导出 */
-    logicTemplateHidden?: boolean;
+    source?: ITemplateConditionSource;
 }
 /**
  * 子模板元素属性接口
@@ -293,10 +275,18 @@ export interface ISubTemplateElement {
     label?: string;
     /** 子模板ID（引用的模板ID） */
     templateId?: string;
+    /** 子模板内容快照，用于表单/打印模式自动展开 */
+    subTemplateContent?: IElement[];
+    /** 子模板条件关系，默认 and */
+    subTemplateRelation?: ITemplateConditionRelation;
+    /** 子模板匹配条件 */
+    subTemplateConditions?: ITemplateCondition[];
     /** 子模板是否展开（表单模式下使用） */
     subTemplateExpanded?: boolean;
+    /** 子模板运行时父节点ID，不参与导出 */
+    subTemplateParentId?: string;
 }
-export type IElement = IElementBasic & IElementStyle & IElementRule & IElementGroup & ITable & IHyperlinkElement & ISuperscriptSubscript & ISeparator & IControlElement & ICheckboxElement & IRadioElement & ILaTexElement & IDateElement & IImageElement & IBlockElement & ITitleElement & IListElement & IAreaElement & ILabelElement & IMenstrualHistoryElement & IFetalHeartPositionElement & IToothPositionElement & IMacroElement & IReusableItemElement & ILogicTemplateElement & ISubTemplateElement;
+export type IElement = IElementBasic & IElementStyle & IElementRule & IElementGroup & ITable & IHyperlinkElement & ISuperscriptSubscript & ISeparator & IControlElement & ICheckboxElement & IRadioElement & ILaTexElement & IDateElement & IImageElement & IBlockElement & ITitleElement & IListElement & IAreaElement & ILabelElement & IMenstrualHistoryElement & IFetalHeartPositionElement & IToothPositionElement & IMacroElement & IReusableItemElement & ISubTemplateElement;
 export interface IElementMetrics {
     width: number;
     height: number;
@@ -428,25 +418,11 @@ export interface IUpdateMacroPropertiesOption {
     /** 是否提交历史 */
     isSubmitHistory?: boolean;
 }
-export interface IInsertLogicTemplateOption {
-    /** 逻辑模板名称 */
-    label: string;
-    /** 引用模板 ID */
-    templateId?: string;
-    /** 逻辑模板内容 */
-    content: IElement[];
-    /** 显示条件 */
-    conditions: ILogicTemplateCondition[];
-    /** 条件关系，默认 and */
-    relation?: ILogicTemplateRelation;
-    /** 是否提交历史 */
-    isSubmitHistory?: boolean;
-}
-export interface IUpdateLogicTemplateOption {
-    /** 逻辑模板 ID */
+export interface IUpdateSubTemplateOption {
+    /** 子模板元素 ID */
     id: string;
     /** 要更新的属性 */
-    properties: Partial<Omit<ILogicTemplateConfig, 'id'>>;
+    properties: Partial<Omit<ISubTemplateElement, 'subTemplateParentId'>>;
     /** 是否提交历史 */
     isSubmitHistory?: boolean;
 }

package/dist/src/editor/utils/templateCondition.d.ts

@@ -0,0 +1,12 @@
+import { IElement, ITemplateCondition, ITemplateConditionRelation, ITemplateConditionSource } from '../interface/Element';
+type ITemplateFieldSource = Exclude<ITemplateConditionSource, 'all'>;
+export interface ITemplateFieldValue {
+    label: string;
+    source: ITemplateFieldSource;
+    value: string;
+}
+export type ITemplateFieldMap = Map<string, ITemplateFieldValue[]>;
+export declare function walkNestedElements(elementList: IElement[], visitor: (element: IElement) => void): void;
+export declare function collectTemplateFieldMap(elementList: IElement[]): ITemplateFieldMap;
+export declare function getTemplateConditionVisible(conditions: ITemplateCondition[] | undefined, fieldMap: ITemplateFieldMap, relation?: ITemplateConditionRelation): boolean;
+export {};

package/package.json

@@ -2,7 +2,7 @@
   "name": "ht-emr",
   "author": "swj",
   "license": "MIT",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "description": "rich text editor by canvas/svg",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package/dist/src/editor/utils/logicTemplate.d.ts

@@ -1,14 +0,0 @@
-import { IElement, ILogicTemplateConditionSource, ILogicTemplateConfig } from '../interface/Element';
-type ILogicTemplateFieldSource = Exclude<ILogicTemplateConditionSource, 'all'>;
-export interface ILogicTemplateFieldValue {
-    label: string;
-    source: ILogicTemplateFieldSource;
-    value: string;
-}
-export type ILogicTemplateFieldMap = Map<string, ILogicTemplateFieldValue[]>;
-export declare function walkLogicTemplateElements(elementList: IElement[], visitor: (element: IElement) => void): void;
-export declare function bindLogicTemplate(elementList: IElement[], logicTemplate: ILogicTemplateConfig): void;
-export declare function collectLogicTemplateList(elementList: IElement[]): ILogicTemplateConfig[];
-export declare function collectLogicTemplateFieldMap(elementList: IElement[]): ILogicTemplateFieldMap;
-export declare function getLogicTemplateVisible(logicTemplate: ILogicTemplateConfig | undefined, fieldMap: ILogicTemplateFieldMap): boolean;
-export {};