weaver-e10-builder 1.6.15 → 1.7.0

package/dist/services/report/cell-transform.d.ts

@@ -0,0 +1,62 @@
+export interface TransformState {
+    transType: string;
+    browserType: any[];
+    transSelectOptions: any[];
+    isHtml: string;
+    qrcodeType: string;
+    prefixAndSuffix: any[];
+    hiddenContext: string;
+    textDirection: string;
+}
+export declare const TRANSFORM_DEFAULTS: TransformState;
+/** 字段记录 → 转换状态（数组键兼容 JSON 串 / 数组）。 */
+export declare function readTransform(cell: any): TransformState;
+export interface TransformPatch {
+    transType?: string;
+    browserType?: any[];
+    transSelectOptions?: any[];
+    isHtml?: string | number | boolean;
+    qrcodeType?: string;
+    prefixAndSuffix?: any[];
+    hiddenContext?: string | number | boolean;
+    textDirection?: string;
+}
+/** `--map 人员` 这类中文名 → 转换补丁；已废弃写法直接报错。 */
+export declare function transformFromMap(label: string): TransformPatch;
+/** 逗号分隔的浏览对象名单 → `browserType`。`none` / 空 = 清空。 */
+export declare function browserTypesFromArg(input: string): any[];
+/**
+ * 合并「当前值 + 补丁」并规范化。
+ *
+ * 显式改 `transType` 时，会清掉不再适配的 `browserType` / `transSelectOptions`
+ * （除非本次也显式给了它们），避免留下切换前的脏配置。
+ */
+export declare function mergeTransform(current: TransformState, patch: TransformPatch, opts?: {
+    transTypeExplicit?: boolean;
+}): {
+    state: TransformState;
+    warnings: string[];
+};
+/** 写进 `fields[]` 的补丁（数组转 JSON 串）。 */
+export declare function transformFieldsPatch(state: TransformState): Record<string, any>;
+/** 写进 workbook `style.cellType` 的补丁（数组保持数组）。 */
+export declare function transformCellTypePatch(state: TransformState): Record<string, any>;
+/** 是否仍是「无转换」的默认态。 */
+export declare function isDefaultTransform(state: TransformState): boolean;
+/** 回读断言：逐键比较。 */
+export declare function diffTransform(expected: TransformState, actual: TransformState): string[];
+export interface TransformRow {
+    cell: string;
+    text: string;
+    fieldKey: string;
+    transform: TransformState;
+}
+/** 列出所有非默认转换的单元格。 */
+export declare function listTransformCells(fields: any[]): TransformRow[];
+/** 文字方向 / 二维码的中文速查（CLI 输出用）。 */
+export declare const TRANSFORM_LABELS: {
+    qrcode: Record<string, string>;
+    direction: Record<string, string>;
+    browser: Record<string, string>;
+};
+//# sourceMappingURL=cell-transform.d.ts.map

package/dist/services/report/cell-transform.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cell-transform.d.ts","sourceRoot":"","sources":["../../../src/services/report/cell-transform.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,kBAAkB,EAAE,GAAG,EAAE,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,GAAG,EAAE,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,eAAO,MAAM,kBAAkB,EAAE,cAShC,CAAC;AAQF,sCAAsC;AACtC,wBAAgB,aAAa,CAAC,IAAI,EAAE,GAAG,GAAG,cAAc,CAoBvD;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC;IACpB,kBAAkB,CAAC,EAAE,GAAG,EAAE,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IAC1C,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,yCAAyC;AACzC,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,CAU9D;AAED,mDAAmD;AACnD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,EAAE,CAOxD;AAkBD;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,cAAc,EACrB,IAAI,GAAE;IAAE,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAO,GACzC;IAAE,KAAK,EAAE,cAAc,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CA2B/C;AAED,qCAAqC;AACrC,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAM/E;AAED,gDAAgD;AAChD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAEjF;AAED,qBAAqB;AACrB,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAYjE;AAED,iBAAiB;AACjB,wBAAgB,aAAa,CAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,GAAG,MAAM,EAAE,CAQxF;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,cAAc,CAAC;CAC3B;AAED,qBAAqB;AACrB,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,YAAY,EAAE,CAchE;AAED,gCAAgC;AAChC,eAAO,MAAM,gBAAgB;;;;CAI5B,CAAC"}

