weaver-e10-builder 1.6.10 → 1.6.11

package/dist/services/report/dataset-heal.js

@@ -0,0 +1,89 @@
+import { EDC } from './http.js';
+import { deleteDataset, fieldsKeyOf, isDatasetUsed, replaceDataset } from './dataset.js';
+/** 只读体检。 */
+export async function inspectHeal(http, reportId, appId) {
+    const r = await http.get(EDC.dataset.list, { hasField: 'true', reportId }, reportId);
+    const rawRows = (r?.data || []);
+    const rows = rawRows.map((d) => ({
+        id: String(d.id),
+        name: d.name || d.originalName || '',
+        sourceId: d.sourceId != null ? String(d.sourceId) : '',
+        sourceType: d.type || '',
+        sourceGroup: d.sourceGroup || '',
+        rawType: String(d.type || ''),
+        appId: String(d.appId || d.appid || ''),
+    }));
+    const biz = rows.filter((d) => !/^systemField$/i.test(d.rawType));
+    const upper = biz.filter((d) => d.rawType === 'LOGIC' && d.sourceId);
+    const garbage = biz.filter((d) => !d.sourceId);
+    const foreign = biz.filter((d) => d.appId && d.appId !== String(appId));
+    const bySource = new Map();
+    for (const d of biz) {
+        if (!d.sourceId)
+            continue;
+        bySource.set(d.sourceId, [...(bySource.get(d.sourceId) || []), d.id]);
+    }
+    const duplicates = [...bySource.entries()]
+        .filter(([, ids]) => ids.length > 1)
+        .map(([sourceId, ids]) => ({ sourceId, count: ids.length, ids }));
+    return { reportId, appId, rows, upper, garbage, foreign, duplicates };
+}
+/** 落库：换型 + 按需清理脏数据集；返回回读结果。 */
+export async function healReport(http, ins, opts = {}) {
+    const replaced = [];
+    for (const d of ins.upper) {
+        let names = [];
+        try {
+            names = (await fieldsKeyOf(http, d.id, ins.reportId, ins.appId, { label: d.name, sourceType: 'logic' })).map((f) => String(f.name || ''));
+        }
+        catch {
+            names = [];
+        }
+        try {
+            const newId = await replaceDataset(http, {
+                reportId: String(ins.reportId),
+                builtinId: String(d.id),
+                name: d.name || '',
+                sourceType: 'logic',
+                sourceId: String(d.sourceId),
+                sourceGroup: d.sourceGroup || 'weaver-ebuilder-form-service',
+                appid: String(ins.appId),
+                fieldMap: names.filter(Boolean).map((n) => ({ builtinField: n, replaceField: n, replaceFieldName: '' })),
+            });
+            replaced.push({ datasetId: d.id, ok: true, newDatasetId: newId, fields: names.length });
+        }
+        catch (e) {
+            replaced.push({
+                datasetId: d.id,
+                ok: false,
+                newDatasetId: null,
+                fields: names.length,
+                error: e.message,
+            });
+        }
+    }
+    const purged = [];
+    if (opts.purge) {
+        for (const d of ins.garbage) {
+            try {
+                if (await isDatasetUsed(http, ins.reportId, d.id)) {
+                    purged.push({ datasetId: d.id, ok: false, reason: '仍被单元格引用' });
+                    continue;
+                }
+                await deleteDataset(http, ins.reportId, d.id);
+                purged.push({ datasetId: d.id, ok: true });
+            }
+            catch (e) {
+                purged.push({ datasetId: d.id, ok: false, reason: e.message });
+            }
+        }
+    }
+    const after = await inspectHeal(http, ins.reportId, ins.appId);
+    return {
+        reportId: ins.reportId,
+        replaced,
+        purged,
+        remaining: { rows: after.rows.length, upper: after.upper.length },
+    };
+}
+//# sourceMappingURL=dataset-heal.js.map

