|
|
@@ -8,7 +8,7 @@ import {
|
|
|
applyHueMod,
|
|
|
applySatMod,
|
|
|
hslToRgb,
|
|
|
- getColorName2Hex,
|
|
|
+ getColorName2Hex
|
|
|
} from './color'
|
|
|
|
|
|
import {
|
|
|
@@ -17,10 +17,10 @@ import {
|
|
|
angleToDegrees,
|
|
|
escapeHtml,
|
|
|
getMimeType,
|
|
|
- toHex,
|
|
|
+ toHex
|
|
|
} from './utils'
|
|
|
|
|
|
-export function getFillType(node) {
|
|
|
+export function getFillType (node) {
|
|
|
let fillType = ''
|
|
|
if (node['a:noFill']) fillType = 'NO_FILL'
|
|
|
if (node['a:solidFill']) fillType = 'SOLID_FILL'
|
|
|
@@ -32,23 +32,19 @@ export function getFillType(node) {
|
|
|
return fillType
|
|
|
}
|
|
|
|
|
|
-export async function getPicFill(type, node, warpObj) {
|
|
|
+export async function getPicFill (type, node, warpObj) {
|
|
|
let img
|
|
|
const rId = node['a:blip']['attrs']['r:embed']
|
|
|
let imgPath
|
|
|
if (type === 'slideBg' || type === 'slide') {
|
|
|
imgPath = getTextByPathList(warpObj, ['slideResObj', rId, 'target'])
|
|
|
- }
|
|
|
- else if (type === 'slideLayoutBg') {
|
|
|
+ } else if (type === 'slideLayoutBg') {
|
|
|
imgPath = getTextByPathList(warpObj, ['layoutResObj', rId, 'target'])
|
|
|
- }
|
|
|
- else if (type === 'slideMasterBg') {
|
|
|
+ } else if (type === 'slideMasterBg') {
|
|
|
imgPath = getTextByPathList(warpObj, ['masterResObj', rId, 'target'])
|
|
|
- }
|
|
|
- else if (type === 'themeBg') {
|
|
|
+ } else if (type === 'themeBg') {
|
|
|
imgPath = getTextByPathList(warpObj, ['themeResObj', rId, 'target'])
|
|
|
- }
|
|
|
- else if (type === 'diagramBg') {
|
|
|
+ } else if (type === 'diagramBg') {
|
|
|
imgPath = getTextByPathList(warpObj, ['diagramResObj', rId, 'target'])
|
|
|
}
|
|
|
if (!imgPath) return imgPath
|
|
|
@@ -71,7 +67,7 @@ export async function getPicFill(type, node, warpObj) {
|
|
|
return img
|
|
|
}
|
|
|
|
|
|
-export function getPicFillOpacity(node) {
|
|
|
+export function getPicFillOpacity (node) {
|
|
|
const aBlipNode = node['a:blip']
|
|
|
|
|
|
const aphaModFixNode = getTextByPathList(aBlipNode, ['a:alphaModFix', 'attrs'])
|
|
|
@@ -83,7 +79,7 @@ export function getPicFillOpacity(node) {
|
|
|
return opacity
|
|
|
}
|
|
|
|
|
|
-export async function getBgPicFill(bgPr, sorce, warpObj) {
|
|
|
+export async function getBgPicFill (bgPr, sorce, warpObj) {
|
|
|
const picBase64 = await getPicFill(sorce, bgPr['a:blipFill'], warpObj)
|
|
|
const aBlipNode = bgPr['a:blipFill']['a:blip']
|
|
|
|
|
|
@@ -95,20 +91,20 @@ export async function getBgPicFill(bgPr, sorce, warpObj) {
|
|
|
|
|
|
return {
|
|
|
picBase64,
|
|
|
- opacity,
|
|
|
+ opacity
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-export function getGradientFill(node, warpObj) {
|
|
|
+export function getGradientFill (node, warpObj) {
|
|
|
const gsLst = node['a:gsLst']['a:gs']
|
|
|
const colors = []
|
|
|
for (let i = 0; i < gsLst.length; i++) {
|
|
|
const lo_color = getSolidFill(gsLst[i], undefined, undefined, warpObj)
|
|
|
const pos = getTextByPathList(gsLst[i], ['attrs', 'pos'])
|
|
|
-
|
|
|
+
|
|
|
colors[i] = {
|
|
|
pos: pos ? (pos / 1000 + '%') : '',
|
|
|
- color: lo_color,
|
|
|
+ color: lo_color
|
|
|
}
|
|
|
}
|
|
|
const lin = node['a:lin']
|
|
|
@@ -117,28 +113,28 @@ export function getGradientFill(node, warpObj) {
|
|
|
if (lin) rot = angleToDegrees(lin['attrs']['ang'])
|
|
|
else {
|
|
|
const path = node['a:path']
|
|
|
- if (path && path['attrs'] && path['attrs']['path']) pathType = path['attrs']['path']
|
|
|
+ if (path && path['attrs'] && path['attrs']['path']) pathType = path['attrs']['path']
|
|
|
}
|
|
|
return {
|
|
|
rot,
|
|
|
path: pathType,
|
|
|
- colors: colors.sort((a, b) => parseInt(a.pos) - parseInt(b.pos)),
|
|
|
+ colors: colors.sort((a, b) => parseInt(a.pos) - parseInt(b.pos))
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-export function getBgGradientFill(bgPr, phClr, slideMasterContent, warpObj) {
|
|
|
+export function getBgGradientFill (bgPr, phClr, slideMasterContent, warpObj) {
|
|
|
if (bgPr) {
|
|
|
const grdFill = bgPr['a:gradFill']
|
|
|
const gsLst = grdFill['a:gsLst']['a:gs']
|
|
|
const colors = []
|
|
|
-
|
|
|
+
|
|
|
for (let i = 0; i < gsLst.length; i++) {
|
|
|
const lo_color = getSolidFill(gsLst[i], slideMasterContent['p:sldMaster']['p:clrMap']['attrs'], phClr, warpObj)
|
|
|
const pos = getTextByPathList(gsLst[i], ['attrs', 'pos'])
|
|
|
|
|
|
colors[i] = {
|
|
|
pos: pos ? (pos / 1000 + '%') : '',
|
|
|
- color: lo_color,
|
|
|
+ color: lo_color
|
|
|
}
|
|
|
}
|
|
|
const lin = grdFill['a:lin']
|
|
|
@@ -147,25 +143,24 @@ export function getBgGradientFill(bgPr, phClr, slideMasterContent, warpObj) {
|
|
|
if (lin) rot = angleToDegrees(lin['attrs']['ang']) + 0
|
|
|
else {
|
|
|
const path = grdFill['a:path']
|
|
|
- if (path && path['attrs'] && path['attrs']['path']) pathType = path['attrs']['path']
|
|
|
+ if (path && path['attrs'] && path['attrs']['path']) pathType = path['attrs']['path']
|
|
|
}
|
|
|
return {
|
|
|
rot,
|
|
|
path: pathType,
|
|
|
- colors: colors.sort((a, b) => parseInt(a.pos) - parseInt(b.pos)),
|
|
|
+ colors: colors.sort((a, b) => parseInt(a.pos) - parseInt(b.pos))
|
|
|
}
|
|
|
- }
|
|
|
- else if (phClr) {
|
|
|
+ } else if (phClr) {
|
|
|
return phClr.indexOf('#') === -1 ? `#${phClr}` : phClr
|
|
|
}
|
|
|
return null
|
|
|
}
|
|
|
|
|
|
-export async function getSlideBackgroundFill(warpObj) {
|
|
|
+export async function getSlideBackgroundFill (warpObj) {
|
|
|
const slideContent = warpObj['slideContent']
|
|
|
const slideLayoutContent = warpObj['slideLayoutContent']
|
|
|
const slideMasterContent = warpObj['slideMasterContent']
|
|
|
-
|
|
|
+
|
|
|
let bgPr = getTextByPathList(slideContent, ['p:sld', 'p:cSld', 'p:bg', 'p:bgPr'])
|
|
|
let bgRef = getTextByPathList(slideContent, ['p:sld', 'p:cSld', 'p:bg', 'p:bgRef'])
|
|
|
|
|
|
@@ -187,23 +182,19 @@ export async function getSlideBackgroundFill(warpObj) {
|
|
|
}
|
|
|
const sldBgClr = getSolidFill(sldFill, clrMapOvr, undefined, warpObj)
|
|
|
background = sldBgClr
|
|
|
- }
|
|
|
- else if (bgFillTyp === 'GRADIENT_FILL') {
|
|
|
+ } else if (bgFillTyp === 'GRADIENT_FILL') {
|
|
|
const gradientFill = getBgGradientFill(bgPr, undefined, slideMasterContent, warpObj)
|
|
|
if (typeof gradientFill === 'string') {
|
|
|
background = gradientFill
|
|
|
- }
|
|
|
- else if (gradientFill) {
|
|
|
+ } else if (gradientFill) {
|
|
|
background = gradientFill
|
|
|
backgroundType = 'gradient'
|
|
|
}
|
|
|
- }
|
|
|
- else if (bgFillTyp === 'PIC_FILL') {
|
|
|
+ } else if (bgFillTyp === 'PIC_FILL') {
|
|
|
background = await getBgPicFill(bgPr, 'slideBg', warpObj)
|
|
|
backgroundType = 'image'
|
|
|
}
|
|
|
- }
|
|
|
- else if (bgRef) {
|
|
|
+ } else if (bgRef) {
|
|
|
let clrMapOvr
|
|
|
const sldClrMapOvr = getTextByPathList(slideContent, ['p:sld', 'p:clrMapOvr', 'a:overrideClrMapping', 'attrs'])
|
|
|
if (sldClrMapOvr) clrMapOvr = sldClrMapOvr
|
|
|
@@ -234,8 +225,7 @@ export async function getSlideBackgroundFill(warpObj) {
|
|
|
}
|
|
|
sortblAry.push(obj)
|
|
|
}
|
|
|
- }
|
|
|
- else {
|
|
|
+ } else {
|
|
|
const obj = {}
|
|
|
obj[key] = bgFillLstTyp
|
|
|
if (bgFillLstTyp['attrs']) {
|
|
|
@@ -256,20 +246,17 @@ export async function getSlideBackgroundFill(warpObj) {
|
|
|
const sldFill = bgFillLstIdx['a:solidFill']
|
|
|
const sldBgClr = getSolidFill(sldFill, clrMapOvr, undefined, warpObj)
|
|
|
background = sldBgClr
|
|
|
- }
|
|
|
- else if (bgFillTyp === 'GRADIENT_FILL') {
|
|
|
+ } else if (bgFillTyp === 'GRADIENT_FILL') {
|
|
|
const gradientFill = getBgGradientFill(bgFillLstIdx, phClr, slideMasterContent, warpObj)
|
|
|
if (typeof gradientFill === 'string') {
|
|
|
background = gradientFill
|
|
|
- }
|
|
|
- else if (gradientFill) {
|
|
|
+ } else if (gradientFill) {
|
|
|
background = gradientFill
|
|
|
backgroundType = 'gradient'
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
- else {
|
|
|
+ } else {
|
|
|
bgPr = getTextByPathList(slideLayoutContent, ['p:sldLayout', 'p:cSld', 'p:bg', 'p:bgPr'])
|
|
|
bgRef = getTextByPathList(slideLayoutContent, ['p:sldLayout', 'p:cSld', 'p:bg', 'p:bgRef'])
|
|
|
|
|
|
@@ -284,26 +271,22 @@ export async function getSlideBackgroundFill(warpObj) {
|
|
|
const sldFill = bgPr['a:solidFill']
|
|
|
const sldBgClr = getSolidFill(sldFill, clrMapOvr, undefined, warpObj)
|
|
|
background = sldBgClr
|
|
|
- }
|
|
|
- else if (bgFillTyp === 'GRADIENT_FILL') {
|
|
|
+ } else if (bgFillTyp === 'GRADIENT_FILL') {
|
|
|
const gradientFill = getBgGradientFill(bgPr, undefined, slideMasterContent, warpObj)
|
|
|
if (typeof gradientFill === 'string') {
|
|
|
background = gradientFill
|
|
|
- }
|
|
|
- else if (gradientFill) {
|
|
|
+ } else if (gradientFill) {
|
|
|
background = gradientFill
|
|
|
backgroundType = 'gradient'
|
|
|
}
|
|
|
- }
|
|
|
- else if (bgFillTyp === 'PIC_FILL') {
|
|
|
+ } else if (bgFillTyp === 'PIC_FILL') {
|
|
|
background = await getBgPicFill(bgPr, 'slideLayoutBg', warpObj)
|
|
|
backgroundType = 'image'
|
|
|
}
|
|
|
- }
|
|
|
- else if (bgRef) {
|
|
|
+ } else if (bgRef) {
|
|
|
const phClr = getSolidFill(bgRef, clrMapOvr, undefined, warpObj)
|
|
|
const idx = Number(bgRef['attrs']['idx'])
|
|
|
-
|
|
|
+
|
|
|
if (idx > 1000) {
|
|
|
const trueIdx = idx - 1000
|
|
|
const bgFillLst = warpObj['themeContent']['a:theme']['a:themeElements']['a:fmtScheme']['a:bgFillStyleLst']
|
|
|
@@ -323,8 +306,7 @@ export async function getSlideBackgroundFill(warpObj) {
|
|
|
}
|
|
|
sortblAry.push(obj)
|
|
|
}
|
|
|
- }
|
|
|
- else {
|
|
|
+ } else {
|
|
|
const obj = {}
|
|
|
obj[key] = bgFillLstTyp
|
|
|
if (bgFillLstTyp['attrs']) {
|
|
|
@@ -345,24 +327,20 @@ export async function getSlideBackgroundFill(warpObj) {
|
|
|
const sldFill = bgFillLstIdx['a:solidFill']
|
|
|
const sldBgClr = getSolidFill(sldFill, clrMapOvr, undefined, warpObj)
|
|
|
background = sldBgClr
|
|
|
- }
|
|
|
- else if (bgFillTyp === 'GRADIENT_FILL') {
|
|
|
+ } else if (bgFillTyp === 'GRADIENT_FILL') {
|
|
|
const gradientFill = getBgGradientFill(bgFillLstIdx, phClr, slideMasterContent, warpObj)
|
|
|
if (typeof gradientFill === 'string') {
|
|
|
background = gradientFill
|
|
|
- }
|
|
|
- else if (gradientFill) {
|
|
|
+ } else if (gradientFill) {
|
|
|
background = gradientFill
|
|
|
backgroundType = 'gradient'
|
|
|
}
|
|
|
- }
|
|
|
- else if (bgFillTyp === 'PIC_FILL') {
|
|
|
+ } else if (bgFillTyp === 'PIC_FILL') {
|
|
|
background = await getBgPicFill(bgFillLstIdx, 'themeBg', warpObj)
|
|
|
backgroundType = 'image'
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
- else {
|
|
|
+ } else {
|
|
|
bgPr = getTextByPathList(slideMasterContent, ['p:sldMaster', 'p:cSld', 'p:bg', 'p:bgPr'])
|
|
|
bgRef = getTextByPathList(slideMasterContent, ['p:sldMaster', 'p:cSld', 'p:bg', 'p:bgRef'])
|
|
|
|
|
|
@@ -373,26 +351,22 @@ export async function getSlideBackgroundFill(warpObj) {
|
|
|
const sldFill = bgPr['a:solidFill']
|
|
|
const sldBgClr = getSolidFill(sldFill, clrMap, undefined, warpObj)
|
|
|
background = sldBgClr
|
|
|
- }
|
|
|
- else if (bgFillTyp === 'GRADIENT_FILL') {
|
|
|
+ } else if (bgFillTyp === 'GRADIENT_FILL') {
|
|
|
const gradientFill = getBgGradientFill(bgPr, undefined, slideMasterContent, warpObj)
|
|
|
if (typeof gradientFill === 'string') {
|
|
|
background = gradientFill
|
|
|
- }
|
|
|
- else if (gradientFill) {
|
|
|
+ } else if (gradientFill) {
|
|
|
background = gradientFill
|
|
|
backgroundType = 'gradient'
|
|
|
}
|
|
|
- }
|
|
|
- else if (bgFillTyp === 'PIC_FILL') {
|
|
|
+ } else if (bgFillTyp === 'PIC_FILL') {
|
|
|
background = await getBgPicFill(bgPr, 'slideMasterBg', warpObj)
|
|
|
backgroundType = 'image'
|
|
|
}
|
|
|
- }
|
|
|
- else if (bgRef) {
|
|
|
+ } else if (bgRef) {
|
|
|
const phClr = getSolidFill(bgRef, clrMap, undefined, warpObj)
|
|
|
const idx = Number(bgRef['attrs']['idx'])
|
|
|
-
|
|
|
+
|
|
|
if (idx > 1000) {
|
|
|
const trueIdx = idx - 1000
|
|
|
const bgFillLst = warpObj['themeContent']['a:theme']['a:themeElements']['a:fmtScheme']['a:bgFillStyleLst']
|
|
|
@@ -412,8 +386,7 @@ export async function getSlideBackgroundFill(warpObj) {
|
|
|
}
|
|
|
sortblAry.push(obj)
|
|
|
}
|
|
|
- }
|
|
|
- else {
|
|
|
+ } else {
|
|
|
const obj = {}
|
|
|
obj[key] = bgFillLstTyp
|
|
|
if (bgFillLstTyp['attrs']) {
|
|
|
@@ -434,18 +407,15 @@ export async function getSlideBackgroundFill(warpObj) {
|
|
|
const sldFill = bgFillLstIdx['a:solidFill']
|
|
|
const sldBgClr = getSolidFill(sldFill, clrMapOvr, undefined, warpObj)
|
|
|
background = sldBgClr
|
|
|
- }
|
|
|
- else if (bgFillTyp === 'GRADIENT_FILL') {
|
|
|
+ } else if (bgFillTyp === 'GRADIENT_FILL') {
|
|
|
const gradientFill = getBgGradientFill(bgFillLstIdx, phClr, slideMasterContent, warpObj)
|
|
|
if (typeof gradientFill === 'string') {
|
|
|
background = gradientFill
|
|
|
- }
|
|
|
- else if (gradientFill) {
|
|
|
+ } else if (gradientFill) {
|
|
|
background = gradientFill
|
|
|
backgroundType = 'gradient'
|
|
|
}
|
|
|
- }
|
|
|
- else if (bgFillTyp === 'PIC_FILL') {
|
|
|
+ } else if (bgFillTyp === 'PIC_FILL') {
|
|
|
background = await getBgPicFill(bgFillLstIdx, 'themeBg', warpObj)
|
|
|
backgroundType = 'image'
|
|
|
}
|
|
|
@@ -455,34 +425,31 @@ export async function getSlideBackgroundFill(warpObj) {
|
|
|
}
|
|
|
return {
|
|
|
type: backgroundType,
|
|
|
- value: background,
|
|
|
+ value: background
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-export async function getShapeFill(node, pNode, isSvgMode, warpObj, source) {
|
|
|
+export async function getShapeFill (node, pNode, isSvgMode, warpObj, source) {
|
|
|
const fillType = getFillType(getTextByPathList(node, ['p:spPr']))
|
|
|
let type = 'color'
|
|
|
let fillValue = ''
|
|
|
if (fillType === 'NO_FILL') {
|
|
|
return isSvgMode ? 'none' : ''
|
|
|
- }
|
|
|
- else if (fillType === 'SOLID_FILL') {
|
|
|
+ } else if (fillType === 'SOLID_FILL') {
|
|
|
const shpFill = node['p:spPr']['a:solidFill']
|
|
|
fillValue = getSolidFill(shpFill, undefined, undefined, warpObj)
|
|
|
type = 'color'
|
|
|
- }
|
|
|
- else if (fillType === 'GRADIENT_FILL') {
|
|
|
+ } else if (fillType === 'GRADIENT_FILL') {
|
|
|
const shpFill = node['p:spPr']['a:gradFill']
|
|
|
fillValue = getGradientFill(shpFill, warpObj)
|
|
|
type = 'gradient'
|
|
|
- }
|
|
|
- else if (fillType === 'PIC_FILL') {
|
|
|
+ } else if (fillType === 'PIC_FILL') {
|
|
|
const shpFill = node['p:spPr']['a:blipFill']
|
|
|
const picBase64 = await getPicFill(source, shpFill, warpObj)
|
|
|
const opacity = getPicFillOpacity(shpFill)
|
|
|
fillValue = {
|
|
|
picBase64,
|
|
|
- opacity,
|
|
|
+ opacity
|
|
|
}
|
|
|
type = 'image'
|
|
|
}
|
|
|
@@ -499,19 +466,18 @@ export async function getShapeFill(node, pNode, isSvgMode, warpObj, source) {
|
|
|
const spShpNode = { 'p:spPr': grpShpFill }
|
|
|
return getShapeFill(spShpNode, node, isSvgMode, warpObj, source)
|
|
|
}
|
|
|
- }
|
|
|
- else if (fillType === 'NO_FILL') {
|
|
|
+ } else if (fillType === 'NO_FILL') {
|
|
|
return isSvgMode ? 'none' : ''
|
|
|
}
|
|
|
}
|
|
|
|
|
|
return {
|
|
|
type,
|
|
|
- value: fillValue,
|
|
|
+ value: fillValue
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-export function getSolidFill(solidFill, clrMap, phClr, warpObj) {
|
|
|
+export function getSolidFill (solidFill, clrMap, phClr, warpObj) {
|
|
|
if (!solidFill) return ''
|
|
|
|
|
|
let color = ''
|
|
|
@@ -520,26 +486,22 @@ export function getSolidFill(solidFill, clrMap, phClr, warpObj) {
|
|
|
if (solidFill['a:srgbClr']) {
|
|
|
clrNode = solidFill['a:srgbClr']
|
|
|
color = getTextByPathList(clrNode, ['attrs', 'val'])
|
|
|
- }
|
|
|
- else if (solidFill['a:schemeClr']) {
|
|
|
+ } else if (solidFill['a:schemeClr']) {
|
|
|
clrNode = solidFill['a:schemeClr']
|
|
|
const schemeClr = 'a:' + getTextByPathList(clrNode, ['attrs', 'val'])
|
|
|
color = getSchemeColorFromTheme(schemeClr, warpObj, clrMap, phClr) || ''
|
|
|
- }
|
|
|
- else if (solidFill['a:scrgbClr']) {
|
|
|
+ } else if (solidFill['a:scrgbClr']) {
|
|
|
clrNode = solidFill['a:scrgbClr']
|
|
|
const defBultColorVals = clrNode['attrs']
|
|
|
const red = (defBultColorVals['r'].indexOf('%') !== -1) ? defBultColorVals['r'].split('%').shift() : defBultColorVals['r']
|
|
|
const green = (defBultColorVals['g'].indexOf('%') !== -1) ? defBultColorVals['g'].split('%').shift() : defBultColorVals['g']
|
|
|
const blue = (defBultColorVals['b'].indexOf('%') !== -1) ? defBultColorVals['b'].split('%').shift() : defBultColorVals['b']
|
|
|
color = toHex(255 * (Number(red) / 100)) + toHex(255 * (Number(green) / 100)) + toHex(255 * (Number(blue) / 100))
|
|
|
- }
|
|
|
- else if (solidFill['a:prstClr']) {
|
|
|
+ } else if (solidFill['a:prstClr']) {
|
|
|
clrNode = solidFill['a:prstClr']
|
|
|
const prstClr = getTextByPathList(clrNode, ['attrs', 'val'])
|
|
|
color = getColorName2Hex(prstClr)
|
|
|
- }
|
|
|
- else if (solidFill['a:hslClr']) {
|
|
|
+ } else if (solidFill['a:hslClr']) {
|
|
|
clrNode = solidFill['a:hslClr']
|
|
|
const defBultColorVals = clrNode['attrs']
|
|
|
const hue = Number(defBultColorVals['hue']) / 100000
|
|
|
@@ -547,8 +509,7 @@ export function getSolidFill(solidFill, clrMap, phClr, warpObj) {
|
|
|
const lum = Number((defBultColorVals['lum'].indexOf('%') !== -1) ? defBultColorVals['lum'].split('%').shift() : defBultColorVals['lum']) / 100
|
|
|
const hsl2rgb = hslToRgb(hue, sat, lum)
|
|
|
color = toHex(hsl2rgb.r) + toHex(hsl2rgb.g) + toHex(hsl2rgb.b)
|
|
|
- }
|
|
|
- else if (solidFill['a:sysClr']) {
|
|
|
+ } else if (solidFill['a:sysClr']) {
|
|
|
clrNode = solidFill['a:sysClr']
|
|
|
const sysClr = getTextByPathList(clrNode, ['attrs', 'lastClr'])
|
|
|
if (sysClr) color = sysClr
|
|
|
@@ -591,4 +552,4 @@ export function getSolidFill(solidFill, clrMap, phClr, warpObj) {
|
|
|
if (color && color.indexOf('#') === -1) color = '#' + color
|
|
|
|
|
|
return color
|
|
|
-}
|
|
|
+}
|
李志伟