@leankylin-sheet/core 3.1.32 → 3.1.34

package/dist/index.esm.js

@@ -36811,7 +36811,7 @@ function functionHTML(txt) {
       } else if (matchConfig.dquote > 0) {
         function_str += "".concat(str, "</span>");
       } else if (str.indexOf("</span>") === -1 && str.length > 0) {
-        var regx = /{.*?}/;
+        var regx = /{{.*?}}/;
         if (regx.test(_.trim(str))) {
           var arraytxt = regx.exec(str)[0];
           var arraystart = str.search(regx);
@@ -36819,7 +36819,7 @@ function functionHTML(txt) {
           if (arraystart > 0) {
             alltxt += "<span dir=\"auto\" class=\"luckysheet-formula-text-color\">".concat(str.substr(0, arraystart), "</span>");
           }
-          alltxt += "<span dir=\"auto\" style=\"color:#959a05\" class=\"luckysheet-formula-text-array\">".concat(arraytxt, "</span>");
+          alltxt += "<span dir=\"auto\" style=\"color:#3b82f4\" class=\"luckysheet-formula-text-var\">".concat(arraytxt, "</span>");
           if (arraystart + arraytxt.length < str.length) {
             alltxt += "<span dir=\"auto\" class=\"luckysheet-formula-text-color\">".concat(str.substr(arraystart + arraytxt.length, str.length), "</span>");
           }
@@ -59652,14 +59652,32 @@ var getCellBorder = function getCellBorder(domStyle, row_index, col_index) {
   };
 };
 var getCellMcBorder = function getCellMcBorder(ctx, domStyle, row_index, col_index, mc) {
-  var keys = [["border-left", "borderLeftWidth", "borderLeftColor", "borderLeftStyle"], ["border-top", "borderTopWidth", "borderTopColor", "borderTopStyle"], ["border-right", "borderRightWidth", "borderRightColor", "borderRightStyle"], ["border-bottom", "borderBottomWidth", "borderBottomColor", "borderBottomStyle"]];
+  var keys = [["border-left", "borderLeftWidth", "borderLeftColor", "borderLeftStyle", function (curIndex, rs) {
+    return [curIndex, curIndex + rs - 1];
+  }, function (curIndex) {
+    return [curIndex, curIndex];
+  }], ["border-top", "borderTopWidth", "borderTopColor", "borderTopStyle", function (curIndex) {
+    return [curIndex, curIndex];
+  }, function (curIndex, cs) {
+    return [curIndex, curIndex + cs - 1];
+  }], ["border-right", "borderRightWidth", "borderRightColor", "borderRightStyle", function (curIndex, rs) {
+    return [curIndex, curIndex + rs - 1];
+  }, function (curIndex, cs) {
+    return [curIndex + cs - 1, curIndex + cs - 1];
+  }], ["border-bottom", "borderBottomWidth", "borderBottomColor", "borderBottomStyle", function (curIndex, cs) {
+    return [curIndex + cs - 1, curIndex + cs - 1];
+  }, function (curIndex, cs) {
+    return [curIndex, curIndex + cs - 1];
+  }]];
   var result = [];
   for (var index = 0; index < keys.length; index += 1) {
-    var _keys$index2 = _slicedToArray(keys[index], 4),
+    var _keys$index2 = _slicedToArray(keys[index], 6),
       p = _keys$index2[0],
       w = _keys$index2[1],
       c = _keys$index2[2],
-      s = _keys$index2[3];
+      s = _keys$index2[3],
+      getRow = _keys$index2[4],
+      getColumn = _keys$index2[5];
     if (parseFloat(domStyle[w]) > 0 && domStyle[s] !== "inset") {
       var _getQKBorder = getQKBorder(domStyle[w], domStyle[s], domStyle[c]),
         _getQKBorder2 = _slicedToArray(_getQKBorder, 2),
@@ -59671,8 +59689,8 @@ var getCellMcBorder = function getCellMcBorder(ctx, domStyle, row_index, col_ind
         color: color,
         style: style,
         range: normalizeSelection(ctx, [{
-          row: [row_index, row_index + mc.rs - 1],
-          column: [col_index, col_index + mc.cs - 1]
+          row: getRow(row_index, mc.rs),
+          column: getColumn(col_index, mc.cs)
         }])
       });
     }
@@ -59719,13 +59737,17 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
   }
   var result = [];
   var borderInfo = [];
+  var startOffColIndexMap = {};
   for (var index = 0; index < (rows === null || rows === void 0 ? void 0 : rows.length); index += 1) {
     var row = rows[index];
+    var isFirstNoRs = false;
     var cells = row.querySelectorAll("td");
     if (!result[index]) {
       result[index] = [];
     }
+    var offsetColIndex = 0;
     for (var cIndex = 0; cIndex < cells.length; cIndex += 1) {
+      var _colIndex = startCol + offsetColIndex + (startOffColIndexMap[index] || 0);
       var cell = cells[cIndex];
       var m = cell === null || cell === void 0 ? void 0 : cell.textContent;
       var v = cell.getAttribute("x:num");
@@ -59740,13 +59762,46 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
         if (colspan > 1 || rowspan > 1) {
           mainCell.mc = {
             rs: rowspan,
-            cs: colspan
+            cs: colspan,
+            r: index + startRow,
+            c: _colIndex
           };
-          borderInfo.push.apply(borderInfo, _toConsumableArray(getCellMcBorder(ctx, style, index + startRow, cIndex + startCol, mainCell.mc)));
+          borderInfo.push.apply(borderInfo, _toConsumableArray(getCellMcBorder(ctx, style, index + startRow, _colIndex, mainCell.mc)));
         } else {
-          borderInfo.push(getCellBorder(style, index + startRow, cIndex + startCol));
+          isFirstNoRs = true;
+          borderInfo.push(getCellBorder(style, index + startRow, _colIndex));
         }
         result[index].push(mainCell);
+        if (rowspan > 1) {
+          for (var rs_index = 1; rs_index < rowspan; rs_index += 1) {
+            if (!result[index + rs_index]) {
+              result[index + rs_index] = [];
+            }
+            result[index + rs_index].push({
+              mc: {
+                r: index + startRow,
+                c: _colIndex
+              }
+            });
+            if (!isFirstNoRs) {
+              if (!startOffColIndexMap[index + rs_index]) {
+                startOffColIndexMap[index + rs_index] = 0;
+              }
+              startOffColIndexMap[index + rs_index] += colspan || 1;
+            }
+          }
+        }
+        if (colspan > 1) {
+          for (var cs_index = 1; cs_index < colspan; cs_index += 1) {
+            result[index].push({
+              mc: {
+                r: index + startRow,
+                c: _colIndex
+              }
+            });
+          }
+        }
+        offsetColIndex += colspan || 1;
       } else {
         result[index].push({
           m: m,
@@ -59760,57 +59815,6 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
     borderInfo: borderInfo
   };
 }
-function expandMergedCells(mergedCells, startRow, startCol) {
-  if (!mergedCells || mergedCells.length === 0) {
-    return [];
-  }
-  var totalRows = mergedCells === null || mergedCells === void 0 ? void 0 : mergedCells.length;
-  var totalCols = 0;
-  for (var j = 0; j < mergedCells[0].length; j += 1) {
-    var _mergedCells$0$j, _mergedCells$0$j$mc;
-    totalCols += ((_mergedCells$0$j = mergedCells[0][j]) === null || _mergedCells$0$j === void 0 ? void 0 : (_mergedCells$0$j$mc = _mergedCells$0$j.mc) === null || _mergedCells$0$j$mc === void 0 ? void 0 : _mergedCells$0$j$mc.cs) || 1;
-  }
-  var result = Array.from({
-    length: totalRows
-  }, function () {
-    return new Array(totalCols);
-  });
-  var currentRow = 0;
-  for (var i = 0; i < mergedCells.length; i += 1) {
-    var currentCol = 0;
-    var rowHeight = 0;
-    for (var _j7 = 0; _j7 < mergedCells[i].length; _j7 += 1) {
-      var _cell$mc2, _cell$mc3;
-      var cell = mergedCells[i][_j7];
-      var rs = (cell === null || cell === void 0 ? void 0 : (_cell$mc2 = cell.mc) === null || _cell$mc2 === void 0 ? void 0 : _cell$mc2.rs) || 1;
-      var cs = (cell === null || cell === void 0 ? void 0 : (_cell$mc3 = cell.mc) === null || _cell$mc3 === void 0 ? void 0 : _cell$mc3.cs) || 1;
-      rowHeight = Math.max(rowHeight, rs);
-      for (var r = 0; r < rs; r += 1) {
-        for (var c = 0; c < cs; c += 1) {
-          var mcR = currentRow + startRow;
-          var mcC = currentCol + startCol;
-          if (r === 0 && c === 0) {
-            result[currentRow + r][currentCol + c] = _objectSpread2({}, cell);
-            if (result[currentRow + r][currentCol + c].mc) {
-              result[currentRow + r][currentCol + c].mc.r = mcR;
-              result[currentRow + r][currentCol + c].mc.c = mcC;
-            }
-          } else {
-            result[currentRow + r][currentCol + c] = {
-              mc: {
-                r: mcR,
-                c: mcC
-              }
-            };
-          }
-        }
-      }
-      currentCol += cs;
-    }
-    currentRow += rowHeight;
-  }
-  return result;
-}
 function handlePasteByLeanklin(_x2, _x3, _x4) {
   return _handlePasteByLeanklin.apply(this, arguments);
 }
@@ -59846,7 +59850,7 @@ function _handlePasteByLeanklin() {
           }
           index = getSheetIndex(ctx, ctx.currentSheetId);
           ctx.luckysheetfile[index].config = ctx.config;
-          data = expandMergedCells(copyData, rows[0], columns[0]);
+          data = copyData;
           copyOne = data.length === 1 && data[0].length === 1 && !((_data$0$ = data[0][0]) === null || _data$0$ === void 0 ? void 0 : _data$0$.mc);
           pasteData = copyOne ? [] : data;
           if (copyOne) {

package/dist/index.js

@@ -36821,7 +36821,7 @@ function functionHTML(txt) {
       } else if (matchConfig.dquote > 0) {
         function_str += "".concat(str, "</span>");
       } else if (str.indexOf("</span>") === -1 && str.length > 0) {
-        var regx = /{.*?}/;
+        var regx = /{{.*?}}/;
         if (regx.test(___default['default'].trim(str))) {
           var arraytxt = regx.exec(str)[0];
           var arraystart = str.search(regx);
@@ -36829,7 +36829,7 @@ function functionHTML(txt) {
           if (arraystart > 0) {
             alltxt += "<span dir=\"auto\" class=\"luckysheet-formula-text-color\">".concat(str.substr(0, arraystart), "</span>");
           }
-          alltxt += "<span dir=\"auto\" style=\"color:#959a05\" class=\"luckysheet-formula-text-array\">".concat(arraytxt, "</span>");
+          alltxt += "<span dir=\"auto\" style=\"color:#3b82f4\" class=\"luckysheet-formula-text-var\">".concat(arraytxt, "</span>");
           if (arraystart + arraytxt.length < str.length) {
             alltxt += "<span dir=\"auto\" class=\"luckysheet-formula-text-color\">".concat(str.substr(arraystart + arraytxt.length, str.length), "</span>");
           }
@@ -59662,14 +59662,32 @@ var getCellBorder = function getCellBorder(domStyle, row_index, col_index) {
   };
 };
 var getCellMcBorder = function getCellMcBorder(ctx, domStyle, row_index, col_index, mc) {
-  var keys = [["border-left", "borderLeftWidth", "borderLeftColor", "borderLeftStyle"], ["border-top", "borderTopWidth", "borderTopColor", "borderTopStyle"], ["border-right", "borderRightWidth", "borderRightColor", "borderRightStyle"], ["border-bottom", "borderBottomWidth", "borderBottomColor", "borderBottomStyle"]];
+  var keys = [["border-left", "borderLeftWidth", "borderLeftColor", "borderLeftStyle", function (curIndex, rs) {
+    return [curIndex, curIndex + rs - 1];
+  }, function (curIndex) {
+    return [curIndex, curIndex];
+  }], ["border-top", "borderTopWidth", "borderTopColor", "borderTopStyle", function (curIndex) {
+    return [curIndex, curIndex];
+  }, function (curIndex, cs) {
+    return [curIndex, curIndex + cs - 1];
+  }], ["border-right", "borderRightWidth", "borderRightColor", "borderRightStyle", function (curIndex, rs) {
+    return [curIndex, curIndex + rs - 1];
+  }, function (curIndex, cs) {
+    return [curIndex + cs - 1, curIndex + cs - 1];
+  }], ["border-bottom", "borderBottomWidth", "borderBottomColor", "borderBottomStyle", function (curIndex, cs) {
+    return [curIndex + cs - 1, curIndex + cs - 1];
+  }, function (curIndex, cs) {
+    return [curIndex, curIndex + cs - 1];
+  }]];
   var result = [];
   for (var index = 0; index < keys.length; index += 1) {
-    var _keys$index2 = _slicedToArray(keys[index], 4),
+    var _keys$index2 = _slicedToArray(keys[index], 6),
       p = _keys$index2[0],
       w = _keys$index2[1],
       c = _keys$index2[2],
-      s = _keys$index2[3];
+      s = _keys$index2[3],
+      getRow = _keys$index2[4],
+      getColumn = _keys$index2[5];
     if (parseFloat(domStyle[w]) > 0 && domStyle[s] !== "inset") {
       var _getQKBorder = getQKBorder(domStyle[w], domStyle[s], domStyle[c]),
         _getQKBorder2 = _slicedToArray(_getQKBorder, 2),
@@ -59681,8 +59699,8 @@ var getCellMcBorder = function getCellMcBorder(ctx, domStyle, row_index, col_ind
         color: color,
         style: style,
         range: normalizeSelection(ctx, [{
-          row: [row_index, row_index + mc.rs - 1],
-          column: [col_index, col_index + mc.cs - 1]
+          row: getRow(row_index, mc.rs),
+          column: getColumn(col_index, mc.cs)
         }])
       });
     }
@@ -59729,13 +59747,17 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
   }
   var result = [];
   var borderInfo = [];
+  var startOffColIndexMap = {};
   for (var index = 0; index < (rows === null || rows === void 0 ? void 0 : rows.length); index += 1) {
     var row = rows[index];
+    var isFirstNoRs = false;
     var cells = row.querySelectorAll("td");
     if (!result[index]) {
       result[index] = [];
     }
+    var offsetColIndex = 0;
     for (var cIndex = 0; cIndex < cells.length; cIndex += 1) {
+      var _colIndex = startCol + offsetColIndex + (startOffColIndexMap[index] || 0);
       var cell = cells[cIndex];
       var m = cell === null || cell === void 0 ? void 0 : cell.textContent;
       var v = cell.getAttribute("x:num");
@@ -59750,13 +59772,46 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
         if (colspan > 1 || rowspan > 1) {
           mainCell.mc = {
             rs: rowspan,
-            cs: colspan
+            cs: colspan,
+            r: index + startRow,
+            c: _colIndex
           };
-          borderInfo.push.apply(borderInfo, _toConsumableArray(getCellMcBorder(ctx, style, index + startRow, cIndex + startCol, mainCell.mc)));
+          borderInfo.push.apply(borderInfo, _toConsumableArray(getCellMcBorder(ctx, style, index + startRow, _colIndex, mainCell.mc)));
         } else {
-          borderInfo.push(getCellBorder(style, index + startRow, cIndex + startCol));
+          isFirstNoRs = true;
+          borderInfo.push(getCellBorder(style, index + startRow, _colIndex));
         }
         result[index].push(mainCell);
+        if (rowspan > 1) {
+          for (var rs_index = 1; rs_index < rowspan; rs_index += 1) {
+            if (!result[index + rs_index]) {
+              result[index + rs_index] = [];
+            }
+            result[index + rs_index].push({
+              mc: {
+                r: index + startRow,
+                c: _colIndex
+              }
+            });
+            if (!isFirstNoRs) {
+              if (!startOffColIndexMap[index + rs_index]) {
+                startOffColIndexMap[index + rs_index] = 0;
+              }
+              startOffColIndexMap[index + rs_index] += colspan || 1;
+            }
+          }
+        }
+        if (colspan > 1) {
+          for (var cs_index = 1; cs_index < colspan; cs_index += 1) {
+            result[index].push({
+              mc: {
+                r: index + startRow,
+                c: _colIndex
+              }
+            });
+          }
+        }
+        offsetColIndex += colspan || 1;
       } else {
         result[index].push({
           m: m,
@@ -59770,57 +59825,6 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
     borderInfo: borderInfo
   };
 }
-function expandMergedCells(mergedCells, startRow, startCol) {
-  if (!mergedCells || mergedCells.length === 0) {
-    return [];
-  }
-  var totalRows = mergedCells === null || mergedCells === void 0 ? void 0 : mergedCells.length;
-  var totalCols = 0;
-  for (var j = 0; j < mergedCells[0].length; j += 1) {
-    var _mergedCells$0$j, _mergedCells$0$j$mc;
-    totalCols += ((_mergedCells$0$j = mergedCells[0][j]) === null || _mergedCells$0$j === void 0 ? void 0 : (_mergedCells$0$j$mc = _mergedCells$0$j.mc) === null || _mergedCells$0$j$mc === void 0 ? void 0 : _mergedCells$0$j$mc.cs) || 1;
-  }
-  var result = Array.from({
-    length: totalRows
-  }, function () {
-    return new Array(totalCols);
-  });
-  var currentRow = 0;
-  for (var i = 0; i < mergedCells.length; i += 1) {
-    var currentCol = 0;
-    var rowHeight = 0;
-    for (var _j7 = 0; _j7 < mergedCells[i].length; _j7 += 1) {
-      var _cell$mc2, _cell$mc3;
-      var cell = mergedCells[i][_j7];
-      var rs = (cell === null || cell === void 0 ? void 0 : (_cell$mc2 = cell.mc) === null || _cell$mc2 === void 0 ? void 0 : _cell$mc2.rs) || 1;
-      var cs = (cell === null || cell === void 0 ? void 0 : (_cell$mc3 = cell.mc) === null || _cell$mc3 === void 0 ? void 0 : _cell$mc3.cs) || 1;
-      rowHeight = Math.max(rowHeight, rs);
-      for (var r = 0; r < rs; r += 1) {
-        for (var c = 0; c < cs; c += 1) {
-          var mcR = currentRow + startRow;
-          var mcC = currentCol + startCol;
-          if (r === 0 && c === 0) {
-            result[currentRow + r][currentCol + c] = _objectSpread2({}, cell);
-            if (result[currentRow + r][currentCol + c].mc) {
-              result[currentRow + r][currentCol + c].mc.r = mcR;
-              result[currentRow + r][currentCol + c].mc.c = mcC;
-            }
-          } else {
-            result[currentRow + r][currentCol + c] = {
-              mc: {
-                r: mcR,
-                c: mcC
-              }
-            };
-          }
-        }
-      }
-      currentCol += cs;
-    }
-    currentRow += rowHeight;
-  }
-  return result;
-}
 function handlePasteByLeanklin(_x2, _x3, _x4) {
   return _handlePasteByLeanklin.apply(this, arguments);
 }
@@ -59856,7 +59860,7 @@ function _handlePasteByLeanklin() {
           }
           index = getSheetIndex(ctx, ctx.currentSheetId);
           ctx.luckysheetfile[index].config = ctx.config;
-          data = expandMergedCells(copyData, rows[0], columns[0]);
+          data = copyData;
           copyOne = data.length === 1 && data[0].length === 1 && !((_data$0$ = data[0][0]) === null || _data$0$ === void 0 ? void 0 : _data$0$.mc);
           pasteData = copyOne ? [] : data;
           if (copyOne) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "3.1.32",
+  "version": "3.1.34",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
@@ -13,7 +13,7 @@
     "build": "father-build"
   },
   "dependencies": {
-    "@leankylin-sheet/formula-parser": "3.1.32",
+    "@leankylin-sheet/formula-parser": "3.1.34",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",