Merge branch 'master' of https://github.com/mengshukeji/Luckysheet

dream-num · Aug 18, 2020 · fa1b189 · fa1b189
2 parents 52375dc + 17ddd13
commit fa1b189
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/controllers/zoom.js b/src/controllers/zoom.js
@@ -5,16 +5,23 @@ import {changeSheetContainerSize} from './resize';
 import { jfrefreshgrid_rhcw } from '../global/refresh';
 
 
+
+let luckysheetZoomTimeout = null;
+
 export function zoomChange(ratio){
     if(Store.flowdata==null || Store.flowdata.length==0){
         return;
     }
 
     Store.zoomRatio = ratio;
 
-    jfrefreshgrid_rhcw(Store.flowdata.length, Store.flowdata[0].length);
-
-    changeSheetContainerSize();
+    clearTimeout(luckysheetZoomTimeout);
+    luckysheetZoomTimeout = setTimeout(() => {
+        jfrefreshgrid_rhcw(Store.flowdata.length, Store.flowdata[0].length);
+        changeSheetContainerSize();
+    }, 100);
+
+
 }
 
 
@@ -31,6 +38,10 @@ export function zoomInitial(){
 
         currentRatio = currentRatio-0.1;
 
+        if(currentRatio==Store.zoomRatio){
+            currentRatio = currentRatio-0.1;
+        }
+
         if(currentRatio<=0.1){
             currentRatio = 0.1;
         }
@@ -51,6 +62,10 @@ export function zoomInitial(){
 
         currentRatio = currentRatio+0.1;
 
+        if(currentRatio==Store.zoomRatio){
+            currentRatio = currentRatio+0.1;
+        }
+
         if(currentRatio>=4){
             currentRatio = 4;
         }
@@ -71,6 +86,7 @@ export function zoomInitial(){
 
     $("#luckysheet-zoom-cursor").mousedown(function(e){
         let curentX = e.pageX,cursorLeft = parseFloat($("#luckysheet-zoom-cursor").css("left"));
+        $("#luckysheet-zoom-cursor").css("transition","none");
         $(document).off("mousemove.zoomCursor").on("mousemove.zoomCursor",function(event){
             let moveX = event.pageX;
             let offsetX = moveX - curentX;
@@ -99,6 +115,7 @@ export function zoomInitial(){
 
         $(document).off("mouseup.zoomCursor").on("mouseup.zoomCursor",function(event){
             $(document).off(".zoomCursor");
+            $("#luckysheet-zoom-cursor").css("transition","all 0.3s");
         });
 
         e.stopPropagation();

diff --git a/src/global/getRowlen.js b/src/global/getRowlen.js
@@ -181,7 +181,7 @@ function getMeasureText(value, ctx){
         cache.width *= Store.zoomRatio;
         cache.actualBoundingBoxDescent *= Store.zoomRatio;
         cache.actualBoundingBoxAscent *= Store.zoomRatio;
-        Store.measureTextCache[value + "_" + ctx.font] = cache;
+        Store.measureTextCache[value + "_" + Store.zoomRatio +  "_" + ctx.font] = cache;
 
         return cache;
     }