Browse Source

fix(store cache): bug fix

master
liuyang 5 years ago
parent
commit
cbd90140e0
  1. 12
      src/controllers/sheetmanage.js
  2. 2
      src/global/createdom.js
  3. 2
      src/index.html

12
src/controllers/sheetmanage.js

@ -695,6 +695,7 @@ const sheetmanage = {
let execF = function(){ let execF = function(){
_this.mergeCalculation(file["index"]); _this.mergeCalculation(file["index"]);
editor.webWorkerFlowDataCache(Store.flowdata);//worker存数据
_this.storeSheetParam(); _this.storeSheetParam();
_this.restoreselect(); _this.restoreselect();
_this.CacheNotLoadControll = []; _this.CacheNotLoadControll = [];
@ -982,9 +983,10 @@ const sheetmanage = {
let load = file["load"]; let load = file["load"];
if (load != null) { if (load != null) {
_this.mergeCalculation(index);
_this.setSheetParam(true); _this.setSheetParam(true);
_this.showSheet(); _this.showSheet();
_this.mergeCalculation(index);
setTimeout(function () { setTimeout(function () {
formula.execFunctionGroup(); formula.execFunctionGroup();
luckysheetrefreshgrid(); luckysheetrefreshgrid();
@ -998,10 +1000,10 @@ const sheetmanage = {
file["data"] = data; file["data"] = data;
file["load"] = "1"; file["load"] = "1";
_this.mergeCalculation(index);
_this.setSheetParam(); _this.setSheetParam();
_this.showSheet(); _this.showSheet();
_this.mergeCalculation(index);
setTimeout(function () { setTimeout(function () {
_this.restoreCache(); _this.restoreCache();
formula.execFunctionGroupForce(luckysheetConfigsetting.forceCalculation); formula.execFunctionGroupForce(luckysheetConfigsetting.forceCalculation);
@ -1041,10 +1043,10 @@ const sheetmanage = {
file["data"] = data; file["data"] = data;
file["load"] = "1"; file["load"] = "1";
_this.mergeCalculation(index);
_this.setSheetParam(); _this.setSheetParam();
_this.showSheet(); _this.showSheet();
_this.mergeCalculation(index);
setTimeout(function () { setTimeout(function () {
_this.restoreCache(); _this.restoreCache();
formula.execFunctionGroupForce(luckysheetConfigsetting.forceCalculation); formula.execFunctionGroupForce(luckysheetConfigsetting.forceCalculation);

2
src/global/createdom.js

@ -51,8 +51,6 @@ export default function luckysheetcreatedom(colwidth, rowheight, data, menu, tit
Store.flowdata = data; Store.flowdata = data;
} }
editor.webWorkerFlowDataCache(Store.flowdata);//worker存数据
let flowHTML = flow; let flowHTML = flow;
if(Store.config == null){ if(Store.config == null){
Store.config = {}; Store.config = {};

2
src/index.html

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save