package/dist/services/report/cell-transform.js

@@ -0,0 +1,192 @@
+/**
+ * 单元格「转换」面板（设计器右侧：单元格 → 转换）。
+ *
+ * 落库键在 `fields[]` 顶层，同时要写进 workbook 的 `style.cellType`：
+ * - `transType` + `browserType` / `transSelectOptions`
+ * - `isHtml`（HTML 转换，不是 transType）
+ * - `qrcodeType`（条码/二维码）
+ * - `prefixAndSuffix`（前缀/后缀）
+ * - `hiddenContext`（隐藏内容，拼写是 Context）
+ * - `textDirection`（文字方向）
+ *
+ * `fields[]` 里数组类键是 JSON 字符串，workbook 里是数组；读写都要走本文件的转换。
+ */
+import { BROWSER_PRESETS, DIR_MAP, QR_MAP, TRANS_MAP, normalizeTransform } from './validate.js';
+import { jsonArrayOf } from './cell-edit.js';
+export const TRANSFORM_DEFAULTS = {
+    transType: 'default',
+    browserType: [],
+    transSelectOptions: [],
+    isHtml: '0',
+    qrcodeType: 'no',
+    prefixAndSuffix: ['', ''],
+    hiddenContext: '0',
+    textDirection: 'FromLeftToRight',
+};
+/** 写 `fields[]` 顶层时，数组键要序列化成 JSON 字符串。 */
+const ARRAY_KEYS = new Set(['browserType', 'transSelectOptions', 'prefixAndSuffix']);
+/** 会用到 `transSelectOptions` 的转换类型。 */
+const OPTION_TYPES = new Set(['select', 'colorSelect', 'scoreIcon', 'slashWord']);
+/** 字段记录 → 转换状态（数组键兼容 JSON 串 / 数组）。 */
+export function readTransform(cell) {
+    const pick = (key, fallback) => {
+        const raw = cell?.[key];
+        if (ARRAY_KEYS.has(key))
+            return jsonArrayOf(raw);
+        return raw == null || raw === '' ? fallback : String(raw);
+    };
+    const state = {
+        transType: pick('transType', TRANSFORM_DEFAULTS.transType),
+        browserType: pick('browserType', [...TRANSFORM_DEFAULTS.browserType]),
+        transSelectOptions: pick('transSelectOptions', [...TRANSFORM_DEFAULTS.transSelectOptions]),
+        isHtml: pick('isHtml', TRANSFORM_DEFAULTS.isHtml),
+        qrcodeType: pick('qrcodeType', TRANSFORM_DEFAULTS.qrcodeType),
+        prefixAndSuffix: pick('prefixAndSuffix', [...TRANSFORM_DEFAULTS.prefixAndSuffix]),
+        hiddenContext: pick('hiddenContext', TRANSFORM_DEFAULTS.hiddenContext),
+        textDirection: pick('textDirection', TRANSFORM_DEFAULTS.textDirection),
+    };
+    if (state.prefixAndSuffix.length < 2) {
+        state.prefixAndSuffix = [state.prefixAndSuffix[0] ?? '', state.prefixAndSuffix[1] ?? ''];
+    }
+    return state;
+}
+/** `--map 人员` 这类中文名 → 转换补丁；已废弃写法直接报错。 */
+export function transformFromMap(label) {
+    const entry = TRANS_MAP[String(label).trim()];
+    if (!entry) {
+        throw new Error(`不认识的转换类型「${label}」。可用：${Object.keys(TRANS_MAP).join(' / ')}`);
+    }
+    if (entry.error)
+        throw new Error(entry.error);
+    const patch = {};
+    if (entry.transType)
+        patch.transType = entry.transType;
+    if (entry.browserType)
+        patch.browserType = entry.browserType;
+    return patch;
+}
+/** 逗号分隔的浏览对象名单 → `browserType`。`none` / 空 = 清空。 */
+export function browserTypesFromArg(input) {
+    const parts = String(input ?? '')
+        .split(/[,，]/)
+        .map((s) => s.trim())
+        .filter(Boolean);
+    if (!parts.length || parts.some((p) => p.toLowerCase() === 'none' || p === '无'))
+        return [];
+    return parts.map((p) => ({ id: BROWSER_PRESETS[p] ?? p }));
+}
+/** 数组键：数组原样，JSON 数组字符串解析，其余报错。 */
+function toArrayValue(value, key) {
+    if (Array.isArray(value))
+        return value;
+    if (value == null || value === '')
+        return [];
+    if (typeof value === 'string') {
+        try {
+            const parsed = JSON.parse(value);
+            if (Array.isArray(parsed))
+                return parsed;
+        }
+        catch {
+            /* fallthrough */
+        }
+        throw new Error(`${key} 必须是数组或 JSON 数组字符串`);
+    }
+    throw new Error(`${key} 必须是数组`);
+}
+/**
+ * 合并「当前值 + 补丁」并规范化。
+ *
+ * 显式改 `transType` 时，会清掉不再适配的 `browserType` / `transSelectOptions`
+ * （除非本次也显式给了它们），避免留下切换前的脏配置。
+ */
+export function mergeTransform(current, patch, opts = {}) {
+    const merged = { ...TRANSFORM_DEFAULTS, ...current, ...patch };
+    if (opts.transTypeExplicit) {
+        if (patch.browserType === undefined && merged.transType !== 'browser')
+            merged.browserType = [];
+        if (patch.transSelectOptions === undefined && !OPTION_TYPES.has(merged.transType))
+            merged.transSelectOptions = [];
+    }
+    // 两个数组键既接受数组，也接受 JSON 数组字符串；其它形状直接拒绝。
+    const browserType = toArrayValue(merged.browserType, 'browserType');
+    const transSelectOptions = toArrayValue(merged.transSelectOptions, 'transSelectOptions');
+    merged.browserType = browserType;
+    merged.transSelectOptions = transSelectOptions;
+    const r = normalizeTransform(merged);
+    if (!r.ok) {
+        throw new Error(`转换配置不合法：\n  - ${r.errors.map((e) => e.message).join('\n  - ')}`);
+    }
+    const n = r.normalized || {};
+    const state = {
+        transType: String(n.transType ?? merged.transType ?? TRANSFORM_DEFAULTS.transType),
+        browserType: Array.isArray(n.browserType) ? n.browserType : browserType,
+        transSelectOptions,
+        isHtml: String(n.isHtml ?? merged.isHtml ?? TRANSFORM_DEFAULTS.isHtml),
+        qrcodeType: String(n.qrcodeType ?? merged.qrcodeType ?? TRANSFORM_DEFAULTS.qrcodeType),
+        prefixAndSuffix: Array.isArray(n.prefixAndSuffix) ? n.prefixAndSuffix : merged.prefixAndSuffix,
+        hiddenContext: String(n.hiddenContext ?? merged.hiddenContext ?? TRANSFORM_DEFAULTS.hiddenContext),
+        textDirection: String(n.textDirection ?? merged.textDirection ?? TRANSFORM_DEFAULTS.textDirection),
+    };
+    return { state, warnings: r.warnings.map((w) => w.message) };
+}
+/** 写进 `fields[]` 的补丁（数组转 JSON 串）。 */
+export function transformFieldsPatch(state) {
+    const out = {};
+    for (const [key, value] of Object.entries(state)) {
+        out[key] = ARRAY_KEYS.has(key) ? JSON.stringify(value) : value;
+    }
+    return out;
+}
+/** 写进 workbook `style.cellType` 的补丁（数组保持数组）。 */
+export function transformCellTypePatch(state) {
+    return { ...state };
+}
+/** 是否仍是「无转换」的默认态。 */
+export function isDefaultTransform(state) {
+    return (state.transType === TRANSFORM_DEFAULTS.transType &&
+        state.browserType.length === 0 &&
+        state.transSelectOptions.length === 0 &&
+        state.isHtml === TRANSFORM_DEFAULTS.isHtml &&
+        state.qrcodeType === TRANSFORM_DEFAULTS.qrcodeType &&
+        (state.prefixAndSuffix[0] ?? '') === '' &&
+        (state.prefixAndSuffix[1] ?? '') === '' &&
+        state.hiddenContext === TRANSFORM_DEFAULTS.hiddenContext &&
+        state.textDirection === TRANSFORM_DEFAULTS.textDirection);
+}
+/** 回读断言：逐键比较。 */
+export function diffTransform(expected, actual) {
+    const errors = [];
+    for (const key of Object.keys(expected)) {
+        const want = JSON.stringify(expected[key]);
+        const got = JSON.stringify(actual[key]);
+        if (want !== got)
+            errors.push(`${key} 回读=${got}，期望=${want}`);
+    }
+    return errors;
+}
+/** 列出所有非默认转换的单元格。 */
+export function listTransformCells(fields) {
+    const rows = [];
+    for (const f of fields || []) {
+        if (String(f?.cellType ?? '') !== 'Field')
+            continue;
+        const transform = readTransform(f);
+        if (isDefaultTransform(transform))
+            continue;
+        rows.push({
+            cell: `${f.x},${f.y}`,
+            text: String(f.text ?? ''),
+            fieldKey: String(f.fieldKey ?? ''),
+            transform,
+        });
+    }
+    return rows;
+}
+/** 文字方向 / 二维码的中文速查（CLI 输出用）。 */
+export const TRANSFORM_LABELS = {
+    qrcode: QR_MAP,
+    direction: DIR_MAP,
+    browser: BROWSER_PRESETS,
+};
+//# sourceMappingURL=cell-transform.js.map

