@leankylin-sheet/excel 7.0.42 → 7.0.44

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.
package/dist/index.esm.js CHANGED
@@ -44,6 +44,27 @@ function _iterableToArrayLimit(r, l) {
44
44
  return a;
45
45
  }
46
46
  }
47
+ function ownKeys(e, r) {
48
+ var t = Object.keys(e);
49
+ if (Object.getOwnPropertySymbols) {
50
+ var o = Object.getOwnPropertySymbols(e);
51
+ r && (o = o.filter(function (r) {
52
+ return Object.getOwnPropertyDescriptor(e, r).enumerable;
53
+ })), t.push.apply(t, o);
54
+ }
55
+ return t;
56
+ }
57
+ function _objectSpread2(e) {
58
+ for (var r = 1; r < arguments.length; r++) {
59
+ var t = null != arguments[r] ? arguments[r] : {};
60
+ r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
61
+ _defineProperty(e, r, t[r]);
62
+ }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
63
+ Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
64
+ });
65
+ }
66
+ return e;
67
+ }
47
68
  function _regeneratorRuntime() {
48
69
  _regeneratorRuntime = function () {
49
70
  return e;
@@ -420,6 +441,20 @@ function _createClass(Constructor, protoProps, staticProps) {
420
441
  });
421
442
  return Constructor;
422
443
  }
444
+ function _defineProperty(obj, key, value) {
445
+ key = _toPropertyKey(key);
446
+ if (key in obj) {
447
+ Object.defineProperty(obj, key, {
448
+ value: value,
449
+ enumerable: true,
450
+ configurable: true,
451
+ writable: true
452
+ });
453
+ } else {
454
+ obj[key] = value;
455
+ }
456
+ return obj;
457
+ }
423
458
  function _extends() {
424
459
  _extends = Object.assign ? Object.assign.bind() : function (target) {
425
460
  for (var i = 1; i < arguments.length; i++) {
@@ -5412,6 +5447,22 @@ var getBorderInfo = function getBorderInfo(luckysheetfile) {
5412
5447
  var cfg = luckysheetfile.config;
5413
5448
  var data = luckysheetfile.data;
5414
5449
  if (!cfg || !data) return {};
5450
+ if (!cfg["merge"]) {
5451
+ cfg = _objectSpread2(_objectSpread2({}, cfg), {}, {
5452
+ merge: {}
5453
+ });
5454
+ }
5455
+ var mergeCfg = cfg["merge"] || {};
5456
+ data = data.map(function (row) {
5457
+ return Array.isArray(row) ? row.map(function (cell) {
5458
+ if (cell && _typeof(cell) === "object" && cell.mc && !mergeCfg["".concat(cell.mc.r, "_").concat(cell.mc.c)]) {
5459
+ var rest = _objectSpread2({}, cell);
5460
+ delete rest.mc;
5461
+ return rest;
5462
+ }
5463
+ return cell;
5464
+ }) : row;
5465
+ });
5415
5466
  var borderInfo = cfg["borderInfo"];
5416
5467
  var dataset_row_st = 0,
5417
5468
  dataset_row_ed = data.length,
package/dist/index.js CHANGED
@@ -56,6 +56,27 @@ function _iterableToArrayLimit(r, l) {
56
56
  return a;
57
57
  }
58
58
  }
59
+ function ownKeys(e, r) {
60
+ var t = Object.keys(e);
61
+ if (Object.getOwnPropertySymbols) {
62
+ var o = Object.getOwnPropertySymbols(e);
63
+ r && (o = o.filter(function (r) {
64
+ return Object.getOwnPropertyDescriptor(e, r).enumerable;
65
+ })), t.push.apply(t, o);
66
+ }
67
+ return t;
68
+ }
69
+ function _objectSpread2(e) {
70
+ for (var r = 1; r < arguments.length; r++) {
71
+ var t = null != arguments[r] ? arguments[r] : {};
72
+ r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
73
+ _defineProperty(e, r, t[r]);
74
+ }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
75
+ Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
76
+ });
77
+ }
78
+ return e;
79
+ }
59
80
  function _regeneratorRuntime() {
60
81
  _regeneratorRuntime = function () {
61
82
  return e;
@@ -432,6 +453,20 @@ function _createClass(Constructor, protoProps, staticProps) {
432
453
  });
433
454
  return Constructor;
434
455
  }
456
+ function _defineProperty(obj, key, value) {
457
+ key = _toPropertyKey(key);
458
+ if (key in obj) {
459
+ Object.defineProperty(obj, key, {
460
+ value: value,
461
+ enumerable: true,
462
+ configurable: true,
463
+ writable: true
464
+ });
465
+ } else {
466
+ obj[key] = value;
467
+ }
468
+ return obj;
469
+ }
435
470
  function _extends() {
436
471
  _extends = Object.assign ? Object.assign.bind() : function (target) {
437
472
  for (var i = 1; i < arguments.length; i++) {
@@ -5424,6 +5459,22 @@ var getBorderInfo = function getBorderInfo(luckysheetfile) {
5424
5459
  var cfg = luckysheetfile.config;
5425
5460
  var data = luckysheetfile.data;
5426
5461
  if (!cfg || !data) return {};
5462
+ if (!cfg["merge"]) {
5463
+ cfg = _objectSpread2(_objectSpread2({}, cfg), {}, {
5464
+ merge: {}
5465
+ });
5466
+ }
5467
+ var mergeCfg = cfg["merge"] || {};
5468
+ data = data.map(function (row) {
5469
+ return Array.isArray(row) ? row.map(function (cell) {
5470
+ if (cell && _typeof(cell) === "object" && cell.mc && !mergeCfg["".concat(cell.mc.r, "_").concat(cell.mc.c)]) {
5471
+ var rest = _objectSpread2({}, cell);
5472
+ delete rest.mc;
5473
+ return rest;
5474
+ }
5475
+ return cell;
5476
+ }) : row;
5477
+ });
5427
5478
  var borderInfo = cfg["borderInfo"];
5428
5479
  var dataset_row_st = 0,
5429
5480
  dataset_row_ed = data.length,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@leankylin-sheet/excel",
3
- "version": "7.0.42",
3
+ "version": "7.0.44",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "module": "dist/index.esm.js",
@@ -20,7 +20,7 @@
20
20
  "access": "public"
21
21
  },
22
22
  "dependencies": {
23
- "@leankylin-sheet/core": "7.0.42",
23
+ "@leankylin-sheet/core": "7.0.44",
24
24
  "dayjs": "^1.11.10",
25
25
  "exceljs": "^4.4.0",
26
26
  "file-saver": "^2.0.5",