@leankylin-sheet/core 2.0.4 → 2.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/canvas.d.ts +1 -0
  2. package/dist/index.esm.js +23 -4
  3. package/dist/index.js +23 -4
  4. package/package.json +2 -2
package/dist/canvas.d.ts CHANGED
@@ -27,6 +27,7 @@ export declare class Canvas {
27
27
  }): void;
28
28
  getCellOverflowMap(canvas: CanvasRenderingContext2D, colStart: number, colEnd: number, rowStart: number, rowEnd: number): any;
29
29
  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;
30
+ renderLyFlag(renderCtx: CanvasRenderingContext2D, cell: any, startY: number, endX: number, offsetLeft: number, offsetTop: number): void;
30
31
  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;
31
32
  cellOverflowRender(r: number, c: number, stc: number, edc: number, renderCtx: CanvasRenderingContext2D, scrollHeight: number, scrollWidth: number, offsetLeft: number, offsetTop: number, afCompute: any, cfCompute: any): void;
32
33
  cellOverflow_trace(r: number, curC: number, traceC: number, traceDir: string, horizonAlign: string, textMetrics: number): any;
package/dist/index.esm.js CHANGED
@@ -62592,7 +62592,7 @@ var Canvas = /*#__PURE__*/function () {
62592
62592
  }, {
62593
62593
  key: "nullCellRender",
62594
62594
  value: function nullCellRender(r, c, startY, startX, endY, endX, renderCtx, afCompute, cfCompute, offsetLeft, offsetTop, dynamicArrayCompute, cellOverflowMap, colStart, colEnd, scrollHeight, scrollWidth, bodrder05) {
62595
- var _this$sheetCtx$hooks$6, _this$sheetCtx$hooks6, _flowdata$r2, _flowdata$r2$c, _this$sheetCtx$hooks$7, _this$sheetCtx$hooks7;
62595
+ var _this$sheetCtx$hooks$6, _this$sheetCtx$hooks6, _flowdata$r2, _flowdata$r3, _flowdata$r3$c, _this$sheetCtx$hooks$7, _this$sheetCtx$hooks7;
62596
62596
  var isMerge = arguments.length > 18 && arguments[18] !== undefined ? arguments[18] : false;
62597
62597
  var checksCF = checkCF(r, c, cfCompute);
62598
62598
  var flowdata = getFlowdata(this.sheetCtx);
@@ -62629,7 +62629,8 @@ var Canvas = /*#__PURE__*/function () {
62629
62629
  renderCtx.textBaseline = "bottom";
62630
62630
  renderCtx.fillText(_.isNil(value) ? "" : value, horizonAlignPos, verticalAlignPos);
62631
62631
  }
62632
- if (flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r2 = flowdata[r]) === null || _flowdata$r2 === void 0 ? void 0 : (_flowdata$r2$c = _flowdata$r2[c]) === null || _flowdata$r2$c === void 0 ? void 0 : _flowdata$r2$c.ps) {
62632
+ 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);
62633
+ 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) {
62633
62634
  var ps_w = 8 * this.sheetCtx.zoomRatio;
62634
62635
  var ps_h = 8 * this.sheetCtx.zoomRatio;
62635
62636
  renderCtx.beginPath();
@@ -62673,10 +62674,27 @@ var Canvas = /*#__PURE__*/function () {
62673
62674
  endX: cellsize[2] + cellsize[0]
62674
62675
  }, renderCtx);
62675
62676
  }
