Browse Source

修复pivot

master
liuyang 5 years ago
parent
commit
1fdca15511
  1. 4
      src/controllers/pivotTable.js
  2. 5
      src/controllers/searchReplace.js

4
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(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(filtermenuHTML(), { "menuid": "pivotTableFilter" }));
$("body").append(replaceHtml(filtersubmenuHTML, { "menuid": "pivotTableFilter" })); $("body").append(replaceHtml(filtersubmenuHTML(), { "menuid": "pivotTableFilter" }));
$("body").append(pivottableconfigHTML); $("body").append(pivottableconfigHTML);
$("body").append(pivottablesumHTML); $("body").append(pivottablesumHTML);

5
src/controllers/searchReplace.js

@ -61,7 +61,7 @@ const luckysheetSearchReplace = {
"botton": '<button class="btn btn-default luckysheet-model-close-btn">关闭</button>', "botton": '<button class="btn btn-default luckysheet-model-close-btn">关闭</button>',
"style": "z-index:100003" "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(), myh = $t.outerHeight(),
myw = $t.outerWidth(); myw = $t.outerWidth();
let winw = $(window).width(), winh = $(window).height(); let winw = $(window).width(), winh = $(window).height();
@ -179,7 +179,8 @@ const luckysheetSearchReplace = {
if(searchText == "" || searchText == null){ if(searchText == "" || searchText == null){
return; return;
} }
const _locale = locale();
const locale_findAndReplace = _locale.findAndReplace;
let range; 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])){ 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 = [{ range = [{

Loading…
Cancel
Save