@fileverse-dev/fortune-core 1.2.56-patch-4 → 1.2.56-patch-6

package/es/events/paste.js

@@ -78,9 +78,11 @@ export function adjustFormulaForPaste(formula, srcCol, srcRow, destCol, destRow)
   var rowOffset = destRow - srcRow;
   var hadInvalid = false;
   var cellRefRegex = /\b(\$?)([A-Z]+)(\$?)(\d+)\b/g;
-  var stringOrCellRef = /"(?:\\.|[^"])*"|(\b\$?[A-Z]+\$?\d+\b)/g;
+  var stringOrCellRef = /"(?:\\.|[^"])*"|(?<!\$)([A-Z]+\d+\b)/g;
   var result = formula.replace(stringOrCellRef, function (m, cellRef) {
     if (!cellRef) return m;
+    if (cellRef.startsWith("$")) return m;
+    console.log(m, "cellRef", cellRef);
     return cellRef.replace(cellRefRegex, function (__, absCol, colLetters, absRow, rowNum) {
       var colIndex = columnLabelIndex(colLetters);
       var rowIndex = parseInt(rowNum, 10);
@@ -969,6 +971,7 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
             var isError = false;
             try {
               adjustedFormula = adjustFormulaForPaste(value.f, c_c1, c_r1, c, h);
+              console.log("adjustedFormula", adjustedFormula);
             } catch (error) {
               isError = true;
               value.error = {
@@ -985,7 +988,6 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
             }
             if (!isError) {
               var funcV = execfunction(ctx, adjustedFormula, h, c, undefined, undefined, true);
-              console.log(funcV, adjustedFormula);
               value.f = adjustedFormula;
               if (!(funcV[1] instanceof Promise) && !funcV[3]) {
                 if (Array.isArray(funcV[1])) {

package/es/modules/dropCell.js

@@ -1,3 +1,13 @@
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
 import _ from "lodash";
 import dayjs from "dayjs";
 import { getFlowdata } from "../context";
@@ -1814,6 +1824,13 @@ export function updateDropCell(ctx) {
             var v = formula.execfunction(ctx, f, j, i);
             formula.execFunctionGroup(ctx, j, i, v[1], undefined, d);
             cell.v = v[1], cell.f = v[2];
+            var afterUpdateCell = ctx.hooks.afterUpdateCell;
+            if (afterUpdateCell) {
+              afterUpdateCell(j, i, null, __assign(__assign({}, cell), {
+                v: v[1] instanceof Promise ? v[1] : cell.v,
+                m: v[1] instanceof Promise ? "[object Promise]" : v[1]
+              }));
+            }
             if (cell.spl != null) {
               cell.spl = v[3].data;
             } else if (cell.v != null) {

package/es/modules/formula.js

@@ -2318,6 +2318,7 @@ export function functionCopy(ctx, txt, mode, step) {
     dquote: 0
   };
   while (i < funcstack.length) {
+    console.log(funcstack);
     var s = funcstack[i];
     if (s === "(" && matchConfig.dquote === 0) {
       matchConfig.bracket += 1;
@@ -2385,7 +2386,7 @@ export function functionCopy(ctx, txt, mode, step) {
       str += s;
     }
     if (i === funcstack.length - 1) {
-      if (iscelldata(_.trim(str))) {
+      if (iscelldata(_.trim(str)) && !_.trim(str).includes("$")) {
         if (mode === "down") {
           function_str += downparam(_.trim(str), step);
         } else if (mode === "up") {

package/lib/events/paste.js

@@ -91,9 +91,11 @@ function adjustFormulaForPaste(formula, srcCol, srcRow, destCol, destRow) {
   var rowOffset = destRow - srcRow;
   var hadInvalid = false;
   var cellRefRegex = /\b(\$?)([A-Z]+)(\$?)(\d+)\b/g;
-  var stringOrCellRef = /"(?:\\.|[^"])*"|(\b\$?[A-Z]+\$?\d+\b)/g;
+  var stringOrCellRef = /"(?:\\.|[^"])*"|(?<!\$)([A-Z]+\d+\b)/g;
   var result = formula.replace(stringOrCellRef, function (m, cellRef) {
     if (!cellRef) return m;
+    if (cellRef.startsWith("$")) return m;
+    console.log(m, "cellRef", cellRef);
     return cellRef.replace(cellRefRegex, function (__, absCol, colLetters, absRow, rowNum) {
       var colIndex = columnLabelIndex(colLetters);
       var rowIndex = parseInt(rowNum, 10);
@@ -982,6 +984,7 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
             var isError = false;
             try {
               adjustedFormula = adjustFormulaForPaste(value.f, c_c1, c_r1, c, h);
+              console.log("adjustedFormula", adjustedFormula);
             } catch (error) {
               isError = true;
               value.error = {
@@ -998,7 +1001,6 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
             }
             if (!isError) {
               var funcV = (0, _formula.execfunction)(ctx, adjustedFormula, h, c, undefined, undefined, true);
-              console.log(funcV, adjustedFormula);
               value.f = adjustedFormula;
               if (!(funcV[1] instanceof Promise) && !funcV[3]) {
                 if (Array.isArray(funcV[1])) {

package/lib/modules/dropCell.js

@@ -26,6 +26,16 @@ var _selection = require("./selection");
 var _refresh = require("./refresh");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
 function toPx(v) {
   return "".concat(v, "px");
 }
@@ -1830,6 +1840,13 @@ function updateDropCell(ctx) {
             var v = formula.execfunction(ctx, f, j, i);
             formula.execFunctionGroup(ctx, j, i, v[1], undefined, d);
             cell.v = v[1], cell.f = v[2];
+            var afterUpdateCell = ctx.hooks.afterUpdateCell;
+            if (afterUpdateCell) {
+              afterUpdateCell(j, i, null, __assign(__assign({}, cell), {
+                v: v[1] instanceof Promise ? v[1] : cell.v,
+                m: v[1] instanceof Promise ? "[object Promise]" : v[1]
+              }));
+            }
             if (cell.spl != null) {
               cell.spl = v[3].data;
             } else if (cell.v != null) {

package/lib/modules/formula.js

@@ -2348,6 +2348,7 @@ function functionCopy(ctx, txt, mode, step) {
     dquote: 0
   };
   while (i < funcstack.length) {
+    console.log(funcstack);
     var s = funcstack[i];
     if (s === "(" && matchConfig.dquote === 0) {
       matchConfig.bracket += 1;
@@ -2415,7 +2416,7 @@ function functionCopy(ctx, txt, mode, step) {
       str += s;
     }
     if (i === funcstack.length - 1) {
-      if (iscelldata(_lodash.default.trim(str))) {
+      if (iscelldata(_lodash.default.trim(str)) && !_lodash.default.trim(str).includes("$")) {
         if (mode === "down") {
           function_str += downparam(_lodash.default.trim(str), step);
         } else if (mode === "up") {

package/package.json

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