pptxtojson 1.6.0 → 1.6.1

package/package.json

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

package/src/fill.js

@@ -461,7 +461,7 @@ export async function getSlideBackgroundFill(warpObj) {
   }
 }
 
-export async function getShapeFill(node, pNode, isSvgMode, warpObj, source) {
+export async function getShapeFill(node, pNode, isSvgMode, warpObj, source, groupHierarchy = []) {
   const fillType = getFillType(getTextByPathList(node, ['p:spPr']))
   let type = 'color'
   let fillValue = ''
@@ -488,23 +488,16 @@ export async function getShapeFill(node, pNode, isSvgMode, warpObj, source) {
     }
     type = 'image'
   }
+  else if (fillType === 'GROUP_FILL') {
+    return findFillInGroupHierarchy(groupHierarchy, warpObj, source)
+  }
   if (!fillValue) {
     const clrName = getTextByPathList(node, ['p:style', 'a:fillRef'])
     fillValue = getSolidFill(clrName, undefined, undefined, warpObj)
     type = 'color'
   }
-  if (!fillValue && pNode) {
-    const grpFill = getTextByPathList(node, ['p:spPr', 'a:grpFill'])
-    if (grpFill) {
-      const grpShpFill = pNode['p:grpSpPr']
-      if (grpShpFill) {
-        const spShpNode = { 'p:spPr': grpShpFill }
-        return getShapeFill(spShpNode, node, isSvgMode, warpObj, source)
-      }
-    } 
-    else if (fillType === 'NO_FILL') {
-      return isSvgMode ? 'none' : ''
-    }
+  if (!fillValue && pNode && fillType === 'NO_FILL') {
+    return isSvgMode ? 'none' : ''
   }
 
   return {
@@ -513,6 +506,52 @@ export async function getShapeFill(node, pNode, isSvgMode, warpObj, source) {
   }
 }
 
+async function findFillInGroupHierarchy(groupHierarchy, warpObj, source) {
+  for (const groupNode of groupHierarchy) {
+    if (!groupNode || !groupNode['p:grpSpPr']) continue
+
+    const grpSpPr = groupNode['p:grpSpPr']
+    const fillType = getFillType(grpSpPr)
+
+    if (fillType === 'SOLID_FILL') {
+      const shpFill = grpSpPr['a:solidFill']
+      const fillValue = getSolidFill(shpFill, undefined, undefined, warpObj)
+      if (fillValue) {
+        return {
+          type: 'color',
+          value: fillValue,
+        }
+      }
+    }
+    else if (fillType === 'GRADIENT_FILL') {
+      const shpFill = grpSpPr['a:gradFill']
+      const fillValue = getGradientFill(shpFill, warpObj)
+      if (fillValue) {
+        return {
+          type: 'gradient',
+          value: fillValue,
+        }
+      }
+    }
+    else if (fillType === 'PIC_FILL') {
+      const shpFill = grpSpPr['a:blipFill']
+      const picBase64 = await getPicFill(source, shpFill, warpObj)
+      const opacity = getPicFillOpacity(shpFill)
+      if (picBase64) {
+        return {
+          type: 'image',
+          value: {
+            picBase64,
+            opacity,
+          },
+        }
+      }
+    }
+  }
+
+  return null
+}
+
 export function getSolidFill(solidFill, clrMap, phClr, warpObj) {
   if (!solidFill) return ''
 

package/src/pptxtojson.js

@@ -399,12 +399,12 @@ function indexNodes(content) {
   return { idTable, idxTable, typeTable }
 }
 
-async function processNodesInSlide(nodeKey, nodeValue, nodes, warpObj, source) {
+async function processNodesInSlide(nodeKey, nodeValue, nodes, warpObj, source, groupHierarchy = []) {
   let json
 
   switch (nodeKey) {
     case 'p:sp': // Shape, Text
-      json = await processSpNode(nodeValue, nodes, warpObj, source)
+      json = await processSpNode(nodeValue, nodes, warpObj, source, groupHierarchy)
       break
     case 'p:cxnSp': // Shape, Text
       json = await processCxnSpNode(nodeValue, nodes, warpObj, source)
@@ -416,11 +416,11 @@ async function processNodesInSlide(nodeKey, nodeValue, nodes, warpObj, source) {
       json = await processGraphicFrameNode(nodeValue, warpObj, source)
       break
     case 'p:grpSp':
-      json = await processGroupSpNode(nodeValue, warpObj, source)
+      json = await processGroupSpNode(nodeValue, warpObj, source, groupHierarchy)
       break
     case 'mc:AlternateContent':
       if (getTextByPathList(nodeValue, ['mc:Fallback', 'p:grpSpPr', 'a:xfrm'])) {
-        json = await processGroupSpNode(getTextByPathList(nodeValue, ['mc:Fallback']), warpObj, source)
+        json = await processGroupSpNode(getTextByPathList(nodeValue, ['mc:Fallback']), warpObj, source, groupHierarchy)
       }
       else if (getTextByPathList(nodeValue, ['mc:Choice'])) {
         json = await processMathNode(nodeValue, warpObj, source)
@@ -466,7 +466,7 @@ async function processMathNode(node, warpObj, source) {
   }
 }
 
-async function processGroupSpNode(node, warpObj, source) {
+async function processGroupSpNode(node, warpObj, source, parentGroupHierarchy = []) {
   const order = node['attrs']['order']
   const xfrmNode = getTextByPathList(node, ['p:grpSpPr', 'a:xfrm'])
   if (!xfrmNode) return null
@@ -489,16 +489,19 @@ async function processGroupSpNode(node, warpObj, source) {
   const ws = cx / chcx
   const hs = cy / chcy
 
+  // 构建当前组合层级（将当前组合添加到父级层级中）
+  const currentGroupHierarchy = [...parentGroupHierarchy, node]
+
   const elements = []
   for (const nodeKey in node) {
     if (node[nodeKey].constructor === Array) {
       for (const item of node[nodeKey]) {
-        const ret = await processNodesInSlide(nodeKey, item, node, warpObj, source)
+        const ret = await processNodesInSlide(nodeKey, item, node, warpObj, source, currentGroupHierarchy)
         if (ret) elements.push(ret)
       }
     }
     else {
-      const ret = await processNodesInSlide(nodeKey, node[nodeKey], node, warpObj, source)
+      const ret = await processNodesInSlide(nodeKey, node[nodeKey], node, warpObj, source, currentGroupHierarchy)
       if (ret) elements.push(ret)
     }
   }
@@ -523,7 +526,7 @@ async function processGroupSpNode(node, warpObj, source) {
   }
 }
 
-async function processSpNode(node, pNode, warpObj, source) {
+async function processSpNode(node, pNode, warpObj, source, groupHierarchy = []) {
   const name = getTextByPathList(node, ['p:nvSpPr', 'p:cNvPr', 'attrs', 'name'])
   const idx = getTextByPathList(node, ['p:nvSpPr', 'p:nvPr', 'p:ph', 'attrs', 'idx'])
   let type = getTextByPathList(node, ['p:nvSpPr', 'p:nvPr', 'p:ph', 'attrs', 'type'])
@@ -558,7 +561,7 @@ async function processSpNode(node, pNode, warpObj, source) {
     else type = 'obj'
   }
 
-  return await genShape(node, pNode, slideLayoutSpNode, slideMasterSpNode, name, type, order, warpObj, source)
+  return await genShape(node, pNode, slideLayoutSpNode, slideMasterSpNode, name, type, order, warpObj, source, groupHierarchy)
 }
 
 async function processCxnSpNode(node, pNode, warpObj, source) {
@@ -569,7 +572,7 @@ async function processCxnSpNode(node, pNode, warpObj, source) {
   return await genShape(node, pNode, undefined, undefined, name, type, order, warpObj, source)
 }
 
-async function genShape(node, pNode, slideLayoutSpNode, slideMasterSpNode, name, type, order, warpObj, source) {
+async function genShape(node, pNode, slideLayoutSpNode, slideMasterSpNode, name, type, order, warpObj, source, groupHierarchy = []) {
   const xfrmList = ['p:spPr', 'a:xfrm']
   const slideXfrmNode = getTextByPathList(node, xfrmList)
   const slideLayoutXfrmNode = getTextByPathList(slideLayoutSpNode, xfrmList)
@@ -598,7 +601,7 @@ async function genShape(node, pNode, slideLayoutSpNode, slideMasterSpNode, name,
   if (node['p:txBody']) content = genTextBody(node['p:txBody'], node, slideLayoutSpNode, type, warpObj)
 
   const { borderColor, borderWidth, borderType, strokeDasharray } = getBorder(node, type, warpObj)
-  const fill = await getShapeFill(node, pNode, undefined, warpObj, source) || ''
+  const fill = await getShapeFill(node, pNode, undefined, warpObj, source, groupHierarchy) || ''
 
   let shadow
   const outerShdwNode = getTextByPathList(node, ['p:spPr', 'a:effectLst', 'a:outerShdw'])