@leankylin-sheet/core 4.0.26 → 4.0.28

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/api/range.d.ts +1 -1
  2. package/dist/index.esm.js +28 -17
  3. package/dist/index.js +28 -17
  4. package/package.json +2 -2
package/dist/api/range.d.ts CHANGED
@@ -18,6 +18,6 @@ export declare function getSelectionCoordinates(ctx: Context): string[];
18
18
  export declare function getCellsByRange(ctx: Context, range: Selection, options?: CommonOptions): (Cell | null)[][];
19
19
  export declare function getHtmlByRange(ctx: Context, range: Range, options?: CommonOptions): string | null;
20
20
  export declare function setSelection(ctx: Context, range: Range, options: CommonOptions): void;
21
- export declare function setCellValuesByRange(ctx: Context, data: any[][], range: SingleRange, cellInput: HTMLDivElement | null, options?: CommonOptions): void;
21
+ export declare function setCellValuesByRange(ctx: Context, data: any[][], range: SingleRange, cellInput: HTMLDivElement | null, options?: CommonOptions, setMerge?: boolean): void;
22
22
  export declare function setCellValues(ctx: Context, data: any[], cellInput: HTMLDivElement | null): void;
23
23
  export declare function setCellFormatByRange(ctx: Context, attr: keyof Cell, value: any, range: Range | SingleRange, options?: CommonOptions): void;
package/dist/index.esm.js CHANGED
@@ -55862,6 +55862,7 @@ function setSelection(ctx, range, options) {
55862
55862
  }
55863
55863
  function setCellValuesByRange(ctx, data, range, cellInput) {
55864
55864
  var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
55865
+ var setMerge = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
55865
55866
  if (data == null) {
55866
55867
  throw INVALID_PARAMS;
55867
55868
  }
@@ -55883,25 +55884,29 @@ function setCellValuesByRange(ctx, data, range, cellInput) {
55883
55884
  }
55884
55885
  for (var i = 0; i < rowCount; i += 1) {
55885
55886
  for (var j = 0; j < columnCount; j += 1) {
55886
- var _data$i$j, _data$i$j$mc, _data$i$j2, _data$i$j2$mc, _data$i$j3, _data$i$j3$mc, _data$i$j4, _data$i$j4$mc;
55887
55887
  var row = range.row[0] + i;
55888
55888
  var column = range.column[0] + j;
55889
55889
  setCellValue$1(ctx, row, column, data[i][j], cellInput, options);
55890
- var r1 = (_data$i$j = data[i][j]) === null || _data$i$j === void 0 ? void 0 : (_data$i$j$mc = _data$i$j.mc) === null || _data$i$j$mc === void 0 ? void 0 : _data$i$j$mc.r;
55891
- var c1 = (_data$i$j2 = data[i][j]) === null || _data$i$j2 === void 0 ? void 0 : (_data$i$j2$mc = _data$i$j2.mc) === null || _data$i$j2$mc === void 0 ? void 0 : _data$i$j2$mc.c;
55892
- var rs = (_data$i$j3 = data[i][j]) === null || _data$i$j3 === void 0 ? void 0 : (_data$i$j3$mc = _data$i$j3.mc) === null || _data$i$j3$mc === void 0 ? void 0 : _data$i$j3$mc.rs;
55893
- var cs = (_data$i$j4 = data[i][j]) === null || _data$i$j4 === void 0 ? void 0 : (_data$i$j4$mc = _data$i$j4.mc) === null || _data$i$j4$mc === void 0 ? void 0 : _data$i$j4$mc.cs;
55894
- if (rs > 1 || cs > 1) {
55895
- cfg.merge["".concat(r1, "_").concat(c1)] = {
55896
- r: r1,
55897
- c: c1,
55898
- rs: rs,
55899
- cs: cs
55900
- };
55890
+ if (setMerge) {
55891
+ var _data$i$j, _data$i$j$mc, _data$i$j2, _data$i$j2$mc, _data$i$j3, _data$i$j3$mc, _data$i$j4, _data$i$j4$mc;
55892
+ var r1 = (_data$i$j = data[i][j]) === null || _data$i$j === void 0 ? void 0 : (_data$i$j$mc = _data$i$j.mc) === null || _data$i$j$mc === void 0 ? void 0 : _data$i$j$mc.r;
55893
+ var c1 = (_data$i$j2 = data[i][j]) === null || _data$i$j2 === void 0 ? void 0 : (_data$i$j2$mc = _data$i$j2.mc) === null || _data$i$j2$mc === void 0 ? void 0 : _data$i$j2$mc.c;
55894
+ var rs = (_data$i$j3 = data[i][j]) === null || _data$i$j3 === void 0 ? void 0 : (_data$i$j3$mc = _data$i$j3.mc) === null || _data$i$j3$mc === void 0 ? void 0 : _data$i$j3$mc.rs;
55895
+ var cs = (_data$i$j4 = data[i][j]) === null || _data$i$j4 === void 0 ? void 0 : (_data$i$j4$mc = _data$i$j4.mc) === null || _data$i$j4$mc === void 0 ? void 0 : _data$i$j4$mc.cs;
55896
+ if (rs > 1 || cs > 1) {
55897
+ cfg.merge["".concat(r1, "_").concat(c1)] = {
55898
+ r: r1,
55899
+ c: c1,
55900
+ rs: rs,
55901
+ cs: cs
55902
+ };
55903
+ }
55901
55904
  }
55902
55905
  }
55903
55906
  }
55904
- sheet.config = cfg;
55907
+ if (setMerge) {
55908
+ sheet.config = cfg;
55909
+ }
55905
55910
  }
55906
55911
  function setCellValues(ctx, data, cellInput) {
55907
55912
  if (data == null) {
@@ -59801,6 +59806,10 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
59801
59806
  m: m || v,
59802
59807
  f: f || undefined
59803
59808
  }, domStyleToCellAttr(style));
59809
+ if (f) {
59810
+ delete mainCell.m;
59811
+ delete mainCell.v;
59812
+ }
59804
59813
  if (colspan > 1 || rowspan > 1) {
59805
59814
  mainCell.mc = {
59806
59815
  rs: rowspan,
@@ -59846,11 +59855,13 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
59846
59855
  }
59847
59856
  offsetColIndex += colspan || 1;
59848
59857
  } else {
59849
- result[index].push({
59858
+ var item = f ? {
59859
+ f: f
59860
+ } : {
59850
59861
  m: m,
59851
- v: v,
59852
- f: f || undefined
59853
- });
59862
+ v: v
59863
+ };
59864
+ result[index].push(item);
59854
59865
  }
59855
59866
  }
