@leankylin-sheet/core 2.0.1 → 2.0.3

package/dist/index.esm.js

@@ -42903,14 +42903,14 @@ function getCellTextInfo(cell, renderCtx, sheetCtx, option, ctx) {
           var _measureText3 = getMeasureText(str, renderCtx, sheetCtx);
           var _textWidth = _measureText3.width;
           var _textHeight2 = _measureText3.actualBoundingBoxAscent + _measureText3.actualBoundingBoxDescent;
-          var _width = _textWidth * Math.cos(rt * Math.PI / 180) + _textHeight2 * Math.sin(rt * Math.PI / 180);
+          var _width2 = _textWidth * Math.cos(rt * Math.PI / 180) + _textHeight2 * Math.sin(rt * Math.PI / 180);
           var _height = _textWidth * Math.sin(rt * Math.PI / 180) + _textHeight2 * Math.cos(rt * Math.PI / 180);
           var _lastWord = str.substr(str.length - 1, 1);
           if (_lastWord === " " || checkWordByteLength(_lastWord) === 2) {
             spaceOrTwoByte = {
               index: _i5,
               str: str,
-              width: _width,
+              width: _width2,
               height: _height,
               asc: _measureText3.actualBoundingBoxAscent,
               desc: _measureText3.actualBoundingBoxDescent
@@ -42975,7 +42975,7 @@ function getCellTextInfo(cell, renderCtx, sheetCtx, option, ctx) {
               _i5 += 1;
             }
           } else {
-            if (_width + space_width > cellWidth && !_.isNil(text_all_split[splitIndex])) {
+            if (_width2 + space_width > cellWidth && !_.isNil(text_all_split[splitIndex])) {
               if (!_.isNil(spaceOrTwoByte) && spaceOrTwoByte.index < _i5) {
                 anchor = spaceOrTwoByte.index;
                 _i5 = spaceOrTwoByte.index + 1;
@@ -43320,13 +43320,21 @@ function getCellTextInfo(cell, renderCtx, sheetCtx, option, ctx) {
       if (isMode === "onlyWidth") {
         return textContent;
       }
-      var _width2 = textWidthAll;
+      var _width3 = textWidthAll;
       var _height2 = textHeightAll;
       var _left3 = space_width + _textHeight3 * Math.sin(_rtPI) * isRotateUp;
       if (horizonAlign === "0") {
-        _left3 = cellWidth / 2 - _width2 / 2 + _textHeight3 * Math.sin(_rtPI) * isRotateUp;
+        var _cell$mc, _cell$mc2;
+        var mcCIndex = cell === null || cell === void 0 ? void 0 : (_cell$mc = cell.mc) === null || _cell$mc === void 0 ? void 0 : _cell$mc.c;
+        var mcCs = cell === null || cell === void 0 ? void 0 : (_cell$mc2 = cell.mc) === null || _cell$mc2 === void 0 ? void 0 : _cell$mc2.cs;
+        var startMc = mcCIndex - 1;
+        var endMc = mcCIndex + mcCs - 1;
+        var startX = sheetCtx.visibledatacolumn[startMc] || 0;
+        var endX = sheetCtx.visibledatacolumn[endMc] || 0;
+        var _width = mcCIndex ? endX - startX : cellWidth;
+        _left3 = _width / 2 - _width3 / 2 + _textHeight3 * Math.sin(_rtPI) * isRotateUp;
       } else if (horizonAlign === "2") {
-        _left3 = cellWidth - space_width - _width2 + _textHeight3 * Math.sin(_rtPI) * isRotateUp;
+        _left3 = cellWidth - space_width - _width3 + _textHeight3 * Math.sin(_rtPI) * isRotateUp;
       }
       var _top3 = cellHeight - space_height - _height2 + _measureText4.actualBoundingBoxAscent * Math.cos(_rtPI) + _textWidth2 * Math.sin(_rtPI) * isRotateUp;
       if (verticalAlign === "0") {
@@ -43338,7 +43346,7 @@ function getCellTextInfo(cell, renderCtx, sheetCtx, option, ctx) {
       var _wordGroup2 = {
         content: value,
         style: fontset,
-        width: _width2,
+        width: _width3,
         height: _height2,
         left: _left3,
         top: _top3
@@ -62365,7 +62373,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 +63199,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();
     }
   }]);
 }();

package/dist/index.js

@@ -42913,14 +42913,14 @@ function getCellTextInfo(cell, renderCtx, sheetCtx, option, ctx) {
           var _measureText3 = getMeasureText(str, renderCtx, sheetCtx);
           var _textWidth = _measureText3.width;
           var _textHeight2 = _measureText3.actualBoundingBoxAscent + _measureText3.actualBoundingBoxDescent;
-          var _width = _textWidth * Math.cos(rt * Math.PI / 180) + _textHeight2 * Math.sin(rt * Math.PI / 180);
+          var _width2 = _textWidth * Math.cos(rt * Math.PI / 180) + _textHeight2 * Math.sin(rt * Math.PI / 180);
           var _height = _textWidth * Math.sin(rt * Math.PI / 180) + _textHeight2 * Math.cos(rt * Math.PI / 180);
           var _lastWord = str.substr(str.length - 1, 1);
           if (_lastWord === " " || checkWordByteLength(_lastWord) === 2) {
             spaceOrTwoByte = {
               index: _i5,
               str: str,
-              width: _width,
+              width: _width2,
               height: _height,
               asc: _measureText3.actualBoundingBoxAscent,
               desc: _measureText3.actualBoundingBoxDescent
@@ -42985,7 +42985,7 @@ function getCellTextInfo(cell, renderCtx, sheetCtx, option, ctx) {
               _i5 += 1;
             }
           } else {
-            if (_width + space_width > cellWidth && !___default['default'].isNil(text_all_split[splitIndex])) {
+            if (_width2 + space_width > cellWidth && !___default['default'].isNil(text_all_split[splitIndex])) {
               if (!___default['default'].isNil(spaceOrTwoByte) && spaceOrTwoByte.index < _i5) {
                 anchor = spaceOrTwoByte.index;
                 _i5 = spaceOrTwoByte.index + 1;
@@ -43330,13 +43330,21 @@ function getCellTextInfo(cell, renderCtx, sheetCtx, option, ctx) {
       if (isMode === "onlyWidth") {
         return textContent;
       }
-      var _width2 = textWidthAll;
+      var _width3 = textWidthAll;
       var _height2 = textHeightAll;
       var _left3 = space_width + _textHeight3 * Math.sin(_rtPI) * isRotateUp;
       if (horizonAlign === "0") {
-        _left3 = cellWidth / 2 - _width2 / 2 + _textHeight3 * Math.sin(_rtPI) * isRotateUp;
+        var _cell$mc, _cell$mc2;
+        var mcCIndex = cell === null || cell === void 0 ? void 0 : (_cell$mc = cell.mc) === null || _cell$mc === void 0 ? void 0 : _cell$mc.c;
+        var mcCs = cell === null || cell === void 0 ? void 0 : (_cell$mc2 = cell.mc) === null || _cell$mc2 === void 0 ? void 0 : _cell$mc2.cs;
+        var startMc = mcCIndex - 1;
+        var endMc = mcCIndex + mcCs - 1;
+        var startX = sheetCtx.visibledatacolumn[startMc] || 0;
+        var endX = sheetCtx.visibledatacolumn[endMc] || 0;
+        var _width = mcCIndex ? endX - startX : cellWidth;
+        _left3 = _width / 2 - _width3 / 2 + _textHeight3 * Math.sin(_rtPI) * isRotateUp;
       } else if (horizonAlign === "2") {
-        _left3 = cellWidth - space_width - _width2 + _textHeight3 * Math.sin(_rtPI) * isRotateUp;
+        _left3 = cellWidth - space_width - _width3 + _textHeight3 * Math.sin(_rtPI) * isRotateUp;
       }
       var _top3 = cellHeight - space_height - _height2 + _measureText4.actualBoundingBoxAscent * Math.cos(_rtPI) + _textWidth2 * Math.sin(_rtPI) * isRotateUp;
       if (verticalAlign === "0") {
@@ -43348,7 +43356,7 @@ function getCellTextInfo(cell, renderCtx, sheetCtx, option, ctx) {
       var _wordGroup2 = {
         content: value,
         style: fontset,
-        width: _width2,
+        width: _width3,
         height: _height2,
         left: _left3,
         top: _top3
@@ -62375,7 +62383,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 +63209,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();
     }
   }]);
 }();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
@@ -9,8 +9,11 @@
   ],
   "repository": "http://114.55.85.79:19999/leankylin-front/leankylin-sheet",
   "license": "MIT",
+  "scripts": {
+    "build": "father-build"
+  },
   "dependencies": {
-    "@leankylin-sheet/formula-parser": "^2.0.1",
+    "@leankylin-sheet/formula-parser": "^2.0.3",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",
@@ -38,8 +41,5 @@
   ],
   "publishConfig": {
     "access": "public"
-  },
-  "scripts": {
-    "build": "father-build"
   }
-}
+}