fix(store cache): bug fix

dream-num · Aug 28, 2020 · cbd9014 · cbd9014
1 parent 552e37d
commit cbd9014
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/controllers/sheetmanage.js b/src/controllers/sheetmanage.js
@@ -695,6 +695,7 @@ const sheetmanage = {
 
                 let execF = function(){
                     _this.mergeCalculation(file["index"]);
+                    editor.webWorkerFlowDataCache(Store.flowdata);//worker存数据
                     _this.storeSheetParam();
                     _this.restoreselect();
                     _this.CacheNotLoadControll = [];
@@ -981,10 +982,11 @@ const sheetmanage = {
         }
 
         let load = file["load"];
-        if (load != null) {
+        if (load != null) {            
+            _this.mergeCalculation(index);
             _this.setSheetParam(true);
             _this.showSheet();
-            _this.mergeCalculation(index);
+
             setTimeout(function () {
                 formula.execFunctionGroup();
                 luckysheetrefreshgrid();
@@ -998,10 +1000,10 @@ const sheetmanage = {
 
                 file["data"] = data;
                 file["load"] = "1";
-
+                _this.mergeCalculation(index);
                 _this.setSheetParam();
                 _this.showSheet();
-                _this.mergeCalculation(index);
+
                 setTimeout(function () {
                     _this.restoreCache();
                     formula.execFunctionGroupForce(luckysheetConfigsetting.forceCalculation);
@@ -1041,10 +1043,10 @@ const sheetmanage = {
 
                     file["data"] = data;
                     file["load"] = "1";
-
+                    _this.mergeCalculation(index);
                     _this.setSheetParam();
                     _this.showSheet();
-                    _this.mergeCalculation(index);
+
                     setTimeout(function () {
                         _this.restoreCache();
                         formula.execFunctionGroupForce(luckysheetConfigsetting.forceCalculation);

diff --git a/src/global/createdom.js b/src/global/createdom.js
@@ -50,8 +50,6 @@ export default function luckysheetcreatedom(colwidth, rowheight, data, menu, tit
     else {
         Store.flowdata = data;
     }
-
-    editor.webWorkerFlowDataCache(Store.flowdata);//worker存数据
 
     let flowHTML = flow;
     if(Store.config == null){

diff --git a/src/index.html b/src/index.html