package/dist/services/report/cell-transform.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cell-transform.js","sourceRoot":"","sources":["../../../src/services/report/cell-transform.ts"],"names":[],"mappings":"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"}

package/dist/services/report/code-block.d.ts

@@ -0,0 +1,45 @@
+/**
+ * 报表「代码块」（设计器 开始 → 代码块）。
+ *
+ * 按 **sheet** 存取，不是按报表整份：
+ * - 读：`GET /api/bs/edc/report/queryCustomCodeById?sheetId=`
+ * - 写：`POST /api/bs/edc/report/saveCustomCode` form `cusCode` + `sheetId`
+ *
+ * `cusCode` 是**代码文本的 UTF-8 base64**（`btoa(unescape(encodeURIComponent(code)))`）。
+ * 写接口回 200 不代表内容已落库，所以 `saveCodeBlock` 会回读比对。
+ */
+import type { ReportHttp } from './http.js';
+export declare const CUSTOM_CODE: {
+    readonly get: "/api/bs/edc/report/queryCustomCodeById";
+    readonly save: "/api/bs/edc/report/saveCustomCode";
+};
+/** UI 新建代码块时的默认模板（清空后设计器再次打开会显示它）。 */
+export declare const CODE_BLOCK_TEMPLATE = "<script type=\"text/javascript\">\n/*\n* \u8BF7\u5728\u4E0B\u9762\u7F16\u5199JS\u4EE3\u7801\n*/\n\n</script>";
+export interface CodeBlock {
+    sheetId: string;
+    code: string;
+    bytes: number;
+}
+/** 代码 → UTF-8 base64（与服务端 `cusCode` 一致）。 */
+export declare function encodeCustomCode(code: string): string;
+/** base64 → 代码文本；非 base64 原样返回（兼容服务端异常回包）。 */
+export declare function decodeCustomCode(raw: unknown): string;
+/**
+ * 解析目标 sheet。优先级：显式 `sheetId` → `sheetIndex` → 第一张 sheet。
+ * 报表带 sheetProps 时，显式值必须命中，否则列出可选值。
+ */
+export declare function resolveSheetId(dev: any, options?: {
+    sheetId?: string;
+    sheetIndex?: number;
+}): string;
+/** 读代码块。 */
+export declare function getCodeBlock(http: ReportHttp, sheetId: string): Promise<CodeBlock>;
+/**
+ * 保存代码块并回读校验。
+ *
+ * 空字符串表示清空；平台返回 200 但回读仍非空时按失败处理。
+ */
+export declare function saveCodeBlock(http: ReportHttp, sheetId: string, code: string): Promise<CodeBlock>;
+/** 清空代码块（保存空文本并回读确认）。 */
+export declare function clearCodeBlock(http: ReportHttp, sheetId: string): Promise<CodeBlock>;
+//# sourceMappingURL=code-block.d.ts.map

