@leankylin-sheet/core 4.0.46 → 4.0.48

package/dist/index.esm.js

@@ -37660,6 +37660,7 @@ function functionCopy(ctx, txt, mode, step) {
     txt = txt.substring(1);
   }
   var funcstack = txt.split("");
+  console.log("funcstack", funcstack);
   var i = 0;
   var str = "";
   var function_str = "";
@@ -37669,20 +37670,26 @@ function functionCopy(ctx, txt, mode, step) {
     squote: 0,
     dquote: 0
   };
-  while (i < funcstack.length) {
+  var _loop3 = function _loop3() {
     var s = funcstack[i];
     var nextS = funcstack[i + 1];
     if (s === "{" && nextS === "{") {
+      var hasCell = false;
       var nextI = funcstack === null || funcstack === void 0 ? void 0 : funcstack.findIndex(function (__, index) {
+        if (i < index && funcstack[index - 1] === "!") {
+          hasCell = true;
+          return true;
+        }
         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;
+        var nestPositionI = hasCell ? nextI : nextI + 2;
+        function_str += txt.substring(i, nestPositionI);
+        i = nestPositionI;
+        return 1; // continue
       }
     }
     if (s === "(" && matchConfig.dquote === 0) {
@@ -37747,6 +37754,9 @@ function functionCopy(ctx, txt, mode, step) {
           function_str += s;
         }
       }
+    } else if (s === "}") {
+      function_str += "".concat(functionCopy(ctx, str, mode, step), "}");
+      str = "";
     } else {
       str += s;
     }
@@ -37766,6 +37776,9 @@ function functionCopy(ctx, txt, mode, step) {
       }
     }
     i += 1;
+  };
+  while (i < funcstack.length) {
+    if (_loop3()) continue;
   }
   return function_str;
 }

package/dist/index.js

@@ -37670,6 +37670,7 @@ function functionCopy(ctx, txt, mode, step) {
     txt = txt.substring(1);
   }
   var funcstack = txt.split("");
+  console.log("funcstack", funcstack);
   var i = 0;
   var str = "";
   var function_str = "";
@@ -37679,20 +37680,26 @@ function functionCopy(ctx, txt, mode, step) {
     squote: 0,
     dquote: 0
   };
-  while (i < funcstack.length) {
+  var _loop3 = function _loop3() {
     var s = funcstack[i];
     var nextS = funcstack[i + 1];
     if (s === "{" && nextS === "{") {
+      var hasCell = false;
       var nextI = funcstack === null || funcstack === void 0 ? void 0 : funcstack.findIndex(function (__, index) {
+        if (i < index && funcstack[index - 1] === "!") {
+          hasCell = true;
+          return true;
+        }
         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;
+        var nestPositionI = hasCell ? nextI : nextI + 2;
+        function_str += txt.substring(i, nestPositionI);
+        i = nestPositionI;
+        return 1; // continue
       }
     }
     if (s === "(" && matchConfig.dquote === 0) {
@@ -37757,6 +37764,9 @@ function functionCopy(ctx, txt, mode, step) {
           function_str += s;
         }
       }
+    } else if (s === "}") {
+      function_str += "".concat(functionCopy(ctx, str, mode, step), "}");
+      str = "";
     } else {
       str += s;
     }
@@ -37776,6 +37786,9 @@ function functionCopy(ctx, txt, mode, step) {
       }
     }
     i += 1;
+  };
+  while (i < funcstack.length) {
+    if (_loop3()) continue;
   }
   return function_str;
 }

package/package.json

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