From 1fdca15511c67dafd1605375a40e186218137e26 Mon Sep 17 00:00:00 2001
From: liuyang <qwbfsa@gmail.com>
Date: Fri, 24 Jul 2020 23:49:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpivot?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/pivotTable.js    | 4 ++--
 src/controllers/searchReplace.js | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

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": '<input id="luckysheet-pivotTable-range-selection-input" class="luckysheet-datavisual-range-container" style="font-size: 14px;padding:5px;max-width:none;" spellcheck="false" aria-label="数据范围" placeholder="数据范围">', "botton": '<button id="luckysheet-pivotTable-selection-confirm" class="btn btn-primary">确认选取</button><button class="btn btn-default luckysheet-model-close-btn">取消</button>' }));
 
-            $("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": '<button class="btn btn-default luckysheet-model-close-btn">关闭</button>', 
             "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 = [{