fix(sheet change arrow): fix bug

dream-num · Jul 31, 2020 · 4a7850b · 4a7850b
1 parent 3e3bf75
commit 4a7850b
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 13 deletions.
diff --git a/src/controllers/pivotTable.js b/src/controllers/pivotTable.js
@@ -2342,7 +2342,7 @@ const pivotTable = {
 
         $("#luckysheet-dialog-pivotTable-range").html(getRangetxt(_this.pivotDataSheetIndex, _this.pivot_select_save));
         $("#luckysheet-modal-dialog-slider-pivot").show();
-        sheetmanage.sheetBarShowAndHide();
+
         luckysheetsizeauto();
     },
     getComposeArray: function (data) {

diff --git a/src/controllers/resize.js b/src/controllers/resize.js
@@ -3,6 +3,7 @@ import luckysheetFreezen from './freezen';
 import { luckysheetrefreshgrid } from '../global/refresh';
 import Store from '../store';
 import locale from '../locale/locale';
+import sheetmanage from './sheetmanage';
 
 let gridW = 0, 
     gridH = 0;
@@ -167,4 +168,7 @@ export default function luckysheetsizeauto() {
     }, function(){
         $(this).prev(".luckysheet-toolbar-button-split-left").removeClass("luckysheet-toolbar-button-hover");
     });
+
+    sheetmanage.sheetArrowShowAndHide();
+    sheetmanage.sheetBarShowAndHide();
 }
diff --git a/src/controllers/sheetBar.js b/src/controllers/sheetBar.js
@@ -244,17 +244,7 @@ export function initialSheetBar(){
             }
         }
 
-        let winW = $(window).width();
-
-        let c_width = 0;
-        $("#luckysheet-sheet-container-c > div.luckysheet-sheets-item:visible").each(function(){
-            c_width += $(this).outerWidth();
-        });
-
-        if (c_width >= winW * 0.7) {
-            $("#luckysheet-sheet-area .luckysheet-sheets-scroll").css("display", "inline-block");
-            $("#luckysheet-sheet-container .docs-sheet-fade-left").show();
-        }
+        sheetmanage.sheetArrowShowAndHide();
 
         Store.luckysheetfile[index].name = txt;
         server.saveParam("all", Store.currentSheetIndex, txt, { "k": "name" });

diff --git a/src/controllers/sheetmanage.js b/src/controllers/sheetmanage.js
@@ -1041,6 +1041,23 @@ const sheetmanage = {
 
         this.sheetBarShowAndHide(index);
     },
+    sheetArrowShowAndHide(){
+        let containerW = $("#luckysheet-sheet-container").width();
+
+        let c_width = 0;
+        $("#luckysheet-sheet-container-c > div.luckysheet-sheets-item:visible").each(function(){
+            c_width += $(this).outerWidth();
+        });
+
+        if (c_width >= containerW) {
+            $("#luckysheet-sheet-area .luckysheet-sheets-scroll").css("display", "inline-block");
+            $("#luckysheet-sheet-container .docs-sheet-fade-left").show();
+        }
+        else{
+            $("#luckysheet-sheet-area .luckysheet-sheets-scroll").css("display", "none");
+            $("#luckysheet-sheet-container .docs-sheet-fade-left").hide();
+        }
+    },
     sheetBarShowAndHide(index){
         let $c = $("#luckysheet-sheet-container-c");
 

diff --git a/src/global/refresh.js b/src/global/refresh.js
@@ -116,7 +116,9 @@ function jfrefreshgrid(data, range, cfg, cdformat, RowlChange, isRunExecFunction
             server.historyParam(Store.flowdata, Store.currentSheetIndex, range[s]);
         }
         // 刷新图表
-        Store.chartparam.jfrefreshchartall(Store.flowdata,range[s].row[0],range[s].row[1],range[s].column[0],range[s].column[1])
+        if(typeof(Store.chartparam.jfrefreshchartall)=="function"){
+            Store.chartparam.jfrefreshchartall(Store.flowdata,range[s].row[0],range[s].row[1],range[s].column[0],range[s].column[1]);
+        }
     }
 
     //刷新表格