diff --git a/src/controllers/filter.js b/src/controllers/filter.js index 24bc433..675ab45 100644 --- a/src/controllers/filter.js +++ b/src/controllers/filter.js @@ -1253,9 +1253,6 @@ function initialFilterHandler(){ $("#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-sheet' + Store.currentSheetIndex + ', #luckysheet-filter-options-sheet' + Store.currentSheetIndex).remove(); - $("#luckysheet-filter-menu, #luckysheet-filter-submenu").hide(); - let redo = {}; redo["type"] = "datachangeAll_filter_clear"; redo["sheetIndex"] = Store.currentSheetIndex; @@ -1290,6 +1287,9 @@ function initialFilterHandler(){ Store.jfundo = []; 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_select = null; diff --git a/src/global/formula.js b/src/global/formula.js index 7787f92..21c1c6a 100644 --- a/src/global/formula.js +++ b/src/global/formula.js @@ -3171,13 +3171,14 @@ const luckysheetformula = { if(kcode != 46){//delete不执行此函数 _this.createRangeHightlight(); } + + $functionbox.html(value); } _this.rangestart = false; _this.rangedrag_column_start = false; _this.rangedrag_row_start = false; - - $functionbox.html(value); + _this.rangeHightlightselected($editer, kcode); }, 1); },