ht-emr 0.7.25 → 0.7.26

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

@@ -116,6 +116,7 @@ export declare class Command {
     executeSetControlPropertiesList: CommandAdapt['setControlPropertiesList'];
     executeSetControlHighlight: CommandAdapt['setControlHighlight'];
     executeSetControlQualityMarks: CommandAdapt['setControlQualityMarks'];
+    executeSetButtonContent: CommandAdapt['setButtonContent'];
     executeLocationControl: CommandAdapt['locationControl'];
     executeInsertControl: CommandAdapt['insertControl'];
     executeInsertTextField: CommandAdapt['insertTextField'];
@@ -149,6 +150,7 @@ export declare class Command {
     getLocale: CommandAdapt['getLocale'];
     getGroupIds: CommandAdapt['getGroupIds'];
     getControlValue: CommandAdapt['getControlValue'];
+    getButtonContent: CommandAdapt['getButtonContent'];
     getControlList: CommandAdapt['getControlList'];
     getContainer: CommandAdapt['getContainer'];
     getTitleValue: CommandAdapt['getTitleValue'];

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

@@ -10,7 +10,7 @@ import { TitleLevel } from '../../dataset/enum/Title';
 import { VerticalAlign } from '../../dataset/enum/VerticalAlign';
 import { ICatalog } from '../../interface/Catalog';
 import { DeepRequired } from '../../interface/Common';
-import { IGetControlValueOption, IGetControlValueResult, IControlQualityMark, ILocationControlOption, IRemoveControlOption, ISetControlExtensionOption, ISetControlHighlightOption, ISetControlProperties, ISetControlValueOption } from '../../interface/Control';
+import { IGetControlValueOption, IGetControlValueResult, IGetButtonContentOption, IControlQualityMark, ILocationControlOption, IRemoveControlOption, ISetButtonContentOption, 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, IGetMacroValueOption, IImageCaption, IImageCrop, IInsertElementListOption, IMacroValueResult, ISetMacroValueOption, IUpdateElementByIdOption, IUpdateMacroPropertiesOption, IUpdateSubTemplateOption } from '../../interface/Element';
@@ -40,6 +40,15 @@ export declare class CommandAdapt {
     private zone;
     private tableOperate;
     constructor(draw: Draw);
+    private getButtonContentControlId;
+    private getButtonContentText;
+    private normalizeButtonContentValue;
+    private getButtonContentResult;
+    private getButtonBusinessValue;
+    private findButtonControlContext;
+    private removeButtonBusinessElements;
+    private appendButtonContentValue;
+    private createButtonBusinessElements;
     private getIsRangeInTextField;
     mode(payload: EditorMode): void;
     cut(): Promise<void>;
@@ -186,6 +195,8 @@ export declare class CommandAdapt {
     locationGroup(groupId: string): void;
     setZone(zone: EditorZone): void;
     getControlValue(payload: IGetControlValueOption): IGetControlValueResult | null;
+    getButtonContent(payload: IGetButtonContentOption): string | IElement[] | null;
+    setButtonContent(payload: ISetButtonContentOption): void;
     setControlValue(payload: ISetControlValueOption): void;
     setControlValueList(payload: ISetControlValueOption[]): void;
     setControlExtension(payload: ISetControlExtensionOption): void;

package/dist/src/editor/core/draw/control/button/ButtonControl.d.ts

@@ -15,13 +15,13 @@ export declare class ButtonControl implements IControlInstance {
     setElement(element: IElement): void;
     getElement(): IElement;
     getIsPopup(): boolean;
-    getValue(): IElement[];
+    getValue(context?: IControlContext): IElement[];
     setValue(data: IElement[], context?: IControlContext, options?: IControlRuleOption): number;
     clearSelect(context?: IControlContext, options?: IControlRuleOption): number;
     keydown(evt: KeyboardEvent): number | null;
     removeByValue(array: IElement[], controlId: string): Promise<unknown>;
     cut(): number;
-    awake(): void;
+    awake(evt?: MouseEvent): void;
     private showInputModal;
     private closeInputModal;
     private showEditModal;

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

@@ -26,7 +26,7 @@ import { ICatalog, ICatalogItem } from './interface/Catalog';
 import { UsePlugin } from './interface/Plugin';
 import { EventBus } from './core/event/eventbus/EventBus';
 import { EventBusMap } from './interface/EventBus';
-import { IRangeStyle } from './interface/Listener';
+import { IButtonActionPayload, IRangeStyle } from './interface/Listener';
 import { Override } from './core/override/Override';
 import { LETTER_CLASS } from './dataset/constant/Common';
 import { INTERNAL_CONTEXT_MENU_KEY } from './dataset/constant/ContextMenu';
@@ -40,7 +40,7 @@ import { AreaMode } from './dataset/enum/Area';
 import { IBadge } from './interface/Badge';
 import { WatermarkType } from './dataset/enum/Watermark';
 import { INTERNAL_SHORTCUT_KEY } from './dataset/constant/Shortcut';
-import { IControlQualityMark, IControlQualityMarkStyle, ISetControlQualityMarksOption } from './interface/Control';
+import { IButtonContentValue, IControlAction, IControlQualityMark, IControlQualityMarkStyle, IGetButtonContentOption, ISetButtonContentOption, ISetControlQualityMarksOption } from './interface/Control';
 /**
  * Canvas编辑器主类
  *
@@ -119,4 +119,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, IControlQualityMark, IControlQualityMarkStyle, ISetControlQualityMarksOption, IMacroConfig, IMacroElement, IGetMacroValueOption, IMacroValueResult, ISetMacroValueOption, IUpdateMacroPropertiesOption, ITemplateCondition, ITemplateConditionRelation, ITemplateConditionSource, ISubTemplateElement, IUpdateSubTemplateOption };
+export type { IElement, IEditorData, IEditorOption, IEditorResult, IFormModeTraceOption, IContextMenuContext, IRegisterContextMenu, IWatermark, INavigateInfo, IBlock, ILang, ICatalog, ICatalogItem, IRange, IRangeStyle, IButtonActionPayload, IBadge, IGetElementListByHTMLOption, IButtonContentValue, IControlAction, IGetButtonContentOption, ISetButtonContentOption, IControlQualityMark, IControlQualityMarkStyle, ISetControlQualityMarksOption, IMacroConfig, IMacroElement, IGetMacroValueOption, IMacroValueResult, ISetMacroValueOption, IUpdateMacroPropertiesOption, ITemplateCondition, ITemplateConditionRelation, ITemplateConditionSource, ISubTemplateElement, IUpdateSubTemplateOption };

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

@@ -79,6 +79,12 @@ export interface IControlRule {
     hide?: boolean;
     readonly?: boolean;
 }
+export interface IControlAction {
+    key: 'outpatient.diagnosis' | 'outpatient.orders' | 'outpatient.patient360' | string;
+    label: string;
+    writeTarget?: 'self' | string;
+    writeMode?: 'confirmAppend' | string;
+}
 export interface IControlBasic {
     type: ControlType;
     value: IElement[] | null;
@@ -104,6 +110,7 @@ export interface IControlBasic {
     label?: string;
     buttonLabel?: string;
     code?: string | null;
+    action?: IControlAction;
     menstrualData?: IMenstrualData;
 }
 export interface IMenstrualData {
@@ -205,6 +212,16 @@ export interface ISetControlValueOption {
     value: string | IElement[] | null;
     isSubmitHistory?: boolean;
 }
+export type IButtonContentValue = string | IElement[];
+export interface IGetButtonContentOption {
+    controlId: string;
+}
+export interface ISetButtonContentOption {
+    controlId: string;
+    value: IButtonContentValue;
+    mode: 'replace' | 'append';
+    isSubmitHistory?: boolean;
+}
 export interface ISetControlExtensionOption {
     id?: string;
     groupId?: string;

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

@@ -3,7 +3,7 @@ import { ElementType } from '../dataset/enum/Element';
 import { ListStyle, ListType } from '../dataset/enum/List';
 import { RowFlex } from '../dataset/enum/Row';
 import { TitleLevel } from '../dataset/enum/Title';
-import { IControlChangeResult, IControlContentChangeResult } from './Control';
+import { IControl, IControlChangeResult, IControlContentChangeResult } from './Control';
 import { IEditorResult } from './Editor';
 import { IElement } from './Element';
 import { IPositionContext } from './Position';
@@ -63,14 +63,15 @@ export type IImageDblclick = (payload: {
     evt: MouseEvent;
     element: IElement;
 }) => void;
-export type IButtonChange = (payload: {
-    controlId: string | undefined;
-    element: IElement | IElement[];
-}) => void;
-export type IButtonClick = (payload: {
-    controlId: string | undefined;
-    element: IElement | IElement[];
-}) => void;
+export interface IButtonActionPayload {
+    evt: MouseEvent;
+    element: IElement;
+    elementList: IElement[];
+    controlId: string;
+    control: IControl;
+}
+export type IButtonChange = (payload: IButtonActionPayload) => void;
+export type IButtonClick = (payload: IButtonActionPayload) => void;
 export type IControlEditAttribute = (payload: {
     controlId: string | undefined;
     element: IElement | IElement[];

package/package.json

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