elink-star
/
luckysheet
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix(rotate text position mistake, when sheet zoom): fix zoom bug, fix strike and underline bug

master
liuyang 5 years ago
parent
09a3de51d3
commit
6680a13425
2 changed files with 44 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/global/draw.js
  2. 80
      src/index.html

8
src/global/draw.js
View File

@ -2140,9 +2140,9 @@ function cellTextRender(textInfo, ctx, option){
if(textInfo.rotate!=0 && textInfo.type!="verticalWrap"){ if(textInfo.rotate!=0 && textInfo.type!="verticalWrap"){
ctx.save(); ctx.save();
ctx.translate(pos_x+textInfo.textLeftAll, pos_y+textInfo.textTopAll); ctx.translate((pos_x+textInfo.textLeftAll)/Store.zoomRatio, (pos_y+textInfo.textTopAll)/Store.zoomRatio);
ctx.rotate(-textInfo.rotate * Math.PI / 180); ctx.rotate(-textInfo.rotate * Math.PI / 180);
ctx.translate(-(textInfo.textLeftAll+pos_x), -(pos_y+textInfo.textTopAll)); ctx.translate(-(textInfo.textLeftAll+pos_x)/Store.zoomRatio, -(pos_y+textInfo.textTopAll)/Store.zoomRatio);
} }
// ctx.fillStyle = "rgb(0,0,0)"; // ctx.fillStyle = "rgb(0,0,0)";
@ -2169,7 +2169,7 @@ function cellTextRender(textInfo, ctx, option){
Math.floor((pos_x +c.endX)/Store.zoomRatio)+0.5 , Math.floor((pos_x +c.endX)/Store.zoomRatio)+0.5 ,
Math.floor((pos_y+c.endY)/Store.zoomRatio)+0.5 , Math.floor((pos_y+c.endY)/Store.zoomRatio)+0.5 ,
); );
ctx.lineWidth = 1; ctx.lineWidth = Math.floor(c.fs/9);
ctx.strokeStyle = ctx.fillStyle; ctx.strokeStyle = ctx.fillStyle;
ctx.stroke(); ctx.stroke();
ctx.closePath(); ctx.closePath();
@ -2188,7 +2188,7 @@ function cellTextRender(textInfo, ctx, option){
Math.floor((pos_x +item.endX)/Store.zoomRatio)+0.5, Math.floor((pos_x +item.endX)/Store.zoomRatio)+0.5,
Math.floor((pos_y+ item.endY)/Store.zoomRatio)+0.5 Math.floor((pos_y+ item.endY)/Store.zoomRatio)+0.5
); );
ctx.lineWidth = 1; ctx.lineWidth = Math.floor(item.fs/9);
ctx.strokeStyle = ctx.fillStyle; ctx.strokeStyle = ctx.fillStyle;
ctx.stroke(); ctx.stroke();
ctx.closePath(); ctx.closePath();

80
src/index.html
View File

@ -81,46 +81,46 @@
forceCalculation:false, forceCalculation:false,
plugins: ['chart'], plugins: ['chart'],
data: data:
[sheetCell,sheetFormula,sheetConditionFormat,sheetSparkline,sheetTable,sheetComment,sheetPivotTableData,sheetPivotTable,sheetChart,sheetPicture,sheetDataVerification] // [sheetCell,sheetFormula,sheetConditionFormat,sheetSparkline,sheetTable,sheetComment,sheetPivotTableData,sheetPivotTable,sheetChart,sheetPicture,sheetDataVerification]
// [{"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":[ [{"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, {"r":0,"c":0,
// "v":{ "v":{
// "ct":{ "ct":{
// "fa":"General", "fa":"General",
// "t":"inlineStr", "t":"inlineStr",
// "s":[ "s":[
// { {
// "ff":"Arial", //font family "ff":"Arial", //font family
// "fc":"#fff000",//font color "fc":"#fff000",//font color
// "fs":12,//font size "fs":12,//font size
// "cl":0,//strike "cl":0,//strike
// "un":0,//underline "un":0,//underline
// "bl":0,//blod "bl":0,//blod
// "it":0,//italic "it":0,//italic
// v:"我在马路\r\n边捡到\r\n\r\n一分钱" v:"我在马路\r\n边捡到\r\n\r\n一分钱"
// }, },
// { {
// "ff":"Arial", //font family "ff":"Arial", //font family
// "fc":"#ff0000",//font color "fc":"#ff0000",//font color
// "fs":14,//font size "fs":14,//font size
// "cl":"1",//strike "cl":"1",//strike
// "un":"1",//underline "un":"1",//underline
// "bl":"1",//blod "bl":"1",//blod
// "it":"0",//italic "it":"0",//italic
// v:"交给警\r\n察叔叔\r\n" v:"交给警\r\n察叔叔\r\n"
// }, },
// ] ]
// }, },
// "fs":11, "fs":11,
// "ff":"等线", "ff":"等线",
// "vt":0, "vt":0,
// "tb":2, "tb":2,
// "v":"", "v":"",
// "qp":1, "qp":1,
// } }
// }, },
// {"r":17,"c":2,"v":{"v":"Luckysheet","ct":{"fa":"General","t":"g"},"bg":null,"bl":0,"it":0,"ff":0,"fs":"11","fc":"rgb(51, 51, 51)","ht":1,"vt":1,"m":"Luckysheet"}} {"r":17,"c":2,"v":{"v":"Luckysheet","ct":{"fa":"General","t":"g"},"bg":null,"bl":0,"it":0,"ff":0,"fs":"11","fc":"rgb(51, 51, 51)","ht":1,"vt":1,"m":"Luckysheet"}}
// ],"calcChain":[]}] ],"calcChain":[]}]
}) })
}) })

Write Preview
Loading…
Cancel
Save