|
@@ -627,8 +627,16 @@ export const getTableData = (data)=>{
|
|
|
let cellOptions = {
|
|
|
colspan:cell.mc.cs===0?1:cell.mc.cs,
|
|
|
rowspan:cell.mc.rs===0?1:cell.mc.rs,
|
|
|
- color: cell.fc?cell.fc.substring(1):'333333',
|
|
|
- fill: cell.bg ? cell.bg.substring(1):'',
|
|
|
+ color: cell.fc
|
|
|
+ ? cell.fc.includes('rgb')
|
|
|
+ ? rgbaToHex(cell.fc).color.substring(1)
|
|
|
+ : (cell.fc.indexOf('#')===0?cell.fc.substring(1):'333333')
|
|
|
+ :'333333',
|
|
|
+ fill: cell.bg
|
|
|
+ ? cell.bg.includes('rgb')
|
|
|
+ ? rgbaToHex(cell.bg).color.substring(1)
|
|
|
+ : (cell.bg.indexOf('#')===0?cell.bg.substring(1):'')
|
|
|
+ : '',
|
|
|
bold: cell.bl ? true : false,
|
|
|
italic: cell.it ? true : false,
|
|
|
}
|