weaver-e10-builder 1.6.9 → 1.6.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/form-data.d.ts.map +1 -1
- package/dist/commands/form-data.js +4 -1
- package/dist/commands/form-data.js.map +1 -1
- package/dist/commands/report-admin.d.ts.map +1 -1
- package/dist/commands/report-admin.js +378 -2
- package/dist/commands/report-admin.js.map +1 -1
- package/dist/commands/report-validate.d.ts.map +1 -1
- package/dist/commands/report-validate.js +1066 -3
- package/dist/commands/report-validate.js.map +1 -1
- package/dist/commands/report.d.ts.map +1 -1
- package/dist/commands/report.js +341 -3
- package/dist/commands/report.js.map +1 -1
- package/dist/commands/workflow-after-submit-comment.d.ts +3 -0
- package/dist/commands/workflow-after-submit-comment.d.ts.map +1 -0
- package/dist/commands/workflow-after-submit-comment.js +56 -0
- package/dist/commands/workflow-after-submit-comment.js.map +1 -0
- package/dist/commands/workflow-setting.d.ts.map +1 -1
- package/dist/commands/workflow-setting.js +2 -67
- package/dist/commands/workflow-setting.js.map +1 -1
- package/dist/services/action-detail.d.ts.map +1 -1
- package/dist/services/action-detail.js +1 -17
- package/dist/services/action-detail.js.map +1 -1
- package/dist/services/actionflow/components/action_eb_update_compiler.d.ts.map +1 -1
- package/dist/services/actionflow/components/action_eb_update_compiler.js +6 -2
- package/dist/services/actionflow/components/action_eb_update_compiler.js.map +1 -1
- package/dist/services/actionflow/components/custom_trigger.js +1 -1
- package/dist/services/actionflow/components/custom_trigger.js.map +1 -1
- package/dist/services/actionflow/components/dml_execute.js +1 -1
- package/dist/services/actionflow/components/dml_execute.js.map +1 -1
- package/dist/services/actionflow/components/document_actions.js +1 -2
- package/dist/services/actionflow/components/document_actions.js.map +1 -1
- package/dist/services/actionflow/components/eb_get_data_by_id.d.ts.map +1 -1
- package/dist/services/actionflow/components/eb_get_data_by_id.js +2 -2
- package/dist/services/actionflow/components/eb_get_data_by_id.js.map +1 -1
- package/dist/services/actionflow/components/form_data_builder.d.ts.map +1 -1
- package/dist/services/actionflow/components/form_data_builder.js +18 -10
- package/dist/services/actionflow/components/form_data_builder.js.map +1 -1
- package/dist/services/actionflow/components/hrm_actions.js +0 -1
- package/dist/services/actionflow/components/hrm_actions.js.map +1 -1
- package/dist/services/actionflow/components/webhook_trigger.js +3 -3
- package/dist/services/actionflow/components/webhook_trigger.js.map +1 -1
- package/dist/services/actionflow/components/workflow_actions.js +3 -2
- package/dist/services/actionflow/components/workflow_actions.js.map +1 -1
- package/dist/services/actionflow/filter_rules.d.ts.map +1 -1
- package/dist/services/actionflow/filter_rules.js +15 -13
- package/dist/services/actionflow/filter_rules.js.map +1 -1
- package/dist/services/actionflow/form_source.d.ts.map +1 -1
- package/dist/services/actionflow/form_source.js +59 -11
- package/dist/services/actionflow/form_source.js.map +1 -1
- package/dist/services/actionflow/formula_service.d.ts.map +1 -1
- package/dist/services/actionflow/formula_service.js +4 -1
- package/dist/services/actionflow/formula_service.js.map +1 -1
- package/dist/services/actionflow/option_field_types.d.ts +5 -0
- package/dist/services/actionflow/option_field_types.d.ts.map +1 -0
- package/dist/services/actionflow/option_field_types.js +20 -0
- package/dist/services/actionflow/option_field_types.js.map +1 -0
- package/dist/services/actionflow/param_group_dto.d.ts.map +1 -1
- package/dist/services/actionflow/param_group_dto.js +7 -3
- package/dist/services/actionflow/param_group_dto.js.map +1 -1
- package/dist/services/actionflow/preflight_service.d.ts.map +1 -1
- package/dist/services/actionflow/preflight_service.js +42 -18
- package/dist/services/actionflow/preflight_service.js.map +1 -1
- package/dist/services/actionflow/webhook_source.d.ts.map +1 -1
- package/dist/services/actionflow/webhook_source.js +9 -4
- package/dist/services/actionflow/webhook_source.js.map +1 -1
- package/dist/services/actionflow/workflow_compiler.d.ts.map +1 -1
- package/dist/services/actionflow/workflow_compiler.js +11 -8
- package/dist/services/actionflow/workflow_compiler.js.map +1 -1
- package/dist/services/report/blueprint.d.ts +109 -0
- package/dist/services/report/blueprint.d.ts.map +1 -0
- package/dist/services/report/blueprint.js +322 -0
- package/dist/services/report/blueprint.js.map +1 -0
- package/dist/services/report/build.d.ts.map +1 -1
- package/dist/services/report/build.js +8 -3
- package/dist/services/report/build.js.map +1 -1
- package/dist/services/report/card.d.ts +65 -0
- package/dist/services/report/card.d.ts.map +1 -0
- package/dist/services/report/card.js +151 -0
- package/dist/services/report/card.js.map +1 -0
- package/dist/services/report/copy-health.d.ts +31 -0
- package/dist/services/report/copy-health.d.ts.map +1 -0
- package/dist/services/report/copy-health.js +87 -0
- package/dist/services/report/copy-health.js.map +1 -0
- package/dist/services/report/dataset-heal.d.ts +64 -0
- package/dist/services/report/dataset-heal.d.ts.map +1 -0
- package/dist/services/report/dataset-heal.js +89 -0
- package/dist/services/report/dataset-heal.js.map +1 -0
- package/dist/services/report/dataset-ids.d.ts +70 -0
- package/dist/services/report/dataset-ids.d.ts.map +1 -0
- package/dist/services/report/dataset-ids.js +149 -0
- package/dist/services/report/dataset-ids.js.map +1 -0
- package/dist/services/report/dataset.d.ts.map +1 -1
- package/dist/services/report/dataset.js +3 -1
- package/dist/services/report/dataset.js.map +1 -1
- package/dist/services/report/empty-dataset.d.ts +51 -0
- package/dist/services/report/empty-dataset.d.ts.map +1 -0
- package/dist/services/report/empty-dataset.js +213 -0
- package/dist/services/report/empty-dataset.js.map +1 -0
- package/dist/services/report/field-binding.d.ts +75 -0
- package/dist/services/report/field-binding.d.ts.map +1 -0
- package/dist/services/report/field-binding.js +160 -0
- package/dist/services/report/field-binding.js.map +1 -0
- package/dist/services/report/forms.d.ts +32 -0
- package/dist/services/report/forms.d.ts.map +1 -1
- package/dist/services/report/forms.js +90 -0
- package/dist/services/report/forms.js.map +1 -1
- package/dist/services/report/formula-parent.d.ts +25 -0
- package/dist/services/report/formula-parent.d.ts.map +1 -0
- package/dist/services/report/formula-parent.js +116 -0
- package/dist/services/report/formula-parent.js.map +1 -0
- package/dist/services/report/locate.d.ts +40 -0
- package/dist/services/report/locate.d.ts.map +1 -0
- package/dist/services/report/locate.js +122 -0
- package/dist/services/report/locate.js.map +1 -0
- package/dist/services/report/reports.d.ts +4 -0
- package/dist/services/report/reports.d.ts.map +1 -1
- package/dist/services/report/reports.js +4 -2
- package/dist/services/report/reports.js.map +1 -1
- package/dist/services/report/scene.d.ts +22 -0
- package/dist/services/report/scene.d.ts.map +1 -0
- package/dist/services/report/scene.js +145 -0
- package/dist/services/report/scene.js.map +1 -0
- package/dist/services/report/types.d.ts +28 -0
- package/dist/services/report/types.d.ts.map +1 -1
- package/dist/services/report/verify.d.ts +24 -0
- package/dist/services/report/verify.d.ts.map +1 -1
- package/dist/services/report/verify.js +115 -2
- package/dist/services/report/verify.js.map +1 -1
- package/dist/services/report/workbook.d.ts +12 -1
- package/dist/services/report/workbook.d.ts.map +1 -1
- package/dist/services/report/workbook.js +107 -8
- package/dist/services/report/workbook.js.map +1 -1
- package/dist/services/workflow-after-submit-comment.d.ts +20 -0
- package/dist/services/workflow-after-submit-comment.d.ts.map +1 -0
- package/dist/services/workflow-after-submit-comment.js +81 -0
- package/dist/services/workflow-after-submit-comment.js.map +1 -0
- package/ecodecmd/src/build.js +36 -12
- package/package.json +1 -1
- package/skill-docs/SKILL.md +4 -4
- package/skill-docs/_catalog.md +10 -1
- package/skill-docs/actionflows/SKILL.md +1 -0
- package/skill-docs/actionflows/references/components/ebuilder/EnquiryForm.md +2 -2
- package/skill-docs/actionflows/references/components/trigger/CustomTrigger.md +2 -0
- package/skill-docs/actionflows/references/components/trigger/WebHookTrigger.md +19 -1
- package/skill-docs/references/coding/guide-form-crud.md +2 -0
- package/skill-docs/references/coding/guide-page-code.md +108 -0
- package/skill-docs/references/components/ref-component-common.md +98 -0
- package/skill-docs/references/report/add-dataset-registration-guide.md +44 -22
- package/skill-docs/references/report/advanced-crosstab-tree-guide.md +82 -0
- package/skill-docs/references/report/ai-report-workflow.md +100 -100
- package/skill-docs/references/report/api-auth-headers.md +129 -0
- package/skill-docs/references/report/api-report-build-fast-path.md +274 -275
- package/skill-docs/references/report/app-datasource-lookup-guide.md +230 -230
- package/skill-docs/references/report/branch-scene-guide.md +293 -0
- package/skill-docs/references/report/build-resilience-guide.md +99 -0
- package/skill-docs/references/report/card-report-guide.md +110 -0
- package/skill-docs/references/report/cell-config-echo-guide.md +44 -9
- package/skill-docs/references/report/cell-transform-guide.md +9 -9
- package/skill-docs/references/report/column-split-report-guide.md +96 -0
- package/skill-docs/references/report/condition-format-guide.md +49 -24
- package/skill-docs/references/report/cross-dataset-filter-guide.md +180 -69
- package/skill-docs/references/report/crosstab-raw-workbook-guide.md +265 -0
- package/skill-docs/references/report/dataset-query-filter-guide.md +231 -235
- package/skill-docs/references/report/dataset-sidebar-ops-guide.md +75 -34
- package/skill-docs/references/report/dataset-table-field-contract-guide.md +196 -46
- package/skill-docs/references/report/datasource-metadata-guide.md +128 -119
- package/skill-docs/references/report/datasource-selection-and-parent-filter-guide.md +183 -148
- package/skill-docs/references/report/date-range-query-reference.md +97 -102
- package/skill-docs/references/report/default-header-style-guide.md +8 -8
- package/skill-docs/references/report/designer-blank-prevention-guide.md +8 -8
- package/skill-docs/references/report/dossier-report-guide.md +69 -0
- package/skill-docs/references/report/drilldown-report-guide.md +59 -0
- package/skill-docs/references/report/event-hreflink-guide.md +53 -47
- package/skill-docs/references/report/expansion-block-parent-config-guide.md +208 -0
- package/skill-docs/references/report/failure-cleanup-and-nonblocking-guide.md +183 -0
- package/skill-docs/references/report/field-bind-exact-match-guide.md +208 -208
- package/skill-docs/references/report/financial-stats-report-guide.md +89 -0
- package/skill-docs/references/report/formula-cell-api-guide.md +325 -258
- package/skill-docs/references/report/golden-case-summary-sheet.md +200 -0
- package/skill-docs/references/report/guide-report-build.md +6 -1
- package/skill-docs/references/report/hidden-row-and-header-merge-guide.md +10 -10
- package/skill-docs/references/report/layout-showlocation-freeze-guide.md +39 -10
- package/skill-docs/references/report/multi-report-crosstab-casebook.md +263 -0
- package/skill-docs/references/report/paged-group-report-guide.md +68 -0
- package/skill-docs/references/report/preaggregate-auto-disable-guide.md +24 -13
- package/skill-docs/references/report/query-condition-api-guide.md +145 -125
- package/skill-docs/references/report/ref-report-commands.md +41 -3
- package/skill-docs/references/report/report-baseinfo-defaults-guide.md +117 -117
- package/skill-docs/references/report/report-building-guide.md +52 -52
- package/skill-docs/references/report/report-case-prompts.md +104 -0
- package/skill-docs/references/report/report-config-schema.md +281 -281
- package/skill-docs/references/report/report-create-modes-guide.md +73 -35
- package/skill-docs/references/report/report-data-model.md +131 -131
- package/skill-docs/references/report/report-delivery-contract.md +23 -3
- package/skill-docs/references/report/report-designer-feature-map.md +30 -35
- package/skill-docs/references/report/report-help-guide.md +304 -0
- package/skill-docs/references/report/report-internal-error-guide.md +71 -0
- package/skill-docs/references/report/report-knowledge-base.md +27 -27
- package/skill-docs/references/report/report-lifecycle-api-guide.md +126 -94
- package/skill-docs/references/report/report-list-page-ops-guide.md +54 -8
- package/skill-docs/references/report/report-permission-guide.md +99 -102
- package/skill-docs/references/report/report-requirement-analysis-template.md +93 -29
- package/skill-docs/references/report/report-self-check-guide.md +164 -164
- package/skill-docs/references/report/report-verification-discipline-guide.md +203 -0
- package/skill-docs/references/report/safe-partial-save-guide.md +151 -151
- package/skill-docs/references/report/shard-freeze-report-guide.md +97 -0
- package/skill-docs/references/report/snowflake-id-precision-guide.md +84 -84
- package/skill-docs/references/report/spec-build-schema.md +71 -71
- package/skill-docs/references/report/targeted-fix-guide.md +155 -97
- package/skill-docs/references/report/user-request-scope-only-guide.md +23 -4
- package/skill-docs/references/workflow/guide-after-submit-comment.md +58 -0
- package/skill-docs/references/workflow/guide-workflow.md +6 -0
|
@@ -0,0 +1,149 @@
|
|
|
1
|
+
export const DATASET_ID_KEYS = [
|
|
2
|
+
'dataSetId',
|
|
3
|
+
'fieldKey',
|
|
4
|
+
'leftFilterField',
|
|
5
|
+
'topFilterField',
|
|
6
|
+
'customFilterField',
|
|
7
|
+
'dataFilterField',
|
|
8
|
+
];
|
|
9
|
+
const TOKEN_RE = /^(\d+)\.(\d+)\./;
|
|
10
|
+
const FILTER_FIELD_NAMES = ['currentField', 'parentField', 'field', 'fieldKey', 'currentFieldKey', 'parentFieldKey'];
|
|
11
|
+
function asString(v) {
|
|
12
|
+
return typeof v === 'string' ? v : JSON.stringify(v);
|
|
13
|
+
}
|
|
14
|
+
/** 列出某键里的每一次数据集 id 引用,并带上该引用自身的 sourceId。 */
|
|
15
|
+
export function idOccurrences(key, val, cellNameIndex) {
|
|
16
|
+
const out = [];
|
|
17
|
+
const s = asString(val);
|
|
18
|
+
const push = (id, sourceId) => out.push({ id: String(id), sourceId: String(sourceId || ''), key });
|
|
19
|
+
if (key === 'dataSetId') {
|
|
20
|
+
const t = s.trim();
|
|
21
|
+
if (/^\d+$/.test(t))
|
|
22
|
+
push(t, cellNameIndex);
|
|
23
|
+
return out;
|
|
24
|
+
}
|
|
25
|
+
if (key === 'fieldKey') {
|
|
26
|
+
const m = s.match(TOKEN_RE);
|
|
27
|
+
if (m)
|
|
28
|
+
push(m[1], m[2]);
|
|
29
|
+
return out;
|
|
30
|
+
}
|
|
31
|
+
let arr;
|
|
32
|
+
try {
|
|
33
|
+
arr = JSON.parse(s);
|
|
34
|
+
}
|
|
35
|
+
catch {
|
|
36
|
+
return out;
|
|
37
|
+
}
|
|
38
|
+
if (!Array.isArray(arr))
|
|
39
|
+
return out;
|
|
40
|
+
for (const it of arr) {
|
|
41
|
+
if (!it || typeof it !== 'object')
|
|
42
|
+
continue;
|
|
43
|
+
for (const k2 of FILTER_FIELD_NAMES) {
|
|
44
|
+
const v = it[k2];
|
|
45
|
+
if (typeof v !== 'string')
|
|
46
|
+
continue;
|
|
47
|
+
const m = v.match(TOKEN_RE);
|
|
48
|
+
if (m)
|
|
49
|
+
push(m[1], m[2]);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return out;
|
|
53
|
+
}
|
|
54
|
+
/** 一格里的全部数据集 id 引用。 */
|
|
55
|
+
export function refsOfField(f) {
|
|
56
|
+
const out = [];
|
|
57
|
+
for (const key of DATASET_ID_KEYS) {
|
|
58
|
+
const v = f[key];
|
|
59
|
+
if (v == null || v === '')
|
|
60
|
+
continue;
|
|
61
|
+
out.push(...idOccurrences(key, v, f.nameIndex));
|
|
62
|
+
}
|
|
63
|
+
return out;
|
|
64
|
+
}
|
|
65
|
+
/** 引用体检:返回外来 id(不属于本报表)的引用。 */
|
|
66
|
+
export function foreignRefs(fields, own) {
|
|
67
|
+
const allow = new Set(own.map((d) => String(d.id)));
|
|
68
|
+
const out = [];
|
|
69
|
+
for (const f of fields) {
|
|
70
|
+
for (const r of refsOfField(f)) {
|
|
71
|
+
if (!allow.has(r.id)) {
|
|
72
|
+
out.push({ ...r, x: Number(f.x), y: Number(f.y), text: String(f.text || '') });
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
return out;
|
|
77
|
+
}
|
|
78
|
+
/** 规划机械重映射;不落库。 */
|
|
79
|
+
export function planDatasetIdRemap(fields, own) {
|
|
80
|
+
const bySource = new Map();
|
|
81
|
+
for (const d of own)
|
|
82
|
+
if (d.sourceId)
|
|
83
|
+
bySource.set(String(d.sourceId), String(d.id));
|
|
84
|
+
const allow = new Set(own.map((d) => String(d.id)));
|
|
85
|
+
const idMap = {};
|
|
86
|
+
const changes = [];
|
|
87
|
+
const unresolved = [];
|
|
88
|
+
const conflicts = [];
|
|
89
|
+
let refCount = 0;
|
|
90
|
+
for (const f of fields) {
|
|
91
|
+
for (const r of refsOfField(f)) {
|
|
92
|
+
refCount++;
|
|
93
|
+
if (allow.has(r.id))
|
|
94
|
+
continue;
|
|
95
|
+
const local = bySource.get(r.sourceId) || '';
|
|
96
|
+
if (!local) {
|
|
97
|
+
unresolved.push({
|
|
98
|
+
x: Number(f.x),
|
|
99
|
+
y: Number(f.y),
|
|
100
|
+
text: String(f.text || ''),
|
|
101
|
+
key: r.key,
|
|
102
|
+
id: r.id,
|
|
103
|
+
sourceId: r.sourceId,
|
|
104
|
+
reason: `该引用的 sourceId=${r.sourceId || '(空)'} 未挂在本报表上(无法确定目标数据集)`,
|
|
105
|
+
});
|
|
106
|
+
continue;
|
|
107
|
+
}
|
|
108
|
+
if (idMap[r.id] && idMap[r.id] !== local) {
|
|
109
|
+
conflicts.push({ foreignId: r.id, a: idMap[r.id], b: local, x: Number(f.x), y: Number(f.y) });
|
|
110
|
+
continue;
|
|
111
|
+
}
|
|
112
|
+
idMap[r.id] = local;
|
|
113
|
+
changes.push({
|
|
114
|
+
x: Number(f.x),
|
|
115
|
+
y: Number(f.y),
|
|
116
|
+
text: String(f.text || ''),
|
|
117
|
+
key: r.key,
|
|
118
|
+
from: r.id,
|
|
119
|
+
to: local,
|
|
120
|
+
sourceId: r.sourceId,
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
const ids = Object.keys(idMap);
|
|
125
|
+
const next = ids.length
|
|
126
|
+
? fields.map((f) => {
|
|
127
|
+
const walk = (v) => {
|
|
128
|
+
if (typeof v === 'string') {
|
|
129
|
+
let s = v;
|
|
130
|
+
for (const id of ids)
|
|
131
|
+
s = s.replace(new RegExp(`(?<!\\d)${id}(?!\\d)`, 'g'), idMap[id]);
|
|
132
|
+
return s;
|
|
133
|
+
}
|
|
134
|
+
if (Array.isArray(v))
|
|
135
|
+
return v.map(walk);
|
|
136
|
+
if (v && typeof v === 'object') {
|
|
137
|
+
const o = {};
|
|
138
|
+
for (const [k, val] of Object.entries(v))
|
|
139
|
+
o[k] = walk(val);
|
|
140
|
+
return o;
|
|
141
|
+
}
|
|
142
|
+
return v;
|
|
143
|
+
};
|
|
144
|
+
return walk(f);
|
|
145
|
+
})
|
|
146
|
+
: fields;
|
|
147
|
+
return { idMap, changes, unresolved, conflicts, next, refCount };
|
|
148
|
+
}
|
|
149
|
+
//# sourceMappingURL=dataset-ids.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dataset-ids.js","sourceRoot":"","sources":["../../../src/services/report/dataset-ids.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +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,
|
|
1
|
+
{"version":3,"file":"dataset.d.ts","sourceRoot":"","sources":["../../../src/services/report/dataset.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ export async function listDatasets(http, reportId, appId) {
|
|
|
18
18
|
sourceType: row.type || '',
|
|
19
19
|
sourceGroup: row.sourceGroup || '',
|
|
20
20
|
tableText: row.tableText || '',
|
|
21
|
+
originalName: row.originalName || row.original_name || '',
|
|
21
22
|
}));
|
|
22
23
|
}
|
|
23
24
|
/**
|
|
@@ -29,7 +30,8 @@ export async function listDatasets(http, reportId, appId) {
|
|
|
29
30
|
* 3. 跨报表的 `datasetId` **不认**,忽略并重新在本报表解析。
|
|
30
31
|
*/
|
|
31
32
|
export async function resolveDataset(http, opt) {
|
|
32
|
-
|
|
33
|
+
// addDataset 的 type 必须是**小写**(设计器口径);写 'LOGIC' 会让报表不可复制
|
|
34
|
+
const sourceType = String(opt.sourceType || 'logic').toLowerCase();
|
|
33
35
|
const sourceGroup = opt.sourceGroup || FORM_SOURCE_GROUP;
|
|
34
36
|
const wantName = normalizeDatasetName(opt.sourceName, sourceType);
|
|
35
37
|
const shape = (row) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataset.js","sourceRoot":"","sources":["../../../src/services/report/dataset.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,GAAG,EAAc,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAGnD,oBAAoB;AACpB,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,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,IAAI,GAAG,CAAC,CAAC,IAAK,CAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAC1C,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,CAAC;QAC1D,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QAClB,IAAI,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE;QACpB,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE;QAC1D,UAAU,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE;QAC1B,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,EAAE;QAClC,SAAS,EAAE,GAAG,CAAC,SAAS,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"dataset.js","sourceRoot":"","sources":["../../../src/services/report/dataset.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 治理「数据集空壳」:挂上了,但字段一个都取不到。
|
|
3
|
+
*
|
|
4
|
+
* 典型成因:数据加工 SQL 视图(sourceGroup=sql / type=eteams)被用普通表单口径
|
|
5
|
+
* (sourceType=logic)挂载;服务端不报错,但落库的是一条空壳 ——
|
|
6
|
+
* 设计器左侧显示成「xxx(业务模块)」,画布上绑该数据集的 Field 格字段下拉全空。
|
|
7
|
+
*
|
|
8
|
+
* `resolveDataset` 有「同 sourceId 必须复用」的门禁,修不掉;这里绕开它直接
|
|
9
|
+
* `addDataset` 再整表重映射。
|
|
10
|
+
*/
|
|
11
|
+
import type { ReportHttp } from './http.js';
|
|
12
|
+
export interface EmptyDatasetRow {
|
|
13
|
+
id: string;
|
|
14
|
+
name: string;
|
|
15
|
+
sourceId: string;
|
|
16
|
+
rawType: string;
|
|
17
|
+
sourceGroup: string;
|
|
18
|
+
fieldCount: number;
|
|
19
|
+
refs: number;
|
|
20
|
+
}
|
|
21
|
+
export interface EmptyDatasetInspection {
|
|
22
|
+
rows: EmptyDatasetRow[];
|
|
23
|
+
empties: EmptyDatasetRow[];
|
|
24
|
+
}
|
|
25
|
+
/** 只读体检:哪些数据集是空壳、被多少格引用。 */
|
|
26
|
+
export declare function inspectEmptyDatasets(http: ReportHttp, reportId: string, appId: string): Promise<EmptyDatasetInspection>;
|
|
27
|
+
export interface EmptyDatasetFixResult {
|
|
28
|
+
targets: Array<{
|
|
29
|
+
oldId: string;
|
|
30
|
+
newId: string;
|
|
31
|
+
cells: number;
|
|
32
|
+
fields: number;
|
|
33
|
+
}>;
|
|
34
|
+
removed: Array<{
|
|
35
|
+
datasetId: string;
|
|
36
|
+
ok: boolean;
|
|
37
|
+
reason?: string;
|
|
38
|
+
}>;
|
|
39
|
+
cellsBefore: number;
|
|
40
|
+
cellsAfter: number;
|
|
41
|
+
staleLeft: number;
|
|
42
|
+
mismatch: number;
|
|
43
|
+
}
|
|
44
|
+
export declare function fixEmptyDatasets(http: ReportHttp, reportId: string, appId: string, opts?: {
|
|
45
|
+
datasetId?: string;
|
|
46
|
+
sourceType?: string;
|
|
47
|
+
sourceGroup?: string;
|
|
48
|
+
tableName?: string;
|
|
49
|
+
keepOld?: boolean;
|
|
50
|
+
}): Promise<EmptyDatasetFixResult>;
|
|
51
|
+
//# sourceMappingURL=empty-dataset.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -0,0 +1,213 @@
|
|
|
1
|
+
import { EDC } from './http.js';
|
|
2
|
+
import { getBaseInfo, getReportDevInfo, saveReportDevInfo } from './reports.js';
|
|
3
|
+
import { buildWorkbookFromFields } from './safe-save.js';
|
|
4
|
+
import { deleteDataset, isDatasetUsed } from './dataset.js';
|
|
5
|
+
async function rawDatasets(http, reportId, appId) {
|
|
6
|
+
const r = await http.get(EDC.dataset.list, { hasField: 'true', reportId }, reportId);
|
|
7
|
+
return (r?.data || []);
|
|
8
|
+
}
|
|
9
|
+
async function fieldNames(http, reportId, datasetId, appId) {
|
|
10
|
+
const r = await http.get(EDC.dataset.fieldsAndOriginFields, { datasetId, hasField: 'true', isFront: 'true', reportId }, reportId);
|
|
11
|
+
const fk = (r?.data?.fieldsKey || []);
|
|
12
|
+
return fk.map((f) => String(f.name || '')).filter(Boolean);
|
|
13
|
+
}
|
|
14
|
+
/** 只读体检:哪些数据集是空壳、被多少格引用。 */
|
|
15
|
+
export async function inspectEmptyDatasets(http, reportId, appId) {
|
|
16
|
+
const dev = await getReportDevInfo(http, reportId);
|
|
17
|
+
const fields = dev.fields || [];
|
|
18
|
+
const rows = [];
|
|
19
|
+
for (const d of await rawDatasets(http, reportId, appId)) {
|
|
20
|
+
const rawType = String(d.type || '');
|
|
21
|
+
if (/^systemField$/i.test(rawType))
|
|
22
|
+
continue;
|
|
23
|
+
let names = [];
|
|
24
|
+
try {
|
|
25
|
+
names = await fieldNames(http, reportId, String(d.id), appId);
|
|
26
|
+
}
|
|
27
|
+
catch {
|
|
28
|
+
names = [];
|
|
29
|
+
}
|
|
30
|
+
rows.push({
|
|
31
|
+
id: String(d.id),
|
|
32
|
+
name: d.name || d.originalName || '',
|
|
33
|
+
sourceId: String(d.sourceId || ''),
|
|
34
|
+
rawType,
|
|
35
|
+
sourceGroup: String(d.sourceGroup || ''),
|
|
36
|
+
fieldCount: names.length,
|
|
37
|
+
refs: fields.filter((f) => String(f.dataSetId || '') === String(d.id)).length,
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
return { rows, empties: rows.filter((r) => r.fieldCount === 0) };
|
|
41
|
+
}
|
|
42
|
+
/** 直接 POST addDataset(绕开 resolveDataset 的同源复用门禁),回查同源同类型的最新一条。 */
|
|
43
|
+
async function addDatasetRaw(http, opts) {
|
|
44
|
+
await http.postFields(EDC.report.addDataset, {
|
|
45
|
+
reportId: opts.reportId,
|
|
46
|
+
sourceType: opts.sourceType,
|
|
47
|
+
sourceIds: opts.sourceId,
|
|
48
|
+
sourceName: opts.sourceName,
|
|
49
|
+
appid: opts.appId,
|
|
50
|
+
sourceGroup: opts.sourceGroup,
|
|
51
|
+
}, opts.reportId);
|
|
52
|
+
for (let i = 0; i < 8; i++) {
|
|
53
|
+
const rows = await rawDatasets(http, opts.reportId, opts.appId);
|
|
54
|
+
const hits = rows
|
|
55
|
+
.filter((d) => String(d.sourceId) === String(opts.sourceId))
|
|
56
|
+
.filter((d) => String(d.type || '').toLowerCase() === opts.sourceType.toLowerCase());
|
|
57
|
+
if (hits.length) {
|
|
58
|
+
const hit = hits[hits.length - 1];
|
|
59
|
+
let n = 0;
|
|
60
|
+
try {
|
|
61
|
+
n = (await fieldNames(http, opts.reportId, String(hit.id), opts.appId)).length;
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
n = 0;
|
|
65
|
+
}
|
|
66
|
+
return { id: String(hit.id), fieldCount: n };
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return null;
|
|
70
|
+
}
|
|
71
|
+
/** 整格重映射:旧 id → 新 id,并修正 nameIndex / fieldKey 第二段 / tableName。 */
|
|
72
|
+
function remapCell(cell, oldId, newId, sourceId, tableName) {
|
|
73
|
+
const s = JSON.stringify(cell);
|
|
74
|
+
if (!s.includes(oldId))
|
|
75
|
+
return { cell, changed: false };
|
|
76
|
+
const re = new RegExp(`(?<!\\d)${oldId}(?!\\d)`, 'g');
|
|
77
|
+
const next = JSON.parse(s.replace(re, newId));
|
|
78
|
+
if (next.dataSetId != null && String(next.dataSetId) === String(newId)) {
|
|
79
|
+
next.nameIndex = String(sourceId);
|
|
80
|
+
next.tableName = tableName;
|
|
81
|
+
const seg = String(next.fieldKey || '').split('.');
|
|
82
|
+
if (seg.length === 3)
|
|
83
|
+
next.fieldKey = `${newId}.${sourceId}.${seg[2]}`;
|
|
84
|
+
}
|
|
85
|
+
return { cell: next, changed: true };
|
|
86
|
+
}
|
|
87
|
+
export async function fixEmptyDatasets(http, reportId, appId, opts = {}) {
|
|
88
|
+
const dev = await getReportDevInfo(http, reportId);
|
|
89
|
+
const fields = dev.fields || [];
|
|
90
|
+
const ins = await inspectEmptyDatasets(http, reportId, appId);
|
|
91
|
+
const targets = (opts.datasetId ? ins.empties.filter((d) => d.id === String(opts.datasetId)) : ins.empties).filter((d) => d.sourceId);
|
|
92
|
+
if (!targets.length) {
|
|
93
|
+
return {
|
|
94
|
+
targets: [],
|
|
95
|
+
removed: [],
|
|
96
|
+
cellsBefore: fields.length,
|
|
97
|
+
cellsAfter: fields.length,
|
|
98
|
+
staleLeft: 0,
|
|
99
|
+
mismatch: 0,
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
let work = JSON.parse(JSON.stringify(fields));
|
|
103
|
+
const done = [];
|
|
104
|
+
for (const old of targets) {
|
|
105
|
+
const sourceType = opts.sourceType || 'eteams';
|
|
106
|
+
const sourceGroup = opts.sourceGroup || (/^sql$/i.test(old.sourceGroup) ? 'sql' : 'sql');
|
|
107
|
+
// 幂等:同源已有「类型正确且字段 > 0」的数据集则复用
|
|
108
|
+
let created = null;
|
|
109
|
+
for (const d of (await rawDatasets(http, reportId, appId))) {
|
|
110
|
+
if (String(d.sourceId) !== old.sourceId || String(d.id) === old.id)
|
|
111
|
+
continue;
|
|
112
|
+
if (String(d.type || '').toLowerCase() !== sourceType.toLowerCase())
|
|
113
|
+
continue;
|
|
114
|
+
let n = 0;
|
|
115
|
+
try {
|
|
116
|
+
n = (await fieldNames(http, reportId, String(d.id), appId)).length;
|
|
117
|
+
}
|
|
118
|
+
catch {
|
|
119
|
+
n = 0;
|
|
120
|
+
}
|
|
121
|
+
if (n > 0) {
|
|
122
|
+
created = { id: String(d.id), fieldCount: n };
|
|
123
|
+
break;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
if (!created) {
|
|
127
|
+
created = await addDatasetRaw(http, {
|
|
128
|
+
reportId,
|
|
129
|
+
appId,
|
|
130
|
+
sourceId: old.sourceId,
|
|
131
|
+
sourceName: old.name,
|
|
132
|
+
sourceType,
|
|
133
|
+
sourceGroup,
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
if (!created || !created.fieldCount) {
|
|
137
|
+
throw new Error(`重新挂载后字段仍为 0(sourceId 可能不是 SQL 视图):${old.sourceId}`);
|
|
138
|
+
}
|
|
139
|
+
const tableName = opts.tableName || old.name;
|
|
140
|
+
let changed = 0;
|
|
141
|
+
work = work.map((c) => {
|
|
142
|
+
const r = remapCell(c, old.id, created.id, old.sourceId, tableName);
|
|
143
|
+
if (r.changed)
|
|
144
|
+
changed++;
|
|
145
|
+
return r.cell;
|
|
146
|
+
});
|
|
147
|
+
done.push({ oldId: old.id, newId: created.id, cells: changed, fields: created.fieldCount });
|
|
148
|
+
}
|
|
149
|
+
// 逐 sheet 重建(多 sheet 各建各的,避免同坐标互相覆盖)
|
|
150
|
+
const sheetProps = dev.sheetProps || [];
|
|
151
|
+
const bySi = new Map();
|
|
152
|
+
for (const c of work) {
|
|
153
|
+
const si = Number(c.sheetIndex || 0);
|
|
154
|
+
if (!bySi.has(si))
|
|
155
|
+
bySi.set(si, []);
|
|
156
|
+
bySi.get(si).push(c);
|
|
157
|
+
}
|
|
158
|
+
const workbook = { version: '11.1.0', sheetCount: bySi.size, newTabVisible: false, tabEditable: false, sheets: {} };
|
|
159
|
+
for (const si of [...bySi.keys()].sort((a, b) => a - b)) {
|
|
160
|
+
const sp = sheetProps.find((s) => Number(s.sheetIndex) === si) || sheetProps[si] || {};
|
|
161
|
+
const name = sp.name || `Sheet${si + 1}`;
|
|
162
|
+
const wb = buildWorkbookFromFields(bySi.get(si), { ...sp, name });
|
|
163
|
+
const sheetObj = Object.values(wb.sheets)[0];
|
|
164
|
+
sheetObj.name = name;
|
|
165
|
+
sheetObj.index = si;
|
|
166
|
+
workbook.sheets[name] = sheetObj;
|
|
167
|
+
}
|
|
168
|
+
const base = await getBaseInfo(http, reportId);
|
|
169
|
+
const fresh = await getReportDevInfo(http, reportId);
|
|
170
|
+
await saveReportDevInfo(http, {
|
|
171
|
+
appId,
|
|
172
|
+
reportId,
|
|
173
|
+
name: String(base.name || ''),
|
|
174
|
+
workbook,
|
|
175
|
+
designKey: String(fresh.designKey || ''),
|
|
176
|
+
groupId: String(base.groupId ?? '-1'),
|
|
177
|
+
nameLabelId: String(base.nameLabelId ?? '-1'),
|
|
178
|
+
});
|
|
179
|
+
const after = await getReportDevInfo(http, reportId);
|
|
180
|
+
const af = after.fields || [];
|
|
181
|
+
const staleLeft = done.reduce((n, r) => n + af.filter((c) => String(c.dataSetId) === r.oldId).length, 0);
|
|
182
|
+
const mismatch = af.filter((c) => c.cellType === 'Field' && String(c.fieldKey || '').split('.')[0] !== String(c.dataSetId)).length;
|
|
183
|
+
const removed = [];
|
|
184
|
+
if (!opts.keepOld) {
|
|
185
|
+
for (const r of done) {
|
|
186
|
+
const used = af.some((c) => String(c.dataSetId) === r.oldId);
|
|
187
|
+
if (used) {
|
|
188
|
+
removed.push({ datasetId: r.oldId, ok: false, reason: '仍有引用' });
|
|
189
|
+
continue;
|
|
190
|
+
}
|
|
191
|
+
try {
|
|
192
|
+
if (await isDatasetUsed(http, reportId, r.oldId)) {
|
|
193
|
+
removed.push({ datasetId: r.oldId, ok: false, reason: '仍被单元格引用' });
|
|
194
|
+
continue;
|
|
195
|
+
}
|
|
196
|
+
await deleteDataset(http, reportId, r.oldId);
|
|
197
|
+
removed.push({ datasetId: r.oldId, ok: true });
|
|
198
|
+
}
|
|
199
|
+
catch (e) {
|
|
200
|
+
removed.push({ datasetId: r.oldId, ok: false, reason: e.message });
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
return {
|
|
205
|
+
targets: done,
|
|
206
|
+
removed,
|
|
207
|
+
cellsBefore: fields.length,
|
|
208
|
+
cellsAfter: af.length,
|
|
209
|
+
staleLeft,
|
|
210
|
+
mismatch,
|
|
211
|
+
};
|
|
212
|
+
}
|
|
213
|
+
//# sourceMappingURL=empty-dataset.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"empty-dataset.js","sourceRoot":"","sources":["../../../src/services/report/empty-dataset.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Field 格绑定回补:`text`(字段显示名)与 `tableName`(数据集回显名)。
|
|
3
|
+
*
|
|
4
|
+
* 换数据集(`dataset replace`)或 heal 之后,服务端重建绑定时会把这两项
|
|
5
|
+
* **抹掉 / 改写成裸雪花号**,而格数、类型、公式、父格都不变 —— 结构比对看不出来。
|
|
6
|
+
* 表象是设计器里字段格整行空白、数据源面板不显示模块类型后缀。
|
|
7
|
+
*
|
|
8
|
+
* 口径(由健康报表反推):
|
|
9
|
+
* - `text` = 数据集字段表里该字段的 `text`(用单元格 `name` 查 `fieldsKey`)
|
|
10
|
+
* - `tableName` = `${originalName || name}(${后缀})`,后缀按数据集类型:
|
|
11
|
+
* `logic` → 业务模块 / `form` → 表单 / `eteams` → 数据加工
|
|
12
|
+
*/
|
|
13
|
+
import type { ReportHttp } from './http.js';
|
|
14
|
+
import type { DevField } from './types.js';
|
|
15
|
+
/** 裸雪花号 / 空串都算「未绑定回显名」。 */
|
|
16
|
+
export declare function isRawTableName(v: unknown): boolean;
|
|
17
|
+
/** 数据集类型 → 单元格 `tableName` 的括号后缀。大小写不敏感。 */
|
|
18
|
+
export declare function displaySuffixOf(type: unknown): string;
|
|
19
|
+
/**
|
|
20
|
+
* 单元格 `tableName` 目标值。
|
|
21
|
+
*
|
|
22
|
+
* 数据集 `name` 在存量数据里可能已经带了一层后缀(我们早先的建表会写全名),
|
|
23
|
+
* 这里先剥掉已知后缀再加正确的那层,避免出现 `X(业务模块)(业务模块)`。
|
|
24
|
+
*/
|
|
25
|
+
export declare function resolveCellTableName(ds: {
|
|
26
|
+
name?: string;
|
|
27
|
+
originalName?: string;
|
|
28
|
+
type?: string;
|
|
29
|
+
sourceType?: string;
|
|
30
|
+
}, forceName?: string): string;
|
|
31
|
+
export interface FieldBindingPatch {
|
|
32
|
+
at: string;
|
|
33
|
+
x: number;
|
|
34
|
+
y: number;
|
|
35
|
+
name: string;
|
|
36
|
+
text?: {
|
|
37
|
+
from: string;
|
|
38
|
+
to: string;
|
|
39
|
+
};
|
|
40
|
+
tableName?: {
|
|
41
|
+
from: string;
|
|
42
|
+
to: string;
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
export interface FieldBindingScan {
|
|
46
|
+
reportId: string;
|
|
47
|
+
appId: string;
|
|
48
|
+
fieldCells: number;
|
|
49
|
+
formulaCells: number;
|
|
50
|
+
/** 旁证:Const 格文字为空(本命令不回补,仅报告 —— 多半是同一轮损伤)。 */
|
|
51
|
+
blankConst: string[];
|
|
52
|
+
patches: FieldBindingPatch[];
|
|
53
|
+
/** 打补丁后的字段副本(落库重建用)。 */
|
|
54
|
+
next: DevField[];
|
|
55
|
+
dev: any;
|
|
56
|
+
}
|
|
57
|
+
/** 只读扫描:算出需要回补的格子,不落库。 */
|
|
58
|
+
export declare function scanFieldBindings(http: ReportHttp, reportId: string, appId: string, opts?: {
|
|
59
|
+
forceTableName?: string;
|
|
60
|
+
}): Promise<FieldBindingScan>;
|
|
61
|
+
/**
|
|
62
|
+
* 落库 + 回读校验。
|
|
63
|
+
*
|
|
64
|
+
* 走 `mergeWorkbookSafe`(优先沿用线上工作簿,公式格存活),把 `text` / `tableName`
|
|
65
|
+
* 同时写进 `fields[]` 与单元格 `style.cellType`,两边保持一致。
|
|
66
|
+
*/
|
|
67
|
+
export declare function applyFieldBindings(http: ReportHttp, scan: FieldBindingScan): Promise<{
|
|
68
|
+
ok: boolean;
|
|
69
|
+
cells: number;
|
|
70
|
+
target: number;
|
|
71
|
+
counts: Record<string, number>;
|
|
72
|
+
residual: number;
|
|
73
|
+
formula: number;
|
|
74
|
+
}>;
|
|
75
|
+
//# sourceMappingURL=field-binding.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"field-binding.d.ts","sourceRoot":"","sources":["../../../src/services/report/field-binding.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAI5C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,2BAA2B;AAC3B,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAIlD;AAED,4CAA4C;AAC5C,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAKrD;AAID;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,EAAE,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,EAChF,SAAS,CAAC,EAAE,MAAM,GACjB,MAAM,CAKR;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACpC,SAAS,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1C;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,8CAA8C;IAC9C,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,EAAE,iBAAiB,EAAE,CAAC;IAC7B,wBAAwB;IACxB,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,GAAG,EAAE,GAAG,CAAC;CACV;AAOD,0BAA0B;AAC1B,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,IAAI,GAAE;IAAE,cAAc,CAAC,EAAE,MAAM,CAAA;CAAO,GACrC,OAAO,CAAC,gBAAgB,CAAC,CA2E3B;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC;IACT,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,CA6CD"}
|