Browse Source

refactor: inlinestr add

master
liuyang 5 years ago
parent
commit
aa3304b9bf
  1. 13
      src/global/draw.js
  2. 42
      src/index.html

13
src/global/draw.js

@ -1568,7 +1568,15 @@ let cellRender = function(r, c, start_r, start_c, end_r, end_c, value, luckyshee
//自动换行 //自动换行
// luckysheetTableContent.textBaseline = 'top'; //textBaseline以top计算 // luckysheetTableContent.textBaseline = 'top'; //textBaseline以top计算
let strArr = [];//文本截断数组 if(cell.ct!=null && cell.ct.t=="inlineStr" && cell.ct.sharedStrings!=null && cell.ct.sharedStrings.length>0){
let strArr = [],lineMaxHeight=[];
let sharedStrings = cell.ct.sharedStrings;
for(let i=0;i<cell.ct.sharedStrings.length;i++){
}
}
else{
let strArr = [];
strArr = getCellTextSplitArr(value.toString(), strArr, (cellWidth - space_width * 2), luckysheetTableContent); strArr = getCellTextSplitArr(value.toString(), strArr, (cellWidth - space_width * 2), luckysheetTableContent);
let word_space_height = oneLineTextHeight/3; let word_space_height = oneLineTextHeight/3;
for(let i = 0; i < strArr.length; i++){ for(let i = 0; i < strArr.length; i++){
@ -1626,6 +1634,9 @@ let cellRender = function(r, c, start_r, start_c, end_r, end_c, value, luckyshee
} }
} }
} }
}
else if(cell.tr != null && cell.tr != '0'){ else if(cell.tr != null && cell.tr != '0'){
//旋转 //旋转
// luckysheetTableContent.textBaseline = 'top'; //textBaseline以top计算 // luckysheetTableContent.textBaseline = 'top'; //textBaseline以top计算

42
src/index.html

@ -37,7 +37,47 @@
allowEdit:true, allowEdit:true,
forceCalculation:false, forceCalculation:false,
plugins: ['chart'], plugins: ['chart'],
data: [sheetCell,sheetFormula,sheetConditionFormat,sheetTable,sheetSparkline,sheetComment,sheetPivotTableData,sheetPivotTable,sheetChart] data: [{"name":"Sheet1","config":{"columnlen":{"0":241},"rowlen":{"0":81}},"index":"1","status":"1","order":"0","luckysheet_select_save":[{"row":[0,0],"column":[4,4],"sheetIndex":1}],"zoomRatio":1,"showGridLines":"1","defaultColWidth":72,"defaultRowHeight":18,"celldata":[
{"r":0,"c":0,
"v":{
"ct":{
"fa":"General",
"t":"inlineStr",
"sharedStrings":[
{
"ff":"等线", //font family
"fc":"#fff000",//font color
"fs":12,//font size
"cl":1,//strike
"un":0,//underline
"bl":0,//blod
"it":1,//italic
v:"我在"
},
{
"t":1,//换行符
},
{
"ff":"等线", //font family
"fc":"#ff0000",//font color
"fs":14,//font size
"cl":"1",//strike
"un":"0",//underline
"bl":"1",//blod
"it":"0",//italic
v:"马路边"
},
]
},
"fs":11,
"ff":"等线",
"vt":0,
"tb":2,
"v":"",
"qp":1,
}
}
],"calcChain":[]}]
}) })
}) })

Loading…
Cancel
Save