@agile-team/mach-report 0.5.0 → 0.7.0

package/dist/layout/paginate.d.ts

@@ -0,0 +1,51 @@
+import { ComponentStyle, PlanComponent, RenderPlan } from '../schema/render-plan';
+import { measureTextMm, wrapText, TextMeasurer } from './textwrap';
+export interface ListColumn {
+    header: string;
+    field: string;
+    widthMm: number;
+    style?: ComponentStyle;
+}
+export interface ListComponent {
+    kind: "list";
+    id?: string;
+    leftMm: number;
+    topMm: number;
+    widthMm: number;
+    dataset: string;
+    columns: ListColumn[];
+    fontSizePt?: number;
+    headerBold?: boolean;
+    rowHeightMm?: number;
+    paddingMm?: number;
+    headerEveryPage?: boolean;
+    headerBackgroundColor?: string;
+    border?: boolean;
+}
+export type TemplateComponent = PlanComponent | ListComponent;
+export interface TemplatePage {
+    widthMm: number;
+    heightMm: number;
+    marginTopMm?: number;
+    marginBottomMm?: number;
+    marginLeftMm?: number;
+    marginRightMm?: number;
+    components: TemplateComponent[];
+}
+export interface ReportTemplate {
+    schemaVersion?: string;
+    pages: TemplatePage[];
+}
+export type DatasetRows = Record<string, Record<string, unknown>[]>;
+export interface PaginateOptions {
+    /** 每行额外占高（mm），压测专用钩子 */
+    mmPerRow?: number;
+    /** 文本测量器（默认启发式；浏览器端可注入 canvas 测量校准） */
+    measurer?: TextMeasurer;
+}
+export interface PaginateResult {
+    plan: RenderPlan;
+    warnings: string[];
+}
+export declare function paginateTemplate(template: ReportTemplate, datasets: DatasetRows, optionsOrMmPerRow?: number | PaginateOptions): PaginateResult;
+export { measureTextMm, wrapText };

package/dist/layout/textwrap.d.ts

@@ -0,0 +1,36 @@
+/**
+ * 文本测量与折行（分页/Canvas/PDF 共用的唯一折行真相源）。
+ *
+ * 测量模型可注入（TextMeasurer）：
+ * - 默认 createHeuristicMeasurer()：CJK/拉丁宽度启发式（零依赖、Node 可用）
+ * - 浏览器端可注入 createCanvasMeasurer()（真字体 metrics，消除三端折行差异）
+ */
+export interface TextMeasureOptions {
+    fontSizePt: number;
+    bold?: boolean;
+    letterSpacingPt?: number;
+}
+/** 宽度测量接口：返回文本在给定字号下的宽度（mm）。实现必须无副作用、可缓存。 */
+export interface TextMeasurer {
+    measureMm(text: string, options: TextMeasureOptions): number;
+}
+export declare function charWidthEm(ch: string): number;
+/** 启发式测量器：宽度模型与 jh4j 近似口径一致（默认实现） */
+export declare const heuristicMeasurer: TextMeasurer;
+/** 兼容旧 API：默认启发式测量 */
+export declare function createHeuristicMeasurer(): TextMeasurer;
+export declare function measureTextMm(text: string, options: TextMeasureOptions): number;
+/**
+ * 浏览器 Canvas 测量器：用真实字体 metrics 校准宽度（可选注入）。
+ * 无 2D 环境时自动回退启发式（Node/SSR 安全）。
+ */
+export declare function createCanvasMeasurer(getCtx2d: () => CanvasRenderingContext2D | null): TextMeasurer;
+/**
+ * 文本折行：
+ * - CJK 字符任意位置可断（与既有行为一致）
+ * - 连续拉丁/数字串视为一个词，仅在词间（空格/CJK 边界）断行；
+ *   单词本身超宽时按字符硬拆（兜底，不无限溢出）
+ * - 换行符强制断行；行首不保留折行产生的空格
+ * - 可注入 TextMeasurer（默认启发式）
+ */
+export declare function wrapText(text: string, maxWidthMm: number, options: TextMeasureOptions, measurer?: TextMeasurer): string[];

