@leankylin-sheet/core 3.0.0 → 3.0.2

package/dist/canvas.d.ts

@@ -27,7 +27,8 @@ export declare class Canvas {
     }): void;
     getCellOverflowMap(canvas: CanvasRenderingContext2D, colStart: number, colEnd: number, rowStart: number, rowEnd: number): any;
     nullCellRender(r: number, c: number, startY: number, startX: number, endY: number, endX: number, renderCtx: CanvasRenderingContext2D, afCompute: any, cfCompute: any, offsetLeft: number, offsetTop: number, dynamicArrayCompute: any, cellOverflowMap: any, colStart: number, colEnd: number, scrollHeight: number, scrollWidth: number, bodrder05: any, isMerge?: boolean): void;
-    renderLyFlag(renderCtx: CanvasRenderingContext2D, cell: any, startY: number, endX: number, offsetLeft: number, offsetTop: number): void;
+    renderDelLine(renderCtx: CanvasRenderingContext2D, cell: any, startX: number, startY: number, endX: number, endY: number, offsetLeft: number, offsetTop: number): void;
+    renderLyFlag(renderCtx: CanvasRenderingContext2D, cell: any, startX: number, startY: number, offsetLeft: number, offsetTop: number): void;
     cellRender(r: number, c: number, startY: number, startX: number, endY: number, endX: number, value: any, renderCtx: CanvasRenderingContext2D, afCompute: any, cfCompute: any, offsetLeft: number, offsetTop: number, dynamicArrayCompute: any, cellOverflowMap: any, colStart: number, colEnd: number, scrollHeight: number, scrollWidth: number, bodrder05: number, isMerge?: boolean): void;
     cellOverflowRender(r: number, c: number, stc: number, edc: number, renderCtx: CanvasRenderingContext2D, scrollHeight: number, scrollWidth: number, offsetLeft: number, offsetTop: number, afCompute: any, cfCompute: any): void;
     cellOverflow_trace(r: number, curC: number, traceC: number, traceDir: string, horizonAlign: string, textMetrics: number): any;

package/dist/index.esm.js

@@ -62576,7 +62576,7 @@ var Canvas = /*#__PURE__*/function () {
   }, {
     key: "nullCellRender",
     value: function nullCellRender(r, c, startY, startX, endY, endX, renderCtx, afCompute, cfCompute, offsetLeft, offsetTop, dynamicArrayCompute, cellOverflowMap, colStart, colEnd, scrollHeight, scrollWidth, bodrder05) {
-      var _this$sheetCtx$hooks$6, _this$sheetCtx$hooks6, _flowdata$r2, _flowdata$r3, _flowdata$r3$c, _this$sheetCtx$hooks$7, _this$sheetCtx$hooks7;
+      var _this$sheetCtx$hooks$6, _this$sheetCtx$hooks6, _flowdata$r2, _flowdata$r3, _flowdata$r4, _flowdata$r4$c, _this$sheetCtx$hooks$7, _this$sheetCtx$hooks7;
       var isMerge = arguments.length > 18 && arguments[18] !== undefined ? arguments[18] : false;
       var checksCF = checkCF(r, c, cfCompute);
       var flowdata = getFlowdata(this.sheetCtx);
@@ -62613,8 +62613,9 @@ var Canvas = /*#__PURE__*/function () {
         renderCtx.textBaseline = "bottom";
         renderCtx.fillText(_.isNil(value) ? "" : value, horizonAlignPos, verticalAlignPos);
       }
-      this.renderLyFlag(renderCtx, flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r2 = flowdata[r]) === null || _flowdata$r2 === void 0 ? void 0 : _flowdata$r2[c], startY, endX, offsetLeft, offsetTop);
-      if (flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r3 = flowdata[r]) === null || _flowdata$r3 === void 0 ? void 0 : (_flowdata$r3$c = _flowdata$r3[c]) === null || _flowdata$r3$c === void 0 ? void 0 : _flowdata$r3$c.ps) {
+      this.renderDelLine(renderCtx, flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r2 = flowdata[r]) === null || _flowdata$r2 === void 0 ? void 0 : _flowdata$r2[c], startX, startY, endX, endY, offsetLeft, offsetTop);
+      this.renderLyFlag(renderCtx, flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r3 = flowdata[r]) === null || _flowdata$r3 === void 0 ? void 0 : _flowdata$r3[c], startX, startY, offsetLeft, offsetTop);
+      if (flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r4 = flowdata[r]) === null || _flowdata$r4 === void 0 ? void 0 : (_flowdata$r4$c = _flowdata$r4[c]) === null || _flowdata$r4$c === void 0 ? void 0 : _flowdata$r4$c.ps) {
         var ps_w = 8 * this.sheetCtx.zoomRatio;
         var ps_h = 8 * this.sheetCtx.zoomRatio;
         renderCtx.beginPath();
@@ -62658,9 +62659,50 @@ var Canvas = /*#__PURE__*/function () {
         endX: cellsize[2] + cellsize[0]
       }, renderCtx);
     }
