Browse Source

fix(bug): bug

bug
master
wpxp123456 5 years ago
parent
commit
ad1ac61545
  1. 6
      src/controllers/filter.js
  2. 5
      src/global/formula.js

6
src/controllers/filter.js

@ -1253,9 +1253,6 @@ function initialFilterHandler(){
$("#luckysheet-filter-menu .luckysheet-filter-selected-input").hide().find("input").val(); $("#luckysheet-filter-menu .luckysheet-filter-selected-input").hide().find("input").val();
$("#luckysheet-filter-selected span").data("type", "0").data("type", null).text(locale_filter.conditionNone); $("#luckysheet-filter-selected span").data("type", "0").data("type", null).text(locale_filter.conditionNone);
$('#luckysheet-filter-selected-sheet' + Store.currentSheetIndex + ', #luckysheet-filter-options-sheet' + Store.currentSheetIndex).remove();
$("#luckysheet-filter-menu, #luckysheet-filter-submenu").hide();
let redo = {}; let redo = {};
redo["type"] = "datachangeAll_filter_clear"; redo["type"] = "datachangeAll_filter_clear";
redo["sheetIndex"] = Store.currentSheetIndex; redo["sheetIndex"] = Store.currentSheetIndex;
@ -1290,6 +1287,9 @@ function initialFilterHandler(){
Store.jfundo = []; Store.jfundo = [];
Store.jfredo.push(redo); Store.jfredo.push(redo);
$('#luckysheet-filter-selected-sheet' + Store.currentSheetIndex + ', #luckysheet-filter-options-sheet' + Store.currentSheetIndex).remove();
$("#luckysheet-filter-menu, #luckysheet-filter-submenu").hide();
//清除筛选发送给后台 //清除筛选发送给后台
Store.luckysheetfile[getSheetIndex(Store.currentSheetIndex)].filter = null; Store.luckysheetfile[getSheetIndex(Store.currentSheetIndex)].filter = null;
Store.luckysheetfile[getSheetIndex(Store.currentSheetIndex)].filter_select = null; Store.luckysheetfile[getSheetIndex(Store.currentSheetIndex)].filter_select = null;

5
src/global/formula.js

@ -3171,13 +3171,14 @@ const luckysheetformula = {
if(kcode != 46){//delete不执行此函数 if(kcode != 46){//delete不执行此函数
_this.createRangeHightlight(); _this.createRangeHightlight();
} }
$functionbox.html(value);
} }
_this.rangestart = false; _this.rangestart = false;
_this.rangedrag_column_start = false; _this.rangedrag_column_start = false;
_this.rangedrag_row_start = false; _this.rangedrag_row_start = false;
$functionbox.html(value);
_this.rangeHightlightselected($editer, kcode); _this.rangeHightlightselected($editer, kcode);
}, 1); }, 1);
}, },

Loading…
Cancel
Save