@hprint/plugins 0.0.10 → 0.0.11-alpha.1

package/dist/src/index.d.ts

@@ -5,4 +5,6 @@ declare const pluginsObject: {
 };
 declare const pluginsList: IPluginTempl[];
 export { pluginsObject, pluginsList, SelectEvent, SelectMode };
+export type { ITableItem, TableColumn, TableOptions, TableGroup, } from './plugins/TablePlugin';
+export { normalizeTableColumns } from './plugins/TablePlugin';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AA0C5D,QAAA,MAAM,aAAa,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA;CAuCjD,CAAC;AAGF,QAAA,MAAM,WAAW,EAAE,YAAY,EAuC9B,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AA2C5D,QAAA,MAAM,aAAa,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA;CAwCjD,CAAC;AAGF,QAAA,MAAM,WAAW,EAAE,YAAY,EAwC9B,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;AAC/D,YAAY,EACR,UAAU,EACV,WAAW,EACX,YAAY,EACZ,UAAU,GACb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/src/plugins/ActualContentLayoutPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ActualContentLayoutPlugin.d.ts","sourceRoot":"","sources":["../../../src/plugins/ActualContentLayoutPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE1D,MAAM,WAAW,2BAA2B;IACxC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;CACpC;AAED,KAAK,OAAO,GAAG,IAAI,CAAC,yBAAyB,EAAE,0BAA0B,CAAC,CAAC;AAE3E,OAAO,QAAQ,cAAc,CAAC;IAC1B,UAAU,OAAQ,SAAQ,OAAO;KAAG;CACvC;AASD,cAAM,yBAA0B,YAAW,YAAY;IAKxC,MAAM,EAAE,MAAM,CAAC,MAAM;IACrB,MAAM,EAAE,OAAO;IAL1B,MAAM,CAAC,UAAU,SAA+B;IAChD,MAAM,CAAC,IAAI,WAAgC;gBAGhC,MAAM,EAAE,MAAM,CAAC,MAAM,EACrB,MAAM,EAAE,OAAO;IAG1B,OAAO,CAAC,aAAa,CAGjB;IAEE,sBAAsB,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE;IAkB/C,wBAAwB,CAAC,eAAe,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM;IA4GrE,OAAO,CAAC,cAAc;IActB,OAAO,CAAC,iBAAiB;IAkBzB,OAAO,CAAC,wBAAwB;IAUhC,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,gBAAgB;IAiBxB,OAAO,CAAC,wBAAwB;IAahC,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,mBAAmB;IAsB3B,OAAO,CAAC,qBAAqB;IAK7B,OAAO,CAAC,qBAAqB;CAyBhC;AAED,eAAe,yBAAyB,CAAC"}
+{"version":3,"file":"ActualContentLayoutPlugin.d.ts","sourceRoot":"","sources":["../../../src/plugins/ActualContentLayoutPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE1D,MAAM,WAAW,2BAA2B;IACxC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;CACpC;AAED,KAAK,OAAO,GAAG,IAAI,CAAC,yBAAyB,EAAE,0BAA0B,CAAC,CAAC;AAE3E,OAAO,QAAQ,cAAc,CAAC;IAC1B,UAAU,OAAQ,SAAQ,OAAO;KAAG;CACvC;AASD,cAAM,yBAA0B,YAAW,YAAY;IAKxC,MAAM,EAAE,MAAM,CAAC,MAAM;IACrB,MAAM,EAAE,OAAO;IAL1B,MAAM,CAAC,UAAU,SAA+B;IAChD,MAAM,CAAC,IAAI,WAAgC;gBAGhC,MAAM,EAAE,MAAM,CAAC,MAAM,EACrB,MAAM,EAAE,OAAO;IAG1B,OAAO,CAAC,aAAa,CAGjB;IAEE,sBAAsB,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE;IAkB/C,wBAAwB,CAAC,eAAe,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM;IAoHrE,OAAO,CAAC,cAAc;IActB,OAAO,CAAC,iBAAiB;IAkBzB,OAAO,CAAC,wBAAwB;IAUhC,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,gBAAgB;IAiBxB,OAAO,CAAC,wBAAwB;IAahC,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,mBAAmB;IAsB3B,OAAO,CAAC,qBAAqB;IAK7B,OAAO,CAAC,qBAAqB;CAyBhC;AAED,eAAe,yBAAyB,CAAC"}

package/dist/src/plugins/TablePlugin.d.ts

@@ -0,0 +1,95 @@
+import { fabric, IEditor, IPluginTempl } from '@hprint/core';
+export interface TableColumn {
+    title: string;
+    field: string;
+    width: number | `${number}%`;
+}
+export interface ITableItem {
+    type: 'table';
+    key: string;
+    title: string;
+    columns: TableColumn[];
+    data?: Array<Record<string, unknown>>;
+    headerHeight?: number;
+    rowHeight?: number;
+    height?: number;
+    heightAllocationMode?: 'stretch' | 'grow';
+    cellPaddingHorizontal?: number;
+    cellPaddingVertical?: number;
+    textOverflow?: 'wrap' | 'ellipsis';
+    textAlign?: 'left' | 'center' | 'right' | 'justify';
+}
+export interface TableOptions {
+    width?: number;
+    height?: number;
+    headerHeight?: number;
+    rowHeight?: number;
+    heightAllocationMode?: 'stretch' | 'grow';
+    borderWidth?: number;
+    fontFamily?: string;
+    fontSize?: number;
+    fontWeight?: string;
+    fontStyle?: string;
+    underline?: boolean | string;
+    linethrough?: boolean | string;
+    textOverflow?: 'wrap' | 'ellipsis';
+    textAlign?: 'left' | 'center' | 'right' | 'justify';
+    lineHeight?: number;
+    charSpacing?: number;
+    color?: string;
+    cellPadding?: number;
+    cellPaddingHorizontal?: number;
+    cellPaddingVertical?: number;
+    data?: Array<Record<string, unknown>>;
+    _field_?: string;
+    _renderRows?: Array<Record<string, unknown>>;
+    _clipContent?: boolean;
+    _actualContentLayout?: boolean;
+    [key: string]: any;
+}
+export type TableGroup = fabric.Group & {
+    extensionType?: string;
+    extension?: TableOptions & {
+        columns: TableColumn[];
+    };
+    _originSize?: Record<string, any>;
+    setExtension?: (fields: Record<string, any>) => Promise<void>;
+    setExtensionByUnit?: (fields: Record<string, any>) => Promise<void>;
+    setByUnit?: (field: string, value: any) => Promise<any>;
+    __tableModified?: () => void;
+};
+type IPlugin = Pick<TablePlugin, 'createTable' | 'initTableEvents' | 'refreshTable'>;
+declare module '@hprint/core' {
+    interface IEditor extends IPlugin {
+    }
+}
+export declare function normalizeTableColumns(columns: TableColumn[]): {
+    ratio: number;
+    title: string;
+    field: string;
+    width: number | `${number}%`;
+}[];
+declare class TablePlugin implements IPluginTempl {
+    canvas: fabric.Canvas;
+    editor: IEditor;
+    static pluginName: string;
+    static apis: string[];
+    constructor(canvas: fabric.Canvas, editor: IEditor);
+    hookTransform(object: any): Promise<void>;
+    hookTransformObjectEnd(...args: unknown[]): Promise<void>;
+    createTable(columns: TableColumn[], options?: TableOptions): TableGroup;
+    initTableEvents(group: TableGroup): void;
+    refreshTable(group: TableGroup): Promise<void>;
+    private normalizeOptions;
+    private positiveNumber;
+    private nonNegativeNumber;
+    private toPx;
+    private buildGroup;
+    private createCellText;
+    private measureCellTextHeight;
+    private ellipsizeCellText;
+    private updateOriginSize;
+    destroy(): void;
+}
+export default TablePlugin;
+//# sourceMappingURL=TablePlugin.d.ts.map

package/dist/src/plugins/TablePlugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TablePlugin.d.ts","sourceRoot":"","sources":["../../../src/plugins/TablePlugin.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hprint/plugins",
-  "version": "0.0.10",
+  "version": "0.0.11-alpha.1",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -22,8 +22,8 @@
     "qs": "~6.12.3",
     "socket.io-client": "^4.8.1",
     "uuid": "~8.3.2",
-    "@hprint/shared": "0.0.10",
-    "@hprint/core": "0.0.10"
+    "@hprint/core": "0.0.11-alpha.1",
+    "@hprint/shared": "0.0.11-alpha.1"
   },
   "devDependencies": {
     "@types/bwip-js": "^3.2.3",

package/src/index.ts

@@ -36,9 +36,10 @@ import ResizePlugin from './plugins/ResizePlugin';
 import LockPlugin from './plugins/LockPlugin';
 import AddBaseTypePlugin from './plugins/AddBaseTypePlugin';
 import PrintPlugin from './plugins/PrintPlugin';
-import CreateElementPlugin from './plugins/CreateElementPlugin';
-import ImageTextListPlugin from './plugins/ImageTextListPlugin';
-import ActualContentLayoutPlugin from './plugins/ActualContentLayoutPlugin';
+import CreateElementPlugin from './plugins/CreateElementPlugin';
+import ImageTextListPlugin from './plugins/ImageTextListPlugin';
+import ActualContentLayoutPlugin from './plugins/ActualContentLayoutPlugin';
+import TablePlugin from './plugins/TablePlugin';
 
 // 对象形式导出所有插件
 const pluginsObject: { [key: string]: IPluginTempl } = {
@@ -77,10 +78,11 @@ const pluginsObject: { [key: string]: IPluginTempl } = {
     LockPlugin,
     AddBaseTypePlugin,
     PrintPlugin,
-    CreateElementPlugin,
-    ImageTextListPlugin,
-    ActualContentLayoutPlugin,
-};
+    CreateElementPlugin,
+    ImageTextListPlugin,
+    ActualContentLayoutPlugin,
+    TablePlugin,
+};
 
 // 数组形式导出所有插件
 const pluginsList: IPluginTempl[] = [
@@ -119,9 +121,17 @@ const pluginsList: IPluginTempl[] = [
     LockPlugin,
     AddBaseTypePlugin,
     PrintPlugin,
-    CreateElementPlugin,
-    ImageTextListPlugin,
-    ActualContentLayoutPlugin,
-];
+    CreateElementPlugin,
+    ImageTextListPlugin,
+    ActualContentLayoutPlugin,
+    TablePlugin,
+];
 
 export { pluginsObject, pluginsList, SelectEvent, SelectMode };
+export type {
+    ITableItem,
+    TableColumn,
+    TableOptions,
+    TableGroup,
+} from './plugins/TablePlugin';
+export { normalizeTableColumns } from './plugins/TablePlugin';

package/src/plugins/ActualContentLayoutPlugin.ts

@@ -60,7 +60,9 @@ class ActualContentLayoutPlugin implements IPluginTempl {
             .getObjects()
             .filter(this.isPrintableObject);
         const mmPerPx = Number(this.editor.getSizeByUnit?.(1, 'mm')) || 1;
-        const sourceObjects = this.getTemplateSourceObjects(templateContent);
+        const sourceObjects = this.getTemplateSourceObjects(templateContent);
+        const unitFactor = mmPerPx;
+        const tolerance = 0.01;
 
         fabricObjects.forEach((object) => this.preparePrintLayoutObject(object));
 
@@ -143,8 +145,14 @@ class ActualContentLayoutPlugin implements IPluginTempl {
         });
 
         this.canvas.requestRenderAll();
+        const hasExpandedTable = entries.some(
+            (entry) =>
+                (entry.object as any)?.extensionType === 'table' &&
+                this.getActualLayoutHeight(entry.object) * unitFactor >
+                    entry.originalBottom - entry.originalTop + tolerance
+        );
         if (
-            settings.overflowMode !== 'expand' ||
+            (!hasExpandedTable && settings.overflowMode !== 'expand') ||
             previousActualBottom === undefined
         ) {
             return templateHeight;
@@ -232,7 +240,7 @@ class ActualContentLayoutPlugin implements IPluginTempl {
     }
 
     private preparePrintLayoutObject(object: any) {
-        if (object?.extensionType !== 'imageTextList') return;
+        if (!['imageTextList', 'table'].includes(object?.extensionType)) return;
         if (object.extension?._clipContent === true) return;
 
         // Design canvases can opt into clipping, but print/layout canvases should