package/dist/manager/api.d.ts

@@ -0,0 +1,45 @@
+import { DatasetRecord, ImportStrategy, PageResult, ParamRecord, ReportRecord, RequestFn } from './types';
+export declare function createReportAdminClient(options: {
+    request: RequestFn;
+    baseUrl?: string;
+}): {
+    /** 模板列表（分页） */
+    listReports(query?: {
+        current?: number;
+        size?: number;
+        directoryId?: string;
+        keyword?: string;
+    }): Promise<PageResult<ReportRecord>>;
+    /** 模板详情（content 为 jh4j 私有模板 JSON 字符串，可喂给 importJh4jTemplateContent） */
+    getReport(id: string): Promise<ReportRecord>;
+    /** 保存模板（jh4j：PUT，body {id, code, name, content}） */
+    updateReport(input: {
+        id: string;
+        code?: string;
+        name?: string;
+        content: string;
+    }): Promise<unknown>;
+    /** 导出模板定义包（body = ID 数组，返回 ZIP blob） */
+    exportDefinition(ids: string[]): Promise<unknown>;
+    /** 导入模板定义包（multipart: file + strategy） */
+    importDefinition(file: File | Blob, strategy: ImportStrategy): Promise<unknown>;
+    /** 数据集列表 */
+    listDatasets(reportId: string): Promise<PageResult<DatasetRecord>>;
+    /** 参数列表 */
+    listParams(reportId: string): Promise<PageResult<ParamRecord>>;
+    /** 模板锁：进入设计器前获取（40s 心跳由 holdLock 驱动） */
+    acquireLock(reportId: string): Promise<unknown>;
+    lockHeartbeat(reportId: string): Promise<unknown>;
+    releaseLock(reportId: string): Promise<unknown>;
+    /**
+     * 持锁执行：acquire → fn（期间自动心跳）→ release（finally）。
+     * 返回 fn 的结果；获取锁失败时抛 ReportAdminError。
+     * 心跳连续失败（默认 2 次）视为锁丢失：触发 onLockLost 回调并停止心跳，
+     * fn 继续执行（避免中途丢弃用户编辑），由调用方决定是否提示/中止。
+     */
+    holdLock<T>(reportId: string, fn: () => Promise<T>, options?: {
+        onLockLost?: (reason: string) => void;
+        heartbeatFailLimit?: number;
+    }): Promise<T>;
+};
+export type ReportAdminClient = ReturnType<typeof createReportAdminClient>;

package/dist/manager/index.d.ts

@@ -0,0 +1,2 @@
+export * from './types';
+export * from './api';

package/dist/manager/types.d.ts

@@ -0,0 +1,50 @@
+export interface ReportRecord {
+    id: string;
+    code?: string;
+    name?: string;
+    publishStatus?: string;
+    directoryId?: string;
+    updateTime?: string;
+    [key: string]: unknown;
+}
+export interface PageResult<T> {
+    records: T[];
+    total?: number;
+    current?: number;
+    size?: number;
+}
+export interface DatasetRecord {
+    id?: string;
+    reportId?: string;
+    code?: string;
+    name?: string;
+    type?: string;
+    datasourceCode?: string;
+    sqlText?: string;
+    apiUrl?: string;
+    fields?: unknown[];
+    [key: string]: unknown;
+}
+export interface ParamRecord {
+    id?: string;
+    reportId?: string;
+    name?: string;
+    defaultValue?: string;
+    [key: string]: unknown;
+}
+export type ImportStrategy = "overwrite" | "skip";
+export type RequestFn = (config: {
+    url: string;
+    method: string;
+    params?: Record<string, unknown>;
+    data?: unknown;
+}) => Promise<unknown>;
+export interface ApiResponse<T = unknown> {
+    code?: number;
+    message?: string;
+    data?: T;
+}
+export declare class ReportAdminError extends Error {
+    readonly url: string;
+    constructor(message: string, url: string);
+}