package/dist/services/report/dataset-heal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dataset-heal.js","sourceRoot":"","sources":["../../../src/services/report/dataset-heal.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAEhC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAuBzF,YAAY;AACZ,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,IAAgB,EAChB,QAAgB,EAChB,KAAa;IAEb,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;IACrF,MAAM,OAAO,GAAG,CAAE,CAAS,EAAE,IAAI,IAAI,EAAE,CAAU,CAAC;IAClD,MAAM,IAAI,GAAqB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACjD,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAChB,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,YAAY,IAAI,EAAE;QACpC,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE;QACtD,UAAU,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE;QACxB,WAAW,EAAE,CAAC,CAAC,WAAW,IAAI,EAAE;QAChC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;QAC7B,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;KACxC,CAAC,CAAC,CAAC;IAEJ,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAClE,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,OAAO,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC;IACrE,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC/C,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAExE,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC7C,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,CAAC,CAAC,QAAQ;YAAE,SAAS;QAC1B,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;IACD,MAAM,UAAU,GAAG,CAAC,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;SACvC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;SACnC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAEpE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;AACxE,CAAC;AASD,+BAA+B;AAC/B,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAAgB,EAChB,GAAmB,EACnB,OAA4B,EAAE;IAE9B,MAAM,QAAQ,GAA2B,EAAE,CAAC;IAC5C,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,KAAK,GAAa,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,KAAK,GAAG,CAAC,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,GAAG,CAC1G,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAE,CAAS,CAAC,IAAI,IAAI,EAAE,CAAC,CACrC,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,KAAK,GAAG,EAAE,CAAC;QACb,CAAC;QACD,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE;gBACvC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAC9B,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvB,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE;gBAClB,UAAU,EAAE,OAAO;gBACnB,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC;gBAC5B,WAAW,EAAE,CAAC,CAAC,WAAW,IAAI,8BAA8B;gBAC5D,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC;gBACxB,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC,CAAC;aACzG,CAAC,CAAC;YACH,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1F,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,QAAQ,CAAC,IAAI,CAAC;gBACZ,SAAS,EAAE,CAAC,CAAC,EAAE;gBACf,EAAE,EAAE,KAAK;gBACT,YAAY,EAAE,IAAI;gBAClB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,KAAK,EAAG,CAAW,CAAC,OAAO;aAC5B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAyB,EAAE,CAAC;IACxC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAC5B,IAAI,CAAC;gBACH,IAAI,MAAM,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;oBAClD,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;oBAC/D,SAAS;gBACX,CAAC;gBACD,MAAM,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC9C,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7C,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAG,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5E,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IAC/D,OAAO;QACL,QAAQ,EAAE,GAAG,CAAC,QAAQ;QACtB,QAAQ;QACR,MAAM;QACN,SAAS,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE;KAClE,CAAC;AACJ,CAAC"}

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