62677
+ }, {
62678
+ key: "renderLyFlag",
62679
+ value: function renderLyFlag(renderCtx, cell, startY, endX, offsetLeft, offsetTop) {
62680
+ var lyFlagColor = cell === null || cell === void 0 ? void 0 : cell.lyFlagColor;
62681
+ if (!lyFlagColor) {
62682
+ return;
62683
+ }
62684
+ var ps_w = 8 * this.sheetCtx.zoomRatio;
62685
+ var ps_h = 8 * this.sheetCtx.zoomRatio;
62686
+ renderCtx.beginPath();
62687
+ renderCtx.moveTo(endX + offsetLeft - ps_w, startY + offsetTop);
62688
+ renderCtx.lineTo(endX + offsetLeft, startY + offsetTop);
62689
+ renderCtx.lineTo(endX + offsetLeft, startY + offsetTop + ps_h);
62690
+ renderCtx.fillStyle = lyFlagColor;
62691
+ renderCtx.fill();
62692
+ renderCtx.closePath();
62693
+ }
62676
62694
  }, {
62677
62695
  key: "cellRender",
62678
62696
  value: function cellRender(r, c, startY, startX, endY, endX, value, renderCtx, afCompute, cfCompute, offsetLeft, offsetTop, dynamicArrayCompute, cellOverflowMap, colStart, colEnd, scrollHeight, scrollWidth, bodrder05) {
62679
- var _this$sheetCtx$hooks$8, _this$sheetCtx$hooks8, _dataVerification, _this$sheetCtx$hooks$9, _this$sheetCtx$hooks9, _flowdata$r3;
62697
+ var _this$sheetCtx$hooks$8, _this$sheetCtx$hooks8, _dataVerification, _this$sheetCtx$hooks$9, _this$sheetCtx$hooks9, _flowdata$r4;
62680
62698
  var isMerge = arguments.length > 19 && arguments[19] !== undefined ? arguments[19] : false;
62681
62699
  var flowdata = getFlowdata(this.sheetCtx);
62682
62700
  if (!flowdata) {
@@ -62726,6 +62744,7 @@ var Canvas = /*#__PURE__*/function () {
62726
62744
  renderCtx.fill();
62727
62745
  renderCtx.closePath();
62728
62746
  }
62747
+ this.renderLyFlag(renderCtx, cell, startY, endX, offsetLeft, offsetTop);
62729
62748
  if (cell === null || cell === void 0 ? void 0 : cell.ps) {
62730
62749
  var ps_w = 8 * this.sheetCtx.zoomRatio;
62731
62750
  var ps_h = 8 * this.sheetCtx.zoomRatio;
@@ -62951,7 +62970,7 @@ var Canvas = /*#__PURE__*/function () {
62951
62970
  renderCtx.stroke();
62952
62971
  renderCtx.closePath();
62953
62972
  }
62954
- (_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$r3 = flowdata[r]) === null || _flowdata$r3 === void 0 ? void 0 : _flowdata$r3[c], {
62973
+ (_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], {
62955
62974
  row: r,
62956
62975
  column: c,
62957
62976
  startX: cellsize[0],
package/dist/index.js CHANGED
@@ -62602,7 +62602,7 @@ var Canvas = /*#__PURE__*/function () {
62602
62602
  }, {
62603
62603
  key: "nullCellRender",
62604
62604
  value: function nullCellRender(r, c, startY, startX, endY, endX, renderCtx, afCompute, cfCompute, offsetLeft, offsetTop, dynamicArrayCompute, cellOverflowMap, colStart, colEnd, scrollHeight, scrollWidth, bodrder05) {
62605
- var _this$sheetCtx$hooks$6, _this$sheetCtx$hooks6, _flowdata$r2, _flowdata$r2$c, _this$sheetCtx$hooks$7, _this$sheetCtx$hooks7;
62605
+ var _this$sheetCtx$hooks$6, _this$sheetCtx$hooks6, _flowdata$r2, _flowdata$r3, _flowdata$r3$c, _this$sheetCtx$hooks$7, _this$sheetCtx$hooks7;
62606
62606
  var isMerge = arguments.length > 18 && arguments[18] !== undefined ? arguments[18] : false;
62607
62607
  var checksCF = checkCF(r, c, cfCompute);
62608
62608
  var flowdata = getFlowdata(this.sheetCtx);
@@ -62639,7 +62639,8 @@ var Canvas = /*#__PURE__*/function () {
62639
62639
  renderCtx.textBaseline = "bottom";
62640
62640
  renderCtx.fillText(___default['default'].isNil(value) ? "" : value, horizonAlignPos, verticalAlignPos);
62641
62641
  }
62642
- if (flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r2 = flowdata[r]) === null || _flowdata$r2 === void 0 ? void 0 : (_flowdata$r2$c = _flowdata$r2[c]) === null || _flowdata$r2$c === void 0 ? void 0 : _flowdata$r2$c.ps) {
62642
+ 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);
62643
+ 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) {
62643
62644
  var ps_w = 8 * this.sheetCtx.zoomRatio;
62644
62645
  var ps_h = 8 * this.sheetCtx.zoomRatio;
62645
62646
  renderCtx.beginPath();
@@ -62683,10 +62684,27 @@ var Canvas = /*#__PURE__*/function () {
62683
62684
  endX: cellsize[2] + cellsize[0]
62684
62685
  }, renderCtx);
62685
62686
  }
62687
+ }, {
62688
+ key: "renderLyFlag",
62689
+ value: function renderLyFlag(renderCtx, cell, startY, endX, offsetLeft, offsetTop) {
62690
+ var lyFlagColor = cell === null || cell === void 0 ? void 0 : cell.lyFlagColor;
62691
+ if (!lyFlagColor) {
62692
+ return;
62693
+ }
62694
+ var ps_w = 8 * this.sheetCtx.zoomRatio;
62695
+ var ps_h = 8 * this.sheetCtx.zoomRatio;
62696
+ renderCtx.beginPath();
62697
+ renderCtx.moveTo(endX + offsetLeft - ps_w, startY + offsetTop);
62698
+ renderCtx.lineTo(endX + offsetLeft, startY + offsetTop);
62699
+ renderCtx.lineTo(endX + offsetLeft, startY + offsetTop + ps_h);
62700
+ renderCtx.fillStyle = lyFlagColor;
62701
+ renderCtx.fill();
62702
+ renderCtx.closePath();
62703
+ }
62686
62704
  }, {
62687
62705
  key: "cellRender",
62688
62706
  value: function cellRender(r, c, startY, startX, endY, endX, value, renderCtx, afCompute, cfCompute, offsetLeft, offsetTop, dynamicArrayCompute, cellOverflowMap, colStart, colEnd, scrollHeight, scrollWidth, bodrder05) {
62689
- var _this$sheetCtx$hooks$8, _this$sheetCtx$hooks8, _dataVerification, _this$sheetCtx$hooks$9, _this$sheetCtx$hooks9, _flowdata$r3;
62707
+ var _this$sheetCtx$hooks$8, _this$sheetCtx$hooks8, _dataVerification, _this$sheetCtx$hooks$9, _this$sheetCtx$hooks9, _flowdata$r4;
62690
62708
  var isMerge = arguments.length > 19 && arguments[19] !== undefined ? arguments[19] : false;
62691
62709
  var flowdata = getFlowdata(this.sheetCtx);
62692
62710
  if (!flowdata) {
@@ -62736,6 +62754,7 @@ var Canvas = /*#__PURE__*/function () {
62736
62754
  renderCtx.fill();
62737
62755
  renderCtx.closePath();
62738
62756
  }
62757
+ this.renderLyFlag(renderCtx, cell, startY, endX, offsetLeft, offsetTop);
62739
62758
  if (cell === null || cell === void 0 ? void 0 : cell.ps) {
62740
62759
  var ps_w = 8 * this.sheetCtx.zoomRatio;
62741
62760
  var ps_h = 8 * this.sheetCtx.zoomRatio;
@@ -62961,7 +62980,7 @@ var Canvas = /*#__PURE__*/function () {
62961
62980
  renderCtx.stroke();
62962
62981
  renderCtx.closePath();
62963
62982
  }
62964
- (_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$r3 = flowdata[r]) === null || _flowdata$r3 === void 0 ? void 0 : _flowdata$r3[c], {
62983
+ (_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], {
62965
62984
  row: r,
62966
62985
  column: c,
62967
62986
  startX: cellsize[0],
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@leankylin-sheet/core",
3
- "version": "2.0.4",
3
+ "version": "2.0.5",
4
4
  "main": "dist/index.js",
5
5
  "module": "dist/index.esm.js",
6
6
  "typings": "dist/index.d.ts",
@@ -13,7 +13,7 @@
13
13
  "build": "father-build"
14
14
  },
15
15
  "dependencies": {
16
- "@leankylin-sheet/formula-parser": "^2.0.4",
16
+ "@leankylin-sheet/formula-parser": "^2.0.5",
17
17
  "dayjs": "^1.11.0",
18
18
  "immer": "^9.0.12",
19
19
  "lodash": "^4.17.21",