package/dist/manager.cjs

@@ -1,122 +1 @@
-'use strict';
-
-// src/manager/types.ts
-var ReportAdminError = class extends Error {
-  constructor(message, url) {
-    super(message);
-    this.url = url;
-    this.name = "ReportAdminError";
-  }
-};
-
-// src/manager/api.ts
-var BASE = "/report/codePrintReport";
-var LOCK_BASE = "/report/codePrintReportLock";
-function unwrap(response, url) {
-  const body = response;
-  if (body && body.code != null && body.code !== 200) {
-    throw new ReportAdminError(String(body.message || "\u8BF7\u6C42\u5931\u8D25"), url);
-  }
-  return body?.data ?? body;
-}
-function createReportAdminClient(options) {
-  const { request } = options;
-  const base = options.baseUrl ?? "";
-  return {
-    /** 模板列表（分页） */
-    async listReports(query = {}) {
-      const url = `${base}${BASE}/list`;
-      return unwrap(
-        await request({ url, method: "get", params: { current: 1, size: 20, ...query } }),
-        url
-      );
-    },
-    /** 模板详情（content 为 jh4j 私有模板 JSON 字符串，可喂给 importJh4jTemplateContent） */
-    async getReport(id) {
-      const url = `${base}${BASE}/getById`;
-      return unwrap(await request({ url, method: "get", params: { id } }), url);
-    },
-    /** 保存模板（jh4j：PUT，body {id, code, name, content}） */
-    async updateReport(input) {
-      const url = `${base}${BASE}/update`;
-      return unwrap(await request({ url, method: "put", data: input }), url);
-    },
-    /** 导出模板定义包（body = ID 数组，返回 ZIP blob） */
-    async exportDefinition(ids) {
-      const url = `${base}${BASE}/exportDefinition`;
-      return request({ url, method: "post", data: ids });
-    },
-    /** 导入模板定义包（multipart: file + strategy） */
-    async importDefinition(file, strategy) {
-      const url = `${base}${BASE}/importDefinition`;
-      const form = new FormData();
-      form.append("file", file);
-      form.append("strategy", strategy);
-      return request({ url, method: "post", data: form });
-    },
-    /** 数据集列表 */
-    async listDatasets(reportId) {
-      const url = `${base}${BASE}Ds/list`;
-      return unwrap(
-        await request({ url, method: "get", params: { reportId, current: 1, size: 999 } }),
-        url
-      );
-    },
-    /** 参数列表 */
-    async listParams(reportId) {
-      const url = `${base}${BASE}Param/list`;
-      return unwrap(
-        await request({ url, method: "get", params: { reportId, current: 1, size: 999 } }),
-        url
-      );
-    },
-    /** 模板锁：进入设计器前获取（40s 心跳由 holdLock 驱动） */
-    async acquireLock(reportId) {
-      const url = `${base}${LOCK_BASE}/acquire`;
-      return unwrap(await request({ url, method: "post", data: { reportId } }), url);
-    },
-    async lockHeartbeat(reportId) {
-      const url = `${base}${LOCK_BASE}/heartbeat`;
-      return unwrap(await request({ url, method: "post", data: { reportId } }), url);
-    },
-    async releaseLock(reportId) {
-      const url = `${base}${LOCK_BASE}/release`;
-      return unwrap(await request({ url, method: "post", data: { reportId } }), url);
-    },
-    /**
-     * 持锁执行：acquire → fn（期间自动心跳）→ release（finally）。
-     * 返回 fn 的结果；获取锁失败时抛 ReportAdminError。
-     * 心跳连续失败（默认 2 次）视为锁丢失：触发 onLockLost 回调并停止心跳，
-     * fn 继续执行（避免中途丢弃用户编辑），由调用方决定是否提示/中止。
-     */
-    async holdLock(reportId, fn, options2 = {}) {
-      await this.acquireLock(reportId);
-      const failLimit = Math.max(1, options2.heartbeatFailLimit ?? 2);
-      let consecutiveFailures = 0;
-      let lockLost = false;
-      const timer = setInterval(() => {
-        void this.lockHeartbeat(reportId).then(() => {
-          consecutiveFailures = 0;
-        }).catch((e) => {
-          consecutiveFailures++;
-          if (!lockLost && consecutiveFailures >= failLimit) {
-            lockLost = true;
-            options2.onLockLost?.(
-              `\u6A21\u677F\u9501\u5FC3\u8DF3\u8FDE\u7EED ${consecutiveFailures} \u6B21\u5931\u8D25\uFF08${e instanceof Error ? e.message : String(e)}\uFF09\uFF0C\u9501\u53EF\u80FD\u5DF2\u88AB\u91CA\u653E`
-            );
-            clearInterval(timer);
-          }
-        });
-      }, 4e4);
-      try {
-        return await fn();
-      } finally {
-        clearInterval(timer);
-        await this.releaseLock(reportId).catch(() => void 0);
-      }
-    }
-  };
-}
-
-exports.ReportAdminError = ReportAdminError;
-exports.createReportAdminClient = createReportAdminClient;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});class h extends Error{constructor(a,r){super(a),this.url=r,this.name="ReportAdminError"}}const o="/report/codePrintReport",d="/report/codePrintReportLock";function n(s,a){const r=s;if(r&&r.code!=null&&r.code!==200)throw new h(String(r.message||"请求失败"),a);return r?.data??r}function $(s){const{request:a}=s,r=s.baseUrl??"";return{async listReports(e={}){const t=`${r}${o}/list`;return n(await a({url:t,method:"get",params:{current:1,size:20,...e}}),t)},async getReport(e){const t=`${r}${o}/getById`;return n(await a({url:t,method:"get",params:{id:e}}),t)},async updateReport(e){const t=`${r}${o}/update`;return n(await a({url:t,method:"put",data:e}),t)},async exportDefinition(e){const t=`${r}${o}/exportDefinition`;return a({url:t,method:"post",data:e})},async importDefinition(e,t){const c=`${r}${o}/importDefinition`,i=new FormData;return i.append("file",e),i.append("strategy",t),a({url:c,method:"post",data:i})},async listDatasets(e){const t=`${r}${o}Ds/list`;return n(await a({url:t,method:"get",params:{reportId:e,current:1,size:999}}),t)},async listParams(e){const t=`${r}${o}Param/list`;return n(await a({url:t,method:"get",params:{reportId:e,current:1,size:999}}),t)},async acquireLock(e){const t=`${r}${d}/acquire`;return n(await a({url:t,method:"post",data:{reportId:e}}),t)},async lockHeartbeat(e){const t=`${r}${d}/heartbeat`;return n(await a({url:t,method:"post",data:{reportId:e}}),t)},async releaseLock(e){const t=`${r}${d}/release`;return n(await a({url:t,method:"post",data:{reportId:e}}),t)},async holdLock(e,t,c={}){await this.acquireLock(e);const i=Math.max(1,c.heartbeatFailLimit??2);let l=0,m=!1;const p=setInterval(()=>{this.lockHeartbeat(e).then(()=>{l=0}).catch(u=>{l++,!m&&l>=i&&(m=!0,c.onLockLost?.(`模板锁心跳连续 ${l} 次失败（${u instanceof Error?u.message:String(u)}），锁可能已被释放`),clearInterval(p))})},4e4);try{return await t()}finally{clearInterval(p),await this.releaseLock(e).catch(()=>{})}}}}exports.ReportAdminError=h;exports.createReportAdminClient=$;

