diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js index 610fc9b..29d8dee 100644 --- a/src/controllers/menuButton.js +++ b/src/controllers/menuButton.js @@ -2887,7 +2887,7 @@ const menuButton = { if(value.substr(0,1)!="="){ let cell = d[Store.luckysheetCellUpdate[0]][Store.luckysheetCellUpdate[1]]; updateInlineStringFormat(cell, attr, foucsStatus, luckysheetformula.rangeResizeTo); - return; + // return; } } } @@ -3014,12 +3014,12 @@ const menuButton = { let value = d[r][c]; if (getObjType(value) == "object") { - if(attr in inlineStyleAffectAttribute && isInlineStringCell(value)){ + // if(attr in inlineStyleAffectAttribute && isInlineStringCell(value)){ updateInlineStringFormatOutside(value, attr, foucsStatus); - } - else{ + // } + // else{ d[r][c][attr] = foucsStatus; - } + // } } else{ diff --git a/src/global/getdata.js b/src/global/getdata.js index 941eb90..5308e21 100644 --- a/src/global/getdata.js +++ b/src/global/getdata.js @@ -393,26 +393,28 @@ export function checkstatusByCell(cell, a){ foucsStatus = "0"; } else{ - var w = window.getSelection(), isInlineEdit=false; - if(w.type!="None"){ - var range = w.getRangeAt(0); - let startContainer = range.startContainer; - if (parseInt($("#luckysheet-input-box").css("top")) > 0 && startContainer.parentNode.tagName=="SPAN" && !range.collapsed) { - let span = startContainer.parentNode; - let styleList = convertCssToStyleList(span.style.cssText); - foucsStatus = styleList[a]; - isInlineEdit = true; - } - } + // var w = window.getSelection(), isInlineEdit=false; + // if(w.type!="None"){ + // var range = w.getRangeAt(0); + // let startContainer = range.startContainer; + // if (parseInt($("#luckysheet-input-box").css("top")) > 0 && startContainer.parentNode.tagName=="SPAN" && !range.collapsed) { + // let span = startContainer.parentNode; + // let styleList = convertCssToStyleList(span.style.cssText); + // foucsStatus = styleList[a]; + // isInlineEdit = true; + // } + // } + + // if(!isInlineEdit){ + // if(isInlineStringCell(cell)){ + // foucsStatus = cell.ct.s[0][a]; + // } + // else{ + // foucsStatus = foucsStatus[a]; + // } + // } - if(!isInlineEdit){ - if(isInlineStringCell(cell)){ - foucsStatus = cell.ct.s[0][a]; - } - else{ - foucsStatus = foucsStatus[a]; - } - } + foucsStatus = foucsStatus[a]; if(foucsStatus == null){ foucsStatus = "0";