diff --git a/src/controllers/pivotTable.js b/src/controllers/pivotTable.js index 67c99ac..888e129 100644 --- a/src/controllers/pivotTable.js +++ b/src/controllers/pivotTable.js @@ -881,8 +881,8 @@ const pivotTable = { $("body").append(replaceHtml(modelHTML, { "id": "luckysheet-data-pivotTable-selection", "addclass": "luckysheet-data-pivotTable-selection", "title": "选取数据范围", "content": '', "botton": '' })); - $("body").append(replaceHtml(filtermenuHTML, { "menuid": "pivotTableFilter" })); - $("body").append(replaceHtml(filtersubmenuHTML, { "menuid": "pivotTableFilter" })); + $("body").append(replaceHtml(filtermenuHTML(), { "menuid": "pivotTableFilter" })); + $("body").append(replaceHtml(filtersubmenuHTML(), { "menuid": "pivotTableFilter" })); $("body").append(pivottableconfigHTML); $("body").append(pivottablesumHTML); diff --git a/src/controllers/searchReplace.js b/src/controllers/searchReplace.js index b816c51..da3ac20 100644 --- a/src/controllers/searchReplace.js +++ b/src/controllers/searchReplace.js @@ -61,7 +61,7 @@ const luckysheetSearchReplace = { "botton": '', "style": "z-index:100003" })); - let $t = $("#luckysheet-search-replace").find(".luckysheet-modal-dialog-content").css("min-width", 400).end(), + let $t = $("#luckysheet-search-replace").find(".luckysheet-modal-dialog-content").css("min-width", 500).end(), myh = $t.outerHeight(), myw = $t.outerWidth(); let winw = $(window).width(), winh = $(window).height(); @@ -179,7 +179,8 @@ const luckysheetSearchReplace = { if(searchText == "" || searchText == null){ return; } - + const _locale = locale(); + const locale_findAndReplace = _locale.findAndReplace; let range; if(Store.luckysheet_select_save.length == 0 || (Store.luckysheet_select_save.length == 1 && Store.luckysheet_select_save[0].row[0] == Store.luckysheet_select_save[0].row[1] && Store.luckysheet_select_save[0].column[0] == Store.luckysheet_select_save[0].column[1])){ range = [{