ht-emr 0.7.5 → 0.7.8

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

@@ -115,6 +115,7 @@ export declare class Command {
     executeSetControlProperties: CommandAdapt['setControlProperties'];
     executeSetControlPropertiesList: CommandAdapt['setControlPropertiesList'];
     executeSetControlHighlight: CommandAdapt['setControlHighlight'];
+    executeSetControlQualityMarks: CommandAdapt['setControlQualityMarks'];
     executeLocationControl: CommandAdapt['locationControl'];
     executeInsertControl: CommandAdapt['insertControl'];
     executeInsertTextField: CommandAdapt['insertTextField'];

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, ILocationControlOption, IRemoveControlOption, ISetControlExtensionOption, ISetControlHighlightOption, ISetControlProperties, ISetControlValueOption } from '../../interface/Control';
+import { IGetControlValueOption, IGetControlValueResult, IControlQualityMark, 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, IGetMacroValueOption, IImageCaption, IImageCrop, IInsertElementListOption, IMacroValueResult, ISetMacroValueOption, IUpdateElementByIdOption, IUpdateMacroPropertiesOption, IUpdateSubTemplateOption } from '../../interface/Element';
@@ -193,6 +193,7 @@ export declare class CommandAdapt {
     setControlProperties(payload: ISetControlProperties): void;
     setControlPropertiesList(payload: ISetControlProperties[]): void;
     setControlHighlight(payload: ISetControlHighlightOption): void;
+    setControlQualityMarks(payload: IControlQualityMark[]): void;
     updateOptions(payload: IUpdateOption): void;
     setFormModeTrace(payload: IFormModeTraceOption): void;
     getControlList(): IElement[];

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

@@ -832,6 +832,8 @@ export declare class Draw {
      */
     render(payload?: IDrawOption): void;
     fixPosition(prev?: boolean): number | undefined;
+    private getInlineBackgroundControlType;
+    private getIsHideInlineBackgroundControlCursor;
     setCursor(curIndex: number | undefined): number | undefined;
     submitHistory(curIndex: number | undefined): void;
     destroy(): void;

package/dist/src/editor/core/draw/control/Control.d.ts

@@ -1,8 +1,10 @@
 import { ControlState } from '../../../dataset/enum/Control';
-import { IControl, IControlChangeOption, IControlContext, IControlHighlight, IControlInitOption, IControlInstance, IDestroyControlOption, IGetControlValueOption, IGetControlValueResult, IInitNextControlOption, INextControlContext, IRepaintControlOption, ISetControlExtensionOption, ISetControlProperties, ISetControlRowFlexOption, ISetControlValueOption } from '../../../interface/Control';
+import { EditorZone } from '../../../dataset/enum/Editor';
+import { IControl, IControlChangeOption, IControlContext, IControlHighlight, IControlQualityMark, IControlInitOption, IControlInstance, IDestroyControlOption, IGetControlValueOption, IGetControlValueResult, IInitNextControlOption, INextControlContext, IRepaintControlOption, ISetControlExtensionOption, ISetControlProperties, ISetControlRowFlexOption, ISetControlValueOption } from '../../../interface/Control';
 import { IElement, IElementPosition } from '../../../interface/Element';
 import { IRange } from '../../../interface/Range';
 import { Draw } from '../Draw';
+import { IRow } from '../../../interface/Row';
 interface IMoveCursorResult {
     newIndex: number;
     newElement: IElement;
@@ -15,6 +17,7 @@ export declare class Control {
     private listener;
     private eventBus;
     private controlSearch;
+    private controlQuality;
     private options;
     private controlOptions;
     private activeControl;
@@ -26,6 +29,9 @@ export declare class Control {
     setHighlightList(payload: IControlHighlight[]): void;
     computeHighlightList(): void;
     renderHighlightList(ctx: CanvasRenderingContext2D, pageNo: number): void;
+    setQualityMarks(payload: IControlQualityMark[]): void;
+    getQualityMarks(): IControlQualityMark[];
+    renderQualityMarks(ctx: CanvasRenderingContext2D, elementList: IElement[], positionList: IElementPosition[], rowList: IRow[], pageNo: number, zone?: EditorZone): void;
     getDraw(): Draw;
     filterAssistElement(elementList: IElement[]): IElement[];
     getIsRangeCanCaptureEvent(): boolean;
@@ -36,6 +42,7 @@ export declare class Control {
     getIsDisabledPasteControl(context?: IControlContext): boolean;
     getIsExistValueByElementListIndex(elementList: IElement[], index: number): boolean;
     getControlHighlight(elementList: IElement[], index: number): string;
+    getIsInlineControlBackground(elementList: IElement[], index: number): boolean;
     getContainer(): HTMLDivElement;
     getElementList(): IElement[];
     getPosition(): IElementPosition | null;

package/dist/src/editor/core/draw/control/interactive/ControlQuality.d.ts

@@ -0,0 +1,19 @@
+import { EditorZone } from '../../../../dataset/enum/Editor';
+import { IControlQualityMark } from '../../../../interface/Control';
+import { IElement, IElementPosition } from '../../../../interface/Element';
+import { IRow } from '../../../../interface/Row';
+import { Draw } from '../../Draw';
+export declare class ControlQuality {
+    private draw;
+    private options;
+    private marks;
+    constructor(draw: Draw);
+    setMarks(marks: IControlQualityMark[]): void;
+    getMarks(): IControlQualityMark[];
+    render(ctx: CanvasRenderingContext2D, elementList: IElement[], positionList: IElementPosition[], rowList: IRow[], pageNo: number, zone?: EditorZone): void;
+    private _getRegions;
+    private _getParentMap;
+    private _getTargetControlIds;
+    private _getTargetIdsForElement;
+    private _getStyle;
+}

package/dist/src/editor/core/draw/control/interactive/ControlSearch.d.ts

@@ -11,6 +11,8 @@ export declare class ControlSearch {
     private highlightMatchResult;
     constructor(control: Control);
     getControlHighlight(elementList: IElement[], index: number): string;
+    getIsInlineControlBackground(elementList: IElement[], index: number): boolean;
+    private _getControlType;
     getHighlightMatchResult(): IHighlightMatchResult;
     getHighlightList(): IControlHighlight[];
     setHighlightList(payload: IControlHighlight[]): void;

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

@@ -15,4 +15,5 @@ export declare const defaultControlOption: {
     disabledBackgroundColor: string;
     existValueBackgroundColor: string;
     noValueBackgroundColor: string;
+    inlineControlBackgroundColor: string;
 };

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

@@ -40,6 +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';
 /**
  * Canvas编辑器主类
  *
@@ -118,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, 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, IBadge, IGetElementListByHTMLOption, IControlQualityMark, IControlQualityMarkStyle, ISetControlQualityMarksOption, IMacroConfig, IMacroElement, IGetMacroValueOption, IMacroValueResult, ISetMacroValueOption, IUpdateMacroPropertiesOption, ITemplateCondition, ITemplateConditionRelation, ITemplateConditionSource, ISubTemplateElement, IUpdateSubTemplateOption };

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

@@ -58,6 +58,18 @@ export interface IControlHighlight {
     id?: string;
     conceptId?: string;
 }
+export interface IControlQualityMarkStyle {
+    borderColor?: string;
+    backgroundColor?: string;
+}
+export interface IControlQualityMark {
+    id?: string;
+    conceptId?: string;
+    code?: string;
+    type?: string;
+    message?: string;
+    style?: IControlQualityMarkStyle;
+}
 export interface IControlRule {
     deletable?: boolean;
     disabled?: boolean;
@@ -141,6 +153,7 @@ export interface IControlOption {
     disabledBackgroundColor?: string;
     existValueBackgroundColor?: string;
     noValueBackgroundColor?: string;
+    inlineControlBackgroundColor?: string;
 }
 export interface IControlInitOption {
     index: number;
@@ -198,6 +211,7 @@ export interface ISetControlExtensionOption {
     extension: unknown;
 }
 export type ISetControlHighlightOption = IControlHighlight[];
+export type ISetControlQualityMarksOption = IControlQualityMark[];
 export type ISetControlProperties = {
     id?: string;
     groupId?: string;

package/package.json

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