pptxtojson 1.0.1 → 1.0.2

package/package.json

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

package/src/fontStyle.js

@@ -95,7 +95,7 @@ export function getFontShadow(node, warpObj) {
     if (shadow) {
       const { h, v, blur, color } = shadow
       if (!isNaN(v) && !isNaN(h)) {
-        return h + 'px ' + v + 'px ' + (blur ? blur + 'px' : '') + ' ' + color
+        return h + 'pt ' + v + 'pt ' + (blur ? blur + 'pt' : '') + ' ' + color
       }
     }
   }

package/src/pptxtojson.js

@@ -9,7 +9,7 @@ import { genTextBody } from './text'
 import { getCustomShapePath } from './shape'
 import { extractFileExtension, base64ArrayBuffer, getTextByPathList, angleToDegrees, getMimeType, isVideoLink, escapeHtml } from './utils'
 import { getShadow } from './shadow'
-import { getTableCellParams, getTableRowParams } from './table'
+import { getTableBorders, getTableCellParams, getTableRowParams } from './table'
 import { RATIO_EMUs_Points } from './constants'
 
 export async function parse(file) {
@@ -748,6 +748,14 @@ function genTable(node, warpObj) {
   }
   if (thisTblStyle) thisTblStyle['tblStylAttrObj'] = tblStylAttrObj
 
+  let tbl_border
+  const tblStyl = getTextByPathList(thisTblStyle, ['a:wholeTbl', 'a:tcStyle'])
+  const tblBorderStyl = getTextByPathList(tblStyl, ['a:tcBdr'])
+  if (tblBorderStyl) {
+    const tbl_borders = getTableBorders(tblBorderStyl, warpObj)
+    if (tbl_borders) tbl_border = tbl_borders.bottom || tbl_borders.left || tbl_borders.right || tbl_borders.top
+  }
+
   let tbl_bgcolor = ''
   let tbl_bgFillschemeClr = getTextByPathList(thisTblStyle, ['a:tblBg', 'a:fillRef'])
   if (tbl_bgFillschemeClr) {
@@ -821,7 +829,7 @@ function genTable(node, warpObj) {
         if (cell.hMerge) td.hMerge = cell.hMerge
         if (cell.fontBold || fontBold) td.fontBold = cell.fontBold || fontBold
         if (cell.fontColor || fontColor) td.fontColor = cell.fontColor || fontColor
-        if (cell.fillColor || fillColor || tbl_bgcolor) td.fill = cell.fillColor || fillColor || tbl_bgcolor
+        if (cell.fillColor || fillColor || tbl_bgcolor) td.fillColor = cell.fillColor || fillColor || tbl_bgcolor
 
         tr.push(td)
       }
@@ -852,7 +860,7 @@ function genTable(node, warpObj) {
       if (cell.hMerge) td.hMerge = cell.hMerge
       if (cell.fontBold || fontBold) td.fontBold = cell.fontBold || fontBold
       if (cell.fontColor || fontColor) td.fontColor = cell.fontColor || fontColor
-      if (cell.fillColor || fillColor || tbl_bgcolor) td.fill = cell.fillColor || fillColor || tbl_bgcolor
+      if (cell.fillColor || fillColor || tbl_bgcolor) td.fillColor = cell.fillColor || fillColor || tbl_bgcolor
 
       tr.push(td)
     }
@@ -866,6 +874,7 @@ function genTable(node, warpObj) {
     width,
     height,
     data,
+    ...(tbl_border || {}),
   }
 }
 

package/src/table.js

@@ -1,6 +1,47 @@
 import { getShapeFill, getSolidFill } from './fill'
 import { getTextByPathList } from './utils'
+import { getBorder } from './border'
 
+export function getTableBorders(node, warpObj) {
+  let borderStyles = {}
+  if (node['a:bottom']) {
+    const obj = {
+      'p:spPr': {
+        'a:ln': node['a:bottom']['a:ln']
+      }
+    }
+    const border = getBorder(obj, undefined, warpObj)
+    borderStyles.bottom = border
+  }
+  if (node['a:top']) {
+    const obj = {
+      'p:spPr': {
+        'a:ln': node['a:top']['a:ln']
+      }
+    }
+    const border = getBorder(obj, undefined, warpObj)
+    borderStyles.top = border
+  }
+  if (node['a:right']) {
+    const obj = {
+      'p:spPr': {
+        'a:ln': node['a:right']['a:ln']
+      }
+    }
+    const border = getBorder(obj, undefined, warpObj)
+    borderStyles.right = border
+  }
+  if (node['a:left']) {
+    const obj = {
+      'p:spPr': {
+        'a:ln': node['a:left']['a:ln']
+      }
+    }
+    const border = getBorder(obj, undefined, warpObj)
+    borderStyles.left = border
+  }
+  return borderStyles
+}
 
 export function getTableCellParams(tcNode, thisTblStyle, cellSource, warpObj) {
   const rowSpan = getTextByPathList(tcNode, ['attrs', 'rowSpan'])
@@ -35,10 +76,10 @@ export function getTableCellParams(tcNode, thisTblStyle, cellSource, warpObj) {
     fillColor,
     fontColor,
     fontBold,
-    rowSpan,
-    colSpan,
-    vMerge,
-    hMerge,
+    rowSpan: rowSpan ? +rowSpan : undefined,
+    colSpan: colSpan ? +colSpan : undefined,
+    vMerge: vMerge ? +vMerge : undefined,
+    hMerge: hMerge ? +hMerge : undefined,
   }
 }