@fileverse-dev/fortune-core 1.2.65 → 1.2.66

package/es/locale/en.d.ts

@@ -513,6 +513,7 @@ declare const _default: {
         chartEditNoOpt: string;
         sheetNameSpecCharError: string;
         sheetNamecannotIsEmptyError: string;
+        confirmMerge: string;
     };
     conditionformat: {
         conditionformat_greaterThan: string;

package/es/locale/en.js

@@ -9610,7 +9610,8 @@ export default {
     noHide: "Can't hide, at least keep one sheet tag",
     chartEditNoOpt: "This operation is not allowed in chart editing mode!",
     sheetNameSpecCharError: "The name cannot contain:[ ] :  ? * / ' \"",
-    sheetNamecannotIsEmptyError: "Sheet name cannot be empty!"
+    sheetNamecannotIsEmptyError: "Sheet name cannot be empty!",
+    confirmMerge: "Merging cells will only preserve the top-leftmost value. Merge anyway?"
   },
   conditionformat: {
     conditionformat_greaterThan: "Conditional format - Greater than",

package/es/locale/index.d.ts

@@ -570,6 +570,7 @@ declare function locale(ctx: Context): {
         chartEditNoOpt: string;
         sheetNameSpecCharError: string;
         sheetNamecannotIsEmptyError: string;
+        confirmMerge: string;
     };
     conditionformat: {
         conditionformat_greaterThan: string;

package/es/locale/zh.d.ts

@@ -569,6 +569,7 @@ declare const _default: {
         chartEditNoOpt: string;
         sheetNameSpecCharError: string;
         sheetNamecannotIsEmptyError: string;
+        confirmMerge: string;
     };
     conditionformat: {
         conditionformat_greaterThan: string;

package/es/locale/zh.js

@@ -10083,7 +10083,8 @@ export default {
     noHide: "不能隐藏, 至少保留一个sheet标签",
     chartEditNoOpt: "图表编辑模式下不允许该操作！",
     sheetNameSpecCharError: "名称不能超过31个字符，首尾不能是' 且名称不能包含:\r\n[ ] : \\ ? * /",
-    sheetNamecannotIsEmptyError: "名称不能为空!"
+    sheetNamecannotIsEmptyError: "名称不能为空!",
+    confirmMerge: "合并单元格将仅保留左上角单元格的值。是否继续？"
   },
   conditionformat: {
     conditionformat_greaterThan: "条件格式——大于",

package/es/modules/merge.js

@@ -97,115 +97,114 @@ export function mergeCells(ctx, sheetId, ranges, type) {
           }
         }
       }
-    } else {
-      for (var i = 0; i < ranges.length; i += 1) {
-        var range = ranges[i];
-        var r1 = range.row[0];
-        var r2 = range.row[1];
-        var c1 = range.column[0];
-        var c2 = range.column[1];
-        if (r1 === r2 && c1 === c2) {
-          continue;
+    }
+    for (var i = 0; i < ranges.length; i += 1) {
+      var range = ranges[i];
+      var r1 = range.row[0];
+      var r2 = range.row[1];
+      var c1 = range.column[0];
+      var c2 = range.column[1];
+      if (r1 === r2 && c1 === c2) {
+        continue;
+      }
+      if (type === "merge-all") {
+        var fv = {};
+        var isfirst = false;
+        for (var r = r1; r <= r2; r += 1) {
+          for (var c = c1; c <= c2; c += 1) {
+            var cell = d[r][c];
+            if (cell != null && (isInlineStringCT(cell.ct) || !_.isEmpty(cell.v) || cell.f != null || cell.s != null || cell.ct && ((_a = cell.ct.s) === null || _a === void 0 ? void 0 : _a.length)) && !isfirst) {
+              fv = _.cloneDeep(cell);
+              isfirst = true;
+            }
+            d[r][c] = {
+              mc: {
+                r: r1,
+                c: c1
+              }
+            };
+          }
         }
-        if (type === "merge-all") {
+        d[r1][c1] = fv;
+        var a = d[r1][c1];
+        if (!a) return;
+        a.mc = {
+          r: r1,
+          c: c1,
+          rs: r2 - r1 + 1,
+          cs: c2 - c1 + 1
+        };
+        cfg.merge["".concat(r1, "_").concat(c1)] = {
+          r: r1,
+          c: c1,
+          rs: r2 - r1 + 1,
+          cs: c2 - c1 + 1
+        };
+      } else if (type === "merge-vertical") {
+        for (var c = c1; c <= c2; c += 1) {
           var fv = {};
           var isfirst = false;
           for (var r = r1; r <= r2; r += 1) {
-            for (var c = c1; c <= c2; c += 1) {
-              var cell = d[r][c];
-              if (cell != null && (isInlineStringCT(cell.ct) || !_.isEmpty(cell.v) || cell.f != null || cell.s != null || cell.ct && ((_a = cell.ct.s) === null || _a === void 0 ? void 0 : _a.length)) && !isfirst) {
-                fv = _.cloneDeep(cell);
-                isfirst = true;
-              }
-              d[r][c] = {
-                mc: {
-                  r: r1,
-                  c: c1
-                }
-              };
+            var cell = d[r][c];
+            if (cell != null && (isInlineStringCT(cell.ct) || !_.isEmpty(cell.v) || cell.f != null || cell.s != null || cell.ct && ((_b = cell.ct.s) === null || _b === void 0 ? void 0 : _b.length)) && !isfirst) {
+              fv = _.cloneDeep(cell);
+              isfirst = true;
             }
+            d[r][c] = {
+              mc: {
+                r: r1,
+                c: c
+              }
+            };
           }
-          d[r1][c1] = fv;
-          var a = d[r1][c1];
+          d[r1][c] = fv;
+          var a = d[r1][c];
           if (!a) return;
           a.mc = {
             r: r1,
-            c: c1,
+            c: c,
             rs: r2 - r1 + 1,
-            cs: c2 - c1 + 1
+            cs: 1
           };
-          cfg.merge["".concat(r1, "_").concat(c1)] = {
+          cfg.merge["".concat(r1, "_").concat(c)] = {
             r: r1,
-            c: c1,
+            c: c,
             rs: r2 - r1 + 1,
-            cs: c2 - c1 + 1
+            cs: 1
           };
-        } else if (type === "merge-vertical") {
+        }
+      } else if (type === "merge-horizontal") {
+        for (var r = r1; r <= r2; r += 1) {
+          var fv = {};
+          var isfirst = false;
           for (var c = c1; c <= c2; c += 1) {
-            var fv = {};
-            var isfirst = false;
-            for (var r = r1; r <= r2; r += 1) {
-              var cell = d[r][c];
-              if (cell != null && (isInlineStringCT(cell.ct) || !_.isEmpty(cell.v) || cell.f != null || cell.s != null || cell.ct && ((_b = cell.ct.s) === null || _b === void 0 ? void 0 : _b.length)) && !isfirst) {
-                fv = _.cloneDeep(cell);
-                isfirst = true;
-              }
-              d[r][c] = {
-                mc: {
-                  r: r1,
-                  c: c
-                }
-              };
+            var cell = d[r][c];
+            if (cell != null && (isInlineStringCT(cell.ct) || !_.isEmpty(cell.v) || cell.f != null || cell.s != null || cell.ct && ((_c = cell.ct.s) === null || _c === void 0 ? void 0 : _c.length)) && !isfirst) {
+              fv = _.cloneDeep(cell);
+              isfirst = true;
             }
-            d[r1][c] = fv;
-            var a = d[r1][c];
-            if (!a) return;
-            a.mc = {
-              r: r1,
-              c: c,
-              rs: r2 - r1 + 1,
-              cs: 1
-            };
-            cfg.merge["".concat(r1, "_").concat(c)] = {
-              r: r1,
-              c: c,
-              rs: r2 - r1 + 1,
-              cs: 1
-            };
-          }
-        } else if (type === "merge-horizontal") {
-          for (var r = r1; r <= r2; r += 1) {
-            var fv = {};
-            var isfirst = false;
-            for (var c = c1; c <= c2; c += 1) {
-              var cell = d[r][c];
-              if (cell != null && (isInlineStringCT(cell.ct) || !_.isEmpty(cell.v) || cell.f != null || cell.s != null || cell.ct && ((_c = cell.ct.s) === null || _c === void 0 ? void 0 : _c.length)) && !isfirst) {
-                fv = _.cloneDeep(cell);
-                isfirst = true;
+            d[r][c] = {
+              mc: {
+                r: r,
+                c: c1
               }
-              d[r][c] = {
-                mc: {
-                  r: r,
-                  c: c1
-                }
-              };
-            }
-            d[r][c1] = fv;
-            var a = d[r][c1];
-            if (!a) return;
-            a.mc = {
-              r: r,
-              c: c1,
-              rs: 1,
-              cs: c2 - c1 + 1
-            };
-            cfg.merge["".concat(r, "_").concat(c1)] = {
-              r: r,
-              c: c1,
-              rs: 1,
-              cs: c2 - c1 + 1
             };
           }
+          d[r][c1] = fv;
+          var a = d[r][c1];
+          if (!a) return;
+          a.mc = {
+            r: r,
+            c: c1,
+            rs: 1,
+            cs: c2 - c1 + 1
+          };
+          cfg.merge["".concat(r, "_").concat(c1)] = {
+            r: r,
+            c: c1,
+            rs: 1,
+            cs: c2 - c1 + 1
+          };
         }
       }
     }

package/lib/locale/en.d.ts

@@ -513,6 +513,7 @@ declare const _default: {
         chartEditNoOpt: string;
         sheetNameSpecCharError: string;
         sheetNamecannotIsEmptyError: string;
+        confirmMerge: string;
     };
     conditionformat: {
         conditionformat_greaterThan: string;

package/lib/locale/en.js

@@ -9616,7 +9616,8 @@ var _default = exports.default = {
     noHide: "Can't hide, at least keep one sheet tag",
     chartEditNoOpt: "This operation is not allowed in chart editing mode!",
     sheetNameSpecCharError: "The name cannot contain:[ ] :  ? * / ' \"",
-    sheetNamecannotIsEmptyError: "Sheet name cannot be empty!"
+    sheetNamecannotIsEmptyError: "Sheet name cannot be empty!",
+    confirmMerge: "Merging cells will only preserve the top-leftmost value. Merge anyway?"
   },
   conditionformat: {
     conditionformat_greaterThan: "Conditional format - Greater than",

package/lib/locale/index.d.ts

@@ -570,6 +570,7 @@ declare function locale(ctx: Context): {
         chartEditNoOpt: string;
         sheetNameSpecCharError: string;
         sheetNamecannotIsEmptyError: string;
+        confirmMerge: string;
     };
     conditionformat: {
         conditionformat_greaterThan: string;

package/lib/locale/zh.d.ts

@@ -569,6 +569,7 @@ declare const _default: {
         chartEditNoOpt: string;
         sheetNameSpecCharError: string;
         sheetNamecannotIsEmptyError: string;
+        confirmMerge: string;
     };
     conditionformat: {
         conditionformat_greaterThan: string;

package/lib/locale/zh.js

@@ -10089,7 +10089,8 @@ var _default = exports.default = {
     noHide: "不能隐藏, 至少保留一个sheet标签",
     chartEditNoOpt: "图表编辑模式下不允许该操作！",
     sheetNameSpecCharError: "名称不能超过31个字符，首尾不能是' 且名称不能包含:\r\n[ ] : \\ ? * /",
-    sheetNamecannotIsEmptyError: "名称不能为空!"
+    sheetNamecannotIsEmptyError: "名称不能为空!",
+    confirmMerge: "合并单元格将仅保留左上角单元格的值。是否继续？"
   },
   conditionformat: {
     conditionformat_greaterThan: "条件格式——大于",

package/lib/modules/merge.js

@@ -104,115 +104,114 @@ function mergeCells(ctx, sheetId, ranges, type) {
           }
         }
       }
-    } else {
-      for (var i = 0; i < ranges.length; i += 1) {
-        var range = ranges[i];
-        var r1 = range.row[0];
-        var r2 = range.row[1];
-        var c1 = range.column[0];
-        var c2 = range.column[1];
-        if (r1 === r2 && c1 === c2) {
-          continue;
+    }
+    for (var i = 0; i < ranges.length; i += 1) {
+      var range = ranges[i];
+      var r1 = range.row[0];
+      var r2 = range.row[1];
+      var c1 = range.column[0];
+      var c2 = range.column[1];
+      if (r1 === r2 && c1 === c2) {
+        continue;
+      }
+      if (type === "merge-all") {
+        var fv = {};
+        var isfirst = false;
+        for (var r = r1; r <= r2; r += 1) {
+          for (var c = c1; c <= c2; c += 1) {
+            var cell = d[r][c];
+            if (cell != null && ((0, _inlineString.isInlineStringCT)(cell.ct) || !_lodash.default.isEmpty(cell.v) || cell.f != null || cell.s != null || cell.ct && ((_a = cell.ct.s) === null || _a === void 0 ? void 0 : _a.length)) && !isfirst) {
+              fv = _lodash.default.cloneDeep(cell);
+              isfirst = true;
+            }
+            d[r][c] = {
+              mc: {
+                r: r1,
+                c: c1
+              }
+            };
+          }
         }
-        if (type === "merge-all") {
+        d[r1][c1] = fv;
+        var a = d[r1][c1];
+        if (!a) return;
+        a.mc = {
+          r: r1,
+          c: c1,
+          rs: r2 - r1 + 1,
+          cs: c2 - c1 + 1
+        };
+        cfg.merge["".concat(r1, "_").concat(c1)] = {
+          r: r1,
+          c: c1,
+          rs: r2 - r1 + 1,
+          cs: c2 - c1 + 1
+        };
+      } else if (type === "merge-vertical") {
+        for (var c = c1; c <= c2; c += 1) {
           var fv = {};
           var isfirst = false;
           for (var r = r1; r <= r2; r += 1) {
-            for (var c = c1; c <= c2; c += 1) {
-              var cell = d[r][c];
-              if (cell != null && ((0, _inlineString.isInlineStringCT)(cell.ct) || !_lodash.default.isEmpty(cell.v) || cell.f != null || cell.s != null || cell.ct && ((_a = cell.ct.s) === null || _a === void 0 ? void 0 : _a.length)) && !isfirst) {
-                fv = _lodash.default.cloneDeep(cell);
-                isfirst = true;
-              }
-              d[r][c] = {
-                mc: {
-                  r: r1,
-                  c: c1
-                }
-              };
+            var cell = d[r][c];
+            if (cell != null && ((0, _inlineString.isInlineStringCT)(cell.ct) || !_lodash.default.isEmpty(cell.v) || cell.f != null || cell.s != null || cell.ct && ((_b = cell.ct.s) === null || _b === void 0 ? void 0 : _b.length)) && !isfirst) {
+              fv = _lodash.default.cloneDeep(cell);
+              isfirst = true;
             }
+            d[r][c] = {
+              mc: {
+                r: r1,
+                c: c
+              }
+            };
           }
-          d[r1][c1] = fv;
-          var a = d[r1][c1];
+          d[r1][c] = fv;
+          var a = d[r1][c];
           if (!a) return;
           a.mc = {
             r: r1,
-            c: c1,
+            c: c,
             rs: r2 - r1 + 1,
-            cs: c2 - c1 + 1
+            cs: 1
           };
-          cfg.merge["".concat(r1, "_").concat(c1)] = {
+          cfg.merge["".concat(r1, "_").concat(c)] = {
             r: r1,
-            c: c1,
+            c: c,
             rs: r2 - r1 + 1,
-            cs: c2 - c1 + 1
+            cs: 1
           };
-        } else if (type === "merge-vertical") {
+        }
+      } else if (type === "merge-horizontal") {
+        for (var r = r1; r <= r2; r += 1) {
+          var fv = {};
+          var isfirst = false;
           for (var c = c1; c <= c2; c += 1) {
-            var fv = {};
-            var isfirst = false;
-            for (var r = r1; r <= r2; r += 1) {
-              var cell = d[r][c];
-              if (cell != null && ((0, _inlineString.isInlineStringCT)(cell.ct) || !_lodash.default.isEmpty(cell.v) || cell.f != null || cell.s != null || cell.ct && ((_b = cell.ct.s) === null || _b === void 0 ? void 0 : _b.length)) && !isfirst) {
-                fv = _lodash.default.cloneDeep(cell);
-                isfirst = true;
-              }
-              d[r][c] = {
-                mc: {
-                  r: r1,
-                  c: c
-                }
-              };
+            var cell = d[r][c];
+            if (cell != null && ((0, _inlineString.isInlineStringCT)(cell.ct) || !_lodash.default.isEmpty(cell.v) || cell.f != null || cell.s != null || cell.ct && ((_c = cell.ct.s) === null || _c === void 0 ? void 0 : _c.length)) && !isfirst) {
+              fv = _lodash.default.cloneDeep(cell);
+              isfirst = true;
             }
-            d[r1][c] = fv;
-            var a = d[r1][c];
-            if (!a) return;
-            a.mc = {
-              r: r1,
-              c: c,
-              rs: r2 - r1 + 1,
-              cs: 1
-            };
-            cfg.merge["".concat(r1, "_").concat(c)] = {
-              r: r1,
-              c: c,
-              rs: r2 - r1 + 1,
-              cs: 1
-            };
-          }
-        } else if (type === "merge-horizontal") {
-          for (var r = r1; r <= r2; r += 1) {
-            var fv = {};
-            var isfirst = false;
-            for (var c = c1; c <= c2; c += 1) {
-              var cell = d[r][c];
-              if (cell != null && ((0, _inlineString.isInlineStringCT)(cell.ct) || !_lodash.default.isEmpty(cell.v) || cell.f != null || cell.s != null || cell.ct && ((_c = cell.ct.s) === null || _c === void 0 ? void 0 : _c.length)) && !isfirst) {
-                fv = _lodash.default.cloneDeep(cell);
-                isfirst = true;
+            d[r][c] = {
+              mc: {
+                r: r,
+                c: c1
               }
-              d[r][c] = {
-                mc: {
-                  r: r,
-                  c: c1
-                }
-              };
-            }
-            d[r][c1] = fv;
-            var a = d[r][c1];
-            if (!a) return;
-            a.mc = {
-              r: r,
-              c: c1,
-              rs: 1,
-              cs: c2 - c1 + 1
-            };
-            cfg.merge["".concat(r, "_").concat(c1)] = {
-              r: r,
-              c: c1,
-              rs: 1,
-              cs: c2 - c1 + 1
             };
           }
+          d[r][c1] = fv;
+          var a = d[r][c1];
+          if (!a) return;
+          a.mc = {
+            r: r,
+            c: c1,
+            rs: 1,
+            cs: c2 - c1 + 1
+          };
+          cfg.merge["".concat(r, "_").concat(c1)] = {
+            r: r,
+            c: c1,
+            rs: 1,
+            cs: c2 - c1 + 1
+          };
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.2.65",
+  "version": "1.2.66",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",