package/dist/manager.d.cts

@@ -1,97 +1,5 @@
-interface ReportRecord {
-    id: string;
-    code?: string;
-    name?: string;
-    publishStatus?: string;
-    directoryId?: string;
-    updateTime?: string;
-    [key: string]: unknown;
-}
-interface PageResult<T> {
-    records: T[];
-    total?: number;
-    current?: number;
-    size?: number;
-}
-interface DatasetRecord {
-    id?: string;
-    reportId?: string;
-    code?: string;
-    name?: string;
-    type?: string;
-    datasourceCode?: string;
-    sqlText?: string;
-    apiUrl?: string;
-    fields?: unknown[];
-    [key: string]: unknown;
-}
-interface ParamRecord {
-    id?: string;
-    reportId?: string;
-    name?: string;
-    defaultValue?: string;
-    [key: string]: unknown;
-}
-type ImportStrategy = "overwrite" | "skip";
-type RequestFn = (config: {
-    url: string;
-    method: string;
-    params?: Record<string, unknown>;
-    data?: unknown;
-}) => Promise<unknown>;
-interface ApiResponse<T = unknown> {
-    code?: number;
-    message?: string;
-    data?: T;
-}
-declare class ReportAdminError extends Error {
-    readonly url: string;
-    constructor(message: string, url: string);
-}
-
-declare function createReportAdminClient(options: {
-    request: RequestFn;
-    baseUrl?: string;
-}): {
-    /** 模板列表（分页） */
-    listReports(query?: {
-        current?: number;
-        size?: number;
-        directoryId?: string;
-        keyword?: string;
-    }): Promise<PageResult<ReportRecord>>;
-    /** 模板详情（content 为 jh4j 私有模板 JSON 字符串，可喂给 importJh4jTemplateContent） */
-    getReport(id: string): Promise<ReportRecord>;
-    /** 保存模板（jh4j：PUT，body {id, code, name, content}） */
-    updateReport(input: {
-        id: string;
-        code?: string;
-        name?: string;
-        content: string;
-    }): Promise<unknown>;
-    /** 导出模板定义包（body = ID 数组，返回 ZIP blob） */
-    exportDefinition(ids: string[]): Promise<unknown>;
-    /** 导入模板定义包（multipart: file + strategy） */
-    importDefinition(file: File | Blob, strategy: ImportStrategy): Promise<unknown>;
-    /** 数据集列表 */
-    listDatasets(reportId: string): Promise<PageResult<DatasetRecord>>;
-    /** 参数列表 */
-    listParams(reportId: string): Promise<PageResult<ParamRecord>>;
-    /** 模板锁：进入设计器前获取（40s 心跳由 holdLock 驱动） */
-    acquireLock(reportId: string): Promise<unknown>;
-    lockHeartbeat(reportId: string): Promise<unknown>;
-    releaseLock(reportId: string): Promise<unknown>;
-    /**
-     * 持锁执行：acquire → fn（期间自动心跳）→ release（finally）。
-     * 返回 fn 的结果；获取锁失败时抛 ReportAdminError。
-     * 心跳连续失败（默认 2 次）视为锁丢失：触发 onLockLost 回调并停止心跳，
-     * fn 继续执行（避免中途丢弃用户编辑），由调用方决定是否提示/中止。
-     */
-    holdLock<T>(reportId: string, fn: () => Promise<T>, options?: {
-        onLockLost?: (reason: string) => void;
-        heartbeatFailLimit?: number;
-    }): Promise<T>;
-};
-type ReportAdminClient = ReturnType<typeof createReportAdminClient>;
-
-export { type ApiResponse, type DatasetRecord, type ImportStrategy, type PageResult, type ParamRecord, type ReportAdminClient, ReportAdminError, type ReportRecord, type RequestFn, createReportAdminClient };
+/**
+ * 管理端 API 子路径入口（@agile-team/mach-report/manager）：
+ * 模板/数据集/参数/导入导出/模板锁（接口面对齐 jh4j 逆向结果）。
+ */
+export * from './manager/index';

