Explorar o código

Merge branch 'requirement_367' into debug

cldu hai 4 semanas
pai
achega
df22f55746
Modificáronse 1 ficheiros con 2 adicións e 1 borrados
  1. 2 1
      src/components/sheet.vue

+ 2 - 1
src/components/sheet.vue

@@ -85,7 +85,7 @@ initTableCellsWid('init',props.sceneConfig)
             text-align: ${HtObj[cell.HorizontalType]};
             font-size: ${cell.fs||props.config.FontSize||12}px;
             width:${index==0?getSize(cell_index,'width'):'auto'};
-            font-family: ${handleFF(cell.ff)};
+            ${cell.ct.s ? '' : `font-family: ${handleFF(cell.ff)};`}
           `"
           @mousemove="e =>isCanDrag && handleMouseMove(e,index,cell_index)"
           @mousedown="e =>isCanDrag && handleMouseDown(e,index,cell_index)"
@@ -100,6 +100,7 @@ initTableCellsWid('init',props.sceneConfig)
                 font-weight: ${word.bl ? 'bold' : 'normal'};
                 font-style: ${word.it ? 'italic' : 'normal'};
                 text-decoration:${word.un?'underline':word.cl?'line-through':'normal'};
+                font-family: ${handleFF(word.ff)};
               `"
             >{{word.v}}</span>
           </div>