Browse Source
Merge pull request #1106 from luncheon/apply-default-font-size
fix: apply defaultFontSize to input fields
master
mengshukeji
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
4 deletions
-
src/controllers/updateCell.js
-
src/global/getdata.js
|
@ -101,7 +101,7 @@ export function luckysheetupdateCell(row_index1, col_index1, d, cover, isnotfocu |
|
|
$("#luckysheet-input-box").removeAttr("style").css({ |
|
|
$("#luckysheet-input-box").removeAttr("style").css({ |
|
|
"background-color": "rgb(255, 255, 255)", |
|
|
"background-color": "rgb(255, 255, 255)", |
|
|
"padding": "0px 2px", |
|
|
"padding": "0px 2px", |
|
|
"font-size": "13px", |
|
|
"font-size": `${Store.defaultFontSize}pt`, |
|
|
"right": "auto", |
|
|
"right": "auto", |
|
|
"overflow-y": "auto", |
|
|
"overflow-y": "auto", |
|
|
"box-sizing": "initial", |
|
|
"box-sizing": "initial", |
|
|
|
@ -352,7 +352,7 @@ export function getFontStyleByCell(cell,checksAF,checksCF, isCheck=true){ |
|
|
style += "font-family: " + f + ";"; |
|
|
style += "font-family: " + f + ";"; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if(key == "fs" && value != "10"){ |
|
|
if(key == "fs"){ |
|
|
style += "font-size: "+ value + "pt;"; |
|
|
style += "font-size: "+ value + "pt;"; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -509,12 +509,12 @@ export function checkstatusByCell(cell, a){ |
|
|
} |
|
|
} |
|
|
else if(a == "fs"){ |
|
|
else if(a == "fs"){ |
|
|
if(foucsStatus == null){ |
|
|
if(foucsStatus == null){ |
|
|
foucsStatus = "10"; |
|
|
foucsStatus = String(Store.defaultFontSize); |
|
|
} |
|
|
} |
|
|
else{ |
|
|
else{ |
|
|
foucsStatus = foucsStatus[a]; |
|
|
foucsStatus = foucsStatus[a]; |
|
|
if(foucsStatus == null){ |
|
|
if(foucsStatus == null){ |
|
|
foucsStatus = "10"; |
|
|
foucsStatus = String(Store.defaultFontSize); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|