package/dist/services/report/code-block.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"code-block.d.ts","sourceRoot":"","sources":["../../../src/services/report/code-block.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE5C,eAAO,MAAM,WAAW;;;CAGd,CAAC;AAEX,sCAAsC;AACtC,eAAO,MAAM,mBAAmB,iHACsC,CAAC;AAEvE,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,4CAA4C;AAC5C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,8CAA8C;AAC9C,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CASrD;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAO,GACtD,MAAM,CAiCR;AAED,YAAY;AACZ,wBAAsB,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAOxF;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,SAAS,CAAC,CAiBpB;AAED,yBAAyB;AACzB,wBAAsB,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAE1F"}

package/dist/services/report/code-block.js

@@ -0,0 +1,92 @@
+export const CUSTOM_CODE = {
+    get: '/api/bs/edc/report/queryCustomCodeById',
+    save: '/api/bs/edc/report/saveCustomCode',
+};
+/** UI 新建代码块时的默认模板（清空后设计器再次打开会显示它）。 */
+export const CODE_BLOCK_TEMPLATE = '<script type="text/javascript">\n/*\n* 请在下面编写JS代码\n*/\n\n</script>';
+/** 代码 → UTF-8 base64（与服务端 `cusCode` 一致）。 */
+export function encodeCustomCode(code) {
+    return Buffer.from(String(code ?? ''), 'utf8').toString('base64');
+}
+/** base64 → 代码文本；非 base64 原样返回（兼容服务端异常回包）。 */
+export function decodeCustomCode(raw) {
+    const value = raw == null ? '' : String(raw);
+    if (!value)
+        return '';
+    if (!/^[A-Za-z0-9+/]*={0,2}$/.test(value) || value.length % 4 !== 0)
+        return value;
+    try {
+        return Buffer.from(value, 'base64').toString('utf8');
+    }
+    catch {
+        return value;
+    }
+}
+/**
+ * 解析目标 sheet。优先级：显式 `sheetId` → `sheetIndex` → 第一张 sheet。
+ * 报表带 sheetProps 时，显式值必须命中，否则列出可选值。
+ */
+export function resolveSheetId(dev, options = {}) {
+    const sheets = Array.isArray(dev?.sheetProps) ? dev.sheetProps : [];
+    const idOf = (s) => String(s?.sheetId ?? s?.id ?? '');
+    const labelOf = (s) => `sheetIndex=${s?.sheetIndex ?? '?'} sheetId=${idOf(s)} name=${s?.name ?? ''}`;
+    if (options.sheetId != null && options.sheetId !== '') {
+        const hit = sheets.find((s) => idOf(s) === String(options.sheetId));
+        if (hit)
+            return idOf(hit);
+        if (sheets.length) {
+            throw new Error(`报表里没有 sheetId=${options.sheetId} 的页。可选：\n  - ${sheets.map(labelOf).join('\n  - ')}`);
+        }
+        return String(options.sheetId);
+    }
+    if (options.sheetIndex != null) {
+        if (!Number.isInteger(options.sheetIndex) || options.sheetIndex < 0) {
+            throw new Error('--sheet-index 必须是非负整数');
+        }
+        const hit = sheets.find((s) => Number(s?.sheetIndex) === options.sheetIndex);
+        if (!hit) {
+            throw new Error(`报表里没有 sheetIndex=${options.sheetIndex} 的页。可选：\n  - ${sheets.map(labelOf).join('\n  - ')}`);
+        }
+        return idOf(hit);
+    }
+    const first = sheets[0];
+    const id = first ? idOf(first) : '';
+    if (!id)
+        throw new Error('取不到报表的 sheetId（sheetProps 为空）；请用 --sheet-id 显式指定');
+    return id;
+}
+/** 读代码块。 */
+export async function getCodeBlock(http, sheetId) {
+    const r = await http.get(CUSTOM_CODE.get, { sheetId });
+    if (r?.code != null && r.code !== 200) {
+        throw new Error(`读取代码块失败：${r?.msg || r?.message || `code=${r.code}`}`);
+    }
+    const code = decodeCustomCode(r?.data);
+    return { sheetId, code, bytes: Buffer.byteLength(code, 'utf8') };
+}
+/**
+ * 保存代码块并回读校验。
+ *
+ * 空字符串表示清空；平台返回 200 但回读仍非空时按失败处理。
+ */
+export async function saveCodeBlock(http, sheetId, code) {
+    const text = String(code ?? '');
+    const r = await http.postFields(CUSTOM_CODE.save, {
+        cusCode: encodeCustomCode(text),
+        sheetId,
+    });
+    if (r?.code != null && r.code !== 200) {
+        throw new Error(`保存代码块失败：${r?.msg || r?.message || `code=${r.code}`}`);
+    }
+    const after = await getCodeBlock(http, sheetId);
+    if (after.code !== text) {
+        throw new Error(`保存接口返回成功，但回读代码不一致（期望 ${Buffer.byteLength(text, 'utf8')} 字节，` +
+            `回读 ${after.bytes} 字节）。`);
+    }
+    return after;
+}
+/** 清空代码块（保存空文本并回读确认）。 */
+export async function clearCodeBlock(http, sheetId) {
+    return saveCodeBlock(http, sheetId, '');
+}
+//# sourceMappingURL=code-block.js.map