@@ -0,0 +1,70 @@
+/**
+ * 单元格里的数据集 id 引用：体检与机械重映射。
+ *
+ * 三段式 `fieldKey = datasetId.sourceId.field`，其中 **sourceId 跨报表不变**
+ * （同一张表单 / 数据加工视图在各报表里 sourceId 相同，datasetId 不同）。
+ * 于是外来 datasetId 可以确定性地换回本报表的 id：
+ *
+ *   外来 datasetId →（该引用自己的 sourceId）→ 本报表 `dataset/list` 里同 sourceId 的那条 id
+ *
+ * 引用分布在六个键：`dataSetId` / `fieldKey` / 四个筛选键（筛选键里还可能是
+ * `currentField` / `parentField` 的三段式，父子可能属于不同数据集）。
+ */
+import type { DevField } from './types.js';
+export declare const DATASET_ID_KEYS: readonly ["dataSetId", "fieldKey", "leftFilterField", "topFilterField", "customFilterField", "dataFilterField"];
+export interface DatasetRef {
+    id: string;
+    sourceId: string;
+    key: string;
+}
+/** 列出某键里的每一次数据集 id 引用，并带上该引用自身的 sourceId。 */
+export declare function idOccurrences(key: string, val: unknown, cellNameIndex?: unknown): DatasetRef[];
+/** 一格里的全部数据集 id 引用。 */
+export declare function refsOfField(f: DevField): DatasetRef[];
+export interface OwnDataset {
+    id: string;
+    sourceId: string;
+    name?: string;
+    type?: string;
+}
+/** 引用体检：返回外来 id（不属于本报表）的引用。 */
+export declare function foreignRefs(fields: DevField[], own: OwnDataset[]): Array<DatasetRef & {
+    x: number;
+    y: number;
+    text: string;
+}>;
+export interface RemapPlan {
+    /** 外来 id → 本报表 id */
+    idMap: Record<string, string>;
+    changes: Array<{
+        x: number;
+        y: number;
+        text: string;
+        key: string;
+        from: string;
+        to: string;
+        sourceId: string;
+    }>;
+    unresolved: Array<{
+        x: number;
+        y: number;
+        text: string;
+        key: string;
+        id: string;
+        sourceId: string;
+        reason: string;
+    }>;
+    conflicts: Array<{
+        foreignId: string;
+        a: string;
+        b: string;
+        x: number;
+        y: number;
+    }>;
+    /** 重映射后的字段副本（未改动的格原样保留）。 */
+    next: DevField[];
+    refCount: number;
+}
+/** 规划机械重映射；不落库。 */
+export declare function planDatasetIdRemap(fields: DevField[], own: OwnDataset[]): RemapPlan;
+//# sourceMappingURL=dataset-ids.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dataset-ids.d.ts","sourceRoot":"","sources":["../../../src/services/report/dataset-ids.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,eAAO,MAAM,eAAe,iHAOlB,CAAC;AAKX,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACb;AAMD,6CAA6C;AAC7C,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,OAAO,GAAG,UAAU,EAAE,CAkC9F;AAED,uBAAuB;AACvB,wBAAgB,WAAW,CAAC,CAAC,EAAE,QAAQ,GAAG,UAAU,EAAE,CAQrD;AAED,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,+BAA+B;AAC/B,wBAAgB,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC,UAAU,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAW7H;AAED,MAAM,WAAW,SAAS;IACxB,qBAAqB;IACrB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,OAAO,EAAE,KAAK,CAAC;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAChH,UAAU,EAAE,KAAK,CAAC;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACrH,SAAS,EAAE,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpF,4BAA4B;IAC5B,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,mBAAmB;AACnB,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,SAAS,CAmEnF"}

package/dist/services/report/dataset-ids.js

