@leankylin-sheet/core 2.0.0 → 2.0.2

package/dist/index.esm.js

@@ -62365,7 +62365,7 @@ var Canvas = /*#__PURE__*/function () {
           _startY2 = this.sheetCtx.visibledatarow[_r2 - 1] - scrollHeight - 1;
         }
         _endY2 = this.sheetCtx.visibledatarow[_r2 + mainCell.mc.rs - 1] - scrollHeight;
-        _endX2 = this.sheetCtx.visibledatacolumn[_c2 + mainCell.mc.cs - 1] - scrollWidth;
+        _endX2 = Math.min(this.sheetCtx.visibledatacolumn[_c2 + mainCell.mc.cs - 1] - scrollWidth, drawWidth);
         if (_.isNil(_value3) || _value3.toString().length === 0) {
           this.nullCellRender(_r2, _c2, _startY2, _startX2, _endY2, _endX2, renderCtx, afCompute, cfCompute, offsetLeft, offsetTop, dynamicArrayCompute, cellOverflowMap, colStart, colEnd, scrollHeight, scrollWidth, bodrder05, true);
         } else {
@@ -63191,27 +63191,6 @@ var Canvas = /*#__PURE__*/function () {
     value: function drawFreezeLine(_ref2) {
       var horizontalTop = _ref2.horizontalTop,
         verticalLeft = _ref2.verticalLeft;
-      var renderCtx = this.canvasElement.getContext("2d");
-      if (!renderCtx) return;
-      renderCtx.save();
-      renderCtx.scale(this.sheetCtx.devicePixelRatio, this.sheetCtx.devicePixelRatio);
-      renderCtx.strokeStyle = "#ccc";
-      renderCtx.lineWidth = 2;
-      if (horizontalTop) {
-        renderCtx.beginPath();
-        renderCtx.moveTo(0, horizontalTop);
-        renderCtx.lineTo(this.canvasElement.width, horizontalTop);
-        renderCtx.stroke();
-        renderCtx.closePath();
-      }
-      if (verticalLeft) {
-        renderCtx.beginPath();
-        renderCtx.moveTo(verticalLeft, 0);
-        renderCtx.lineTo(verticalLeft, this.canvasElement.height);
-        renderCtx.stroke();
-        renderCtx.closePath();
-      }
-      renderCtx.restore();
     }
   }]);
 }();
@@ -66360,18 +66339,11 @@ function handleGlobalWheel(ctx, e, cache, scrollbarX, scrollbarY) {
   var scrollLeft = scrollbarX.scrollLeft;
   var scrollTop = scrollbarY.scrollTop;
   if (e.deltaY !== 0) {
-    if (e.deltaY > 0) {
-      scrollTop += 20 * ctx.zoomRatio;
-    } else {
-      scrollTop -= 20 * ctx.zoomRatio;
-    }
+    scrollTop += e.deltaY * ctx.zoomRatio;
     scrollbarY.scrollTop = scrollTop;
-  } else if (e.deltaX !== 0) {
-    if (e.deltaX > 0) {
-      scrollLeft += 20 * ctx.zoomRatio;
-    } else {
-      scrollLeft -= 20 * ctx.zoomRatio;
-    }
+  }
+  if (e.deltaX !== 0) {
+    scrollLeft += e.deltaX * ctx.zoomRatio;
     scrollbarX.scrollLeft = scrollLeft;
   }
   e.preventDefault();

package/dist/index.js

@@ -62375,7 +62375,7 @@ var Canvas = /*#__PURE__*/function () {
           _startY2 = this.sheetCtx.visibledatarow[_r2 - 1] - scrollHeight - 1;
         }
         _endY2 = this.sheetCtx.visibledatarow[_r2 + mainCell.mc.rs - 1] - scrollHeight;
-        _endX2 = this.sheetCtx.visibledatacolumn[_c2 + mainCell.mc.cs - 1] - scrollWidth;
+        _endX2 = Math.min(this.sheetCtx.visibledatacolumn[_c2 + mainCell.mc.cs - 1] - scrollWidth, drawWidth);
         if (___default['default'].isNil(_value3) || _value3.toString().length === 0) {
           this.nullCellRender(_r2, _c2, _startY2, _startX2, _endY2, _endX2, renderCtx, afCompute, cfCompute, offsetLeft, offsetTop, dynamicArrayCompute, cellOverflowMap, colStart, colEnd, scrollHeight, scrollWidth, bodrder05, true);
         } else {
@@ -63201,27 +63201,6 @@ var Canvas = /*#__PURE__*/function () {
     value: function drawFreezeLine(_ref2) {
       var horizontalTop = _ref2.horizontalTop,
         verticalLeft = _ref2.verticalLeft;
-      var renderCtx = this.canvasElement.getContext("2d");
-      if (!renderCtx) return;
-      renderCtx.save();
-      renderCtx.scale(this.sheetCtx.devicePixelRatio, this.sheetCtx.devicePixelRatio);
-      renderCtx.strokeStyle = "#ccc";
-      renderCtx.lineWidth = 2;
-      if (horizontalTop) {
-        renderCtx.beginPath();
-        renderCtx.moveTo(0, horizontalTop);
-        renderCtx.lineTo(this.canvasElement.width, horizontalTop);
-        renderCtx.stroke();
-        renderCtx.closePath();
-      }
-      if (verticalLeft) {
-        renderCtx.beginPath();
-        renderCtx.moveTo(verticalLeft, 0);
-        renderCtx.lineTo(verticalLeft, this.canvasElement.height);
-        renderCtx.stroke();
-        renderCtx.closePath();
-      }
-      renderCtx.restore();
     }
   }]);
 }();
@@ -66370,18 +66349,11 @@ function handleGlobalWheel(ctx, e, cache, scrollbarX, scrollbarY) {
   var scrollLeft = scrollbarX.scrollLeft;
   var scrollTop = scrollbarY.scrollTop;
   if (e.deltaY !== 0) {
-    if (e.deltaY > 0) {
-      scrollTop += 20 * ctx.zoomRatio;
-    } else {
-      scrollTop -= 20 * ctx.zoomRatio;
-    }
+    scrollTop += e.deltaY * ctx.zoomRatio;
     scrollbarY.scrollTop = scrollTop;
-  } else if (e.deltaX !== 0) {
-    if (e.deltaX > 0) {
-      scrollLeft += 20 * ctx.zoomRatio;
-    } else {
-      scrollLeft -= 20 * ctx.zoomRatio;
-    }
+  }
+  if (e.deltaX !== 0) {
+    scrollLeft += e.deltaX * ctx.zoomRatio;
     scrollbarX.scrollLeft = scrollLeft;
   }
   e.preventDefault();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
@@ -10,7 +10,7 @@
   "repository": "http://114.55.85.79:19999/leankylin-front/leankylin-sheet",
   "license": "MIT",
   "dependencies": {
-    "@leankylin-sheet/formula-parser": "^2.0.0",
+    "@leankylin-sheet/formula-parser": "^2.0.2",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",