@freereportjs/core 0.10.0 → 0.10.2

package/dist/index.d.ts

@@ -76,14 +76,21 @@ interface ElementBase {
     canGrow?: boolean;
     /**
      * Follow the band's height when it grows. Default: true for elements that touch the bottom
-     * of the band, so cells of a table row stay the same height.
+     * of the band, so cells of a table row stay the same height. 'row': take the height of the
+     * tallest element on the same row (same y and h), so a label cell grows with its content cell.
      */
-    stretch?: boolean;
+    stretch?: boolean | 'row';
     /**
      * Move down when an element above it grows (canGrow), by as much as that element grew, so
-     * long text pushes the rest of the band down instead of overlapping it. Default true.
+     * long text pushes the rest of the band down instead of overlapping it. Only elements that
+     * overlap it horizontally move. Default true.
      */
     shift?: boolean;
+    /**
+     * When `visible` is false, give its space back: the elements below it move up into its place
+     * and the band shrinks. Default false (the space stays empty).
+     */
+    collapse?: boolean;
     /** Excel export: column name in "data" mode; ignored elsewhere. */
     name?: string;
 }
@@ -511,6 +518,8 @@ interface ElementAnchor {
     h: number;
     /** Its `visible` expression was false: the box it would have used. */
     hidden?: boolean;
+    /** It ends below the page's printable area (a band that grew past the page). */
+    offPage?: boolean;
 }
 interface LayoutResult {
     pages: ReportPage[];
@@ -921,10 +930,12 @@ declare function pagesToXlsx(layout: LayoutResult, def: ReportDefinition, opts?:
 declare function dataToXlsx(def: ReportDefinition, data: ReportData, opts?: {
     params?: Record<string, unknown>;
     sheetName?: string;
+    locale?: string;
 }): Uint8Array;
 /** CSV of the same columns as `dataToXlsx` (UTF-8 with BOM so Excel opens Korean correctly). */
 declare function dataToCsv(def: ReportDefinition, data: ReportData, opts?: {
     params?: Record<string, unknown>;
+    locale?: string;
 }): string;
 
 /** Export laid-out pages as an HWPX document (한/글 2018+, 한컴오피스 뷰어). */
@@ -1185,7 +1196,7 @@ declare function verifyLicense(key: string, host: string, opts?: {
 declare function setLicenseKey(key: string): void;
 
 /** FreeReport version (kept in sync with releases.json by scripts/release.mjs). */
-declare const version = "0.10.0";
+declare const version = "0.10.2";
 
 type Lang = 'ko' | 'en';
 

package/dist/index.js

@@ -368,7 +368,7 @@ function formatValue(v, format, locale = "ko") {
 }
 
 // src/version.ts
-var version = "0.10.0";
+var version = "0.10.2";
 var releaseDate = "2026-10-19";
 
 // src/license.ts
@@ -1038,8 +1038,8 @@ function textMark(text, cx, cy, size, opts) {
     source: { band: "watermark" }
   };
 }
-function watermarkItems(wm, page, scope, measure) {
-  const text = wm.text ? interpolate(wm.text, scope) : "";
+function watermarkItems(wm, page, scope, measure, locale) {
+  const text = wm.text ? interpolate(wm.text, scope, locale) : "";
   const opacity = wm.opacity ?? 0.12;
   const angle = wm.angle ?? -35;
   const color = wm.color ?? "#808080";
@@ -1191,7 +1191,7 @@ var shift = (d, dx, dy) => {
   }
   return out;
 };
-function embossItems(em, page, scope, measure) {
+function embossItems(em, page, scope, measure, locale) {
   const w = em.w ?? 32, h = em.h ?? (em.shape === "rect" ? 20 : w);
   const x = em.x ?? page.width - page.margins[1] - w - 4;
   const y = em.y ?? page.height - page.margins[2] - h - 12;
@@ -1210,8 +1210,8 @@ function embossItems(em, page, scope, measure) {
   } else if (shape === "rect") {
     shapes.push(rectRing(x, y, w, h, Math.max(0.6, Math.min(w, h) * 0.05)));
   }
-  const text = em.text ? interpolate(em.text, scope) : "";
-  const center = em.centerText ? interpolate(em.centerText, scope) : "";
+  const text = em.text ? interpolate(em.text, scope, locale) : "";
+  const center = em.centerText ? interpolate(em.centerText, scope, locale) : "";
   if (shape === "circle" && text) {
     const r = Math.min(w, h) / 2;
     const size = em.fontSize ?? Math.max(5, r * 0.62);
@@ -1250,11 +1250,11 @@ function decoratePages(pages, marks, geometry, scopeFor, measure) {
     const back = [], front = [];
     for (const wm of wms) {
       if (!onPage(wm.pages, i, pages.length) || !wm.text && !wm.image) continue;
-      (wm.layer === "front" ? front : back).push(...watermarkItems(wm, page, scope, measure));
+      (wm.layer === "front" ? front : back).push(...watermarkItems(wm, page, scope, measure, marks.locale));
     }
     for (const em of ems) {
       if (!onPage(em.pages, i, pages.length)) continue;
-      front.push(...embossItems(em, { ...page, margins: geometry.margins }, scope, measure));
+      front.push(...embossItems(em, { ...page, margins: geometry.margins }, scope, measure, marks.locale));
     }
     page.items = [...back, ...page.items, ...front];
   });
@@ -1353,7 +1353,7 @@ function textSvg(t, clipId) {
   }
   const overflow = t.source?.band !== "watermark" && t.lines.some((l) => l.x < t.x - 0.05 || l.x + l.width > t.x + t.w + 0.05 || l.y - sizeMm * 0.8 < t.y - 0.05 || l.y + sizeMm * 0.2 > t.y + t.h + 0.05);
   const transform = t.rotate ? ` transform="rotate(${n(t.rotate)} ${n(t.x + t.w / 2)} ${n(t.y + t.h / 2)})"` : "";
-  const hooks = sourceAttrs(t) + (t.overflow ? ' data-fr-overflow="1"' : "");
+  const hooks = sourceAttrs(t) + (t.overflow && t.source?.band !== "watermark" ? ' data-fr-overflow="1"' : "");
   if (!overflow) return { defs: "", body: `<g ${attrs}${hooks}${transform}${opacityAttr(t.opacity)}>${body}</g>` };
   const id = clipId();
   return {
@@ -1408,7 +1408,7 @@ function pageToSvg(page, opts = {}) {
     const r = itemSvg(it, clipId);
     defs += r.defs;
     const hooks = it.kind === "text" ? "" : sourceAttrs(it);
-    body += hooks && r.body ? `<g${hooks}>${r.body}</g>` : r.body;
+    body += !hooks || !r.body ? r.body : r.body.indexOf("<", 1) < 0 ? r.body.replace(/^<(\w+)/, (_, tag) => `<${tag}${hooks}`) : `<g${hooks}>${r.body}</g>`;
   }
   const size = opts.scale ? `width="${n(page.width * opts.scale)}" height="${n(page.height * opts.scale)}"` : `width="${n(page.width)}mm" height="${n(page.height)}mm"`;
   return `<svg xmlns="http://www.w3.org/2000/svg" ${size} viewBox="0 0 ${n(page.width)} ${n(page.height)}"${opts.className ? ` class="${opts.className}"` : ""} text-rendering="geometricPrecision">${defs ? `<defs>${defs}</defs>` : ""}<rect width="100%" height="100%" fill="#fff"/>${body}</svg>`;
@@ -2548,7 +2548,10 @@ function renderChart(el, scope, box, ctx) {
   const labelStyle = { ...style, padding: [0, 0, 0, 0], letterSpacing: 0, border: {} };
   const lh = fontSize * PT * 1.3;
   const items = [];
-  const label = (text, x2, y2, w2, align, bold = false, color = "#444444") => items.push({ ...textItem(x2, y2, w2, lh, [text], { ...font, bold }, { ...labelStyle, align, valign: "middle", color }, ctx.measure), source: { band: ctx.kind, elementId: el.id } });
+  const label = (text, x2, y2, w2, align, bold = false, color = "#444444") => (
+    // chart labels are allowed to run past their slot: not an overflow of the element's text
+    items.push({ ...textItem(x2, y2, w2, lh, [text], { ...font, bold }, { ...labelStyle, align, valign: "middle", color }, ctx.measure), overflow: void 0, source: { band: ctx.kind, elementId: el.id } })
+  );
   let { x, y, w, h } = box;
   if (el.title) {
     label(el.title, x, y, w, "center", true, style.color);
@@ -2952,7 +2955,7 @@ function textItem(x, y, w, h, lines, font, st, measure) {
     else if (st.align === "right") lx = x + w - pr - width;
     return { text, x: lx, y: top + i * lineH + (lineH - font.size * PT) / 2 + font.size * PT * ASCENT, width };
   });
-  const overflow = total > innerH + 0.05 || out.some((l) => l.width > w - pl - pr + 0.05);
+  const overflow = top < y - 0.05 || top + total > y + h + 0.05 || out.some((l) => l.x < x - 0.05 || l.x + l.width > x + w + 0.05);
   return {
     kind: "text",
     x,
@@ -3036,28 +3039,52 @@ function barcodeItems(el, x, y, w, h, scope, ctx) {
     return [textItem(x, y, w, h, ["(barcode?)"], { family: "sans-serif", size: 7, bold: false, italic: false }, { ...resolveStyle(ctx.def, el), color: "#cc0000" }, ctx.measure)];
   }
 }
-function shifts(prepared) {
-  let grew = false;
-  for (const p of prepared) if (p.needed > p.el.h + 0.01) {
-    grew = true;
+var topOf = (el) => Math.min(el.y, el.y + el.h);
+var bottomOf = (el) => Math.max(el.y, el.y + el.h);
+var leftOf = (el) => Math.min(el.x, el.x + el.w);
+var rightOf = (el) => Math.max(el.x, el.x + el.w);
+function shifts(slots) {
+  let changed = false;
+  for (const s of slots) if (s.collapsed || !s.hidden && s.needed > s.el.h + 0.01) {
+    changed = true;
     break;
   }
-  if (!grew) return null;
-  const out = /* @__PURE__ */ new Map();
-  const top = (p) => Math.min(p.el.y, p.el.y + p.el.h);
-  const bottom = (p) => Math.max(p.el.y, p.el.y + p.el.h);
-  const order = [...prepared].sort((a, b) => top(a) - top(b));
+  if (!changed) return null;
+  const off = /* @__PURE__ */ new Map();
+  const order = [...slots].sort((a, b) => topOf(a.el) - topOf(b.el));
+  const growth = (q) => q.hidden ? 0 : Math.max(0, q.needed - q.el.h);
   for (const p of order) {
     if (p.el.shift === false) continue;
-    let by = 0;
+    const pt = topOf(p.el), pl = leftOf(p.el), pr = rightOf(p.el);
+    let nearest3 = null;
+    let floor = -Infinity, pushed = -Infinity;
+    const above = [];
     for (const q of order) {
-      if (top(q) >= top(p)) break;
-      if (bottom(q) > top(p) + 0.01) continue;
-      by = Math.max(by, (out.get(q) ?? 0) + Math.max(0, q.needed - q.el.h));
+      if (topOf(q.el) >= pt) break;
+      if (bottomOf(q.el) > pt + 0.01 || leftOf(q.el) >= pr - 0.01 || pl >= rightOf(q.el) - 0.01) continue;
+      above.push(q);
+      if (!nearest3 || bottomOf(q.el) > bottomOf(nearest3.el) + 0.01) nearest3 = q;
+    }
+    for (const q of above) {
+      if (q.collapsed) continue;
+      const by2 = (off.get(q) ?? 0) + growth(q);
+      if (by2 > 0 && !above.some((c) => c.collapsed && topOf(c.el) >= bottomOf(q.el) - 0.01)) pushed = Math.max(pushed, by2);
+      floor = Math.max(floor, bottomOf(q.el) + by2 - pt);
+    }
+    if (!nearest3) continue;
+    const base2 = nearest3.collapsed ? topOf(nearest3.el) + (off.get(nearest3) ?? 0) - pt : (off.get(nearest3) ?? 0) + growth(nearest3);
+    const by = Math.max(base2, pushed, floor);
+    if (Math.abs(by) > 1e-9) off.set(p, by);
+  }
+  return off;
+}
+function stretchRows(slots) {
+  for (const s of slots) {
+    if (s.el.stretch !== "row" || s.hidden) continue;
+    for (const o of slots) {
+      if (!o.hidden && Math.abs(o.el.y - s.el.y) < 0.01 && Math.abs(o.el.h - s.el.h) < 0.01) s.needed = Math.max(s.needed, o.needed);
     }
-    if (by > 0) out.set(p, by);
   }
-  return out;
 }
 function addAnchor(out, el, ctx, left, top, y, h, hidden) {
   if (!el.id) return;
@@ -3075,29 +3102,47 @@ function addAnchor(out, el, ctx, left, top, y, h, hidden) {
 }
 function renderBand(band, scope, ctx, left, top, minHeight = 0) {
   const bandGrow = band.canGrow ?? (ctx.kind === "detail" || ctx.kind === "groupHeader" || ctx.kind === "groupFooter" || ctx.kind === "summary" || ctx.kind === "title");
-  const prepared = [];
+  const slots = [];
   const anchors = ctx.anchors && !ctx.blank ? [] : void 0;
+  let collapsed = false, rows = false;
   for (const el of band.elements) {
     if (el.visible && !ctx.blank && !truthy(evaluate(el.visible, scope))) {
-      if (anchors) addAnchor(anchors, el, ctx, left, top, el.y, el.h, true);
+      if (el.collapse) collapsed = true;
+      slots.push({ el, style: resolveStyle(ctx.def, el), needed: el.h, hidden: true, collapsed: !!el.collapse });
       continue;
     }
-    prepared.push(prepare(el, scope, ctx, bandGrow));
+    if (el.stretch === "row") rows = true;
+    slots.push(prepare(el, scope, ctx, bandGrow));
   }
-  const shift2 = shifts(prepared);
+  if (rows) stretchRows(slots);
+  const shift2 = shifts(slots);
+  const yOf = (s) => shift2 ? s.el.y + (shift2.get(s) ?? 0) : s.el.y;
   let height = Math.max(band.height, minHeight);
-  for (const p of prepared) height = Math.max(height, p.el.y + (shift2?.get(p) ?? 0) + p.needed);
+  if (collapsed) {
+    let lowest = 0, lowestNew = 0;
+    for (const s of slots) {
+      lowest = Math.max(lowest, bottomOf(s.el));
+      if (!s.hidden) lowestNew = Math.max(lowestNew, yOf(s) + Math.max(s.needed, 0));
+    }
+    height = Math.max(minHeight, lowestNew + Math.max(0, band.height - lowest));
+  } else for (const s of slots) if (!s.hidden) height = Math.max(height, yOf(s) + s.needed);
   const items = [];
   const bg = ctx.background ?? band.background;
   if (bg) items.push({ kind: "box", x: left, y: top, w: ctx.width, h: height, fill: bg, source: { band: ctx.kind, row: ctx.rowIndex } });
-  for (const p of prepared) {
+  for (const p of slots) {
     const el = p.el;
-    const elY = shift2 ? el.y + (shift2.get(p) ?? 0) : el.y;
+    const elY = yOf(p);
+    if (p.hidden) {
+      if (anchors) addAnchor(anchors, el, ctx, left, top, elY, el.h, true);
+      continue;
+    }
     const touchesBottom = el.y + el.h >= band.height - 0.01;
+    const follows = el.stretch === "row" ? touchesBottom : el.stretch ?? touchesBottom;
     let h = p.needed;
-    if ((el.stretch ?? touchesBottom) && el.type !== "line" && el.type !== "table" && el.type !== "crosstab") h = Math.max(h, height - elY);
+    if (follows && el.type !== "line" && el.type !== "table" && el.type !== "crosstab") h = Math.max(h, height - elY);
+    if (el.type === "line") h = el.h === 0 ? 0 : el.stretch === "row" ? p.needed : touchesBottom ? Math.max(el.h, height - elY) : el.h;
     const x = left + el.x, y = top + elY;
-    if (anchors) addAnchor(anchors, el, ctx, left, top, elY, el.type === "line" ? el.h === 0 ? 0 : el.y + el.h >= band.height - 0.01 ? Math.max(el.h, height - elY) : el.h : h);
+    if (anchors) addAnchor(anchors, el, ctx, left, top, elY, h);
     switch (el.type) {
       case "text":
       case "field": {
@@ -3112,8 +3157,7 @@ function renderBand(band, scope, ctx, left, top, minHeight = 0) {
         break;
       }
       case "line": {
-        const lh = el.h === 0 ? 0 : el.y + el.h >= band.height - 0.01 ? Math.max(el.h, height - elY) : el.h;
-        items.push({ kind: "line", x1: x, y1: y, x2: x + el.w, y2: y + lh, width: el.width ?? 0.2, color: el.color ?? "#000000", dash: el.dash, source: { band: ctx.kind, elementId: el.id } });
+        items.push({ kind: "line", x1: x, y1: y, x2: x + el.w, y2: y + h, width: el.width ?? 0.2, color: el.color ?? "#000000", dash: el.dash, source: { band: ctx.kind, elementId: el.id } });
         break;
       }
       case "rect": {
@@ -3352,7 +3396,10 @@ function paginate(def, data, opts, knownTotal, docHash) {
   const place = (band, kind, scope, extra = {}, pre) => {
     const r = pre ? { height: pre.height, items: shiftItems(pre.items, y), anchors: pre.anchors?.map((a) => ({ ...a, y: a.y + y })) } : renderBand(band, scope, ctxFor(kind, extra), ml, y);
     for (const it of r.items) page.items.push(it);
-    if (r.anchors) (page.anchors ?? (page.anchors = [])).push(...r.anchors);
+    if (r.anchors) {
+      for (const a of r.anchors) if (a.y + a.h > limit + 0.01) a.offPage = true;
+      (page.anchors ?? (page.anchors = [])).push(...r.anchors);
+    }
     y += r.height;
     hasBody = true;
     return r.height;
@@ -3474,7 +3521,7 @@ function paginate(def, data, opts, knownTotal, docHash) {
     draw(b.pageFooter, "pageFooter", geo.height - mb - footerH);
     p.items.push(...extraItems);
   });
-  decoratePages(pages, { watermark: def.watermark, emboss: def.emboss }, geo, (p, i) => ({
+  decoratePages(pages, { watermark: def.watermark, emboss: def.emboss, locale }, geo, (p, i) => ({
     ...allScope,
     rows: pageRows[i],
     pageRows: pageRows[i],
@@ -3873,10 +3920,10 @@ function dataToXlsx(def, data, opts = {}) {
   rows.forEach((row, i) => {
     const scope = { ...base2, row, vars: { ...base2.vars, rowNum: i + 1, rowIndex: i + 1 } };
     out.push(cols.map((c) => {
-      if (c.type === "text") return { v: interpolate(c.text, scope) };
+      if (c.type === "text") return { v: interpolate(c.text, scope, opts.locale) };
       const v = evaluate(c.expr, scope);
       if (typeof v === "number" || v instanceof Date) return { v, s: { fmt: excelFormat(c.format) } };
-      return { v: v == null ? "" : formatValue(v, c.format) };
+      return { v: v == null ? "" : formatValue(v, c.format, opts.locale) };
     }));
   });
   const widths = cols.map((c, i) => Math.min(60, Math.max(6, String(header[i].v ?? "").length * 2, c.w / MM_PER_CHAR)));
@@ -3896,7 +3943,7 @@ function dataToCsv(def, data, opts = {}) {
     const scope = { ...base2, row, vars: { ...base2.vars, rowNum: i + 1 } };
     lines.push(fields.map((f2) => {
       const v = evaluate(f2.expr, scope);
-      return typeof v === "number" ? q(String(v), true) : q(formatValue(v, f2.format));
+      return typeof v === "number" ? q(String(v), true) : q(formatValue(v, f2.format, opts.locale));
     }).join(","));
   });
   return "\uFEFF" + lines.join("\r\n");
@@ -5669,7 +5716,7 @@ function createReport(definition, data = {}, opts = {}) {
     },
     async toXlsx(mode = "form") {
       if (!await allowed(mode === "data" ? "xlsx-data" : "xlsx")) return null;
-      const bytes = mode === "data" ? dataToXlsx(def, rows, { params }) : pagesToXlsx(layout(), def);
+      const bytes = mode === "data" ? dataToXlsx(def, rows, { params, locale: opts.locale }) : pagesToXlsx(layout(), def);
       return new Blob([bytes], { type: MIME.xlsx });
     },
     async toHwpx() {
@@ -5678,7 +5725,7 @@ function createReport(definition, data = {}, opts = {}) {
     },
     async toCsv() {
       if (!await allowed("csv")) return null;
-      return new Blob([dataToCsv(def, rows, { params })], { type: MIME.csv });
+      return new Blob([dataToCsv(def, rows, { params, locale: opts.locale })], { type: MIME.csv });
     },
     async download(kind, fileName) {
       const base2 = safeName(fileName ?? def.name ?? "report");
@@ -5966,12 +6013,22 @@ function createViewer(el, options) {
   let runSeq = 0;
   let runs = 0;
   let latest = Promise.resolve();
-  const setState = (state) => {
-    el.dataset.frState = state;
+  let running = false, deciding = 0;
+  let outcome = null;
+  const showState = () => {
+    if (destroyed) return;
+    el.dataset.frState = running || deciding ? "busy" : outcome ?? "busy";
+  };
+  const finish = (how) => {
+    running = false;
+    outcome = how;
+    el.dataset.frRun = String(++runs);
+    showState();
   };
   const runOnce = async (seq2) => {
     busy(t.loading);
-    setState("busy");
+    running = true;
+    showState();
     let during = "data";
     const stale = () => seq2 !== runSeq;
     try {
@@ -5988,8 +6045,7 @@ function createViewer(el, options) {
       result = report.layout();
       reported = -1;
       build();
-      el.dataset.frRun = String(++runs);
-      setState("ready");
+      finish("ready");
       try {
         options.onReady?.({ pages: result.pages.length, rows: result.rowCount, ms: result.ms, params: { ...params } });
       } catch (e) {
@@ -5997,10 +6053,10 @@ function createViewer(el, options) {
       }
     } catch (e) {
       if (stale()) return await latest;
+      if (destroyed) return;
       const err = fail(e, during);
       pagesEl.innerHTML = `<p class="fr-empty">${t.error}: ${escapeHtml(err.message)}</p>`;
-      el.dataset.frRun = String(++runs);
-      setState("error");
+      finish("error");
     } finally {
       if (!stale()) busy(null);
     }
@@ -6136,18 +6192,20 @@ function createViewer(el, options) {
       const v = inp.value;
       next[inp.name] = type === "number" ? v === "" ? null : Number(v) : type === "boolean" ? v === "true" : v;
     });
-    const before = el.dataset.frState;
-    setState("busy");
+    deciding++;
+    showState();
     let answer;
     try {
       answer = await options.onParamsSubmit?.({ ...next });
     } catch (x) {
       fail(x, "data");
-      setState(before ?? "ready");
+      deciding--;
+      showState();
       return;
     }
+    deciding--;
     if (answer === false) {
-      setState(before ?? "ready");
+      showState();
       return;
     }
     params = answer && typeof answer === "object" ? { ...next, ...answer } : next;
@@ -6428,7 +6486,13 @@ var L = {
     suppress: "\uAC19\uC740 \uAC12 \uBC18\uBCF5 \uC228\uAE30\uAE30",
     visible: "\uD45C\uC2DC \uC870\uAC74 (\uC2DD)",
     canGrow: "\uB0B4\uC6A9\uC5D0 \uB9DE\uCDB0 \uB298\uB9AC\uAE30",
-    stretch: "\uBC34\uB4DC \uB192\uC774 \uB530\uB77C\uAC00\uAE30",
+    stretch: "\uB192\uC774 \uB9DE\uCD94\uAE30",
+    stretchAuto: "\uAE30\uBCF8 (\uBC34\uB4DC \uBC14\uB2E5\uC5D0 \uB2FF\uC73C\uBA74 \uBC34\uB4DC \uB192\uC774)",
+    stretchBand: "\uBC34\uB4DC \uB192\uC774",
+    stretchRow: "\uAC19\uC740 \uC904\uC758 \uAC00\uC7A5 \uB192\uC740 \uCE78",
+    stretchNone: "\uB9DE\uCD94\uC9C0 \uC54A\uC74C",
+    shift: "\uC704 \uC694\uC18C\uAC00 \uB298\uBA74 \uD568\uAED8 \uB0B4\uB824\uAC00\uAE30",
+    collapse: "\uC228\uC73C\uBA74 \uC790\uB9AC \uC811\uAE30 (\uC544\uB798 \uC694\uC18C\uAC00 \uC62C\uB77C\uC634)",
     style: "\uC2A4\uD0C0\uC77C",
     bold: "\uAD75\uAC8C",
     italic: "\uAE30\uC6B8\uC784",
@@ -6542,7 +6606,13 @@ var L = {
     suppress: "Hide repeated values",
     visible: "Visible when (expression)",
     canGrow: "Grow to fit content",
-    stretch: "Follow band height",
+    stretch: "Height",
+    stretchAuto: "Default (band height when touching its bottom)",
+    stretchBand: "Band height",
+    stretchRow: "Tallest cell on the same row",
+    stretchNone: "Own height",
+    shift: "Move down when an element above grows",
+    collapse: "Give the space back when hidden",
     style: "Style",
     bold: "Bold",
     italic: "Italic",
@@ -6801,7 +6871,16 @@ function elementFields(els, t, def) {
     out.push({ label: t.shrink, kind: "check", get: () => !!same((e) => !!e.style?.shrinkToFit), set: (v) => styleSet("shrinkToFit")(v) });
     out.push({ label: t.canGrow, kind: "check", get: () => same((e) => e.canGrow !== false), set: (v) => setAll((e) => v ? delete e.canGrow : e.canGrow = false) });
   }
+  out.push({
+    label: t.stretch,
+    kind: "select",
+    options: [{ value: "", label: t.stretchAuto }, { value: "band", label: t.stretchBand }, { value: "row", label: t.stretchRow }, { value: "none", label: t.stretchNone }],
+    get: () => same((e) => e.stretch === void 0 ? "" : e.stretch === "row" ? "row" : e.stretch ? "band" : "none"),
+    set: (v) => setAll((e) => v === "row" ? e.stretch = "row" : v === "band" ? e.stretch = true : v === "none" ? e.stretch = false : delete e.stretch)
+  });
+  out.push({ label: t.shift, kind: "check", get: () => same((e) => e.shift !== false), set: (v) => setAll((e) => v ? delete e.shift : e.shift = false) });
   out.push({ label: t.visible, kind: "expr", wide: true, get: () => same((e) => e.visible ?? "") ?? "", set: (v) => setAll((e) => v ? e.visible = String(v) : delete e.visible) });
+  out.push({ label: t.collapse, kind: "check", get: () => same((e) => !!e.collapse), set: (v) => setAll((e) => v ? e.collapse = true : delete e.collapse) });
   return out;
 }
 function bandFields(band, label, t, group, isDetail) {
@@ -7967,7 +8046,7 @@ async function renderPdf(def, data = {}, opts = {}) {
   return writePdf(layout.pages, { title: def.name, creator: "FreeReport", ...opts.pdf, fonts: { default: first, ...fonts } });
 }
 async function renderXlsx(def, data = {}, opts = {}) {
-  if (opts.mode === "data") return dataToXlsx(def, data, { params: opts.params });
+  if (opts.mode === "data") return dataToXlsx(def, data, { params: opts.params, locale: opts.locale });
   const { layout } = await prepare2(def, data, opts);
   return pagesToXlsx(layout, def);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freereportjs/core",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "FreeReport — a web reporting engine (free for personal use): banded report designer, paged viewer, printing, PDF with embedded Korean fonts, Excel export.",
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",