@leankylin-sheet/core 4.0.29 → 4.0.31

package/dist/index.esm.js

@@ -10403,11 +10403,11 @@ var en = {
     columnOverLimit: "1000 column limit exceeded"
   },
   comment: {
-    insert: "Insert",
-    edit: "Edit",
-    delete: "Delete",
-    showOne: "Show/Hide",
-    showAll: "Show/Hide All"
+    insert: "Insert Comment",
+    edit: "Edit Comment",
+    delete: "Delete Comment",
+    showOne: "Show/Hide Comment",
+    showAll: "Show/Hide All Comment"
   },
   screenshot: {
     screenshotTipNoSelection: "Please select the scope of the screenshot",
@@ -20967,11 +20967,11 @@ var zh = {
     columnOverLimit: "超出1000列限制"
   },
   comment: {
-    insert: "新建批注",
-    edit: "编辑批注",
-    delete: "删除",
-    showOne: "显示/隐藏批注",
-    showAll: "显示/隐藏所有批注"
+    insert: "新建说明",
+    edit: "编辑说明",
+    delete: "删除说明",
+    showOne: "显示/隐藏说明",
+    showAll: "显示/隐藏所有说明"
   },
   screenshot: {
     screenshotTipNoSelection: "请框选需要截图的范围",
@@ -37620,6 +37620,20 @@ function functionCopy(ctx, txt, mode, step) {
   };
   while (i < funcstack.length) {
     var s = funcstack[i];
+    var nextS = funcstack[i + 1];
+    if (s === "{" && nextS === "{") {
+      var nextI = funcstack === null || funcstack === void 0 ? void 0 : funcstack.findIndex(function (__, index) {
+        if (i < index && funcstack[index] === "}" && funcstack[index + 1] === "}") {
+          return true;
+        }
+        return false;
+      });
+      if (nextI !== -1) {
+        function_str += txt.substring(i, nextI + 2);
+        i = nextI + 2;
+        continue;
+      }
+    }
     if (s === "(" && matchConfig.dquote === 0) {
       matchConfig.bracket += 1;
       if (str.length > 0) {
@@ -44599,7 +44613,7 @@ function insertRowCol(ctx, op) {
       var calc_funcStr = getcellFormula(ctx, calc_r, calc_c, calc_i);
       if (type === "row" && SheetIndex === curOrder) {
         var _d$calc_r, _d$calc_r$calc_c;
-        var functionStr = "=".concat(functionStrChange(calc_funcStr, "add", "row", direction, index, count, sheetName, curOrder === i));
+        var functionStr = "=".concat(functionStrChange(calc_funcStr, "add", "row", direction, index, count, sheetName, id === calc_i));
         if (((_d$calc_r = d[calc_r]) === null || _d$calc_r === void 0 ? void 0 : (_d$calc_r$calc_c = _d$calc_r[calc_c]) === null || _d$calc_r$calc_c === void 0 ? void 0 : _d$calc_r$calc_c.f) === calc_funcStr) {
           d[calc_r][calc_c].f = functionStr;
         }
@@ -44615,13 +44629,13 @@ function insertRowCol(ctx, op) {
         newCalcChain.push(calc);
       } else if (type === "row") {
         var _data$calc_r, _data$calc_r$calc_c;
-        var _functionStr = "=".concat(functionStrChange(calc_funcStr, "add", "row", direction, index, count, sheetName, curOrder === i));
+        var _functionStr = "=".concat(functionStrChange(calc_funcStr, "add", "row", direction, index, count, sheetName, id === calc_i));
         if (((_data$calc_r = data[calc_r]) === null || _data$calc_r === void 0 ? void 0 : (_data$calc_r$calc_c = _data$calc_r[calc_c]) === null || _data$calc_r$calc_c === void 0 ? void 0 : _data$calc_r$calc_c.f) === calc_funcStr) {
           data[calc_r][calc_c].f = _functionStr;
         }
       } else if (type === "column" && SheetIndex === curOrder) {
         var _d$calc_r2, _d$calc_r2$calc_c;
-        var _functionStr2 = "=".concat(functionStrChange(calc_funcStr, "add", "col", direction, index, count, sheetName, curOrder === i));
+        var _functionStr2 = "=".concat(functionStrChange(calc_funcStr, "add", "col", direction, index, count, sheetName, id === calc_i));
         if (((_d$calc_r2 = d[calc_r]) === null || _d$calc_r2 === void 0 ? void 0 : (_d$calc_r2$calc_c = _d$calc_r2[calc_c]) === null || _d$calc_r2$calc_c === void 0 ? void 0 : _d$calc_r2$calc_c.f) === calc_funcStr) {
           d[calc_r][calc_c].f = _functionStr2;
         }
@@ -44637,7 +44651,7 @@ function insertRowCol(ctx, op) {
         newCalcChain.push(calc);
       } else if (type === "column") {
         var _data$calc_r2, _data$calc_r2$calc_c;
-        var _functionStr3 = "=".concat(functionStrChange(calc_funcStr, "add", "col", direction, index, count, sheetName, curOrder === i));
+        var _functionStr3 = "=".concat(functionStrChange(calc_funcStr, "add", "col", direction, index, count, sheetName, id === calc_i));
         if (((_data$calc_r2 = data[calc_r]) === null || _data$calc_r2 === void 0 ? void 0 : (_data$calc_r2$calc_c = _data$calc_r2[calc_c]) === null || _data$calc_r2$calc_c === void 0 ? void 0 : _data$calc_r2$calc_c.f) === calc_funcStr) {
           data[calc_r][calc_c].f = _functionStr3;
         }
@@ -45565,7 +45579,7 @@ function deleteRowCol(ctx, op) {
       if (type === "row" && SheetIndex === curOrder) {
         if (calc_r < start || calc_r > end) {
           var _data$calc_r3, _data$calc_r3$calc_c;
-          var functionStr = "=".concat(functionStrChange(calc_funcStr, "del", "row", null, start, slen, sheetName, curOrder === i));
+          var functionStr = "=".concat(functionStrChange(calc_funcStr, "del", "row", null, start, slen, sheetName, id === calc_i));
           if (((_data$calc_r3 = data[calc_r]) === null || _data$calc_r3 === void 0 ? void 0 : (_data$calc_r3$calc_c = _data$calc_r3[calc_c]) === null || _data$calc_r3$calc_c === void 0 ? void 0 : _data$calc_r3$calc_c.f) === calc_funcStr) {
             data[calc_r][calc_c].f = functionStr;
           }
@@ -45576,14 +45590,14 @@ function deleteRowCol(ctx, op) {
         }
       } else if (type === "row") {
         var _data$calc_r4, _data$calc_r4$calc_c;
-        var _functionStr4 = "=".concat(functionStrChange(calc_funcStr, "del", "row", null, start, slen, sheetName, curOrder === i));
+        var _functionStr4 = "=".concat(functionStrChange(calc_funcStr, "del", "row", null, start, slen, sheetName, id === calc_i));
         if (((_data$calc_r4 = data[calc_r]) === null || _data$calc_r4 === void 0 ? void 0 : (_data$calc_r4$calc_c = _data$calc_r4[calc_c]) === null || _data$calc_r4$calc_c === void 0 ? void 0 : _data$calc_r4$calc_c.f) === calc_funcStr) {
           data[calc_r][calc_c].f = _functionStr4;
         }
       } else if (type === "column" && SheetIndex === curOrder) {
         if (calc_c < start || calc_c > end) {
           var _data$calc_r5, _data$calc_r5$calc_c;
-          var _functionStr5 = "=".concat(functionStrChange(calc_funcStr, "del", "col", null, start, slen, sheetName, curOrder === i));
+          var _functionStr5 = "=".concat(functionStrChange(calc_funcStr, "del", "col", null, start, slen, sheetName, id === calc_i));
           if (((_data$calc_r5 = data[calc_r]) === null || _data$calc_r5 === void 0 ? void 0 : (_data$calc_r5$calc_c = _data$calc_r5[calc_c]) === null || _data$calc_r5$calc_c === void 0 ? void 0 : _data$calc_r5$calc_c.f) === calc_funcStr) {
             data[calc_r][calc_c].f = _functionStr5;
           }
@@ -45594,7 +45608,7 @@ function deleteRowCol(ctx, op) {
         }
       } else if (type === "column") {
         var _data$calc_r6, _data$calc_r6$calc_c;
-        var _functionStr6 = "=".concat(functionStrChange(calc_funcStr, "del", "col", null, start, slen, sheetName, curOrder === i));
+        var _functionStr6 = "=".concat(functionStrChange(calc_funcStr, "del", "col", null, start, slen, sheetName, id === calc_i));
         if (((_data$calc_r6 = data[calc_r]) === null || _data$calc_r6 === void 0 ? void 0 : (_data$calc_r6$calc_c = _data$calc_r6[calc_c]) === null || _data$calc_r6$calc_c === void 0 ? void 0 : _data$calc_r6$calc_c.f) === calc_funcStr) {
           data[calc_r][calc_c].f = _functionStr6;
         }

package/dist/index.js

@@ -10413,11 +10413,11 @@ var en = {
     columnOverLimit: "1000 column limit exceeded"
   },
   comment: {
-    insert: "Insert",
-    edit: "Edit",
-    delete: "Delete",
-    showOne: "Show/Hide",
-    showAll: "Show/Hide All"
+    insert: "Insert Comment",
+    edit: "Edit Comment",
+    delete: "Delete Comment",
+    showOne: "Show/Hide Comment",
+    showAll: "Show/Hide All Comment"
   },
   screenshot: {
     screenshotTipNoSelection: "Please select the scope of the screenshot",
@@ -20977,11 +20977,11 @@ var zh = {
     columnOverLimit: "超出1000列限制"
   },
   comment: {
-    insert: "新建批注",
-    edit: "编辑批注",
-    delete: "删除",
-    showOne: "显示/隐藏批注",
-    showAll: "显示/隐藏所有批注"
+    insert: "新建说明",
+    edit: "编辑说明",
+    delete: "删除说明",
+    showOne: "显示/隐藏说明",
+    showAll: "显示/隐藏所有说明"
   },
   screenshot: {
     screenshotTipNoSelection: "请框选需要截图的范围",
@@ -37630,6 +37630,20 @@ function functionCopy(ctx, txt, mode, step) {
   };
   while (i < funcstack.length) {
     var s = funcstack[i];
+    var nextS = funcstack[i + 1];
+    if (s === "{" && nextS === "{") {
+      var nextI = funcstack === null || funcstack === void 0 ? void 0 : funcstack.findIndex(function (__, index) {
+        if (i < index && funcstack[index] === "}" && funcstack[index + 1] === "}") {
+          return true;
+        }
+        return false;
+      });
+      if (nextI !== -1) {
+        function_str += txt.substring(i, nextI + 2);
+        i = nextI + 2;
+        continue;
+      }
+    }
     if (s === "(" && matchConfig.dquote === 0) {
       matchConfig.bracket += 1;
       if (str.length > 0) {
@@ -44609,7 +44623,7 @@ function insertRowCol(ctx, op) {
       var calc_funcStr = getcellFormula(ctx, calc_r, calc_c, calc_i);
       if (type === "row" && SheetIndex === curOrder) {
         var _d$calc_r, _d$calc_r$calc_c;
-        var functionStr = "=".concat(functionStrChange(calc_funcStr, "add", "row", direction, index, count, sheetName, curOrder === i));
+        var functionStr = "=".concat(functionStrChange(calc_funcStr, "add", "row", direction, index, count, sheetName, id === calc_i));
         if (((_d$calc_r = d[calc_r]) === null || _d$calc_r === void 0 ? void 0 : (_d$calc_r$calc_c = _d$calc_r[calc_c]) === null || _d$calc_r$calc_c === void 0 ? void 0 : _d$calc_r$calc_c.f) === calc_funcStr) {
           d[calc_r][calc_c].f = functionStr;
         }
@@ -44625,13 +44639,13 @@ function insertRowCol(ctx, op) {
         newCalcChain.push(calc);
       } else if (type === "row") {
         var _data$calc_r, _data$calc_r$calc_c;
-        var _functionStr = "=".concat(functionStrChange(calc_funcStr, "add", "row", direction, index, count, sheetName, curOrder === i));
+        var _functionStr = "=".concat(functionStrChange(calc_funcStr, "add", "row", direction, index, count, sheetName, id === calc_i));
         if (((_data$calc_r = data[calc_r]) === null || _data$calc_r === void 0 ? void 0 : (_data$calc_r$calc_c = _data$calc_r[calc_c]) === null || _data$calc_r$calc_c === void 0 ? void 0 : _data$calc_r$calc_c.f) === calc_funcStr) {
           data[calc_r][calc_c].f = _functionStr;
         }
       } else if (type === "column" && SheetIndex === curOrder) {
         var _d$calc_r2, _d$calc_r2$calc_c;
-        var _functionStr2 = "=".concat(functionStrChange(calc_funcStr, "add", "col", direction, index, count, sheetName, curOrder === i));
+        var _functionStr2 = "=".concat(functionStrChange(calc_funcStr, "add", "col", direction, index, count, sheetName, id === calc_i));
         if (((_d$calc_r2 = d[calc_r]) === null || _d$calc_r2 === void 0 ? void 0 : (_d$calc_r2$calc_c = _d$calc_r2[calc_c]) === null || _d$calc_r2$calc_c === void 0 ? void 0 : _d$calc_r2$calc_c.f) === calc_funcStr) {
           d[calc_r][calc_c].f = _functionStr2;
         }
@@ -44647,7 +44661,7 @@ function insertRowCol(ctx, op) {
         newCalcChain.push(calc);
       } else if (type === "column") {
         var _data$calc_r2, _data$calc_r2$calc_c;
-        var _functionStr3 = "=".concat(functionStrChange(calc_funcStr, "add", "col", direction, index, count, sheetName, curOrder === i));
+        var _functionStr3 = "=".concat(functionStrChange(calc_funcStr, "add", "col", direction, index, count, sheetName, id === calc_i));
         if (((_data$calc_r2 = data[calc_r]) === null || _data$calc_r2 === void 0 ? void 0 : (_data$calc_r2$calc_c = _data$calc_r2[calc_c]) === null || _data$calc_r2$calc_c === void 0 ? void 0 : _data$calc_r2$calc_c.f) === calc_funcStr) {
           data[calc_r][calc_c].f = _functionStr3;
         }
@@ -45575,7 +45589,7 @@ function deleteRowCol(ctx, op) {
       if (type === "row" && SheetIndex === curOrder) {
         if (calc_r < start || calc_r > end) {
           var _data$calc_r3, _data$calc_r3$calc_c;
-          var functionStr = "=".concat(functionStrChange(calc_funcStr, "del", "row", null, start, slen, sheetName, curOrder === i));
+          var functionStr = "=".concat(functionStrChange(calc_funcStr, "del", "row", null, start, slen, sheetName, id === calc_i));
           if (((_data$calc_r3 = data[calc_r]) === null || _data$calc_r3 === void 0 ? void 0 : (_data$calc_r3$calc_c = _data$calc_r3[calc_c]) === null || _data$calc_r3$calc_c === void 0 ? void 0 : _data$calc_r3$calc_c.f) === calc_funcStr) {
             data[calc_r][calc_c].f = functionStr;
           }
@@ -45586,14 +45600,14 @@ function deleteRowCol(ctx, op) {
         }
       } else if (type === "row") {
         var _data$calc_r4, _data$calc_r4$calc_c;
-        var _functionStr4 = "=".concat(functionStrChange(calc_funcStr, "del", "row", null, start, slen, sheetName, curOrder === i));
+        var _functionStr4 = "=".concat(functionStrChange(calc_funcStr, "del", "row", null, start, slen, sheetName, id === calc_i));
         if (((_data$calc_r4 = data[calc_r]) === null || _data$calc_r4 === void 0 ? void 0 : (_data$calc_r4$calc_c = _data$calc_r4[calc_c]) === null || _data$calc_r4$calc_c === void 0 ? void 0 : _data$calc_r4$calc_c.f) === calc_funcStr) {
           data[calc_r][calc_c].f = _functionStr4;
         }
       } else if (type === "column" && SheetIndex === curOrder) {
         if (calc_c < start || calc_c > end) {
           var _data$calc_r5, _data$calc_r5$calc_c;
-          var _functionStr5 = "=".concat(functionStrChange(calc_funcStr, "del", "col", null, start, slen, sheetName, curOrder === i));
+          var _functionStr5 = "=".concat(functionStrChange(calc_funcStr, "del", "col", null, start, slen, sheetName, id === calc_i));
           if (((_data$calc_r5 = data[calc_r]) === null || _data$calc_r5 === void 0 ? void 0 : (_data$calc_r5$calc_c = _data$calc_r5[calc_c]) === null || _data$calc_r5$calc_c === void 0 ? void 0 : _data$calc_r5$calc_c.f) === calc_funcStr) {
             data[calc_r][calc_c].f = _functionStr5;
           }
@@ -45604,7 +45618,7 @@ function deleteRowCol(ctx, op) {
         }
       } else if (type === "column") {
         var _data$calc_r6, _data$calc_r6$calc_c;
-        var _functionStr6 = "=".concat(functionStrChange(calc_funcStr, "del", "col", null, start, slen, sheetName, curOrder === i));
+        var _functionStr6 = "=".concat(functionStrChange(calc_funcStr, "del", "col", null, start, slen, sheetName, id === calc_i));
         if (((_data$calc_r6 = data[calc_r]) === null || _data$calc_r6 === void 0 ? void 0 : (_data$calc_r6$calc_c = _data$calc_r6[calc_c]) === null || _data$calc_r6$calc_c === void 0 ? void 0 : _data$calc_r6$calc_c.f) === calc_funcStr) {
           data[calc_r][calc_c].f = _functionStr6;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "4.0.29",
+  "version": "4.0.31",
   "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": "4.0.29",
+    "@leankylin-sheet/formula-parser": "4.0.31",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",