+  }, {
+    key: "renderDelLine",
+    value: function renderDelLine(renderCtx, cell, startX, startY, endX, endY, offsetLeft, offsetTop) {
+      var delLineColor = cell === null || cell === void 0 ? void 0 : cell.delLineColor;
+      if (!delLineColor) {
+        return;
+      }
+      var delLineSpace = (cell === null || cell === void 0 ? void 0 : cell.delLineSpace) || 8;
+      startX += offsetLeft;
+      startY += offsetTop + 1;
+      endX += offsetLeft;
+      endY += offsetTop - 2;
+      renderCtx.strokeStyle = delLineColor;
+      renderCtx.lineWidth = 1;
+      var rectWidth = endX - startX;
+      var rectHeight = endY - startY;
+      var tsPosition = function tsPosition(_ref2) {
+        var _ref3 = _slicedToArray(_ref2, 2),
+          x = _ref3[0],
+          y = _ref3[1];
+        if (y > startY + rectHeight) {
+          var dis = y - (startY + rectHeight);
+          y = startY + rectHeight;
+          x += dis;
+        }
+        if (x > startX + rectWidth) {
+          var _dis = x - (startX + rectWidth);
+          x = startX + rectWidth;
+          y += _dis;
+        }
+        return [x, y];
+      };
+      renderCtx.beginPath();
+      for (var space = 0; space < rectWidth + rectHeight; space += delLineSpace) {
+        var startP = tsPosition([startX, startY + space]);
+        var endP = tsPosition([startX + space, startY]);
+        renderCtx.moveTo(startP[0], startP[1]);
+        renderCtx.lineTo(endP[0], endP[1]);
+      }
+      renderCtx.stroke();
+    }
   }, {
     key: "renderLyFlag",
-    value: function renderLyFlag(renderCtx, cell, startY, endX, offsetLeft, offsetTop) {
+    value: function renderLyFlag(renderCtx, cell, startX, startY, offsetLeft, offsetTop) {
       var lyFlagColor = cell === null || cell === void 0 ? void 0 : cell.lyFlagColor;
       if (!lyFlagColor) {
         return;
@@ -62668,9 +62710,9 @@ var Canvas = /*#__PURE__*/function () {
       var ps_w = 8 * this.sheetCtx.zoomRatio;
       var ps_h = 8 * this.sheetCtx.zoomRatio;
       renderCtx.beginPath();
-      renderCtx.moveTo(endX + offsetLeft - ps_w, startY + offsetTop);
-      renderCtx.lineTo(endX + offsetLeft, startY + offsetTop);
-      renderCtx.lineTo(endX + offsetLeft, startY + offsetTop + ps_h);
+      renderCtx.moveTo(startX + offsetLeft, startY + offsetTop);
+      renderCtx.lineTo(startX + offsetLeft, startY + offsetTop + ps_h);
+      renderCtx.lineTo(startX + offsetLeft + ps_w, startY + offsetTop);
       renderCtx.fillStyle = lyFlagColor;
       renderCtx.fill();
       renderCtx.closePath();
@@ -62678,7 +62720,7 @@ var Canvas = /*#__PURE__*/function () {
   }, {
     key: "cellRender",
     value: function cellRender(r, c, startY, startX, endY, endX, value, renderCtx, afCompute, cfCompute, offsetLeft, offsetTop, dynamicArrayCompute, cellOverflowMap, colStart, colEnd, scrollHeight, scrollWidth, bodrder05) {
-      var _this$sheetCtx$hooks$8, _this$sheetCtx$hooks8, _dataVerification, _this$sheetCtx$hooks$9, _this$sheetCtx$hooks9, _flowdata$r4;
+      var _this$sheetCtx$hooks$8, _this$sheetCtx$hooks8, _this$sheetCtx$hooks$9, _this$sheetCtx$hooks9, _flowdata$r5;
       var isMerge = arguments.length > 19 && arguments[19] !== undefined ? arguments[19] : false;
       var flowdata = getFlowdata(this.sheetCtx);
       if (!flowdata) {
@@ -62728,7 +62770,8 @@ var Canvas = /*#__PURE__*/function () {
         renderCtx.fill();
         renderCtx.closePath();
       }
-      this.renderLyFlag(renderCtx, cell, startY, endX, offsetLeft, offsetTop);
+      this.renderDelLine(renderCtx, cell, startX, startY, endX, endY, offsetLeft, offsetTop);
+      this.renderLyFlag(renderCtx, cell, startX, startY, offsetLeft, offsetTop);
       if (cell === null || cell === void 0 ? void 0 : cell.ps) {
         var ps_w = 8 * this.sheetCtx.zoomRatio;
         var ps_h = 8 * this.sheetCtx.zoomRatio;
@@ -62759,53 +62802,6 @@ var Canvas = /*#__PURE__*/function () {
         } else {
           cellOverflow_bd_r_render = false;
         }
-      } else if ((dataVerification === null || dataVerification === void 0 ? void 0 : (_dataVerification = dataVerification["".concat(r, "_").concat(c)]) === null || _dataVerification === void 0 ? void 0 : _dataVerification.type) === "checkbox") {
-        var pos_x = startX + offsetLeft;
-        var pos_y = startY + offsetTop + 1;
-        renderCtx.save();
-        renderCtx.beginPath();
-        renderCtx.rect(pos_x, pos_y, cellWidth, cellHeight);
-        renderCtx.clip();
-        renderCtx.scale(this.sheetCtx.zoomRatio, this.sheetCtx.zoomRatio);
-        var measureText = getMeasureText(value, renderCtx, this.sheetCtx);
-        var textMetrics = measureText.width + 14;
-        var oneLineTextHeight = measureText.actualBoundingBoxDescent + measureText.actualBoundingBoxAscent;
-        var horizonAlignPos = pos_x + space_width;
-        if (horizonAlign === 0) {
-          horizonAlignPos = pos_x + cellWidth / 2 - textMetrics / 2;
-        } else if (horizonAlign === 2) {
-          horizonAlignPos = pos_x + cellWidth - space_width - textMetrics;
-        }
-        var verticalCellHeight = cellHeight > oneLineTextHeight ? cellHeight : oneLineTextHeight;
-        var verticalAlignPos_text = pos_y + verticalCellHeight - space_height;
-        renderCtx.textBaseline = "bottom";
-        var verticalAlignPos_checkbox = verticalAlignPos_text - 13 * this.sheetCtx.zoomRatio;
-        if (verticalAlign === 0) {
-          verticalAlignPos_text = pos_y + verticalCellHeight / 2;
-          renderCtx.textBaseline = "middle";
-          verticalAlignPos_checkbox = verticalAlignPos_text - 6 * this.sheetCtx.zoomRatio;
-        } else if (verticalAlign === 1) {
-          verticalAlignPos_text = pos_y + space_height;
-          renderCtx.textBaseline = "top";
-          verticalAlignPos_checkbox = verticalAlignPos_text + 1 * this.sheetCtx.zoomRatio;
-        }
-        horizonAlignPos /= this.sheetCtx.zoomRatio;
-        verticalAlignPos_text /= this.sheetCtx.zoomRatio;
-        verticalAlignPos_checkbox /= this.sheetCtx.zoomRatio;
-        renderCtx.lineWidth = 1;
-        renderCtx.strokeStyle = "#000";
-        renderCtx.strokeRect(horizonAlignPos, verticalAlignPos_checkbox, 10, 10);
-        if (dataVerification["".concat(r, "_").concat(c)].checked) {
-          renderCtx.beginPath();
-          renderCtx.lineTo(horizonAlignPos + 1, verticalAlignPos_checkbox + 6);
-          renderCtx.lineTo(horizonAlignPos + 4, verticalAlignPos_checkbox + 9);
-          renderCtx.lineTo(horizonAlignPos + 9, verticalAlignPos_checkbox + 2);
-          renderCtx.stroke();
-          renderCtx.closePath();
-        }
-        renderCtx.fillStyle = normalizedAttr(flowdata, r, c, "fc");
-        renderCtx.fillText(_.isNil(value) ? "" : value, horizonAlignPos + 14, verticalAlignPos_text);
-        renderCtx.restore();
       } else {
         var _checksCF$dataBar, _checksCF$dataBar2, _checksCF$dataBar2$va, _cell$ct$fa$indexOf, _cell$ct, _cell$ct$fa, _cell$ct2;
         if ((checksCF === null || checksCF === void 0 ? void 0 : (_checksCF$dataBar = checksCF.dataBar) === null || _checksCF$dataBar === void 0 ? void 0 : _checksCF$dataBar.valueLen) && (checksCF === null || checksCF === void 0 ? void 0 : (_checksCF$dataBar2 = checksCF.dataBar) === null || _checksCF$dataBar2 === void 0 ? void 0 : (_checksCF$dataBar2$va = _checksCF$dataBar2.valueLen) === null || _checksCF$dataBar2$va === void 0 ? void 0 : _checksCF$dataBar2$va.toString()) !== "NaN") {
@@ -62887,11 +62883,11 @@ var Canvas = /*#__PURE__*/function () {
             }
           }
         }
-        var _pos_x = startX + offsetLeft;
-        var _pos_y = startY + offsetTop + 1;
+        var pos_x = startX + offsetLeft;
+        var pos_y = startY + offsetTop + 1;
         renderCtx.save();
         renderCtx.beginPath();
-        renderCtx.rect(_pos_x, _pos_y, cellWidth, cellHeight);
+        renderCtx.rect(pos_x, pos_y, cellWidth, cellHeight);
         renderCtx.clip();
         renderCtx.scale(this.sheetCtx.zoomRatio, this.sheetCtx.zoomRatio);
         var textInfo = cell ? getCellTextInfo(cell, renderCtx, this.sheetCtx, {
@@ -62906,16 +62902,16 @@ var Canvas = /*#__PURE__*/function () {
           var l = checksCF.icons.left;
           var t = checksCF.icons.top;
           var _value = textInfo.values[0];
-          var verticalAlignPos = _pos_y + _value.top - textInfo.textHeightAll;
+          var verticalAlignPos = pos_y + _value.top - textInfo.textHeightAll;
           if (verticalAlign === 0) {
-            verticalAlignPos = _pos_y + cellHeight / 2 - textInfo.textHeightAll / 2;
+            verticalAlignPos = pos_y + cellHeight / 2 - textInfo.textHeightAll / 2;
           } else if (verticalAlign === 1) {
-            verticalAlignPos = _pos_y;
+            verticalAlignPos = pos_y;
           } else if (verticalAlign === 2) {
             verticalAlignPos -= textInfo.desc;
           }
           verticalAlignPos /= this.sheetCtx.zoomRatio;
-          renderCtx.drawImage(getCfIconsImg(), l * 42, t * 32, 32, 32, _pos_x / this.sheetCtx.zoomRatio, verticalAlignPos, textInfo.textHeightAll / this.sheetCtx.zoomRatio, textInfo.textHeightAll / this.sheetCtx.zoomRatio);
+          renderCtx.drawImage(getCfIconsImg(), l * 42, t * 32, 32, 32, pos_x / this.sheetCtx.zoomRatio, verticalAlignPos, textInfo.textHeightAll / this.sheetCtx.zoomRatio, textInfo.textHeightAll / this.sheetCtx.zoomRatio);
         }
         renderCtx.fillStyle = normalizedAttr(flowdata, r, c, "fc");
         if (checksAF === null || checksAF === void 0 ? void 0 : checksAF[0]) {
@@ -62929,8 +62925,8 @@ var Canvas = /*#__PURE__*/function () {
           renderCtx.fillStyle = "#ff0000";
         }
         this.cellTextRender(textInfo, renderCtx, {
-          pos_x: _pos_x,
-          pos_y: _pos_y
+          pos_x: pos_x,
+          pos_y: pos_y
         });
         renderCtx.restore();
       }
@@ -62954,7 +62950,7 @@ var Canvas = /*#__PURE__*/function () {
         renderCtx.stroke();
         renderCtx.closePath();
       }
-      (_this$sheetCtx$hooks$9 = (_this$sheetCtx$hooks9 = this.sheetCtx.hooks).afterRenderCell) === null || _this$sheetCtx$hooks$9 === void 0 ? void 0 : _this$sheetCtx$hooks$9.call(_this$sheetCtx$hooks9, (_flowdata$r4 = flowdata[r]) === null || _flowdata$r4 === void 0 ? void 0 : _flowdata$r4[c], {
+      (_this$sheetCtx$hooks$9 = (_this$sheetCtx$hooks9 = this.sheetCtx.hooks).afterRenderCell) === null || _this$sheetCtx$hooks$9 === void 0 ? void 0 : _this$sheetCtx$hooks$9.call(_this$sheetCtx$hooks9, (_flowdata$r5 = flowdata[r]) === null || _flowdata$r5 === void 0 ? void 0 : _flowdata$r5[c], {
         row: r,
         column: c,
         startX: cellsize[0],
@@ -63194,9 +63190,9 @@ var Canvas = /*#__PURE__*/function () {
     }
   }, {
     key: "drawFreezeLine",
-    value: function drawFreezeLine(_ref2) {
-      var horizontalTop = _ref2.horizontalTop,
-        verticalLeft = _ref2.verticalLeft;
+    value: function drawFreezeLine(_ref4) {
+      var horizontalTop = _ref4.horizontalTop,
+        verticalLeft = _ref4.verticalLeft;
     }
   }]);
 }();

package/dist/index.js

@@ -62586,7 +62586,7 @@ var Canvas = /*#__PURE__*/function () {
   }, {
     key: "nullCellRender",
     value: function nullCellRender(r, c, startY, startX, endY, endX, renderCtx, afCompute, cfCompute, offsetLeft, offsetTop, dynamicArrayCompute, cellOverflowMap, colStart, colEnd, scrollHeight, scrollWidth, bodrder05) {
-      var _this$sheetCtx$hooks$6, _this$sheetCtx$hooks6, _flowdata$r2, _flowdata$r3, _flowdata$r3$c, _this$sheetCtx$hooks$7, _this$sheetCtx$hooks7;
+      var _this$sheetCtx$hooks$6, _this$sheetCtx$hooks6, _flowdata$r2, _flowdata$r3, _flowdata$r4, _flowdata$r4$c, _this$sheetCtx$hooks$7, _this$sheetCtx$hooks7;
       var isMerge = arguments.length > 18 && arguments[18] !== undefined ? arguments[18] : false;
       var checksCF = checkCF(r, c, cfCompute);
       var flowdata = getFlowdata(this.sheetCtx);
@@ -62623,8 +62623,9 @@ var Canvas = /*#__PURE__*/function () {
         renderCtx.textBaseline = "bottom";
         renderCtx.fillText(___default['default'].isNil(value) ? "" : value, horizonAlignPos, verticalAlignPos);
       }
-      this.renderLyFlag(renderCtx, flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r2 = flowdata[r]) === null || _flowdata$r2 === void 0 ? void 0 : _flowdata$r2[c], startY, endX, offsetLeft, offsetTop);
-      if (flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r3 = flowdata[r]) === null || _flowdata$r3 === void 0 ? void 0 : (_flowdata$r3$c = _flowdata$r3[c]) === null || _flowdata$r3$c === void 0 ? void 0 : _flowdata$r3$c.ps) {
+      this.renderDelLine(renderCtx, flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r2 = flowdata[r]) === null || _flowdata$r2 === void 0 ? void 0 : _flowdata$r2[c], startX, startY, endX, endY, offsetLeft, offsetTop);
+      this.renderLyFlag(renderCtx, flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r3 = flowdata[r]) === null || _flowdata$r3 === void 0 ? void 0 : _flowdata$r3[c], startX, startY, offsetLeft, offsetTop);
+      if (flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r4 = flowdata[r]) === null || _flowdata$r4 === void 0 ? void 0 : (_flowdata$r4$c = _flowdata$r4[c]) === null || _flowdata$r4$c === void 0 ? void 0 : _flowdata$r4$c.ps) {
         var ps_w = 8 * this.sheetCtx.zoomRatio;
         var ps_h = 8 * this.sheetCtx.zoomRatio;
         renderCtx.beginPath();
@@ -62668,9 +62669,50 @@ var Canvas = /*#__PURE__*/function () {
         endX: cellsize[2] + cellsize[0]
       }, renderCtx);
     }
+  }, {
+    key: "renderDelLine",
+    value: function renderDelLine(renderCtx, cell, startX, startY, endX, endY, offsetLeft, offsetTop) {
+      var delLineColor = cell === null || cell === void 0 ? void 0 : cell.delLineColor;
+      if (!delLineColor) {
+        return;
+      }
+      var delLineSpace = (cell === null || cell === void 0 ? void 0 : cell.delLineSpace) || 8;
+      startX += offsetLeft;
+      startY += offsetTop + 1;
+      endX += offsetLeft;
+      endY += offsetTop - 2;
+      renderCtx.strokeStyle = delLineColor;
+      renderCtx.lineWidth = 1;
+      var rectWidth = endX - startX;
+      var rectHeight = endY - startY;
+      var tsPosition = function tsPosition(_ref2) {
+        var _ref3 = _slicedToArray(_ref2, 2),
+          x = _ref3[0],
+          y = _ref3[1];
+        if (y > startY + rectHeight) {
+          var dis = y - (startY + rectHeight);
+          y = startY + rectHeight;
+          x += dis;
+        }
+        if (x > startX + rectWidth) {
+          var _dis = x - (startX + rectWidth);
+          x = startX + rectWidth;
+          y += _dis;
+        }
+        return [x, y];
+      };
+      renderCtx.beginPath();
+      for (var space = 0; space < rectWidth + rectHeight; space += delLineSpace) {
+        var startP = tsPosition([startX, startY + space]);
+        var endP = tsPosition([startX + space, startY]);
+        renderCtx.moveTo(startP[0], startP[1]);
+        renderCtx.lineTo(endP[0], endP[1]);
+      }
+      renderCtx.stroke();
+    }
   }, {
     key: "renderLyFlag",
-    value: function renderLyFlag(renderCtx, cell, startY, endX, offsetLeft, offsetTop) {
+    value: function renderLyFlag(renderCtx, cell, startX, startY, offsetLeft, offsetTop) {
       var lyFlagColor = cell === null || cell === void 0 ? void 0 : cell.lyFlagColor;
       if (!lyFlagColor) {
         return;
@@ -62678,9 +62720,9 @@ var Canvas = /*#__PURE__*/function () {
       var ps_w = 8 * this.sheetCtx.zoomRatio;
       var ps_h = 8 * this.sheetCtx.zoomRatio;
       renderCtx.beginPath();
-      renderCtx.moveTo(endX + offsetLeft - ps_w, startY + offsetTop);
-      renderCtx.lineTo(endX + offsetLeft, startY + offsetTop);
-      renderCtx.lineTo(endX + offsetLeft, startY + offsetTop + ps_h);
+      renderCtx.moveTo(startX + offsetLeft, startY + offsetTop);
+      renderCtx.lineTo(startX + offsetLeft, startY + offsetTop + ps_h);
+      renderCtx.lineTo(startX + offsetLeft + ps_w, startY + offsetTop);
       renderCtx.fillStyle = lyFlagColor;
       renderCtx.fill();
       renderCtx.closePath();
@@ -62688,7 +62730,7 @@ var Canvas = /*#__PURE__*/function () {
   }, {
     key: "cellRender",
     value: function cellRender(r, c, startY, startX, endY, endX, value, renderCtx, afCompute, cfCompute, offsetLeft, offsetTop, dynamicArrayCompute, cellOverflowMap, colStart, colEnd, scrollHeight, scrollWidth, bodrder05) {
-      var _this$sheetCtx$hooks$8, _this$sheetCtx$hooks8, _dataVerification, _this$sheetCtx$hooks$9, _this$sheetCtx$hooks9, _flowdata$r4;
+      var _this$sheetCtx$hooks$8, _this$sheetCtx$hooks8, _this$sheetCtx$hooks$9, _this$sheetCtx$hooks9, _flowdata$r5;
       var isMerge = arguments.length > 19 && arguments[19] !== undefined ? arguments[19] : false;
       var flowdata = getFlowdata(this.sheetCtx);
       if (!flowdata) {
@@ -62738,7 +62780,8 @@ var Canvas = /*#__PURE__*/function () {
         renderCtx.fill();
         renderCtx.closePath();
       }
-      this.renderLyFlag(renderCtx, cell, startY, endX, offsetLeft, offsetTop);
+      this.renderDelLine(renderCtx, cell, startX, startY, endX, endY, offsetLeft, offsetTop);
+      this.renderLyFlag(renderCtx, cell, startX, startY, offsetLeft, offsetTop);
       if (cell === null || cell === void 0 ? void 0 : cell.ps) {
         var ps_w = 8 * this.sheetCtx.zoomRatio;
         var ps_h = 8 * this.sheetCtx.zoomRatio;
@@ -62769,53 +62812,6 @@ var Canvas = /*#__PURE__*/function () {
         } else {
           cellOverflow_bd_r_render = false;
         }
-      } else if ((dataVerification === null || dataVerification === void 0 ? void 0 : (_dataVerification = dataVerification["".concat(r, "_").concat(c)]) === null || _dataVerification === void 0 ? void 0 : _dataVerification.type) === "checkbox") {
-        var pos_x = startX + offsetLeft;
-        var pos_y = startY + offsetTop + 1;
-        renderCtx.save();
-        renderCtx.beginPath();
-        renderCtx.rect(pos_x, pos_y, cellWidth, cellHeight);
-        renderCtx.clip();
-        renderCtx.scale(this.sheetCtx.zoomRatio, this.sheetCtx.zoomRatio);
-        var measureText = getMeasureText(value, renderCtx, this.sheetCtx);
-        var textMetrics = measureText.width + 14;
-        var oneLineTextHeight = measureText.actualBoundingBoxDescent + measureText.actualBoundingBoxAscent;
-        var horizonAlignPos = pos_x + space_width;
-        if (horizonAlign === 0) {
-          horizonAlignPos = pos_x + cellWidth / 2 - textMetrics / 2;
-        } else if (horizonAlign === 2) {
-          horizonAlignPos = pos_x + cellWidth - space_width - textMetrics;
-        }
-        var verticalCellHeight = cellHeight > oneLineTextHeight ? cellHeight : oneLineTextHeight;
-        var verticalAlignPos_text = pos_y + verticalCellHeight - space_height;
-        renderCtx.textBaseline = "bottom";
-        var verticalAlignPos_checkbox = verticalAlignPos_text - 13 * this.sheetCtx.zoomRatio;
-        if (verticalAlign === 0) {
-          verticalAlignPos_text = pos_y + verticalCellHeight / 2;
-          renderCtx.textBaseline = "middle";
-          verticalAlignPos_checkbox = verticalAlignPos_text - 6 * this.sheetCtx.zoomRatio;
-        } else if (verticalAlign === 1) {
-          verticalAlignPos_text = pos_y + space_height;
-          renderCtx.textBaseline = "top";
-          verticalAlignPos_checkbox = verticalAlignPos_text + 1 * this.sheetCtx.zoomRatio;
-        }
-        horizonAlignPos /= this.sheetCtx.zoomRatio;
-        verticalAlignPos_text /= this.sheetCtx.zoomRatio;
-        verticalAlignPos_checkbox /= this.sheetCtx.zoomRatio;
-        renderCtx.lineWidth = 1;
-        renderCtx.strokeStyle = "#000";
-        renderCtx.strokeRect(horizonAlignPos, verticalAlignPos_checkbox, 10, 10);
-        if (dataVerification["".concat(r, "_").concat(c)].checked) {
-          renderCtx.beginPath();
-          renderCtx.lineTo(horizonAlignPos + 1, verticalAlignPos_checkbox + 6);
-          renderCtx.lineTo(horizonAlignPos + 4, verticalAlignPos_checkbox + 9);
-          renderCtx.lineTo(horizonAlignPos + 9, verticalAlignPos_checkbox + 2);
-          renderCtx.stroke();
-          renderCtx.closePath();
-        }
-        renderCtx.fillStyle = normalizedAttr(flowdata, r, c, "fc");
-        renderCtx.fillText(___default['default'].isNil(value) ? "" : value, horizonAlignPos + 14, verticalAlignPos_text);
-        renderCtx.restore();
       } else {
         var _checksCF$dataBar, _checksCF$dataBar2, _checksCF$dataBar2$va, _cell$ct$fa$indexOf, _cell$ct, _cell$ct$fa, _cell$ct2;
         if ((checksCF === null || checksCF === void 0 ? void 0 : (_checksCF$dataBar = checksCF.dataBar) === null || _checksCF$dataBar === void 0 ? void 0 : _checksCF$dataBar.valueLen) && (checksCF === null || checksCF === void 0 ? void 0 : (_checksCF$dataBar2 = checksCF.dataBar) === null || _checksCF$dataBar2 === void 0 ? void 0 : (_checksCF$dataBar2$va = _checksCF$dataBar2.valueLen) === null || _checksCF$dataBar2$va === void 0 ? void 0 : _checksCF$dataBar2$va.toString()) !== "NaN") {
@@ -62897,11 +62893,11 @@ var Canvas = /*#__PURE__*/function () {
             }
           }
         }
-        var _pos_x = startX + offsetLeft;
-        var _pos_y = startY + offsetTop + 1;
+        var pos_x = startX + offsetLeft;
+        var pos_y = startY + offsetTop + 1;
         renderCtx.save();
         renderCtx.beginPath();
-        renderCtx.rect(_pos_x, _pos_y, cellWidth, cellHeight);
+        renderCtx.rect(pos_x, pos_y, cellWidth, cellHeight);
         renderCtx.clip();
         renderCtx.scale(this.sheetCtx.zoomRatio, this.sheetCtx.zoomRatio);
         var textInfo = cell ? getCellTextInfo(cell, renderCtx, this.sheetCtx, {
@@ -62916,16 +62912,16 @@ var Canvas = /*#__PURE__*/function () {
           var l = checksCF.icons.left;
           var t = checksCF.icons.top;
           var _value = textInfo.values[0];
-          var verticalAlignPos = _pos_y + _value.top - textInfo.textHeightAll;
+          var verticalAlignPos = pos_y + _value.top - textInfo.textHeightAll;
           if (verticalAlign === 0) {
-            verticalAlignPos = _pos_y + cellHeight / 2 - textInfo.textHeightAll / 2;
+            verticalAlignPos = pos_y + cellHeight / 2 - textInfo.textHeightAll / 2;
           } else if (verticalAlign === 1) {
-            verticalAlignPos = _pos_y;
+            verticalAlignPos = pos_y;
           } else if (verticalAlign === 2) {
             verticalAlignPos -= textInfo.desc;
           }
           verticalAlignPos /= this.sheetCtx.zoomRatio;
-          renderCtx.drawImage(getCfIconsImg(), l * 42, t * 32, 32, 32, _pos_x / this.sheetCtx.zoomRatio, verticalAlignPos, textInfo.textHeightAll / this.sheetCtx.zoomRatio, textInfo.textHeightAll / this.sheetCtx.zoomRatio);
+          renderCtx.drawImage(getCfIconsImg(), l * 42, t * 32, 32, 32, pos_x / this.sheetCtx.zoomRatio, verticalAlignPos, textInfo.textHeightAll / this.sheetCtx.zoomRatio, textInfo.textHeightAll / this.sheetCtx.zoomRatio);
         }
         renderCtx.fillStyle = normalizedAttr(flowdata, r, c, "fc");
         if (checksAF === null || checksAF === void 0 ? void 0 : checksAF[0]) {
@@ -62939,8 +62935,8 @@ var Canvas = /*#__PURE__*/function () {
           renderCtx.fillStyle = "#ff0000";
         }
         this.cellTextRender(textInfo, renderCtx, {
-          pos_x: _pos_x,
-          pos_y: _pos_y
+          pos_x: pos_x,
+          pos_y: pos_y
         });
         renderCtx.restore();
       }
@@ -62964,7 +62960,7 @@ var Canvas = /*#__PURE__*/function () {
         renderCtx.stroke();
         renderCtx.closePath();
       }
-      (_this$sheetCtx$hooks$9 = (_this$sheetCtx$hooks9 = this.sheetCtx.hooks).afterRenderCell) === null || _this$sheetCtx$hooks$9 === void 0 ? void 0 : _this$sheetCtx$hooks$9.call(_this$sheetCtx$hooks9, (_flowdata$r4 = flowdata[r]) === null || _flowdata$r4 === void 0 ? void 0 : _flowdata$r4[c], {
+      (_this$sheetCtx$hooks$9 = (_this$sheetCtx$hooks9 = this.sheetCtx.hooks).afterRenderCell) === null || _this$sheetCtx$hooks$9 === void 0 ? void 0 : _this$sheetCtx$hooks$9.call(_this$sheetCtx$hooks9, (_flowdata$r5 = flowdata[r]) === null || _flowdata$r5 === void 0 ? void 0 : _flowdata$r5[c], {
         row: r,
         column: c,
         startX: cellsize[0],
@@ -63204,9 +63200,9 @@ var Canvas = /*#__PURE__*/function () {
     }
   }, {
     key: "drawFreezeLine",
-    value: function drawFreezeLine(_ref2) {
-      var horizontalTop = _ref2.horizontalTop,
-        verticalLeft = _ref2.verticalLeft;
+    value: function drawFreezeLine(_ref4) {
+      var horizontalTop = _ref4.horizontalTop,
+        verticalLeft = _ref4.verticalLeft;
     }
   }]);
 }();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
@@ -13,7 +13,7 @@
     "build": "father-build"
   },
   "dependencies": {
-    "@leankylin-sheet/formula-parser": "^3.0.0",
+    "@leankylin-sheet/formula-parser": "^3.0.2",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",