59856
59867
  }
package/dist/index.js CHANGED
@@ -55872,6 +55872,7 @@ function setSelection(ctx, range, options) {
55872
55872
  }
55873
55873
  function setCellValuesByRange(ctx, data, range, cellInput) {
55874
55874
  var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
55875
+ var setMerge = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
55875
55876
  if (data == null) {
55876
55877
  throw INVALID_PARAMS;
55877
55878
  }
@@ -55893,25 +55894,29 @@ function setCellValuesByRange(ctx, data, range, cellInput) {
55893
55894
  }
55894
55895
  for (var i = 0; i < rowCount; i += 1) {
55895
55896
  for (var j = 0; j < columnCount; j += 1) {
55896
- var _data$i$j, _data$i$j$mc, _data$i$j2, _data$i$j2$mc, _data$i$j3, _data$i$j3$mc, _data$i$j4, _data$i$j4$mc;
55897
55897
  var row = range.row[0] + i;
55898
55898
  var column = range.column[0] + j;
55899
55899
  setCellValue$1(ctx, row, column, data[i][j], cellInput, options);
55900
- var r1 = (_data$i$j = data[i][j]) === null || _data$i$j === void 0 ? void 0 : (_data$i$j$mc = _data$i$j.mc) === null || _data$i$j$mc === void 0 ? void 0 : _data$i$j$mc.r;
55901
- var c1 = (_data$i$j2 = data[i][j]) === null || _data$i$j2 === void 0 ? void 0 : (_data$i$j2$mc = _data$i$j2.mc) === null || _data$i$j2$mc === void 0 ? void 0 : _data$i$j2$mc.c;
55902
- var rs = (_data$i$j3 = data[i][j]) === null || _data$i$j3 === void 0 ? void 0 : (_data$i$j3$mc = _data$i$j3.mc) === null || _data$i$j3$mc === void 0 ? void 0 : _data$i$j3$mc.rs;
55903
- var cs = (_data$i$j4 = data[i][j]) === null || _data$i$j4 === void 0 ? void 0 : (_data$i$j4$mc = _data$i$j4.mc) === null || _data$i$j4$mc === void 0 ? void 0 : _data$i$j4$mc.cs;
55904
- if (rs > 1 || cs > 1) {
55905
- cfg.merge["".concat(r1, "_").concat(c1)] = {
55906
- r: r1,
55907
- c: c1,
55908
- rs: rs,
55909
- cs: cs
55910
- };
55900
+ if (setMerge) {
55901
+ var _data$i$j, _data$i$j$mc, _data$i$j2, _data$i$j2$mc, _data$i$j3, _data$i$j3$mc, _data$i$j4, _data$i$j4$mc;
55902
+ var r1 = (_data$i$j = data[i][j]) === null || _data$i$j === void 0 ? void 0 : (_data$i$j$mc = _data$i$j.mc) === null || _data$i$j$mc === void 0 ? void 0 : _data$i$j$mc.r;
55903
+ var c1 = (_data$i$j2 = data[i][j]) === null || _data$i$j2 === void 0 ? void 0 : (_data$i$j2$mc = _data$i$j2.mc) === null || _data$i$j2$mc === void 0 ? void 0 : _data$i$j2$mc.c;
55904
+ var rs = (_data$i$j3 = data[i][j]) === null || _data$i$j3 === void 0 ? void 0 : (_data$i$j3$mc = _data$i$j3.mc) === null || _data$i$j3$mc === void 0 ? void 0 : _data$i$j3$mc.rs;
55905
+ var cs = (_data$i$j4 = data[i][j]) === null || _data$i$j4 === void 0 ? void 0 : (_data$i$j4$mc = _data$i$j4.mc) === null || _data$i$j4$mc === void 0 ? void 0 : _data$i$j4$mc.cs;
55906
+ if (rs > 1 || cs > 1) {
55907
+ cfg.merge["".concat(r1, "_").concat(c1)] = {
55908
+ r: r1,
55909
+ c: c1,
55910
+ rs: rs,
55911
+ cs: cs
55912
+ };
55913
+ }
55911
55914
  }
55912
55915
  }
55913
55916
  }
55914
- sheet.config = cfg;
55917
+ if (setMerge) {
55918
+ sheet.config = cfg;
55919
+ }
55915
55920
  }
55916
55921
  function setCellValues(ctx, data, cellInput) {
55917
55922
  if (data == null) {
@@ -59811,6 +59816,10 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
59811
59816
  m: m || v,
59812
59817
  f: f || undefined
59813
59818
  }, domStyleToCellAttr(style));
59819
+ if (f) {
59820
+ delete mainCell.m;
59821
+ delete mainCell.v;
59822
+ }
59814
59823
  if (colspan > 1 || rowspan > 1) {
59815
59824
  mainCell.mc = {
59816
59825
  rs: rowspan,
@@ -59856,11 +59865,13 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
59856
59865
  }
59857
59866
  offsetColIndex += colspan || 1;
59858
59867
  } else {
59859
- result[index].push({
59868
+ var item = f ? {
59869
+ f: f
59870
+ } : {
59860
59871
  m: m,
59861
- v: v,
59862
- f: f || undefined
59863
- });
59872
+ v: v
59873
+ };
59874
+ result[index].push(item);
59864
59875
  }
59865
59876
  }
59866
59877
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@leankylin-sheet/core",
3
- "version": "4.0.26",
3
+ "version": "4.0.28",
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": "4.0.26",
16
+ "@leankylin-sheet/formula-parser": "4.0.28",
17
17
  "dayjs": "^1.11.0",
18
18
  "immer": "^9.0.12",
19
19
  "lodash": "^4.17.21",