@@ -0,0 +1,149 @@
+export const DATASET_ID_KEYS = [
+    'dataSetId',
+    'fieldKey',
+    'leftFilterField',
+    'topFilterField',
+    'customFilterField',
+    'dataFilterField',
+];
+const TOKEN_RE = /^(\d+)\.(\d+)\./;
+const FILTER_FIELD_NAMES = ['currentField', 'parentField', 'field', 'fieldKey', 'currentFieldKey', 'parentFieldKey'];
+function asString(v) {
+    return typeof v === 'string' ? v : JSON.stringify(v);
+}
+/** 列出某键里的每一次数据集 id 引用，并带上该引用自身的 sourceId。 */
+export function idOccurrences(key, val, cellNameIndex) {
+    const out = [];
+    const s = asString(val);
+    const push = (id, sourceId) => out.push({ id: String(id), sourceId: String(sourceId || ''), key });
+    if (key === 'dataSetId') {
+        const t = s.trim();
+        if (/^\d+$/.test(t))
+            push(t, cellNameIndex);
+        return out;
+    }
+    if (key === 'fieldKey') {
+        const m = s.match(TOKEN_RE);
+        if (m)
+            push(m[1], m[2]);
+        return out;
+    }
+    let arr;
+    try {
+        arr = JSON.parse(s);
+    }
+    catch {
+        return out;
+    }
+    if (!Array.isArray(arr))
+        return out;
+    for (const it of arr) {
+        if (!it || typeof it !== 'object')
+            continue;
+        for (const k2 of FILTER_FIELD_NAMES) {
+            const v = it[k2];
+            if (typeof v !== 'string')
+                continue;
+            const m = v.match(TOKEN_RE);
+            if (m)
+                push(m[1], m[2]);
+        }
+    }
+    return out;
+}
+/** 一格里的全部数据集 id 引用。 */
+export function refsOfField(f) {
+    const out = [];
+    for (const key of DATASET_ID_KEYS) {
+        const v = f[key];
+        if (v == null || v === '')
+            continue;
+        out.push(...idOccurrences(key, v, f.nameIndex));
+    }
+    return out;
+}
+/** 引用体检：返回外来 id（不属于本报表）的引用。 */
+export function foreignRefs(fields, own) {
+    const allow = new Set(own.map((d) => String(d.id)));
+    const out = [];
+    for (const f of fields) {
+        for (const r of refsOfField(f)) {
+            if (!allow.has(r.id)) {
+                out.push({ ...r, x: Number(f.x), y: Number(f.y), text: String(f.text || '') });
+            }
+        }
+    }
+    return out;
+}
+/** 规划机械重映射；不落库。 */
+export function planDatasetIdRemap(fields, own) {
+    const bySource = new Map();
+    for (const d of own)
+        if (d.sourceId)
+            bySource.set(String(d.sourceId), String(d.id));
+    const allow = new Set(own.map((d) => String(d.id)));
+    const idMap = {};
+    const changes = [];
+    const unresolved = [];
+    const conflicts = [];
+    let refCount = 0;
+    for (const f of fields) {
+        for (const r of refsOfField(f)) {
+            refCount++;
+            if (allow.has(r.id))
+                continue;
+            const local = bySource.get(r.sourceId) || '';
+            if (!local) {
+                unresolved.push({
+                    x: Number(f.x),
+                    y: Number(f.y),
+                    text: String(f.text || ''),
+                    key: r.key,
+                    id: r.id,
+                    sourceId: r.sourceId,
+                    reason: `该引用的 sourceId=${r.sourceId || '(空)'} 未挂在本报表上（无法确定目标数据集）`,
+                });
+                continue;
+            }
+            if (idMap[r.id] && idMap[r.id] !== local) {
+                conflicts.push({ foreignId: r.id, a: idMap[r.id], b: local, x: Number(f.x), y: Number(f.y) });
+                continue;
+            }
+            idMap[r.id] = local;
+            changes.push({
+                x: Number(f.x),
+                y: Number(f.y),
+                text: String(f.text || ''),
+                key: r.key,
+                from: r.id,
+                to: local,
+                sourceId: r.sourceId,
+            });
+        }
+    }
+    const ids = Object.keys(idMap);
+    const next = ids.length
+        ? fields.map((f) => {
+            const walk = (v) => {
+                if (typeof v === 'string') {
+                    let s = v;
+                    for (const id of ids)
+                        s = s.replace(new RegExp(`(?<!\\d)${id}(?!\\d)`, 'g'), idMap[id]);
+                    return s;
+                }
+                if (Array.isArray(v))
+                    return v.map(walk);
+                if (v && typeof v === 'object') {
+                    const o = {};
+                    for (const [k, val] of Object.entries(v))
+                        o[k] = walk(val);
+                    return o;
+                }
+                return v;
+            };
+            return walk(f);
+        })
+        : fields;
+    return { idMap, changes, unresolved, conflicts, next, refCount };
+}
+//# sourceMappingURL=dataset-ids.js.map

package/dist/services/report/dataset-ids.js.map

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

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":"AAAA;;;;;GAKG;AACH,OAAO,EAAO,UAAU,EAAE,MAAM,WAAW,CAAC;AAG5C,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE7D,oBAAoB;AACpB,wBAAsB,YAAY,CAChC,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,aAAa,EAAE,CAAC,CAW1B;AAED,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4CAA4C;IAC5C,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,gCAAgC;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,6CAA6C;IAC7C,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GACA,OAAO,CAAC,eAAe,CAAC,CAqF1B;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,MAAM,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAO,GACnD,OAAO,CAAC,WAAW,EAAE,CAAC,CAoBxB;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GAC9F,OAAO,CAAC,WAAW,EAAE,CAAC,CAWxB;AAID,wBAAsB,aAAa,CACjC,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,WAAW,SAAO,GACjB,OAAO,CAAC,GAAG,CAAC,CAEd;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAGtF;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,GAAG,CAAC,CAKd;AAED,wBAAsB,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAG/E;AAED,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,GAAG,CAAC,CAKd;AAED,+CAA+C;AAC/C,wBAAsB,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAKrF;AAED,uDAAuD;AACvD,wBAAsB,aAAa,CACjC,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC,CAIlB;AAED,6DAA6D;AAC7D,wBAAsB,aAAa,CACjC,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,GAAG,CAAC,CAMd;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAGtF"}
+{"version":3,"file":"dataset.d.ts","sourceRoot":"","sources":["../../../src/services/report/dataset.ts"],"names":[],"mappings":"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"}

