Merge branch 'requirement_367' into debug

src/CustomElement/EtaTable.ce.vue

@@ -72,13 +72,15 @@ async function getTableData(){
 getTableData()
 
 function handleCellStyle(cell){
-    return `
+    let res = `
         color: ${cell.fc};
         font-weight: ${cell.bl ? 'bold' : 'normal'};
         font-style: ${cell.it ? 'italic' : 'normal'};
         text-align: ${HtObj[cell.HorizontalType]};
         font-family: ${handleFF(cell.ff)};
-    `
+    `;
+    if(cell.cl || cell.un) res += `text-decoration:${cell.cl ? 'line-through' : ''}  ${cell.un ? 'underline' : ''};`;
+    return res;
 }
 
 function handleFF(ff){

src/views/ppt/components/SheetWrap.vue

@@ -57,13 +57,15 @@ function setDefaultSource(sourceText){
 }
 
 function handleCellStyle(cell){
-    return `
+    let res =  `
         color: ${cell.fc};
         font-weight: ${cell.bl ? 'bold' : 'normal'};
         font-style: ${cell.it ? 'italic' : 'normal'};
         text-align: ${HtObj[cell.HorizontalType]};
         font-family: ${handleFF(cell.ff)};
-    `
+    `;
+    if(cell.cl || cell.un) res += `text-decoration:${cell.cl ? 'line-through' : ''}  ${cell.un ? 'underline' : ''};`;
+    return res;
 }
 
 function handleFF(ff){