pptxtojson 1.6.1 → 1.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pptxtojson",
-	"version": "1.6.1",
+	"version": "1.7.0",
 	"description": "A javascript tool for parsing .pptx file",
 	"type": "module",
 	"main": "./dist/index.umd.js",

package/src/fill.js

@@ -85,6 +85,79 @@ export function getPicFillOpacity(node) {
   return opacity
 }
 
+export function getPicFilters(node) {
+  if (!node) return null
+
+  const aBlipNode = node['a:blip']
+  if (!aBlipNode) return null
+
+  const filters = {}
+
+  // 从a:extLst中获取滤镜效果（Microsoft Office 2010+扩展）
+  const extLstNode = aBlipNode['a:extLst']
+  if (extLstNode && extLstNode['a:ext']) {
+    const extNodes = Array.isArray(extLstNode['a:ext']) ? extLstNode['a:ext'] : [extLstNode['a:ext']]
+
+    for (const extNode of extNodes) {
+      if (!extNode['a14:imgProps'] || !extNode['a14:imgProps']['a14:imgLayer']) continue
+
+      const imgLayerNode = extNode['a14:imgProps']['a14:imgLayer']
+      const imgEffects = imgLayerNode['a14:imgEffect']
+
+      if (!imgEffects) continue
+
+      const effectArray = Array.isArray(imgEffects) ? imgEffects : [imgEffects]
+
+      for (const effect of effectArray) {
+        // 饱和度
+        if (effect['a14:saturation']) {
+          const satAttr = getTextByPathList(effect, ['a14:saturation', 'attrs', 'sat'])
+          if (satAttr) {
+            filters.saturation = parseInt(satAttr) / 100000
+          }
+        }
+
+        // 亮度、对比度
+        if (effect['a14:brightnessContrast']) {
+          const brightAttr = getTextByPathList(effect, ['a14:brightnessContrast', 'attrs', 'bright'])
+          const contrastAttr = getTextByPathList(effect, ['a14:brightnessContrast', 'attrs', 'contrast'])
+
+          if (brightAttr) {
+            filters.brightness = parseInt(brightAttr) / 100000
+          }
+          if (contrastAttr) {
+            filters.contrast = parseInt(contrastAttr) / 100000
+          }
+        }
+
+        // 锐化/柔化
+        if (effect['a14:sharpenSoften']) {
+          const amountAttr = getTextByPathList(effect, ['a14:sharpenSoften', 'attrs', 'amount'])
+          if (amountAttr) {
+            const amount = parseInt(amountAttr) / 100000
+            if (amount > 0) {
+              filters.sharpen = amount
+            }
+            else {
+              filters.soften = Math.abs(amount)
+            }
+          }
+        }
+
+        // 色温
+        if (effect['a14:colorTemperature']) {
+          const tempAttr = getTextByPathList(effect, ['a14:colorTemperature', 'attrs', 'colorTemp'])
+          if (tempAttr) {
+            filters.colorTemperature = parseInt(tempAttr)
+          }
+        }
+      }
+    }
+  }
+
+  return Object.keys(filters).length > 0 ? filters : null
+}
+
 export async function getBgPicFill(bgPr, sorce, warpObj) {
   const picBase64 = await getPicFill(sorce, bgPr['a:blipFill'], warpObj)
   const aBlipNode = bgPr['a:blipFill']['a:blip']

package/src/fontStyle.js

@@ -48,14 +48,49 @@ export function getFontColor(node, pNode, lstStyle, pFontStyle, lvl, warpObj) {
   return color || ''
 }
 
-export function getFontSize(node, slideLayoutSpNode, type, slideMasterTextStyles) {
+export function getFontSize(node, slideLayoutSpNode, type, slideMasterTextStyles, textBodyNode, pNode) {
   let fontSize
 
   if (getTextByPathList(node, ['a:rPr', 'attrs', 'sz'])) fontSize = getTextByPathList(node, ['a:rPr', 'attrs', 'sz']) / 100
 
+  if ((isNaN(fontSize) || !fontSize) && pNode) {
+    if (getTextByPathList(pNode, ['a:endParaRPr', 'attrs', 'sz'])) {
+      fontSize = getTextByPathList(pNode, ['a:endParaRPr', 'attrs', 'sz']) / 100
+    }
+  }
+
+  if ((isNaN(fontSize) || !fontSize) && textBodyNode) {
+    const lstStyle = getTextByPathList(textBodyNode, ['a:lstStyle'])
+    if (lstStyle) {
+      let lvl = 1
+      if (pNode) {
+        const lvlNode = getTextByPathList(pNode, ['a:pPr', 'attrs', 'lvl'])
+        if (lvlNode !== undefined) lvl = parseInt(lvlNode) + 1
+      }
+
+      const sz = getTextByPathList(lstStyle, [`a:lvl${lvl}pPr`, 'a:defRPr', 'attrs', 'sz'])
+      if (sz) fontSize = parseInt(sz) / 100
+    }
+  }
+
   if ((isNaN(fontSize) || !fontSize)) {
     const sz = getTextByPathList(slideLayoutSpNode, ['p:txBody', 'a:lstStyle', 'a:lvl1pPr', 'a:defRPr', 'attrs', 'sz'])
-    fontSize = parseInt(sz) / 100
+    if (sz) fontSize = parseInt(sz) / 100
+  }
+
+  if ((isNaN(fontSize) || !fontSize) && slideLayoutSpNode) {
+    let lvl = 1
+    if (pNode) {
+      const lvlNode = getTextByPathList(pNode, ['a:pPr', 'attrs', 'lvl'])
+      if (lvlNode !== undefined) lvl = parseInt(lvlNode) + 1
+    }
+    const layoutSz = getTextByPathList(slideLayoutSpNode, ['p:txBody', 'a:lstStyle', `a:lvl${lvl}pPr`, 'a:defRPr', 'attrs', 'sz'])
+    if (layoutSz) fontSize = parseInt(layoutSz) / 100
+  }
+
+  if ((isNaN(fontSize) || !fontSize) && pNode) {
+    const paraSz = getTextByPathList(pNode, ['a:pPr', 'a:defRPr', 'attrs', 'sz'])
+    if (paraSz) fontSize = parseInt(paraSz) / 100
   }
 
   if (isNaN(fontSize) || !fontSize) {

package/src/pptxtojson.js

@@ -1,7 +1,7 @@
 import JSZip from 'jszip'
 import { readXmlFile } from './readXmlFile'
 import { getBorder } from './border'
-import { getSlideBackgroundFill, getShapeFill, getSolidFill, getPicFill } from './fill'
+import { getSlideBackgroundFill, getShapeFill, getSolidFill, getPicFill, getPicFilters } from './fill'
 import { getChartInfo } from './chart'
 import { getVerticalAlign } from './align'
 import { getPosition, getSize } from './position'
@@ -135,9 +135,17 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
     switch (relationshipArrayItem['attrs']['Type']) {
       case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout':
         layoutFilename = relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
+        slideResObj[relationshipArrayItem['attrs']['Id']] = {
+          type: relationshipArrayItem['attrs']['Type'].replace('http://schemas.openxmlformats.org/officeDocument/2006/relationships/', ''),
+          target: relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
+        }
         break
       case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesSlide':
         noteFilename = relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
+        slideResObj[relationshipArrayItem['attrs']['Id']] = {
+          type: relationshipArrayItem['attrs']['Type'].replace('http://schemas.openxmlformats.org/officeDocument/2006/relationships/', ''),
+          target: relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
+        }
         break
       case 'http://schemas.microsoft.com/office/2007/relationships/diagramDrawing':
         diagramFilename = relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
@@ -794,11 +802,13 @@ async function processPicNode(node, warpObj, source) {
 
   const { borderColor, borderWidth, borderType, strokeDasharray } = getBorder(node, undefined, warpObj)
 
-  return {
+  const filters = getPicFilters(node['p:blipFill'])
+
+  const imageData = {
     type: 'image',
     top,
     left,
-    width, 
+    width,
     height,
     rotate,
     src,
@@ -812,6 +822,10 @@ async function processPicNode(node, warpObj, source) {
     borderType,
     borderStrokeDasharray: strokeDasharray,
   }
+
+  if (filters) imageData.filters = filters
+
+  return imageData
 }
 
 async function processGraphicFrameNode(node, warpObj, source) {

package/src/text.js

@@ -111,7 +111,7 @@ export function genSpanElement(node, pNode, textBodyNode, pFontStyle, slideLayou
 
   let styleText = ''
   const fontColor = getFontColor(node, pNode, lstStyle, pFontStyle, lvl, warpObj)
-  const fontSize = getFontSize(node, slideLayoutSpNode, type, slideMasterTextStyles)
+  const fontSize = getFontSize(node, slideLayoutSpNode, type, slideMasterTextStyles, textBodyNode, pNode)
   const fontType = getFontType(node, type, warpObj)
   const fontBold = getFontBold(node)
   const fontItalic = getFontItalic(node)
@@ -133,7 +133,7 @@ export function genSpanElement(node, pNode, textBodyNode, pFontStyle, slideLayou
   if (shadow) styleText += `text-shadow: ${shadow};`
 
   const linkID = getTextByPathList(node, ['a:rPr', 'a:hlinkClick', 'attrs', 'r:id'])
-  if (linkID) {
+  if (linkID && warpObj['slideResObj'][linkID]) {
     const linkURL = warpObj['slideResObj'][linkID]['target']
     return `<span style="${styleText}"><a href="${linkURL}" target="_blank">${text.replace(/\t/g, '&nbsp;&nbsp;&nbsp;&nbsp;').replace(/\s/g, '&nbsp;')}</a></span>`
   }