@4399ywkf/editor 0.2.0 → 0.3.0

package/dist/docx.js

@@ -2,6 +2,20 @@ import { Node, mergeAttributes, Extension } from '@tiptap/core';
 import { unzipSync, zipSync } from 'fflate';
 
 // src/docx/index.ts
+
+// src/docx/measure.ts
+function measureContentWidth(dom) {
+  const el = dom;
+  if (!el || typeof globalThis.getComputedStyle !== "function") return void 0;
+  const cs = globalThis.getComputedStyle(el);
+  const w = el.clientWidth - (Number.parseFloat(cs.paddingLeft) || 0) - (Number.parseFloat(cs.paddingRight) || 0);
+  return Number.isFinite(w) && w > 0 ? w : void 0;
+}
+function tableCellMinWidth(editor) {
+  const ext = editor.extensionManager?.extensions?.find((e) => e.name === "table");
+  const v = ext?.options?.cellMinWidth;
+  return typeof v === "number" && v > 0 ? v : void 0;
+}
 var DocxField = Node.create({
   name: "docxField",
   group: "inline",
@@ -86,12 +100,34 @@ var DocxInk = Node.create({
 
 // src/docx/parse.ts
 var EMU_PER_PX = 9525;
+var HIGHLIGHT = {
+  black: "#000000",
+  blue: "#0000FF",
+  cyan: "#00FFFF",
+  green: "#008000",
+  magenta: "#FF00FF",
+  red: "#FF0000",
+  yellow: "#FFFF00",
+  white: "#FFFFFF",
+  darkBlue: "#000080",
+  darkCyan: "#008080",
+  darkGreen: "#006400",
+  darkMagenta: "#800080",
+  darkRed: "#800000",
+  darkYellow: "#808000",
+  darkGray: "#808080",
+  lightGray: "#C0C0C0"
+};
 var decoder = new TextDecoder("utf-8");
 function parseDocx(entries, opts) {
   const { DOMParser } = opts;
   const recovered = {
     styleFormat: 0,
     directFormat: 0,
+    charStyles: 0,
+    fontSizes: 0,
+    fontFamilies: 0,
+    highlights: 0,
     fields: 0,
     ink: 0,
     floatImages: 0,
@@ -102,6 +138,9 @@ function parseDocx(entries, opts) {
     tableCells: 0,
     mergedCells: 0,
     cellShading: 0,
+    paraShading: 0,
+    paraSpacing: 0,
+    paraIndent: 0,
     lists: 0,
     listItems: 0
   };
@@ -125,6 +164,7 @@ function parseDocx(entries, opts) {
   }
   const STYLE_NAME = {};
   const STYLE_FMT = {};
+  const STYLE_PPR = {};
   const STYLE_BASE = {};
   const stylesDoc = xml("word/styles.xml");
   if (stylesDoc) {
@@ -134,9 +174,10 @@ function parseDocx(entries, opts) {
       const name = s.getElementsByTagName("w:name")[0]?.getAttribute("w:val");
       if (name) STYLE_NAME[id] = name;
       STYLE_BASE[id] = s.getElementsByTagName("w:basedOn")[0]?.getAttribute("w:val") ?? null;
-      const rPr = Array.from(s.childNodes).find(
-        (c) => c.nodeType === 1 && c.nodeName === "w:rPr"
-      );
+      const own = Array.from(s.childNodes).filter((c) => c.nodeType === 1);
+      const pPr = own.find((c) => c.nodeName === "w:pPr");
+      if (pPr) STYLE_PPR[id] = pPr;
+      const rPr = own.find((c) => c.nodeName === "w:rPr");
       if (!rPr) continue;
       STYLE_FMT[id] = readFmt(rPr);
     }
@@ -146,15 +187,29 @@ function parseDocx(entries, opts) {
       const e = rPr.getElementsByTagName(t)[0];
       if (!e) return void 0;
       const v = e.getAttribute("w:val");
-      return v !== "0" && v !== "false" && v !== "none" ? true : void 0;
+      return v === "0" || v === "false" || v === "none" || v === "off" ? false : true;
     };
     const color = rPr.getElementsByTagName("w:color")[0]?.getAttribute("w:val");
+    const szRaw = rPr.getElementsByTagName("w:sz")[0]?.getAttribute("w:val");
+    const szNum = szRaw ? Number(szRaw) : Number.NaN;
+    const size = Number.isFinite(szNum) && szNum > 0 ? `${szNum / 2}pt` : void 0;
+    const rf = rPr.getElementsByTagName("w:rFonts")[0];
+    const stack = [rf?.getAttribute("w:ascii"), rf?.getAttribute("w:hAnsi"), rf?.getAttribute("w:eastAsia")].filter((n) => Boolean(n)).filter((n, i, a) => a.indexOf(n) === i).map((n) => /[\s,]/.test(n) ? `"${n}"` : n);
+    const font = stack.length ? stack.join(", ") : void 0;
+    const hlName = rPr.getElementsByTagName("w:highlight")[0]?.getAttribute("w:val");
+    const shdFill = rPr.getElementsByTagName("w:shd")[0]?.getAttribute("w:fill");
+    const highlight = hlName && hlName !== "none" ? HIGHLIGHT[hlName] ?? void 0 : shdFill && shdFill !== "auto" && shdFill !== "FFFFFF" ? `#${shdFill}` : void 0;
+    const va = rPr.getElementsByTagName("w:vertAlign")[0]?.getAttribute("w:val");
     return {
       b: on("w:b"),
       i: on("w:i"),
       u: on("w:u"),
       strike: on("w:strike"),
-      color: color && color !== "auto" ? `#${color}` : void 0
+      color: color && color !== "auto" ? `#${color}` : void 0,
+      size,
+      font,
+      highlight,
+      vertAlign: va === "superscript" || va === "subscript" ? va : void 0
     };
   }
   function resolveStyleFmt(id, seen = /* @__PURE__ */ new Set()) {
@@ -172,7 +227,22 @@ function parseDocx(entries, opts) {
     if (f.i) marks.push({ type: "italic" });
     if (f.u) marks.push({ type: "underline" });
     if (f.strike) marks.push({ type: "strike" });
-    if (f.color) marks.push({ type: "textStyle", attrs: { color: f.color } });
+    const ts = {};
+    if (f.color) ts.color = f.color;
+    if (f.size) {
+      ts.fontSize = f.size;
+      recovered.fontSizes += 1;
+    }
+    if (f.font) {
+      ts.fontFamily = f.font;
+      recovered.fontFamilies += 1;
+    }
+    if (Object.keys(ts).length) marks.push({ type: "textStyle", attrs: ts });
+    if (f.highlight) {
+      marks.push({ type: "highlight", attrs: { color: f.highlight } });
+      recovered.highlights += 1;
+    }
+    if (f.vertAlign) marks.push({ type: f.vertAlign });
     return marks;
   }
   const mediaCache = /* @__PURE__ */ new Map();
@@ -192,6 +262,7 @@ function parseDocx(entries, opts) {
   }
   const docXml = xml("word/document.xml");
   if (!docXml) throw new Error("这不是一个有效的 .docx：缺少 word/document.xml");
+  const documentXml = docXml;
   const kids = (n) => Array.from(n.childNodes).filter((c) => c.nodeType === 1);
   const first = (n, name) => n.getElementsByTagName(name)[0] ?? null;
   function readDrawing(dr) {
@@ -264,7 +335,14 @@ function parseDocx(entries, opts) {
     const rPr = first(r, "w:rPr");
     const direct = rPr ? readFmt(rPr) : {};
     if (rPr && Object.values(direct).some((v) => v !== void 0)) recovered.directFormat += 1;
-    const marks = fmtToMarks({ ...inherited, ...stripUndefined(direct) });
+    const rStyleId = rPr ? rPr.getElementsByTagName("w:rStyle")[0]?.getAttribute("w:val") ?? null : null;
+    const charFmt = rStyleId ? resolveStyleFmt(rStyleId) : {};
+    if (rStyleId && Object.values(charFmt).some((v) => v !== void 0)) recovered.charStyles += 1;
+    const marks = fmtToMarks({
+      ...inherited,
+      ...stripUndefined(charFmt),
+      ...stripUndefined(direct)
+    });
     for (const c of kids(r)) {
       const t = c.nodeName;
       if (t === "w:t") {
@@ -340,17 +418,63 @@ function parseDocx(entries, opts) {
       }
     }
   }
+  function paraLayout(pPr, count = true) {
+    const attrs = {};
+    const jc = first(pPr, "w:jc")?.getAttribute("w:val");
+    if (jc) attrs.textAlign = jc === "both" ? "justify" : jc;
+    const fill = first(pPr, "w:shd")?.getAttribute("w:fill");
+    if (fill && fill !== "auto" && fill !== "FFFFFF") {
+      attrs.backgroundColor = `#${fill}`;
+      if (count) recovered.paraShading += 1;
+    }
+    const ind = first(pPr, "w:ind");
+    const left = Number(ind?.getAttribute("w:left") ?? ind?.getAttribute("w:start") ?? 0);
+    if (left > 0) {
+      attrs.indent = Math.min(8, Math.max(1, Math.round(left / 420)));
+      if (count) recovered.paraIndent += 1;
+    }
+    const sp = first(pPr, "w:spacing");
+    if (sp) {
+      let touched = false;
+      const line = Number(sp.getAttribute("w:line") ?? 0);
+      if (line > 0) {
+        const rule = sp.getAttribute("w:lineRule") ?? "auto";
+        attrs.lineHeight = rule === "auto" ? String(Math.round(line / 240 * 100) / 100) : `${line / 20}pt`;
+        touched = true;
+      }
+      const before = sp.getAttribute("w:before");
+      if (before != null && sp.getAttribute("w:beforeAutospacing") !== "1") {
+        attrs.spaceBefore = `${Number(before) / 20}pt`;
+        touched = true;
+      }
+      const after = sp.getAttribute("w:after");
+      if (after != null && sp.getAttribute("w:afterAutospacing") !== "1") {
+        attrs.spaceAfter = `${Number(after) / 20}pt`;
+        touched = true;
+      }
+      if (touched && count) recovered.paraSpacing += 1;
+    }
+    return attrs;
+  }
+  function resolveStylePara(id, seen = /* @__PURE__ */ new Set()) {
+    if (!id || seen.has(id)) return {};
+    seen.add(id);
+    const pPr = STYLE_PPR[id];
+    return {
+      ...resolveStylePara(STYLE_BASE[id] ?? null, seen),
+      ...pPr ? paraLayout(pPr, false) : {}
+    };
+  }
   function paragraph(p) {
     const pPr = first(p, "w:pPr");
     const styleId = pPr ? first(pPr, "w:pStyle")?.getAttribute("w:val") ?? null : null;
     const styleName = styleId ? STYLE_NAME[styleId] ?? styleId : null;
-    const jc = pPr ? first(pPr, "w:jc")?.getAttribute("w:val") : null;
     const styleFmt = resolveStyleFmt(styleId);
     if (Object.values(styleFmt).some((v) => v !== void 0)) recovered.styleFormat += 1;
     const out = { inline: [], blocks: [] };
     childrenInto(p, out, styleFmt);
-    const attrs = {};
-    if (jc) attrs.textAlign = jc;
+    const attrs = { ...resolveStylePara(styleId) };
+    if (pPr) Object.assign(attrs, paraLayout(pPr));
     const heading = /^heading\s*(\d)$/i.exec(styleName ?? "");
     const blocks = [];
     const hasContent = out.inline.length > 0;
@@ -367,6 +491,45 @@ function parseDocx(entries, opts) {
     return blocks;
   }
   const dxaToPx = (v) => v ? Math.round(Number(v) / 15) : null;
+  const sectionTextWidthPx = (() => {
+    const sects = documentXml.getElementsByTagName("w:sectPr");
+    const sect = sects[sects.length - 1];
+    if (!sect) return null;
+    const num = (tag, attr) => Number(sect.getElementsByTagName(tag)[0]?.getAttribute(attr) ?? Number.NaN);
+    const text2 = num("w:pgSz", "w:w") - num("w:pgMar", "w:left") - num("w:pgMar", "w:right");
+    return Number.isFinite(text2) && text2 > 0 ? text2 / 15 : null;
+  })();
+  function fitColumns(pxWidths) {
+    const basis = opts.contentWidthPx;
+    const usable = typeof basis === "number" && Number.isFinite(basis) && basis > 0 && sectionTextWidthPx !== null && sectionTextWidthPx > 0;
+    const scale = usable ? basis / sectionTextWidthPx : 1;
+    let out = pxWidths.map((w) => w * scale);
+    const min = opts.minColumnWidthPx ?? 0;
+    if (min > 0) {
+      const total = out.reduce((a, b) => a + b, 0);
+      const pinned = out.map(() => false);
+      for (let round = 0; round < out.length; round++) {
+        const freeTotal = total - out.reduce((a, w, i) => a + (pinned[i] ? min : 0), 0);
+        const freeSum = out.reduce((a, w, i) => a + (pinned[i] ? 0 : w), 0);
+        if (freeSum <= 0 || freeTotal <= 0) break;
+        const k = freeTotal / freeSum;
+        const short = out.map((w, i) => !pinned[i] && w * k < min);
+        if (!short.some(Boolean)) {
+          out = out.map((w, i) => pinned[i] ? min : w * k);
+          break;
+        }
+        short.forEach((s, i) => {
+          if (s) pinned[i] = true;
+        });
+      }
+      out = out.map((w, i) => pinned[i] ? Math.max(w, min) : w);
+    }
+    const target = Math.round(out.reduce((a, b) => a + b, 0));
+    const rounded = out.map((w) => Math.round(w));
+    const drift = target - rounded.reduce((a, b) => a + b, 0);
+    if (drift !== 0 && rounded.length) rounded[rounded.length - 1] += drift;
+    return rounded.map((w) => Math.max(1, w));
+  }
   function readRows(tbl) {
     const rows = [];
     for (const tr of kids(tbl)) {
@@ -404,7 +567,7 @@ function parseDocx(entries, opts) {
     const grid = first(tbl, "w:tblGrid");
     const rawWidths = grid ? kids(grid).filter((g) => g.nodeName === "w:gridCol").map((g) => dxaToPx(g.getAttribute("w:w"))) : [];
     const sane = rawWidths.length > 0 && rawWidths.every((w) => w != null && w >= 20);
-    const colWidths = useAbsoluteWidths && sane ? rawWidths : [];
+    const colWidths = useAbsoluteWidths && sane ? fitColumns(rawWidths) : [];
     if (rawWidths.length > 0 && colWidths.length === 0) {
       warnings.push(
         `表格列宽未采信（tblW type=${tblWType ?? "未指定"}），改为自动分配 —— gridCol 原值 ${rawWidths.slice(0, 4).join("/")}`
@@ -543,12 +706,89 @@ function parseDocx(entries, opts) {
   if (!body) throw new Error("docx 缺少 w:body");
   const content = blocksOf(body);
   const doc = remapTypes({ type: "doc", content }, opts.prosemirrorNodes, opts.prosemirrorMarks);
+  const section = readSection();
+  const defaultHeader = section.refs.find((r) => r.kind === "header" && r.type === "default");
+  const defaultFooter = section.refs.find((r) => r.kind === "footer" && r.type === "default");
   return {
     doc,
     recovered,
     warnings,
-    ...opts.cssStyles ? { css: extractCss(stylesDoc) } : {}
+    ...opts.cssStyles ? { css: extractCss(stylesDoc) } : {},
+    header: defaultHeader ? partContent(defaultHeader.path, "w:hdr") : null,
+    footer: defaultFooter ? partContent(defaultFooter.path, "w:ftr") : null,
+    section
   };
+  function partContent(path, root) {
+    const d = xml(path);
+    const el = d?.getElementsByTagName(root)[0];
+    if (!el) return null;
+    return remapTypes(
+      { type: "doc", content: blocksOf(el) },
+      opts.prosemirrorNodes,
+      opts.prosemirrorMarks
+    );
+  }
+  function resolveRelative(fromPart, target) {
+    const segs = fromPart.split("/").slice(0, -1);
+    for (const s of target.split("/")) {
+      if (s === "" || s === ".") continue;
+      if (s === "..") segs.pop();
+      else segs.push(s);
+    }
+    return segs.join("/");
+  }
+  function collectPart(path, into) {
+    const bytes = entries.read(path);
+    if (!bytes) {
+      warnings.push(`页眉/页脚部件缺失，已跳过：${path}`);
+      return false;
+    }
+    into[path] = bytes;
+    const relsPath = path.replace(/([^/]+)$/, "_rels/$1.rels");
+    const relBytes = entries.read(relsPath);
+    if (!relBytes) return true;
+    into[relsPath] = relBytes;
+    const relsDom = new DOMParser().parseFromString(decoder.decode(relBytes), "text/xml");
+    for (const r of Array.from(relsDom.getElementsByTagName("Relationship"))) {
+      if (r.getAttribute("TargetMode") === "External") continue;
+      const target = r.getAttribute("Target");
+      if (!target || /^[a-z]+:\/\//i.test(target)) continue;
+      const dep = resolveRelative(path, target);
+      const b = entries.read(dep);
+      if (b) into[dep] = b;
+    }
+    return true;
+  }
+  function readSection() {
+    const files = {};
+    const refs = [];
+    const sects = documentXml.getElementsByTagName("w:sectPr");
+    const sect = sects[sects.length - 1];
+    if (sect) {
+      for (const kind of ["header", "footer"]) {
+        for (const ref of Array.from(sect.getElementsByTagName(`w:${kind}Reference`))) {
+          const rid = ref.getAttribute("r:id");
+          const target = rid ? REL[rid] : void 0;
+          if (!rid || !target) continue;
+          const path = `word/${target.replace(/^\.\//, "")}`;
+          if (!collectPart(path, files)) continue;
+          refs.push({ kind, type: ref.getAttribute("w:type") ?? "default", rid, path });
+        }
+      }
+    }
+    return {
+      sectPrXml: rawSectPr(),
+      refs,
+      files,
+      settingsXml: text("word/settings.xml")
+    };
+  }
+  function rawSectPr() {
+    const src = text("word/document.xml");
+    if (!src) return null;
+    const all = src.match(/<w:sectPr\b[^>]*(?:\/>|>[\s\S]*?<\/w:sectPr>)/g);
+    return all?.length ? all[all.length - 1] : null;
+  }
   function extractCss(sd) {
     if (!sd) return "";
     const defRPr = sd.getElementsByTagName("w:rPrDefault")[0]?.getElementsByTagName("w:rPr")[0];
@@ -635,6 +875,52 @@ function serializeDocx(doc, opts = {}) {
   const mediaExts = /* @__PURE__ */ new Set();
   let relSeq = 0;
   const imageCache = /* @__PURE__ */ new Map();
+  const carried = opts.section?.files ?? {};
+  for (const [p, b] of Object.entries(carried)) files[p] = b;
+  const pageTextWidthDxa = (() => {
+    const raw = opts.section?.sectPrXml;
+    const attr = (tag, name) => {
+      const el = raw ? new RegExp(`<w:${tag}\\b[^>]*>`).exec(raw)?.[0] : null;
+      const m = el ? new RegExp(`w:${name}="(\\d+)"`).exec(el) : null;
+      return m ? Number(m[1]) : null;
+    };
+    const w = attr("pgSz", "w");
+    const l = attr("pgMar", "left");
+    const r = attr("pgMar", "right");
+    const text = w !== null && l !== null && r !== null ? w - l - r : null;
+    return text !== null && text > 0 ? text : 11906 - 1440 - 1440;
+  })();
+  function columnsToDxa(px) {
+    const basis = opts.contentWidthPx;
+    const clamp = (arr) => {
+      const total = arr.reduce((a, b) => a + b, 0);
+      if (total <= pageTextWidthDxa || total <= 0) return arr;
+      const k = pageTextWidthDxa / total;
+      return arr.map((w) => Math.max(1, Math.round(w * k)));
+    };
+    if (typeof basis === "number" && Number.isFinite(basis) && basis > 0) {
+      const k = pageTextWidthDxa / basis;
+      return clamp(px.map((w) => Math.max(1, Math.round(w * k))));
+    }
+    return clamp(px.map((w) => Math.max(1, Math.round(w * PX_TO_DXA))));
+  }
+  const ridMap = /* @__PURE__ */ new Map();
+  const hdrFtrOverrides = [];
+  for (const ref of opts.section?.refs ?? []) {
+    if (!files[ref.path]) continue;
+    const id = `rHF${ridMap.size + 1}`;
+    ridMap.set(ref.rid, id);
+    rels.push(
+      `<Relationship Id="${id}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/${ref.kind}" Target="${esc(ref.path.replace(/^word\//, ""))}"/>`
+    );
+    hdrFtrOverrides.push(
+      `<Override PartName="/${esc(ref.path)}" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.${ref.kind}+xml"/>`
+    );
+  }
+  for (const p of Object.keys(carried)) {
+    const ext = /\.([a-z0-9]+)$/i.exec(p)?.[1]?.toLowerCase();
+    if (ext && ext !== "xml" && ext !== "rels") mediaExts.add(ext);
+  }
   function addImage(src) {
     if (imageCache.has(src)) return imageCache.get(src) ?? null;
     const bytes = opts.resolveImage?.(src) ?? null;
@@ -646,7 +932,9 @@ function serializeDocx(doc, opts = {}) {
     const ext = sniffExt(bytes);
     mediaExts.add(ext);
     const id = `rImg${++relSeq}`;
-    const name = `image${relSeq}.${ext}`;
+    let n = relSeq;
+    while (files[`word/media/image${n}.${ext}`]) n += 1;
+    const name = `image${n}.${ext}`;
     files[`word/media/${name}`] = bytes;
     rels.push(
       `<Relationship Id="${id}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="media/${name}"/>`
@@ -673,16 +961,25 @@ function serializeDocx(doc, opts = {}) {
   function runProps(marks = []) {
     const p = [];
     const has = (t) => marks.some((m) => m.type === t);
+    const ts = marks.find((m) => m.type === "textStyle")?.attrs ?? {};
+    const fam = cssFontStack(ts.fontFamily);
+    if (fam) {
+      p.push(
+        `<w:rFonts w:ascii="${esc(fam.ascii)}" w:hAnsi="${esc(fam.ascii)}" w:eastAsia="${esc(fam.eastAsia)}" w:cs="${esc(fam.ascii)}"/>`
+      );
+    }
     if (has("bold")) p.push("<w:b/>");
     if (has("italic")) p.push("<w:i/>");
-    if (has("underline")) p.push('<w:u w:val="single"/>');
     if (has("strike")) p.push("<w:strike/>");
-    if (has("superscript")) p.push('<w:vertAlign w:val="superscript"/>');
-    if (has("subscript")) p.push('<w:vertAlign w:val="subscript"/>');
-    const color = marks.find((m) => m.type === "textStyle")?.attrs?.color;
+    const color = ts.color;
     if (color) p.push(`<w:color w:val="${String(color).replace("#", "")}"/>`);
+    const halfPt = cssToHalfPoints(ts.fontSize);
+    if (halfPt) p.push(`<w:sz w:val="${halfPt}"/><w:szCs w:val="${halfPt}"/>`);
+    if (has("underline")) p.push('<w:u w:val="single"/>');
     const hl = marks.find((m) => m.type === "highlight")?.attrs?.color;
     if (hl) p.push(`<w:shd w:val="clear" w:fill="${String(hl).replace("#", "")}"/>`);
+    if (has("superscript")) p.push('<w:vertAlign w:val="superscript"/>');
+    if (has("subscript")) p.push('<w:vertAlign w:val="subscript"/>');
     return p.length ? `<w:rPr>${p.join("")}</w:rPr>` : "";
   }
   function drawing(relId, wPx, hPx, alt, float) {
@@ -744,21 +1041,35 @@ function serializeDocx(doc, opts = {}) {
     }
     return out;
   }
-  function paraProps(node, extra = []) {
-    const p = [...extra];
-    const align = node.attrs?.textAlign ?? node.attrs?.nodeTextAlign;
-    if (align && align !== "left") p.push(`<w:jc w:val="${esc(align)}"/>`);
+  function paraProps(node, lead = [], indentTwips) {
+    const p = [...lead];
     const bg = node.attrs?.backgroundColor;
     if (bg) p.push(`<w:shd w:val="clear" w:fill="${String(bg).replace("#", "")}"/>`);
-    const ind = Number(node.attrs?.indent ?? 0);
-    if (ind > 0) p.push(`<w:ind w:left="${ind * 420}"/>`);
+    const sp = [];
+    const before = cssToTwips(node.attrs?.spaceBefore);
+    if (before !== null) sp.push(`w:before="${before}"`);
+    const after = cssToTwips(node.attrs?.spaceAfter);
+    if (after !== null) sp.push(`w:after="${after}"`);
+    const lh = String(node.attrs?.lineHeight ?? "").trim();
+    if (lh) {
+      const abs = cssToTwips(lh);
+      if (/^[\d.]+$/.test(lh)) sp.push(`w:line="${Math.round(Number(lh) * 240)}" w:lineRule="auto"`);
+      else if (abs !== null) sp.push(`w:line="${abs}" w:lineRule="atLeast"`);
+    }
+    if (sp.length) p.push(`<w:spacing ${sp.join(" ")}/>`);
+    const ind = indentTwips ?? Number(node.attrs?.indent ?? 0) * 420;
+    if (ind > 0) p.push(`<w:ind w:left="${ind}"/>`);
+    const align = node.attrs?.textAlign ?? node.attrs?.nodeTextAlign;
+    if (align && align !== "left") {
+      p.push(`<w:jc w:val="${esc(align === "justify" ? "both" : align)}"/>`);
+    }
     const ov = opts.paragraphOverrides?.(node);
     for (const [k, v] of Object.entries(ov ?? {})) p.push(`<w:${k} w:val="${esc(v)}"/>`);
     return p.length ? `<w:pPr>${p.join("")}</w:pPr>` : "";
   }
-  function paragraph(node, extraProps = []) {
+  function paragraph(node, lead = [], indentTwips) {
     stats.paragraphs += 1;
-    return `<w:p>${paraProps(node, extraProps)}${inlineToRuns(node.content)}</w:p>`;
+    return `<w:p>${paraProps(node, lead, indentTwips)}${inlineToRuns(node.content)}</w:p>`;
   }
   function heading(node) {
     stats.headings += 1;
@@ -778,8 +1089,9 @@ function serializeDocx(doc, opts = {}) {
           list(child, level + 1, out);
           continue;
         }
-        const props = firstDone ? [`<w:ind w:left="${(level + 1) * 720}"/>`] : [`<w:numPr><w:ilvl w:val="${level}"/><w:numId w:val="${numId}"/></w:numPr>`];
-        out.push(`<w:p>${paraProps(child, props)}${inlineToRuns(child.content)}</w:p>`);
+        const lead = firstDone ? [] : [`<w:numPr><w:ilvl w:val="${level}"/><w:numId w:val="${numId}"/></w:numPr>`];
+        const indent = firstDone ? (level + 1) * 720 : void 0;
+        out.push(`<w:p>${paraProps(child, lead, indent)}${inlineToRuns(child.content)}</w:p>`);
         firstDone = true;
       }
       if (!firstDone) {
@@ -814,20 +1126,24 @@ function serializeDocx(doc, opts = {}) {
         c += occupied[r][c];
       }
     });
-    const widths = [];
+    const px = [];
     for (const { cell, colSpan } of grid[0] ?? []) {
       const cw = cell?.attrs?.colwidth ?? [];
-      for (let i = 0; i < colSpan; i++) widths.push(Math.round((cw[i] ?? 100) * PX_TO_DXA));
+      for (let i = 0; i < colSpan; i++) px.push(cw[i] ?? 100);
     }
+    const widths = columnsToDxa(px);
     const gridXml = widths.map((w) => `<w:gridCol w:w="${w}"/>`).join("");
     const borders = "<w:tblBorders>" + ["top", "left", "bottom", "right", "insideH", "insideV"].map((s) => `<w:${s} w:val="single" w:sz="4" w:color="auto"/>`).join("") + "</w:tblBorders>";
-    let xml = `<w:tbl><w:tblPr><w:tblW w:type="dxa" w:w="${widths.reduce((a, b) => a + b, 0)}"/>${borders}</w:tblPr><w:tblGrid>${gridXml}</w:tblGrid>`;
+    let xml = `<w:tbl><w:tblPr><w:tblW w:type="dxa" w:w="${widths.reduce((a, b) => a + b, 0)}"/>${borders}<w:tblLayout w:type="fixed"/></w:tblPr><w:tblGrid>${gridXml}</w:tblGrid>`;
     grid.forEach((cells, r) => {
       const isHeader = (rows[r].content ?? []).some((c) => c.type === "tableHeader");
       xml += "<w:tr>";
       if (isHeader) xml += "<w:trPr><w:tblHeader/></w:trPr>";
+      let col = 0;
       for (const { cell, colSpan } of cells) {
-        const props = [];
+        const tcW = widths.slice(col, col + colSpan).reduce((a, b) => a + b, 0);
+        col += colSpan;
+        const props = [`<w:tcW w:type="dxa" w:w="${tcW || 100}"/>`];
         if (colSpan > 1) props.push(`<w:gridSpan w:val="${colSpan}"/>`);
         if (!cell) {
           props.push("<w:vMerge/>");
@@ -864,7 +1180,7 @@ function serializeDocx(doc, opts = {}) {
           out.push(table(n));
           break;
         case "blockquote":
-          for (const c of n.content ?? []) out.push(paragraph(c, ['<w:ind w:left="720"/>']));
+          for (const c of n.content ?? []) out.push(paragraph(c, [], 720));
           break;
         case "codeBlock":
           out.push(`<w:p><w:pPr><w:pStyle w:val="Code"/></w:pPr><w:r><w:rPr><w:rFonts w:ascii="Consolas" w:hAnsi="Consolas"/></w:rPr><w:t xml:space="preserve">${esc(collectText(n))}</w:t></w:r></w:p>`);
@@ -885,9 +1201,23 @@ function serializeDocx(doc, opts = {}) {
     }
     return out.join("");
   }
+  function sectPr() {
+    const raw = opts.section?.sectPrXml;
+    const refs = (opts.section?.refs ?? []).filter((r) => ridMap.has(r.rid)).map(
+      (r) => `<w:${r.kind}Reference w:type="${esc(r.type)}" r:id="${ridMap.get(r.rid)}"/>`
+    ).join("");
+    if (!raw) {
+      const geometry = '<w:pgSz w:w="11906" w:h="16838"/><w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440"/>';
+      return `<w:sectPr>${refs}${geometry}</w:sectPr>`;
+    }
+    const stripped = raw.replace(/<w:(?:header|footer)Reference\b[^>]*\/>/g, "");
+    const selfClosing = /^<w:sectPr\b([^>]*)\/>$/.exec(stripped);
+    if (selfClosing) return `<w:sectPr${selfClosing[1]}>${refs}</w:sectPr>`;
+    return stripped.replace(/^(<w:sectPr\b[^>]*>)/, `$1${refs}`);
+  }
   const bodyXml = blocks(doc.content ?? []);
   files["word/document.xml"] = enc.encode(
-    `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:document ${NS}><w:body>${bodyXml}<w:sectPr><w:pgSz w:w="11906" w:h="16838"/><w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440"/></w:sectPr></w:body></w:document>`
+    `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:document ${NS}><w:body>${bodyXml}${sectPr()}</w:body></w:document>`
   );
   const headingStyles = Array.from({ length: 9 }, (_, i) => {
     const lv = i + 1;
@@ -909,6 +1239,12 @@ function serializeDocx(doc, opts = {}) {
   files["word/numbering.xml"] = enc.encode(
     `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:numbering ${NS}>${abstractNums}${nums}</w:numbering>`
   );
+  files["word/settings.xml"] = enc.encode(
+    opts.section?.settingsXml ?? `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:settings ${NS}><w:compat><w:compatSetting w:name="compatibilityMode" w:uri="http://schemas.microsoft.com/office/word" w:val="15"/></w:compat></w:settings>`
+  );
+  rels.push(
+    `<Relationship Id="rSettings" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings" Target="settings.xml"/>`
+  );
   files["word/_rels/document.xml.rels"] = enc.encode(
     `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">${rels.join("")}</Relationships>`
   );
@@ -917,10 +1253,33 @@ function serializeDocx(doc, opts = {}) {
   );
   const defaults = ["rels", "xml", ...mediaExts];
   files["[Content_Types].xml"] = enc.encode(
-    `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">` + defaults.map((e) => `<Default Extension="${e}" ContentType="${contentTypeOf(e)}"/>`).join("") + `<Override PartName="/word/document.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"/><Override PartName="/word/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"/><Override PartName="/word/numbering.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml"/></Types>`
+    `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">` + defaults.map((e) => `<Default Extension="${e}" ContentType="${contentTypeOf(e)}"/>`).join("") + `<Override PartName="/word/document.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"/><Override PartName="/word/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"/><Override PartName="/word/numbering.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml"/><Override PartName="/word/settings.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"/>` + hdrFtrOverrides.join("") + `</Types>`
   );
   return { files, warnings, stats };
 }
+function cssToPoints(v) {
+  const m = /^\s*(-?[\d.]+)\s*(pt|px|in|cm|mm)\s*$/.exec(String(v ?? ""));
+  if (!m) return null;
+  const n = Number(m[1]);
+  if (!Number.isFinite(n)) return null;
+  const perUnit = { pt: 1, px: 0.75, in: 72, cm: 72 / 2.54, mm: 7.2 / 2.54 };
+  return n * perUnit[m[2]];
+}
+function cssToTwips(v) {
+  const pt = cssToPoints(v);
+  return pt === null ? null : Math.round(pt * 20);
+}
+function cssToHalfPoints(v) {
+  const pt = cssToPoints(v);
+  return pt === null || pt <= 0 ? null : Math.round(pt * 2);
+}
+function cssFontStack(v) {
+  const raw = String(v ?? "").trim();
+  if (!raw) return null;
+  const parts = raw.split(",").map((s) => s.trim().replace(/^["']|["']$/g, "")).filter(Boolean);
+  if (!parts.length) return null;
+  return { ascii: parts[0], eastAsia: parts[parts.length - 1] };
+}
 function collectText(n) {
   if (n?.type === "text") return n.text ?? "";
   return (n?.content ?? []).map(collectText).join("");
@@ -968,18 +1327,30 @@ var ExportDocx = Extension.create({
       verbose: 0,
       resolveImage: void 0,
       styleOverrides: void 0,
-      paragraphOverrides: void 0
+      paragraphOverrides: void 0,
+      section: void 0,
+      contentWidthPx: void 0
     };
   },
   addCommands() {
     return {
       exportDocx: (override = {}) => ({ editor }) => {
         const o = { ...this.options, ...override };
+        if (o.section === void 0) {
+          o.section = editor.storage.importDocx?.section ?? void 0;
+        }
+        if (o.contentWidthPx === void 0) {
+          o.contentWidthPx = measureContentWidth(editor.view?.dom);
+        }
         try {
           const { bytes, warnings, stats } = docxFromJSON(editor.getJSON(), o);
           if (o.verbose >= 1) console.info("[exportDocx] 统计", stats);
           if (o.verbose >= 2) for (const w of warnings) console.warn("[exportDocx]", w);
-          o.onCompleteExport?.(deliver(bytes, o.exportType));
+          o.onCompleteExport?.(deliver(bytes, o.exportType), {
+            stats,
+            warnings,
+            bytes: bytes.length
+          });
         } catch (e) {
           if (o.verbose >= 1) console.error("[exportDocx] 失败", e);
           return false;
@@ -1091,12 +1462,16 @@ var ImportDocx = Extension.create({
       cssStyles: false,
       verbose: 0,
       preserveUnsupported: true,
-      injectStyles: true
+      injectStyles: true,
+      tableWidthBasis: "auto"
     };
   },
   addExtensions() {
     return this.options.preserveUnsupported === false ? [] : [DocxInk, DocxField];
   },
+  addStorage() {
+    return { section: null };
+  },
   onCreate() {
     if (this.options.injectStyles) injectStyles();
   },
@@ -1118,6 +1493,7 @@ var ImportDocx = Extension.create({
             warnings: [],
             header: null,
             footer: null,
+            section: { sectPrXml: null, refs: [], files: {}, settingsXml: null },
             footnotes: {},
             endnotes: {}
           });
@@ -1128,6 +1504,7 @@ var ImportDocx = Extension.create({
             if (!opts.resolveMedia && opts.imageUploadConfig) {
               uploaded = await uploadImages(files, opts.imageUploadConfig);
             }
+            const contentWidthPx = opts.tableWidthBasis === "auto" ? measureContentWidth(editor.view?.dom) : opts.tableWidthBasis ?? void 0;
             const result = parseDocx(
               { read: (p) => files[p] ?? null },
               {
@@ -1135,7 +1512,9 @@ var ImportDocx = Extension.create({
                 resolveMedia: opts.resolveMedia ?? (uploaded ? (_b, entry) => uploaded.get(entry) ?? "" : void 0),
                 prosemirrorNodes: opts.prosemirrorNodes ?? void 0,
                 prosemirrorMarks: opts.prosemirrorMarks ?? void 0,
-                cssStyles: opts.cssStyles
+                cssStyles: opts.cssStyles,
+                contentWidthPx,
+                minColumnWidthPx: tableCellMinWidth(editor)
               }
             );
             const warned = /* @__PURE__ */ new Set();
@@ -1153,14 +1532,16 @@ var ImportDocx = Extension.create({
             if (opts.verbose >= 2) {
               for (const w of result.warnings) console.warn("[importDocx]", w);
             }
+            this.storage.section = result.section;
             finish({
               content: result.doc,
               setEditorContent: (c) => editor.commands.setContent(c ?? result.doc, { emitUpdate: true }),
               recovered: result.recovered,
               warnings: result.warnings,
               css: result.css,
-              header: null,
-              footer: null,
+              header: result.header,
+              footer: result.footer,
+              section: result.section,
               footnotes: {},
               endnotes: {}
             });