package/dist/services/report/dataset.js

@@ -18,6 +18,7 @@ export async function listDatasets(http, reportId, appId) {
         sourceType: row.type || '',
         sourceGroup: row.sourceGroup || '',
         tableText: row.tableText || '',
+        originalName: row.originalName || row.original_name || '',
     }));
 }
 /**
@@ -29,7 +30,8 @@ export async function listDatasets(http, reportId, appId) {
  * 3. 跨报表的 `datasetId` **不认**，忽略并重新在本报表解析。
  */
 export async function resolveDataset(http, opt) {
-    const sourceType = opt.sourceType || 'LOGIC';
+    // addDataset 的 type 必须是**小写**（设计器口径）；写 'LOGIC' 会让报表不可复制
+    const sourceType = String(opt.sourceType || 'logic').toLowerCase();
     const sourceGroup = opt.sourceGroup || FORM_SOURCE_GROUP;
     const wantName = normalizeDatasetName(opt.sourceName, sourceType);
     const shape = (row) => ({

package/dist/services/report/dataset.js.map

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

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

@@ -0,0 +1,51 @@
+/**
+ * 治理「数据集空壳」：挂上了，但字段一个都取不到。
+ *
+ * 典型成因：数据加工 SQL 视图（sourceGroup=sql / type=eteams）被用普通表单口径
+ * （sourceType=logic）挂载；服务端不报错，但落库的是一条空壳 ——
+ * 设计器左侧显示成「xxx(业务模块)」，画布上绑该数据集的 Field 格字段下拉全空。
+ *
+ * `resolveDataset` 有「同 sourceId 必须复用」的门禁，修不掉；这里绕开它直接
+ * `addDataset` 再整表重映射。
+ */
+import type { ReportHttp } from './http.js';
+export interface EmptyDatasetRow {
+    id: string;
+    name: string;
+    sourceId: string;
+    rawType: string;
+    sourceGroup: string;
+    fieldCount: number;
+    refs: number;
+}
+export interface EmptyDatasetInspection {
+    rows: EmptyDatasetRow[];
+    empties: EmptyDatasetRow[];
+}
+/** 只读体检：哪些数据集是空壳、被多少格引用。 */
+export declare function inspectEmptyDatasets(http: ReportHttp, reportId: string, appId: string): Promise<EmptyDatasetInspection>;
+export interface EmptyDatasetFixResult {
+    targets: Array<{
+        oldId: string;
+        newId: string;
+        cells: number;
+        fields: number;
+    }>;
+    removed: Array<{
+        datasetId: string;
+        ok: boolean;
+        reason?: string;
+    }>;
+    cellsBefore: number;
+    cellsAfter: number;
+    staleLeft: number;
+    mismatch: number;
+}
+export declare function fixEmptyDatasets(http: ReportHttp, reportId: string, appId: string, opts?: {
+    datasetId?: string;
+    sourceType?: string;
+    sourceGroup?: string;
+    tableName?: string;
+    keepOld?: boolean;
+}): Promise<EmptyDatasetFixResult>;
+//# sourceMappingURL=empty-dataset.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"empty-dataset.d.ts","sourceRoot":"","sources":["../../../src/services/report/empty-dataset.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAO5C,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,eAAe,EAAE,CAAC;IACxB,OAAO,EAAE,eAAe,EAAE,CAAC;CAC5B;AAiBD,4BAA4B;AAC5B,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,sBAAsB,CAAC,CAwBjC;AAqDD,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAChF,OAAO,EAAE,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpE,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,IAAI,GAAE;IACJ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACd,GACL,OAAO,CAAC,qBAAqB,CAAC,CAuIhC"}