@hufe921/canvas-editor 1.0.5 → 1.0.6

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

@@ -33,6 +33,8 @@ export declare class Command {
     executeList: CommandAdapt['list'];
     executeRowFlex: CommandAdapt['rowFlex'];
     executeRowMargin: CommandAdapt['rowMargin'];
+    executeSpacingBefore: CommandAdapt['spacingBefore'];
+    executeSpacingAfter: CommandAdapt['spacingAfter'];
     executeInsertTable: CommandAdapt['insertTable'];
     executeInsertTableTopRow: CommandAdapt['insertTableTopRow'];
     executeInsertTableBottomRow: CommandAdapt['insertTableBottomRow'];
@@ -49,6 +51,8 @@ export declare class Command {
     executeTableBorderType: CommandAdapt['tableBorderType'];
     executeTableBorderColor: CommandAdapt['tableBorderColor'];
     executeTableTdBorderType: CommandAdapt['tableTdBorderType'];
+    executeTableTdBorderColor: CommandAdapt['tableTdBorderColor'];
+    executeTableTdBorderWidth: CommandAdapt['tableTdBorderWidth'];
     executeTableTdSlashType: CommandAdapt['tableTdSlashType'];
     executeTableTdBackgroundColor: CommandAdapt['tableTdBackgroundColor'];
     executeTableAutoFitToContent: CommandAdapt['tableAutoFitToContent'];

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

@@ -75,6 +75,8 @@ export declare class CommandAdapt {
     list(listType: ListType | null, listStyle?: ListStyle): void;
     rowFlex(payload: RowFlex): void;
     rowMargin(payload: number): void;
+    spacingBefore(payload: number): void;
+    spacingAfter(payload: number): void;
     insertTable(row: number, col: number): void;
     insertTableTopRow(): void;
     insertTableBottomRow(): void;
@@ -91,6 +93,8 @@ export declare class CommandAdapt {
     tableBorderType(payload: TableBorder): void;
     tableBorderColor(payload: string): void;
     tableTdBorderType(payload: TdBorder): void;
+    tableTdBorderColor(payload: string): void;
+    tableTdBorderWidth(payload: number): void;
     tableTdSlashType(payload: TdSlash): void;
     tableTdBackgroundColor(payload: string): void;
     tableAutoFitToContent(): void;

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

@@ -53,6 +53,7 @@ import { LineBreakParticle } from './particle/LineBreakParticle';
 import { ITd } from '../../interface/table/Td';
 import { TableOperate } from './particle/table/TableOperate';
 import { Area } from './interactive/Area';
+import { AreaTool } from './interactive/AreaTool';
 import { Badge } from './frame/Badge';
 import { Graffiti } from './graffiti/Graffiti';
 import { Magnifier } from './interactive/Magnifier';
@@ -86,6 +87,7 @@ export declare class Draw {
     private spellcheck;
     private group;
     private area;
+    private areaTool;
     private underline;
     private strikeout;
     private highlight;
@@ -219,6 +221,7 @@ export declare class Draw {
     getSpellcheck(): Spellcheck;
     getGroup(): Group;
     getArea(): Area;
+    getAreaTool(): AreaTool;
     getBadge(): Badge;
     getMagnifier(): Magnifier;
     getHistoryManager(): HistoryManager;
@@ -237,6 +240,7 @@ export declare class Draw {
     getElementList(): IElement[];
     getMainElementList(): IElement[];
     getRawRowList(): IRow[];
+    getMainRowList(): IRow[];
     getIncrementalRowComputer(): IncrementalRowComputer;
     getIsElementListTruncated(): boolean;
     getIsControlMinWidthPlaceholder(): boolean;

package/dist/src/editor/core/draw/interactive/Area.d.ts

@@ -1,6 +1,7 @@
 import { Draw } from '../Draw';
 import { IAreaInfo, IDeleteAreaOption, IGetAreaValueOption, IGetAreaValueResult, IInsertAreaOption, ILocationAreaOption, ISetAreaPropertiesOption, ISetAreaValueOption } from '../../../interface/Area';
 import { IRange } from '../../../interface/Range';
+import { IRow } from '../../../interface/Row';
 import { IElementPosition } from '../../../interface/Element';
 export declare class Area {
     private draw;
@@ -17,8 +18,19 @@ export declare class Area {
     insertArea(payload: IInsertAreaOption): string | null;
     render(ctx: CanvasRenderingContext2D, pageNo: number): void;
     compute(): void;
+    /**
+     * 收集区域补高的跨页延续段：
+     * 结转标记在区域后续行时，起点 = 结转行内容顶部 - 本行全部偏移（即页内容区顶部）；
+     * 结转标记在区域末行自身时（区域位于文档末尾），延续段位于下一空白页顶部
+     */
+    private computePaddingSegmentList;
     private computeAreaInfo;
     private computeTableAreaInfo;
+    /**
+     * 应用区域最小高度：按区域分组连续行累计内容高度，
+     * 不足 minHeight 时将差值补充到区域末行行高（区域顶部间距不计入内容高度）
+     */
+    applyMinHeight(rowList: IRow[]): void;
     getAreaValue(options?: IGetAreaValueOption): IGetAreaValueResult | null;
     getContextByAreaId(areaId: string, options?: ILocationAreaOption): {
         range: IRange;

package/dist/src/editor/core/draw/interactive/AreaTool.d.ts

@@ -0,0 +1,18 @@
+import { Draw } from '../Draw';
+export declare class AreaTool {
+    private readonly BORDER_VALUE;
+    private readonly MIN_AREA_HEIGHT;
+    private draw;
+    private canvas;
+    private options;
+    private container;
+    private toolBorder;
+    private anchorLine;
+    private mousedownY;
+    private lastAnchorKey;
+    constructor(draw: Draw);
+    dispose(): void;
+    render(): void;
+    private _mousedown;
+    private _mousemove;
+}

package/dist/src/editor/core/draw/particle/date/DatePicker.d.ts

@@ -59,6 +59,7 @@ export declare class DatePicker {
     private _bindEvent;
     private _setPosition;
     isInvalidDate(value: Date): boolean;
+    parseDate(value: string, format: string): Date | null;
     private _setValue;
     private _getDatePickerType;
     private _getLang;

package/dist/src/editor/core/draw/particle/table/TableOperate.d.ts

@@ -26,6 +26,8 @@ export declare class TableOperate {
     tableBorderType(payload: TableBorder): void;
     tableBorderColor(payload: string): void;
     tableTdBorderType(payload: TdBorder): void;
+    tableTdBorderColor(payload: string): void;
+    tableTdBorderWidth(payload: number): void;
     tableTdSlashType(payload: TdSlash): void;
     tableTdBackgroundColor(payload: string): void;
     private _measureTdContentWidth;

package/dist/src/editor/core/event/GlobalEvent.d.ts

@@ -8,6 +8,7 @@ export declare class GlobalEvent {
     private range;
     private previewer;
     private tableTool;
+    private areaTool;
     private hyperlinkParticle;
     private hintParticle;
     private control;

package/dist/src/editor/dataset/enum/Common.d.ts

@@ -28,3 +28,7 @@ export declare enum FlexDirection {
     ROW = "row",
     COLUMN = "column"
 }
+export declare enum CheckboxMarkType {
+    CHECK = "check",
+    CROSS = "cross"
+}

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

@@ -4,7 +4,7 @@ import { IElement } from './interface/Element';
 import { Command } from './core/command/Command';
 import { Listener } from './core/listener/Listener';
 import { RowFlex } from './dataset/enum/Row';
-import { FlexDirection, ImageDisplay, LocationPosition, SurroundPosition } from './dataset/enum/Common';
+import { FlexDirection, CheckboxMarkType, ImageDisplay, LocationPosition, SurroundPosition } from './dataset/enum/Common';
 import { ElementType } from './dataset/enum/Element';
 import { Register } from './core/register/Register';
 import { IContextMenuContext, IRegisterContextMenu } from './interface/contextmenu/ContextMenu';
@@ -56,5 +56,5 @@ 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, MacroType, PaperDirection, TableBorder, TdBorder, TdSlash, MaxHeightRatio, NumberType, TitleLevel, ListType, ListStyle, WordBreak, ControlIndentation, ControlComponent, BackgroundRepeat, BackgroundSize, TextDecorationStyle, LineNumberType, LocationPosition, SurroundPosition, AreaMode, ControlState, FlexDirection, WatermarkType, WatermarkLayer };
+export { Editor, RowFlex, VerticalAlign, EditorZone, EditorMode, ElementType, ControlType, EditorComponent, PageMode, RenderMode, ImageDisplay, Command, KeyMap, BlockType, MacroType, PaperDirection, TableBorder, TdBorder, TdSlash, MaxHeightRatio, NumberType, TitleLevel, ListType, ListStyle, WordBreak, ControlIndentation, ControlComponent, BackgroundRepeat, BackgroundSize, TextDecorationStyle, LineNumberType, LocationPosition, SurroundPosition, AreaMode, ControlState, FlexDirection, CheckboxMarkType, WatermarkType, WatermarkLayer };
 export type { IElement, IEditorData, IEditorOption, IEditorResult, IContextMenuContext, IRegisterContextMenu, IWatermark, INavigateInfo, IBlock, ILang, ICatalog, ICatalogItem, IRange, IRangeStyle, RangeRect, IBadge, IGetElementListByHTMLOption };

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

@@ -10,6 +10,7 @@ export interface IAreaBasic {
 }
 export interface IAreaStyle {
     top?: number;
+    minHeight?: number;
     borderColor?: string;
     backgroundColor?: string;
 }
@@ -17,6 +18,7 @@ export interface IAreaRule {
     mode?: AreaMode;
     hide?: boolean;
     deletable?: boolean;
+    resizable?: boolean;
 }
 export type IArea = IAreaBasic & IAreaStyle & IAreaRule;
 export interface IInsertAreaOption {
@@ -44,6 +46,11 @@ export interface IGetAreaValueResult {
     endPageNo: number;
     value: IElement[];
 }
+export interface IAreaPaddingSegment {
+    pageNo: number;
+    y: number;
+    height: number;
+}
 export interface IAreaInfo {
     id: string;
     area: IArea;
@@ -54,6 +61,7 @@ export interface IAreaInfo {
         td: ITd;
         tablePosition: IElementPosition;
     };
+    paddingSegmentList?: IAreaPaddingSegment[];
 }
 export interface ILocationAreaOption {
     position: LocationPosition;

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

@@ -1,8 +1,10 @@
+import { CheckboxMarkType } from '../dataset/enum/Common';
 import { VerticalAlign } from '../dataset/enum/VerticalAlign';
 export interface ICheckbox {
     value: boolean | null;
     code?: string;
     disabled?: boolean;
+    markType?: CheckboxMarkType;
 }
 export interface ICheckboxOption {
     width?: number;
@@ -14,5 +16,6 @@ export interface ICheckboxOption {
     checkFillStyle?: string;
     checkStrokeStyle?: string;
     checkMarkColor?: string;
+    markType?: CheckboxMarkType;
     verticalAlign?: VerticalAlign;
 }

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

@@ -1,4 +1,4 @@
-import { FlexDirection, LocationPosition } from '../dataset/enum/Common';
+import { CheckboxMarkType, FlexDirection, LocationPosition } from '../dataset/enum/Common';
 import { ControlType, ControlIndentation, ControlState } from '../dataset/enum/Control';
 import { EditorZone } from '../dataset/enum/Editor';
 import { MoveDirection } from '../dataset/enum/Observer';
@@ -27,6 +27,7 @@ export interface IControlCheckbox {
     max?: number;
     flexDirection: FlexDirection;
     valueSets: IValueSet[];
+    markType?: CheckboxMarkType;
 }
 export interface IControlRadio {
     code: string | null;

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

@@ -39,6 +39,8 @@ export interface IElementStyle {
     strikeout?: boolean;
     rowFlex?: RowFlex;
     rowMargin?: number;
+    spacingBefore?: number;
+    spacingAfter?: number;
     level?: TitleLevel;
     title?: ITitle;
     letterSpacing?: number;

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

@@ -24,6 +24,8 @@ export interface IRangeStyle {
     highlight: string | null;
     rowFlex: RowFlex | null;
     rowMargin: number;
+    spacingBefore: number;
+    spacingAfter: number;
     dashArray: number[];
     level: TitleLevel | null;
     listType: ListType | null;

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

@@ -20,6 +20,15 @@ export interface IRow {
     listIndex?: number;
     offsetX?: number;
     offsetY?: number;
+    spacingAfter?: number;
+    areaPadding?: {
+        areaId: string;
+        height: number;
+    };
+    areaPaddingCarry?: {
+        areaId: string;
+        height: number;
+    };
     elementList: IRowElement[];
     isWidthNotEnough?: boolean;
     rowIndex: number;

package/dist/src/editor/interface/table/Td.d.ts

@@ -25,6 +25,8 @@ export interface ITd {
     positionList?: IElementPosition[];
     verticalAlign?: VerticalAlign;
     backgroundColor?: string;
+    borderColor?: string;
+    borderWidth?: number;
     borderTypes?: TdBorder[];
     slashTypes?: TdSlash[];
     mainHeight?: number;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@hufe921/canvas-editor",
   "author": "Hufe",
   "license": "MIT",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "A Canvas/SVG-based rich text editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -45,16 +45,17 @@
     "docs:dev": "vitepress dev docs",
     "docs:build": "vitepress build docs",
     "docs:preview": "vitepress preview docs",
-    "pre-release": "node scripts/pre-release.js"
+    "pre-release": "node scripts/pre-release.js",
+    "prepublishOnly": "npm run lib && npm run pre-release"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
     "@rollup/plugin-typescript": "^12.3.0",
     "@types/jsdom": "^28.0.3",
-    "@types/node": "^24.19.1",
+    "@types/node": "^24.19.2",
     "@types/prismjs": "^1.26.6",
-    "@typescript-eslint/eslint-plugin": "^8.71.1",
-    "@typescript-eslint/parser": "^8.71.1",
+    "@typescript-eslint/eslint-plugin": "^8.71.2",
+    "@typescript-eslint/parser": "^8.71.2",
     "@vitest/coverage-v8": "^4.1.11",
     "cypress": "^15.21.1",
     "cypress-file-upload": "^5.0.8",
@@ -64,13 +65,13 @@
     "simple-git-hooks": "^2.14.0",
     "tslib": "^2.8.1",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.71.1",
-    "vite": "^8.3.3",
+    "typescript-eslint": "^8.71.2",
+    "vite": "^8.3.4",
     "vite-plugin-css-injected-by-js": "^5.0.1",
     "vitepress": "^1.6.4",
     "vitest": "^4.1.11",
     "vitest-canvas-mock": "^1.2.0",
-    "vue": "^3.5.43"
+    "vue": "^3.5.44"
   },
   "simple-git-hooks": {
     "pre-commit": "npm run lint && npm run type:check",