@leankylin-sheet/core 4.0.23 → 4.0.25

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 (3) hide show
  1. package/dist/index.esm.js +24 -3
  2. package/dist/index.js +24 -3
  3. package/package.json +2 -2
package/dist/index.esm.js CHANGED
@@ -36282,14 +36282,14 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
36282
36282
  }
36283
36283
  }
36284
36284
  for (var _j2 = 0; _j2 < formulaTextArray.length; _j2 += 1) {
36285
- var t = formulaTextArray[_j2];
36285
+ var t = _.trim(formulaTextArray[_j2]);
36286
36286
  if (t.length <= 1) {
36287
36287
  continue;
36288
36288
  }
36289
36289
  if (t.substring(0, 1) === '"' && t.substring(t.length - 1, 1) === '"' || !iscelldata(t)) {
36290
36290
  continue;
36291
36291
  }
36292
- var range = getcellrange(ctx, _.trim(t), formulaCell.id);
36292
+ var range = getcellrange(ctx, t, formulaCell.id);
36293
36293
  if (_.isNil(range)) {
36294
36294
  continue;
36295
36295
  }
@@ -40771,6 +40771,9 @@ function scrollToHighlightCell(ctx, r, c) {
40771
40771
  scrollTop = ctx.scrollTop;
40772
40772
  var winH = ctx.cellmainHeight;
40773
40773
  var winW = ctx.cellmainWidth;
40774
+ if (winW <= 0 || winH <= 0) {
40775
+ return;
40776
+ }
40774
40777
  var sheetIndex = getSheetIndex(ctx, ctx.currentSheetId);
40775
40778
  var sheet = sheetIndex == null ? null : ctx.luckysheetfile[sheetIndex];
40776
40779
  if (!sheet) return;
@@ -40800,7 +40803,6 @@ function scrollToHighlightCell(ctx, r, c) {
40800
40803
  var _scrollAmount = Math.max(20, freezeW);
40801
40804
  ctx.scrollLeft = col_pre - _scrollAmount;
40802
40805
  }
40803
- console.log(ctx.scrollLeft, c, r, col_pre, Math.max(20, freezeW), freezeW, column_focus, winW, col - scrollLeft - winW + 20 > 0);
40804
40806
  }
40805
40807
  }
40806
40808
  function seletedHighlistByindex(ctx, r1, r2, c1, c2) {
@@ -55874,13 +55876,32 @@ function setCellValuesByRange(ctx, data, range, cellInput) {
55874
55876
  if (data.length !== rowCount || data[0].length !== columnCount) {
55875
55877
  throw new Error("data size does not match range");
55876
55878
  }
55879
+ var sheet = getSheet(ctx, options);
55880
+ var cfg = sheet.config || {};
55881
+ if (cfg.merge == null) {
55882
+ cfg.merge = {};
55883
+ }
55877
55884
  for (var i = 0; i < rowCount; i += 1) {
55878
55885
  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;
55879
55887
  var row = range.row[0] + i;
55880
55888
  var column = range.column[0] + j;
55881
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
+ };
55901
+ }
55882
55902
  }
55883
55903
  }
55904
+ sheet.config = cfg;
55884
55905
  }
55885
55906
  function setCellValues(ctx, data, cellInput) {
55886
55907
  if (data == null) {
package/dist/index.js CHANGED
@@ -36292,14 +36292,14 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
36292
36292
  }
36293
36293
  }
36294
36294
  for (var _j2 = 0; _j2 < formulaTextArray.length; _j2 += 1) {
36295
- var t = formulaTextArray[_j2];
36295
+ var t = ___default['default'].trim(formulaTextArray[_j2]);
36296
36296
  if (t.length <= 1) {
36297
36297
  continue;
36298
36298
  }
36299
36299
  if (t.substring(0, 1) === '"' && t.substring(t.length - 1, 1) === '"' || !iscelldata(t)) {
36300
36300
  continue;
36301
36301
  }
36302
- var range = getcellrange(ctx, ___default['default'].trim(t), formulaCell.id);
36302
+ var range = getcellrange(ctx, t, formulaCell.id);
36303
36303
  if (___default['default'].isNil(range)) {
36304
36304
  continue;
36305
36305
  }
@@ -40781,6 +40781,9 @@ function scrollToHighlightCell(ctx, r, c) {
40781
40781
  scrollTop = ctx.scrollTop;
40782
40782
  var winH = ctx.cellmainHeight;
40783
40783
  var winW = ctx.cellmainWidth;
40784
+ if (winW <= 0 || winH <= 0) {
40785
+ return;
40786
+ }
40784
40787
  var sheetIndex = getSheetIndex(ctx, ctx.currentSheetId);
40785
40788
  var sheet = sheetIndex == null ? null : ctx.luckysheetfile[sheetIndex];
40786
40789
  if (!sheet) return;
@@ -40810,7 +40813,6 @@ function scrollToHighlightCell(ctx, r, c) {
40810
40813
  var _scrollAmount = Math.max(20, freezeW);
40811
40814
  ctx.scrollLeft = col_pre - _scrollAmount;
40812
40815
  }
40813
- console.log(ctx.scrollLeft, c, r, col_pre, Math.max(20, freezeW), freezeW, column_focus, winW, col - scrollLeft - winW + 20 > 0);
40814
40816
  }
40815
40817
  }
40816
40818
  function seletedHighlistByindex(ctx, r1, r2, c1, c2) {
@@ -55884,13 +55886,32 @@ function setCellValuesByRange(ctx, data, range, cellInput) {
55884
55886
  if (data.length !== rowCount || data[0].length !== columnCount) {
55885
55887
  throw new Error("data size does not match range");
55886
55888
  }
55889
+ var sheet = getSheet(ctx, options);
55890
+ var cfg = sheet.config || {};
55891
+ if (cfg.merge == null) {
55892
+ cfg.merge = {};
55893
+ }
55887
55894
  for (var i = 0; i < rowCount; i += 1) {
55888
55895
  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;
55889
55897
  var row = range.row[0] + i;
55890
55898
  var column = range.column[0] + j;
55891
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
+ };
55911
+ }
55892
55912
  }
55893
55913
  }
55914
+ sheet.config = cfg;
55894
55915
  }
55895
55916
  function setCellValues(ctx, data, cellInput) {
55896
55917
  if (data == null) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@leankylin-sheet/core",
3
- "version": "4.0.23",
3
+ "version": "4.0.25",
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.23",
16
+ "@leankylin-sheet/formula-parser": "4.0.25",
17
17
  "dayjs": "^1.11.0",
18
18
  "immer": "^9.0.12",
19
19
  "lodash": "^4.17.21",