package/dist/services/report/code-block.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"code-block.js","sourceRoot":"","sources":["../../../src/services/report/code-block.ts"],"names":[],"mappings":"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"}

package/dist/services/report/dataset.d.ts

@@ -61,6 +61,46 @@ export declare function fieldsBySource(http: ReportHttp, sourceId: string, opts?
 export declare function renameDataset(http: ReportHttp, datasetId: string, name: string, nameLabelId?: string): Promise<any>;
 export declare function getAggregation(http: ReportHttp, datasetId: string): Promise<any>;
 export declare function saveAggregation(http: ReportHttp, datasetId: string, aggreData: unknown): Promise<any>;
+/**
+ * 「数据聚合」（左侧数据集 `…` → 数据聚合）的 `aggreData` 行只有两种：
+ * - 维度：`{ groupBy: '<datasetId>.<tableId>.<fieldName>' }`
+ * - 度量：`{ fieldId: 同上, countType, showName?, fieldName? }`
+ *
+ * 非空配置必须同时有维度与度量；空数组 = 清空。此函数只做本地结构校验，
+ * 不做字段是否属于该数据集的校验（需要额外拉字段清单，留给调用方按需处理）。
+ */
+export declare function normalizeAggreData(input: unknown, opts?: {
+    requirePair?: boolean;
+}): {
+    rows: any[];
+    warnings: string[];
+};
+/** 聚合行身份：维度按 groupBy，度量按 fieldId + countType。 */
+export declare function aggreRowKey(row: any): string;
+/** 服务端回包 → 聚合数组（可能是数组、JSON 字符串、或 { aggreData/list }）。 */
+export declare function asAggreArray(value: unknown): any[];
+export interface SaveAggregationResult {
+    rows: any[];
+    warnings: string[];
+}
+/**
+ * 保存聚合配置 + 回读校验。
+ *
+ * 平台 `aggregationSave` 是「先删该数据集全部聚合行再插入」的全量替换；
+ * 返回 200 不代表行真的落进去了，所以以回读数组为判据。
+ */
+export declare function saveAggregationChecked(http: ReportHttp, datasetId: string, input: unknown): Promise<SaveAggregationResult>;
+/** 追加聚合行（读现有 → 追加 → 全量保存 → 回读）。 */
+export declare function addAggregation(http: ReportHttp, datasetId: string, extra: unknown): Promise<SaveAggregationResult>;
+/**
+ * 删除聚合行。按 `group-by` / `field-id` 匹配整行，或按 1 基序号删。
+ * 没有匹配项直接报错，避免「命令成功但什么都没删」。
+ */
+export declare function removeAggregation(http: ReportHttp, datasetId: string, match: {
+    groupBy?: string;
+    fieldId?: string;
+    index?: number;
+}): Promise<SaveAggregationResult>;
 export declare function getSort(http: ReportHttp, datasetId: string): Promise<any>;
 export declare function saveSort(http: ReportHttp, datasetId: string, sortData: unknown): Promise<any>;
 /** 替换数据集（整表换源）。body 由调用方给出，含 `fieldMap` 映射。 */

package/dist/services/report/dataset.d.ts.map

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