@agile-team/mach-report 0.4.0 → 0.6.0

package/dist/layout/paginate.d.ts

@@ -1,5 +1,5 @@
-import type { ComponentStyle, PlanComponent, RenderPlan } from "../schema/render-plan";
-import { measureTextMm, wrapText, type TextMeasurer } from "./textwrap";
+import { ComponentStyle, PlanComponent, RenderPlan } from '../schema/render-plan';
+import { measureTextMm, wrapText, TextMeasurer } from './textwrap';
 export interface ListColumn {
     header: string;
     field: string;

package/dist/manager/api.d.ts

@@ -1,4 +1,4 @@
-import type { DatasetRecord, ImportStrategy, PageResult, ParamRecord, ReportRecord, RequestFn } from "./types";
+import { DatasetRecord, ImportStrategy, PageResult, ParamRecord, ReportRecord, RequestFn } from './types';
 export declare function createReportAdminClient(options: {
     request: RequestFn;
     baseUrl?: string;

package/dist/manager/index.d.ts

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

package/dist/manager.cjs

@@ -0,0 +1 @@
+"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

@@ -0,0 +1,5 @@
+/**
+ * 管理端 API 子路径入口（@agile-team/mach-report/manager）：
+ * 模板/数据集/参数/导入导出/模板锁（接口面对齐 jh4j 逆向结果）。
+ */
+export * from './manager/index';

package/dist/manager.d.ts

@@ -2,4 +2,4 @@
  * 管理端 API 子路径入口（@agile-team/mach-report/manager）：
  * 模板/数据集/参数/导入导出/模板锁（接口面对齐 jh4j 逆向结果）。
  */
-export * from "./manager/index";
+export * from './manager/index';

package/dist/manager.js

@@ -1,6 +1,104 @@
-/**
- * 管理端 API 子路径入口（@agile-team/mach-report/manager）：
- * 模板/数据集/参数/导入导出/模板锁（接口面对齐 jh4j 逆向结果）。
- */
-export * from "./manager/index";
-//# sourceMappingURL=manager.js.map
+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
+      );
+    },
+    /** 模板详情（content 为 jh4j 私有模板 JSON 字符串，可喂给 importJh4jTemplateContent） */
+    async getReport(e) {
+      const t = `${r}${o}/getById`;
+      return n(await a({ url: t, method: "get", params: { id: e } }), t);
+    },
+    /** 保存模板（jh4j：PUT，body {id, code, name, content}） */
+    async updateReport(e) {
+      const t = `${r}${o}/update`;
+      return n(await a({ url: t, method: "put", data: e }), t);
+    },
+    /** 导出模板定义包（body = ID 数组，返回 ZIP blob） */
+    async exportDefinition(e) {
+      const t = `${r}${o}/exportDefinition`;
+      return a({ url: t, method: "post", data: e });
+    },
+    /** 导入模板定义包（multipart: file + strategy） */
+    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
+      );
+    },
+    /** 模板锁：进入设计器前获取（40s 心跳由 holdLock 驱动） */
+    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);
+    },
+    /**
+     * 持锁执行：acquire → fn（期间自动心跳）→ release（finally）。
+     * 返回 fn 的结果；获取锁失败时抛 ReportAdminError。
+     * 心跳连续失败（默认 2 次）视为锁丢失：触发 onLockLost 回调并停止心跳，
+     * fn 继续执行（避免中途丢弃用户编辑），由调用方决定是否提示/中止。
+     */
+    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(() => {
+        });
+      }
+    }
+  };
+}
+export {
+  h as ReportAdminError,
+  $ as createReportAdminClient
+};

package/dist/pdf/index.d.ts

@@ -1,2 +1,2 @@
-export * from "./render-pdf";
-export * from "./font-loader";
+export * from './render-pdf';
+export * from './font-loader';

package/dist/pdf/render-pdf.d.ts

@@ -1,6 +1,5 @@
-import { PDFDocument } from "pdf-lib";
-import type { RenderPlan } from "../schema/render-plan";
-import { type TextMeasurer } from "../index";
+import { RenderPlan } from '../schema/render-plan';
+import { TextMeasurer } from '../index';
 export interface PdfRenderOptions {
     /** 嵌入字体字节（TTF，如黑体）；缺省用 Helvetica（不支持 CJK） */
     customFontBytes?: Uint8Array | ArrayBuffer;
@@ -8,8 +7,15 @@ export interface PdfRenderOptions {
     /** 文本测量器（默认启发式；与分页/Canvas 注入同一实例可消除折行差异） */
     measurer?: TextMeasurer;
 }
+/**
+ * PDF 文档句柄（不透明最小面）：结构化仅暴露 save()，
+ * 避免在公共类型面泄漏 pdf-lib 类型（引擎保持零运行时依赖声明）。
+ */
+export type PdfDocumentHandle = {
+    save(): Promise<Uint8Array>;
+};
 export interface PdfRenderResult {
-    pdfDoc: PDFDocument;
+    pdfDoc: PdfDocumentHandle;
     bytes: Uint8Array;
     pageErrors: string[];
     unsupportedTextCount: number;