pptx2js 0.4.0 → 0.4.1

package/lib/chart.js

@@ -48,6 +48,7 @@ function extractChart(graphicFrame, ctx) {
 
   const parsed = parseChartPlotArea(plotArea);
   if (parsed) {
+    parsed.title = extractChartTitle(chartRoot);
     return {
       slideIndex: ctx.slideIndex,
       slidePath: ctx.slidePath,
@@ -74,11 +75,10 @@ function parseChartPlotArea(plotArea) {
     const series = extractSeries(chartNode, plotArea);
     if (!series.length) continue;
 
-    const title = extractChartTitle(plotArea);
     return {
       type: pptxType,
       data: series,
-      title,
+      title: '',
     };
   }
   return null;
@@ -94,7 +94,7 @@ function extractSeries(chartNode, plotArea) {
 
   for (const ser of seriesNodes) {
     const titleText = extractSeriesName(ser);
-    const cat = extractCategoryLabels(ser, plotArea);
+    const cat = extractCategoryLabels(ser);
     const values = extractSeriesValues(ser, plotArea);
     if (!values.length) continue;
 
@@ -119,19 +119,56 @@ function extractSeriesName(ser) {
 
 /**
  * @param {object} ser
- * @param {object} plotArea
  */
-function extractCategoryLabels(ser, plotArea) {
-  void plotArea;
+function extractCategoryLabels(ser) {
   const cat = child(ser, 'c:cat');
   if (!cat) return [];
+
   const strRef = child(cat, 'c:strRef');
+  if (strRef) {
+    const pts = extractCachePoints(strRef, 'c:strCache', 'c:v');
+    if (pts.length) return pts;
+  }
+
+  const multiRef = child(cat, 'c:multiLvlStrRef');
+  if (multiRef) {
+    const pts = extractMultiLvlStrLabels(multiRef);
+    if (pts.length) return pts;
+  }
+
   const numRef = child(cat, 'c:numRef');
-  if (strRef) return extractCachePoints(strRef, 'c:strCache', 'c:v');
-  if (numRef) return extractCachePoints(numRef, 'c:numCache', 'c:v').map(String);
+  if (numRef) {
+    const pts = extractCachePoints(numRef, 'c:numCache', 'c:v').map(String);
+    if (pts.length) return pts;
+  }
+
+  const strLit = child(cat, 'c:strLit');
+  if (strLit) {
+    return extractCachePoints(strLit, null, 'c:v').filter(Boolean);
+  }
+
   return [];
 }
 
+/**
+ * PptxGenJS 常用 multiLvlStrRef 缓存分类标签
+ * @param {object} multiRef
+ */
+function extractMultiLvlStrLabels(multiRef) {
+  const cache = child(multiRef, 'c:multiLvlStrCache');
+  if (!cache) return [];
+  const lvl = child(cache, 'c:lvl');
+  if (!lvl) return [];
+  const pts = asArray(lvl['c:pt']);
+  return pts
+    .sort(
+      (a, b) =>
+        parseInt(attr(a, 'idx') ?? '0', 10) - parseInt(attr(b, 'idx') ?? '0', 10)
+    )
+    .map((pt) => textContent(child(pt, 'c:v')))
+    .filter(Boolean);
+}
+
 /**
  * @param {object} ser
  * @param {object} plotArea
@@ -147,22 +184,23 @@ function extractSeriesValues(ser, plotArea) {
 
 /**
  * @param {object} refNode
- * @param {string} cacheKey
+ * @param {string|null} cacheKey null 时直接在 refNode 上找 c:pt（如 strLit）
  * @param {string} valueKey
  */
 function extractCachePoints(refNode, cacheKey, valueKey) {
-  const cache = child(refNode, cacheKey);
-  const pts = asArray(child(cache, 'c:pt'));
+  const container = cacheKey ? child(refNode, cacheKey) : refNode;
+  if (!container) return [];
+  const pts = asArray(child(container, 'c:pt'));
   return pts
     .sort((a, b) => parseInt(attr(a, 'idx') ?? '0', 10) - parseInt(attr(b, 'idx') ?? '0', 10))
     .map((pt) => textContent(child(pt, valueKey)));
 }
 
 /**
- * @param {object} plotArea
+ * @param {object} chartRoot c:chart
  */
-function extractChartTitle(plotArea) {
-  const title = child(plotArea, 'c:title');
+function extractChartTitle(chartRoot) {
+  const title = child(chartRoot, 'c:title');
   if (!title) return '';
   const tx = child(title, 'c:tx');
   const rich = child(tx, 'c:rich');

package/lib/codegen.js

@@ -1,6 +1,7 @@
 /**
  * ⑤ 代码生成器 — IR → PptxGenJS 脚本
  */
+const { compressRunOptions } = require('./run-utils');
 
 function generateScript(ir, options = {}) {
   const lines = [];
@@ -80,7 +81,10 @@ function emitElement(el, slideVar, indent, options) {
   if (el.type === 'chart') {
     const dataLit = JSON.stringify(el.data);
     const opts = [`${pos}`];
-    if (el.title) opts.push(`title: '${escapeJs(el.title)}'`);
+    if (el.title) {
+      opts.push('showTitle: true');
+      opts.push(`title: '${escapeJs(el.title)}'`);
+    }
     return [
       `${indent(1)}${slideVar}.addChart(pptx.charts.${el.chartType}, ${dataLit}, { ${opts.join(', ')} });`,
     ];
@@ -90,7 +94,10 @@ function emitElement(el, slideVar, indent, options) {
     const shapeRef = `pptx.shapes.${el.shape}`;
     const opts = [pos];
     if (el.fill) opts.push(`fill: { color: '${escapeJs(el.fill)}' }`);
-    if (el.line) opts.push(`line: { color: '${escapeJs(el.line)}', width: 1 }`);
+    if (el.line) {
+      const w = el.lineWidth ?? 1;
+      opts.push(`line: { color: '${escapeJs(el.line)}', width: ${w} }`);
+    }
     return [`${indent(1)}${slideVar}.addShape(${shapeRef}, { ${opts.join(', ')} });`];
   }
 
@@ -100,10 +107,13 @@ function emitElement(el, slideVar, indent, options) {
 function formatTableRows(rows) {
   const mapped = rows.map((row) =>
     row.map((cell) => {
-      const parts = [`text: '${escapeJs(cell.text ?? '')}'`];
-      const optKeys = Object.keys(cell.options ?? {});
-      if (optKeys.length) {
-        parts.push(`options: ${JSON.stringify(cell.options)}`);
+      const textLit = Array.isArray(cell.text)
+        ? formatTextRuns(cell.text)
+        : `'${escapeJs(cell.text ?? '')}'`;
+      const parts = [`text: ${textLit}`];
+      const opts = compressTableCellOptions(cell.options ?? {});
+      if (Object.keys(opts).length) {
+        parts.push(`options: ${formatOptionsObject(opts)}`);
       }
       return `{ ${parts.join(', ')} }`;
     })
@@ -111,6 +121,47 @@ function formatTableRows(rows) {
   return `[\n    ${mapped.map((r) => `[${r.join(', ')}]`).join(',\n    ')}\n  ]`;
 }
 
+/**
+ * @param {object} opts
+ */
+function compressTableCellOptions(opts) {
+  const copy = compressRunOptions({ ...opts });
+  return copy;
+}
+
+/**
+ * 生成可读的 options 字面量（避免 JSON 双引号风格）
+ * @param {object} opts
+ */
+function formatBorderObject(border) {
+  if (border.type === 'solid' && border.color) {
+    const parts = [`type: 'solid'`, `color: '${escapeJs(border.color)}'`];
+    if (border.pt != null) parts.push(`pt: ${border.pt}`);
+    return `{ ${parts.join(', ')} }`;
+  }
+  return JSON.stringify(border);
+}
+
+function formatOptionsObject(opts) {
+  const entries = [];
+  for (const [key, val] of Object.entries(opts)) {
+    if (key === 'border' && val && typeof val === 'object') {
+      entries.push(`border: ${formatBorderObject(val)}`);
+    } else if (val === true) {
+      entries.push(`${key}: true`);
+    } else if (val === false) {
+      entries.push(`${key}: false`);
+    } else if (typeof val === 'number') {
+      entries.push(`${key}: ${val}`);
+    } else if (typeof val === 'string') {
+      entries.push(`${key}: '${escapeJs(val)}'`);
+    } else {
+      entries.push(`${key}: ${JSON.stringify(val)}`);
+    }
+  }
+  return `{ ${entries.join(', ')} }`;
+}
+
 function formatTextRuns(runs) {
   if (!runs?.length) return "''";
 
@@ -131,7 +182,7 @@ function formatTextRuns(runs) {
 }
 
 function formatRunOptions(options) {
-  const copy = { ...options };
+  const copy = compressRunOptions({ ...options });
   delete copy._degraded;
   const entries = [];
   if (copy.fontSize != null) entries.push(`fontSize: ${copy.fontSize}`);
@@ -146,6 +197,11 @@ function formatRunOptions(options) {
   if (copy.hyperlink?.url) {
     entries.push(`hyperlink: { url: '${escapeJs(copy.hyperlink.url)}' }`);
   }
+  if (copy.underline === true) {
+    entries.push('underline: true');
+  } else if (copy.underline && typeof copy.underline === 'object') {
+    entries.push(`underline: { style: '${escapeJs(copy.underline.style ?? 'sng')}' }`);
+  }
   if (copy.align) entries.push(`align: '${escapeJs(String(copy.align))}'`);
   if (copy.indentLevel != null && copy.indentLevel > 0) {
     entries.push(`indentLevel: ${copy.indentLevel}`);

package/lib/extractor.js

@@ -9,6 +9,7 @@ const {
   resolveFillColor,
   resolveColorFromContainer,
 } = require('./utils/color');
+const { compressTextRuns } = require('./run-utils');
 const { getSlidePaths, getThemePath } = require('./presentation');
 const {
   buildSlideInheritance,
@@ -207,6 +208,7 @@ function extractShape(sp, ctx) {
   );
   const ln = child(spPr, 'a:ln');
   const lineColor = ln ? resolveFillColor(ln, ctx.scheme).color : null;
+  const lineWidth = extractLineWidthPt(ln);
 
   if (!shapeName) {
     ctx.entities.push({
@@ -215,7 +217,7 @@ function extractShape(sp, ctx) {
       decision: 'DEGRADE',
       kind: 'shape',
       bounds,
-      shape: { type: 'RECTANGLE', fill: fillColor, line: lineColor },
+      shape: { type: 'RECTANGLE', fill: fillColor, line: lineColor, lineWidth },
       degradeReason: `未知预设形状 "${prst}"，退化为矩形`,
     });
     return;
@@ -227,11 +229,22 @@ function extractShape(sp, ctx) {
     decision: fillDegraded ? 'DEGRADE' : 'FULL',
     kind: 'shape',
     bounds,
-    shape: { type: shapeName, fill: fillColor, line: lineColor },
+    shape: { type: shapeName, fill: fillColor, line: lineColor, lineWidth },
     degradeReason: fillDegraded ? '渐变填充退化为纯色' : undefined,
   });
 }
 
+/**
+ * @param {object|null|undefined} ln a:ln
+ * @returns {number|undefined}
+ */
+function extractLineWidthPt(ln) {
+  if (!ln) return undefined;
+  const w = parseInt(attr(ln, 'w') ?? '0', 10);
+  if (!w) return undefined;
+  return Math.max(1, Math.round(w / 12700));
+}
+
 function extractPicture(pic, ctx) {
   const spPr = child(pic, 'p:spPr');
   const bounds = boundsFromXfrm(child(spPr, 'a:xfrm'), ctx.offset);
@@ -300,21 +313,56 @@ const PARA_ALIGN_MAP = {
 
 function extractTextRuns(txBody, scheme, linkCtx) {
   const runs = [];
-  for (const p of asArray(txBody['a:p'])) {
-    const pPr = child(p, 'a:pPr');
-    const bullet = extractBullet(pPr);
-    const paraOpts = extractParaOptions(pPr);
+  const bodyParaOpts = extractBodyPrParaOptions(txBody);
+  const paragraphs = asArray(txBody['a:p']);
+
+  for (let pi = 0; pi < paragraphs.length; pi++) {
+    const p = paragraphs[pi];
+    // 同一段落内可有多个 a:pPr（PptxGenJS 为每个 run 内联段落属性）→ xml2js 解析为数组
+    const pPrs = asArray(p['a:pPr']);
+    const pRuns = asArray(p['a:r']);
+    const bullet0 = extractBullet(pPrs[0]);
+
+    pRuns.forEach((r, ri) => {
+      const pPr = pPrs[ri] ?? pPrs[0];
+      const paraOpts = { ...bodyParaOpts, ...extractParaOptions(pPr) };
+      const bullet = extractBullet(pPr) ?? bullet0;
 
-    for (const r of asArray(p['a:r'])) {
       const text = textContent(r['a:t']);
-      if (!text) continue;
+      if (!text) return;
       const options = extractRunOptions(r['a:rPr'], scheme, linkCtx);
       Object.assign(options, paraOpts);
       if (bullet) Object.assign(options, bullet);
       runs.push({ text, options, degraded: options._degraded });
+    });
+
+    for (const _br of asArray(p['a:br'])) {
+      const pPr = pPrs[0];
+      const paraOpts = { ...bodyParaOpts, ...extractParaOptions(pPr) };
+      runs.push({ text: '\n', options: { ...paraOpts }, degraded: false });
+    }
+
+    if (pi < paragraphs.length - 1) {
+      const last = runs[runs.length - 1];
+      if (!last || !last.text.endsWith('\n')) {
+        const paraOpts = { ...bodyParaOpts, ...extractParaOptions(pPrs[0]) };
+        if (bullet0) delete paraOpts.bullet;
+        runs.push({ text: '\n', options: { ...paraOpts }, degraded: false });
+      }
     }
   }
-  return runs;
+  return compressTextRuns(runs);
+}
+
+/**
+ * 文本框级默认段落属性（a:lstStyle 在 a:txBody 下，不在 a:bodyPr 下）
+ * @param {object|null|undefined} txBody
+ */
+function extractBodyPrParaOptions(txBody) {
+  if (!txBody) return {};
+  const lstStyle = child(txBody, 'a:lstStyle');
+  const defPPr = lstStyle && child(lstStyle, 'a:defPPr');
+  return defPPr ? extractParaOptions(defPPr) : {};
 }
 
 /**
@@ -322,24 +370,25 @@ function extractTextRuns(txBody, scheme, linkCtx) {
  */
 function extractParaOptions(pPr) {
   if (!pPr) return {};
+  const node = Array.isArray(pPr) ? pPr[0] : pPr;
   const opts = {};
 
-  const algn = attr(pPr, 'algn');
+  const algn = attr(node, 'algn');
   if (algn && PARA_ALIGN_MAP[algn]) opts.align = PARA_ALIGN_MAP[algn];
 
-  const lvl = attr(pPr, 'lvl');
+  const lvl = attr(node, 'lvl');
   if (lvl) opts.indentLevel = parseInt(lvl, 10);
 
   // 注：a:spcPct（百分比段前/段后距）暂不处理
-  const spcBef = attr(child(child(pPr, 'a:spcBef'), 'a:spcPts'), 'val');
+  const spcBef = attr(child(child(node, 'a:spcBef'), 'a:spcPts'), 'val');
   if (spcBef) opts.paraSpaceBefore = parseInt(spcBef, 10) / 100;
 
   // 注：a:spcPct（百分比段后距）暂不处理
-  const spcAft = attr(child(child(pPr, 'a:spcAft'), 'a:spcPts'), 'val');
+  const spcAft = attr(child(child(node, 'a:spcAft'), 'a:spcPts'), 'val');
   if (spcAft) opts.paraSpaceAfter = parseInt(spcAft, 10) / 100;
 
   // 注：a:spcPct（百分比行距）暂不处理
-  const lnSpc = attr(child(child(pPr, 'a:lnSpc'), 'a:spcPts'), 'val');
+  const lnSpc = attr(child(child(node, 'a:lnSpc'), 'a:spcPts'), 'val');
   if (lnSpc) opts.lineSpacing = parseInt(lnSpc, 10) / 100;
 
   return opts;
@@ -347,8 +396,9 @@ function extractParaOptions(pPr) {
 
 function extractBullet(pPr) {
   if (!pPr) return null;
-  if (child(pPr, 'a:buChar')) return { bullet: true };
-  if (child(pPr, 'a:buAutoNum')) return { bullet: { type: 'number' } };
+  const node = Array.isArray(pPr) ? pPr[0] : pPr;
+  if (child(node, 'a:buChar')) return { bullet: true };
+  if (child(node, 'a:buAutoNum')) return { bullet: { type: 'number' } };
   return null;
 }
 
@@ -362,6 +412,9 @@ function extractRunOptions(rPr, scheme, linkCtx) {
   if (attr(rPr, 'b') === '1') options.bold = true;
   if (attr(rPr, 'i') === '1') options.italic = true;
 
+  const u = attr(rPr, 'u');
+  if (u && u !== 'none') options.underline = { style: 'sng' };
+
   const face = attr(child(rPr, 'a:latin'), 'typeface');
   if (face) options.fontFace = face;
 
@@ -389,6 +442,7 @@ function extractRunOptions(rPr, scheme, linkCtx) {
 
 module.exports = {
   extractEntities,
+  extractTextRuns,
   PRST_TO_SHAPE,
   boundsFromXfrm,
 };

package/lib/mapper.js

@@ -84,6 +84,7 @@ function mapToIR(entitiesBySlide, ctx) {
           shape: entity.shape.type,
           fill: entity.shape.fill,
           line: entity.shape.line,
+          lineWidth: entity.shape.lineWidth,
           degradeReason: entity.degradeReason,
         });
       }

package/lib/rels.js

@@ -51,11 +51,24 @@ function isExternalTarget(rel) {
 }
 
 function resolveTargetPath(ownerPath, target) {
+  const normalized = String(target).replace(/\\/g, '/');
+
+  // PptxGenJS 等写入的包根绝对路径：/ppt/charts/chart1.xml
+  if (normalized.startsWith('/')) {
+    return path.posix.normalize(normalized.slice(1));
+  }
+
   if (!ownerPath) {
-    return path.posix.normalize(target);
+    return path.posix.normalize(normalized);
   }
+
+  // 已是包内绝对路径（无 ..）：ppt/charts/chart1.xml
+  if (normalized.startsWith('ppt/') && !normalized.includes('..')) {
+    return path.posix.normalize(normalized);
+  }
+
   const ownerDir = path.posix.dirname(ownerPath);
-  return path.posix.normalize(path.posix.join(ownerDir, target));
+  return path.posix.normalize(path.posix.join(ownerDir, normalized));
 }
 
 /**

package/lib/run-utils.js

@@ -0,0 +1,179 @@
+/**
+ * 文本 run 合并与 PptxGenJS 选项压缩（IR → 代码 简化层）
+ */
+
+const DEFAULT_TEXT_COLOR = '000000';
+
+/**
+ * @param {object} a
+ * @param {object} b
+ */
+function optionsEqual(a, b) {
+  return optionsKey(a) === optionsKey(b);
+}
+
+/**
+ * @param {object} opts
+ */
+function optionsKey(opts) {
+  const o = compressRunOptions({ ...opts });
+  return JSON.stringify(o, Object.keys(o).sort());
+}
+
+/**
+ * @param {string} text
+ */
+function isNewlineOnly(text) {
+  return typeof text === 'string' && /^[\r\n\s]*$/.test(text) && /[\r\n]/.test(text);
+}
+
+/**
+ * 剔除 PptxGenJS 默认值，简化 underline
+ * @param {object} opts
+ */
+function compressRunOptions(opts) {
+  if (!opts || typeof opts !== 'object') return {};
+  const copy = { ...opts };
+  delete copy._degraded;
+
+  if (copy.color === DEFAULT_TEXT_COLOR || copy.color === '000000') {
+    delete copy.color;
+  }
+
+  if (copy.underline && typeof copy.underline === 'object') {
+    if ((copy.underline.style ?? 'sng') === 'sng') {
+      copy.underline = true;
+    }
+  }
+
+  return copy;
+}
+
+/**
+ * 合并相邻同样式 run，将独立换行 run 并入前一段文本
+ * @param {Array<{ text: string, options?: object }>} runs
+ */
+function compressTextRuns(runs) {
+  if (!runs?.length) return [];
+
+  /** @type {Array<{ text: string, options: object }>} */
+  const out = [];
+
+  for (const run of runs) {
+    const text = run.text ?? '';
+    const options = compressRunOptions(run.options ?? {});
+
+    if (!text && Object.keys(options).length === 0) continue;
+
+    if (!out.length) {
+      out.push({ text, options });
+      continue;
+    }
+
+    const last = out[out.length - 1];
+
+    if (isNewlineOnly(text)) {
+      const nlOpts = { ...options };
+      delete nlOpts.bullet;
+      if (optionsEqual(last.options, nlOpts) || optionsEqual(last.options, options)) {
+        if (!last.text.endsWith('\n')) {
+          last.text += text.includes('\r') ? '\r\n' : '\n';
+        }
+        continue;
+      }
+    }
+
+    if (optionsEqual(last.options, options)) {
+      last.text += text;
+      continue;
+    }
+
+    out.push({ text, options });
+  }
+
+  while (out.length > 1 && isNewlineOnly(out[out.length - 1].text)) {
+    const tail = out.pop();
+    const prev = out[out.length - 1];
+    if (optionsEqual(prev.options, tail.options) && !prev.text.endsWith('\n')) {
+      prev.text += tail.text.includes('\r') ? '\r\n' : '\n';
+    } else {
+      out.push(tail);
+      break;
+    }
+  }
+
+  return out.map((run) => {
+    if (!isNewlineOnly(run.text)) return run;
+    const options = { ...run.options };
+    delete options.bullet;
+    return { text: run.text, options };
+  });
+}
+
+/**
+ * 四边相同时合并为 PptxGenJS 简写 border
+ * @param {object|null} border
+ */
+function compressCellBorder(border) {
+  if (!border) return null;
+
+  const sides = ['left', 'right', 'top', 'bottom'];
+  const present = sides.filter((s) => border[s]);
+  if (present.length === 0) return null;
+
+  if (present.length < 4) return border;
+
+  const first = border[present[0]];
+  const allSame = present.every((s) => {
+    const side = border[s];
+    return (
+      (side.color ?? null) === (first.color ?? null) &&
+      (side.pt ?? 1) === (first.pt ?? 1)
+    );
+  });
+
+  if (allSame) {
+    return {
+      type: 'solid',
+      color: first.color,
+      pt: first.pt ?? 1,
+    };
+  }
+
+  return border;
+}
+
+/**
+ * 表格单元格：压缩 runs → 纯文本或内联多 run
+ * @param {Array<{ text: string, options?: object }>} runs
+ */
+function flattenTableCellText(runs) {
+  const merged = compressTextRuns(runs);
+  if (!merged.length) return { text: '', runOptions: {} };
+
+  const allSame =
+    merged.length === 1 ||
+    merged.every((r) => optionsEqual(r.options, merged[0].options));
+
+  if (allSame) {
+    const text = merged.map((r) => r.text).join('').replace(/\r\n/g, '\n');
+    return { text, runOptions: compressRunOptions(merged[0].options) };
+  }
+
+  return {
+    text: merged.map((r) => ({
+      text: String(r.text).replace(/\r\n/g, '\n'),
+      options: compressRunOptions(r.options),
+    })),
+    runOptions: {},
+  };
+}
+
+module.exports = {
+  compressRunOptions,
+  compressTextRuns,
+  compressCellBorder,
+  flattenTableCellText,
+  optionsEqual,
+  isNewlineOnly,
+};

package/lib/table.js

@@ -1,11 +1,12 @@
 /**
  * 表格提取（design.html §4.5）
  */
-const { asArray, attr, child, textContent } = require('./xml-utils');
+const { asArray, attr, child } = require('./xml-utils');
 const { getGraphicXfrm } = require('./graphic');
 const { boundsFromXfrm } = require('./utils/bounds');
 const { resolveFillColor } = require('./utils/color');
 const { emuToInch } = require('./utils/emu');
+const { compressCellBorder, flattenTableCellText } = require('./run-utils');
 
 /**
  * @param {object} graphicFrame
@@ -52,20 +53,40 @@ function extractTableRows(tbl, scheme) {
   for (const tr of asArray(tbl['a:tr'])) {
     const cells = [];
     for (const tc of asArray(tr['a:tc'])) {
-      const text = extractCellText(tc);
       const tcPr = child(tc, 'a:tcPr');
+      const txBody = child(tc, 'a:txBody');
+      let text = '';
+      /** @type {object} */
+      let runOptions = {};
+      if (txBody) {
+        const { extractTextRuns } = require('./extractor');
+        const flat = flattenTableCellText(extractTextRuns(txBody, scheme, null));
+        text = flat.text;
+        runOptions = flat.runOptions;
+      }
+
       const fill = tcPr ? resolveFillColor(tcPr, scheme).color : null;
+      const borderRaw = extractCellBorderSides(tcPr, scheme);
+      const borderColors = borderRaw
+        ? Object.values(borderRaw)
+            .map((b) => b.color)
+            .filter(Boolean)
+        : [];
+      const border = compressCellBorder(borderRaw);
+      const fillIsJustBorderColor =
+        fill &&
+        borderColors.length > 0 &&
+        borderColors.every((c) => c === fill);
+
       const merge = {};
       const rowSpan = attr(tcPr, 'rowSpan');
       const gridSpan = attr(tcPr, 'gridSpan');
       if (rowSpan && rowSpan !== '1') merge.rowspan = parseInt(rowSpan, 10);
       if (gridSpan && gridSpan !== '1') merge.colspan = parseInt(gridSpan, 10);
 
-      const cell = { text, options: {} };
-      if (fill) cell.options.fill = { color: fill };
+      const cell = { text, options: { ...runOptions } };
+      if (fill && !fillIsJustBorderColor) cell.options.fill = fill;
       if (Object.keys(merge).length) Object.assign(cell.options, merge);
-
-      const border = extractCellBorder(tcPr, scheme);
       if (border) cell.options.border = border;
 
       cells.push(cell);
@@ -79,7 +100,7 @@ function extractTableRows(tbl, scheme) {
  * @param {object|null|undefined} tcPr
  * @param {Record<string, string>} scheme
  */
-function extractCellBorder(tcPr, scheme) {
+function extractCellBorderSides(tcPr, scheme) {
   if (!tcPr) return null;
   const border = {};
   const sides = {
@@ -106,21 +127,6 @@ function extractCellBorder(tcPr, scheme) {
   return hasAny ? border : null;
 }
 
-/**
- * @param {object} tc
- */
-function extractCellText(tc) {
-  const txBody = child(tc, 'a:txBody');
-  if (!txBody) return '';
-  const parts = [];
-  for (const p of asArray(txBody['a:p'])) {
-    for (const r of asArray(p['a:r'])) {
-      parts.push(textContent(r['a:t']));
-    }
-  }
-  return parts.join('');
-}
-
 /**
  * @param {object} tbl
  * @returns {number[]|undefined}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pptx2js",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "将 .pptx 文件转换为可运行的 PptxGenJS 生成脚本",
   "main": "lib/index.js",
   "bin": {
@@ -8,7 +8,8 @@
   },
   "scripts": {
     "test": "jest",
-    "test:watch": "jest --watch"
+    "test:watch": "jest --watch",
+    "test:sample": "npm run generate --prefix testPPT && node bin/pptx2js.js testppt/sample.pptx -o testppt/pptx2js-output"
   },
   "keywords": [
     "pptx",