Browse Source

Merge branch 'dev' of github.com:Geekhyt/Luckysheet into dev

master
tong 4 years ago
parent
commit
7f9f0072f3
  1. 3
      src/controllers/resize.js
  2. 6
      src/controllers/updateCell.js

3
src/controllers/resize.js

@ -402,6 +402,9 @@ export function menuToolBarWidth() {
for (let i = 0; i<defaultToolbar.length; i++) { for (let i = 0; i<defaultToolbar.length; i++) {
current = defaultToolbar[i]; current = defaultToolbar[i];
next = defaultToolbar[i + 1]; next = defaultToolbar[i + 1];
if (config[current] === false) {
continue;
}
if (current !== '|' && config[current]) { if (current !== '|' && config[current]) {
obj[current] = { obj[current] = {

6
src/controllers/updateCell.js

@ -214,9 +214,9 @@ export function luckysheetupdateCell(row_index1, col_index1, d, cover, isnotfocu
input_postition["min-width"] = input_postition["max-width"]; input_postition["min-width"] = input_postition["max-width"];
} }
if((value == null || value.toString() == "") && !cover){ // if((value == null || value.toString() == "") && !cover){
value = "<br/>"; // value = "<br/>";
} // }
value = formula.xssDeal(value); value = formula.xssDeal(value);
if(!checkProtectionCellHidden(row_index, col_index, Store.currentSheetIndex) && value.length>0 && value.substr(0, 63)=='<span dir="auto" class="luckysheet-formula-text-color">=</span>'){ if(!checkProtectionCellHidden(row_index, col_index, Store.currentSheetIndex) && value.length>0 && value.substr(0, 63)=='<span dir="auto" class="luckysheet-formula-text-color">=</span>'){
$("#luckysheet-rich-text-editor").html(""); $("#luckysheet-rich-text-editor").html("");

Loading…
Cancel
Save