package/dist/manager.d.ts

@@ -1,97 +1,5 @@
-interface ReportRecord {
-    id: string;
-    code?: string;
-    name?: string;
-    publishStatus?: string;
-    directoryId?: string;
-    updateTime?: string;
-    [key: string]: unknown;
-}
-interface PageResult<T> {
-    records: T[];
-    total?: number;
-    current?: number;
-    size?: number;
-}
-interface DatasetRecord {
-    id?: string;
-    reportId?: string;
-    code?: string;
-    name?: string;
-    type?: string;
-    datasourceCode?: string;
-    sqlText?: string;
-    apiUrl?: string;
-    fields?: unknown[];
-    [key: string]: unknown;
-}
-interface ParamRecord {
-    id?: string;
-    reportId?: string;
-    name?: string;
-    defaultValue?: string;
-    [key: string]: unknown;
-}
-type ImportStrategy = "overwrite" | "skip";
-type RequestFn = (config: {
-    url: string;
-    method: string;
-    params?: Record<string, unknown>;
-    data?: unknown;
-}) => Promise<unknown>;
-interface ApiResponse<T = unknown> {
-    code?: number;
-    message?: string;
-    data?: T;
-}
-declare class ReportAdminError extends Error {
-    readonly url: string;
-    constructor(message: string, url: string);
-}
-
-declare function createReportAdminClient(options: {
-    request: RequestFn;
-    baseUrl?: string;
-}): {
-    /** 模板列表（分页） */
-    listReports(query?: {
-        current?: number;
-        size?: number;
-        directoryId?: string;
-        keyword?: string;
-    }): Promise<PageResult<ReportRecord>>;
-    /** 模板详情（content 为 jh4j 私有模板 JSON 字符串，可喂给 importJh4jTemplateContent） */
-    getReport(id: string): Promise<ReportRecord>;
-    /** 保存模板（jh4j：PUT，body {id, code, name, content}） */
-    updateReport(input: {
-        id: string;
-        code?: string;
-        name?: string;
-        content: string;
-    }): Promise<unknown>;
-    /** 导出模板定义包（body = ID 数组，返回 ZIP blob） */
-    exportDefinition(ids: string[]): Promise<unknown>;
-    /** 导入模板定义包（multipart: file + strategy） */
-    importDefinition(file: File | Blob, strategy: ImportStrategy): Promise<unknown>;
-    /** 数据集列表 */
-    listDatasets(reportId: string): Promise<PageResult<DatasetRecord>>;
-    /** 参数列表 */
-    listParams(reportId: string): Promise<PageResult<ParamRecord>>;
-    /** 模板锁：进入设计器前获取（40s 心跳由 holdLock 驱动） */
-    acquireLock(reportId: string): Promise<unknown>;
-    lockHeartbeat(reportId: string): Promise<unknown>;
-    releaseLock(reportId: string): Promise<unknown>;
-    /**
-     * 持锁执行：acquire → fn（期间自动心跳）→ release（finally）。
-     * 返回 fn 的结果；获取锁失败时抛 ReportAdminError。
-     * 心跳连续失败（默认 2 次）视为锁丢失：触发 onLockLost 回调并停止心跳，
-     * fn 继续执行（避免中途丢弃用户编辑），由调用方决定是否提示/中止。
-     */
-    holdLock<T>(reportId: string, fn: () => Promise<T>, options?: {
-        onLockLost?: (reason: string) => void;
-        heartbeatFailLimit?: number;
-    }): Promise<T>;
-};
-type ReportAdminClient = ReturnType<typeof createReportAdminClient>;
-
-export { type ApiResponse, type DatasetRecord, type ImportStrategy, type PageResult, type ParamRecord, type ReportAdminClient, ReportAdminError, type ReportRecord, type RequestFn, createReportAdminClient };
+/**
+ * 管理端 API 子路径入口（@agile-team/mach-report/manager）：
+ * 模板/数据集/参数/导入导出/模板锁（接口面对齐 jh4j 逆向结果）。
+ */
+export * from './manager/index';