Browse Source

fix(fix): fix

master
liuyang 5 years ago
parent
commit
194dea1767
  1. 47
      src/controllers/sheetmanage.js
  2. 4
      src/demoData/sheetCell.js

47
src/controllers/sheetmanage.js

@ -6,6 +6,7 @@ import luckysheetcreatedom from '../global/createdom';
import tooltip from '../global/tooltip'; import tooltip from '../global/tooltip';
import formula from '../global/formula'; import formula from '../global/formula';
import { luckysheetrefreshgrid, jfrefreshgrid_rhcw } from '../global/refresh'; import { luckysheetrefreshgrid, jfrefreshgrid_rhcw } from '../global/refresh';
import rhchInit from '../global/rhchInit';
import editor from '../global/editor'; import editor from '../global/editor';
import { luckysheetextendtable, luckysheetdeletetable } from '../global/extend'; import { luckysheetextendtable, luckysheetdeletetable } from '../global/extend';
import { isRealNum } from '../global/validate'; import { isRealNum } from '../global/validate';
@ -841,25 +842,7 @@ const sheetmanage = {
createFilterOptions(file["filter_select"], file["filter"]); createFilterOptions(file["filter_select"], file["filter"]);
Store.scrollRefreshSwitch = false; rhchInit(Store.flowdata.length, Store.flowdata[0].length);
if(file["scrollLeft"] != null && file["scrollLeft"] > 0){
$("#luckysheet-scrollbar-x").scrollLeft(file["scrollLeft"]);
}
else{
$("#luckysheet-scrollbar-x").scrollLeft(0);
}
if(file["scrollTop"] != null && file["scrollTop"] > 0){
$("#luckysheet-scrollbar-y").scrollTop(file["scrollTop"]);
}
else{
$("#luckysheet-scrollbar-y").scrollTop(0);
}
setTimeout(() => {
Store.scrollRefreshSwitch = true;
}, 0);
jfrefreshgrid_rhcw(Store.flowdata.length, Store.flowdata[0].length, false);
}, },
restoreselect: function() { restoreselect: function() {
let index = this.getSheetIndex(Store.currentSheetIndex); let index = this.getSheetIndex(Store.currentSheetIndex);
@ -1074,6 +1057,32 @@ const sheetmanage = {
$("#luckysheet-scrollbar-x div").width(Store.ch_width); $("#luckysheet-scrollbar-x div").width(Store.ch_width);
$("#luckysheet-scrollbar-y div").height(Store.rh_height + Store.columeHeaderHeight - Store.cellMainSrollBarSize - 3); $("#luckysheet-scrollbar-y div").height(Store.rh_height + Store.columeHeaderHeight - Store.cellMainSrollBarSize - 3);
//等待滚动条dom宽高计算完成后 初始化该表格滚动位置
let index = this.getSheetIndex(Store.currentSheetIndex);
let file = Store.luckysheetfile[index];
Store.scrollRefreshSwitch = false;
if(file["scrollLeft"] != null && file["scrollLeft"] > 0){
$("#luckysheet-scrollbar-x").scrollLeft(file["scrollLeft"] * Store.zoomRatio);
}
else{
$("#luckysheet-scrollbar-x").scrollLeft(0);
}
if(file["scrollTop"] != null && file["scrollTop"] > 0){
$("#luckysheet-scrollbar-y").scrollTop(file["scrollTop"] * Store.zoomRatio);
}
else{
$("#luckysheet-scrollbar-y").scrollTop(0);
}
setTimeout(() => {
Store.scrollRefreshSwitch = true;
}, 0);
zoomNumberDomBind(Store.zoomRatio); zoomNumberDomBind(Store.zoomRatio);
}, },
setCurSheet: function(index) { setCurSheet: function(index) {

4
src/demoData/sheetCell.js

@ -5581,7 +5581,7 @@ const sheetCell = {
"column_focus": 0 "column_focus": 0
}], }],
"luckysheet_selection_range": [], "luckysheet_selection_range": [],
"scrollLeft": 0, "scrollLeft": 300,
"scrollTop": 0 "scrollTop": 500
} }
export default sheetCell export default sheetCell
Loading…
Cancel
Save