@fileverse-dev/fortune-core 1.2.96-maitra-feb6-patch-1 → 1.2.96-scroll

package/es/modules/cell.js

@@ -309,7 +309,7 @@ export function setCellValue(ctx, r, c, d, v) {
           var flag = vupdate.split("").every(function (ele) {
             return ele === "0" || ele === ".";
           });
-          if (flag || /^0+\d/.test(vupdate)) {
+          if (flag) {
             vupdate = parseFloat(vupdate);
           }
         }
@@ -568,18 +568,7 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
   var curv = flowdata[r][c];
   var oldValue = _.cloneDeep(curv);
   var isPrevInline = isInlineStringCell(curv);
-  var isCurInline = false;
-  if ((inputText === null || inputText === void 0 ? void 0 : inputText.slice(0, 1)) !== "=" && (inputHtml === null || inputHtml === void 0 ? void 0 : inputHtml.substring(0, 5)) === "<span") {
-    var spans = ($input === null || $input === void 0 ? void 0 : $input.querySelectorAll("span")) || [];
-    var hasMultipleSpans = spans.length > 1;
-    var hasFormattingOrSpecialClasses = Array.from(spans).some(function (span) {
-      var hasSpecialClass = span.className.includes("luckysheet") || span.className.includes("fortune");
-      var cssText = span.style.cssText || "";
-      var meaningfulCss = cssText.replace(/color:\s*rgb\(0,\s*0,\s*0\);?/gi, "").replace(/color:\s*#000000;?/gi, "").replace(/color:\s*black;?/gi, "").trim();
-      return hasSpecialClass || meaningfulCss.length > 0;
-    });
-    isCurInline = hasMultipleSpans || hasFormattingOrSpecialClasses;
-  }
+  var isCurInline = (inputText === null || inputText === void 0 ? void 0 : inputText.slice(0, 1)) !== "=" && (inputHtml === null || inputHtml === void 0 ? void 0 : inputHtml.substring(0, 5)) === "<span";
   var isCopyVal = false;
   if (!isCurInline && inputText && inputText.length > 0) {
     var splitArr = inputText.replace(/\r\n/g, "_x000D_").replace(/&#13;&#10;/g, "_x000D_").replace(/\r/g, "_x000D_").replace(/\n/g, "_x000D_").split("_x000D_");

package/es/modules/formula.js

@@ -124,7 +124,7 @@ var FormulaCache = function () {
     });
   }
   FormulaCache.prototype.tryGetCellAsNumber = function (cell) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d;
     var isCryptoDeno = typeof (cell === null || cell === void 0 ? void 0 : cell.m) === "string" ? ((_a = cell === null || cell === void 0 ? void 0 : cell.m) === null || _a === void 0 ? void 0 : _a.includes("ETH")) || ((_b = cell === null || cell === void 0 ? void 0 : cell.m) === null || _b === void 0 ? void 0 : _b.includes("SOL")) || ((_c = cell === null || cell === void 0 ? void 0 : cell.m) === null || _c === void 0 ? void 0 : _c.includes("BTC")) : false;
     if (isCryptoDeno && typeof (cell === null || cell === void 0 ? void 0 : cell.m) === "string") {
       var splitedNumberString = cell.m.split(" ")[0];
@@ -134,20 +134,6 @@ var FormulaCache = function () {
       var n = Number(cell === null || cell === void 0 ? void 0 : cell.v);
       return Number.isNaN(n) ? cell.v : n;
     }
-    if (((_e = cell === null || cell === void 0 ? void 0 : cell.ct) === null || _e === void 0 ? void 0 : _e.t) === "inlineStr" && Array.isArray((_f = cell === null || cell === void 0 ? void 0 : cell.ct) === null || _f === void 0 ? void 0 : _f.s) && cell.ct.s.length > 0) {
-      var inlineValue = cell.ct.s.map(function (segment) {
-        return (segment === null || segment === void 0 ? void 0 : segment.v) || "";
-      }).join("");
-      var trimmedValue = inlineValue.trim();
-      if (trimmedValue.length > 0) {
-        var cleanedValue = trimmedValue.replace(/,/g, "");
-        var n = Number(cleanedValue);
-        if (!Number.isNaN(n)) {
-          return n;
-        }
-        return inlineValue;
-      }
-    }
     return String(cell === null || cell === void 0 ? void 0 : cell.m).includes("%") ? cell === null || cell === void 0 ? void 0 : cell.m : cell === null || cell === void 0 ? void 0 : cell.v;
   };
   return FormulaCache;

package/es/modules/validation.js

@@ -25,7 +25,7 @@ export function isRealNull(val) {
   return _.isNil(val) || val.toString().replace(/\s/g, "") === "";
 }
 export function isHexValue(str) {
-  return /^0x[a-fA-F0-9]+$/i.test(str);
+  return /^0x?[a-fA-F0-9]+$/.test(str);
 }
 export function isRealNum(val) {
   if (isHexValue(val === null || val === void 0 ? void 0 : val.toString())) {

package/lib/modules/cell.js

@@ -342,7 +342,7 @@ function setCellValue(ctx, r, c, d, v) {
           var flag = vupdate.split("").every(function (ele) {
             return ele === "0" || ele === ".";
           });
-          if (flag || /^0+\d/.test(vupdate)) {
+          if (flag) {
             vupdate = parseFloat(vupdate);
           }
         }
@@ -601,18 +601,7 @@ function updateCell(ctx, r, c, $input, value, canvas) {
   var curv = flowdata[r][c];
   var oldValue = _lodash.default.cloneDeep(curv);
   var isPrevInline = (0, _inlineString.isInlineStringCell)(curv);
-  var isCurInline = false;
-  if ((inputText === null || inputText === void 0 ? void 0 : inputText.slice(0, 1)) !== "=" && (inputHtml === null || inputHtml === void 0 ? void 0 : inputHtml.substring(0, 5)) === "<span") {
-    var spans = ($input === null || $input === void 0 ? void 0 : $input.querySelectorAll("span")) || [];
-    var hasMultipleSpans = spans.length > 1;
-    var hasFormattingOrSpecialClasses = Array.from(spans).some(function (span) {
-      var hasSpecialClass = span.className.includes("luckysheet") || span.className.includes("fortune");
-      var cssText = span.style.cssText || "";
-      var meaningfulCss = cssText.replace(/color:\s*rgb\(0,\s*0,\s*0\);?/gi, "").replace(/color:\s*#000000;?/gi, "").replace(/color:\s*black;?/gi, "").trim();
-      return hasSpecialClass || meaningfulCss.length > 0;
-    });
-    isCurInline = hasMultipleSpans || hasFormattingOrSpecialClasses;
-  }
+  var isCurInline = (inputText === null || inputText === void 0 ? void 0 : inputText.slice(0, 1)) !== "=" && (inputHtml === null || inputHtml === void 0 ? void 0 : inputHtml.substring(0, 5)) === "<span";
   var isCopyVal = false;
   if (!isCurInline && inputText && inputText.length > 0) {
     var splitArr = inputText.replace(/\r\n/g, "_x000D_").replace(/&#13;&#10;/g, "_x000D_").replace(/\r/g, "_x000D_").replace(/\n/g, "_x000D_").split("_x000D_");

package/lib/modules/formula.js

@@ -155,7 +155,7 @@ var FormulaCache = exports.FormulaCache = function () {
     });
   }
   FormulaCache.prototype.tryGetCellAsNumber = function (cell) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d;
     var isCryptoDeno = typeof (cell === null || cell === void 0 ? void 0 : cell.m) === "string" ? ((_a = cell === null || cell === void 0 ? void 0 : cell.m) === null || _a === void 0 ? void 0 : _a.includes("ETH")) || ((_b = cell === null || cell === void 0 ? void 0 : cell.m) === null || _b === void 0 ? void 0 : _b.includes("SOL")) || ((_c = cell === null || cell === void 0 ? void 0 : cell.m) === null || _c === void 0 ? void 0 : _c.includes("BTC")) : false;
     if (isCryptoDeno && typeof (cell === null || cell === void 0 ? void 0 : cell.m) === "string") {
       var splitedNumberString = cell.m.split(" ")[0];
@@ -165,20 +165,6 @@ var FormulaCache = exports.FormulaCache = function () {
       var n = Number(cell === null || cell === void 0 ? void 0 : cell.v);
       return Number.isNaN(n) ? cell.v : n;
     }
-    if (((_e = cell === null || cell === void 0 ? void 0 : cell.ct) === null || _e === void 0 ? void 0 : _e.t) === "inlineStr" && Array.isArray((_f = cell === null || cell === void 0 ? void 0 : cell.ct) === null || _f === void 0 ? void 0 : _f.s) && cell.ct.s.length > 0) {
-      var inlineValue = cell.ct.s.map(function (segment) {
-        return (segment === null || segment === void 0 ? void 0 : segment.v) || "";
-      }).join("");
-      var trimmedValue = inlineValue.trim();
-      if (trimmedValue.length > 0) {
-        var cleanedValue = trimmedValue.replace(/,/g, "");
-        var n = Number(cleanedValue);
-        if (!Number.isNaN(n)) {
-          return n;
-        }
-        return inlineValue;
-      }
-    }
     return String(cell === null || cell === void 0 ? void 0 : cell.m).includes("%") ? cell === null || cell === void 0 ? void 0 : cell.m : cell === null || cell === void 0 ? void 0 : cell.v;
   };
   return FormulaCache;

package/lib/modules/validation.js

@@ -42,7 +42,7 @@ function isRealNull(val) {
   return _lodash.default.isNil(val) || val.toString().replace(/\s/g, "") === "";
 }
 function isHexValue(str) {
-  return /^0x[a-fA-F0-9]+$/i.test(str);
+  return /^0x?[a-fA-F0-9]+$/.test(str);
 }
 function isRealNum(val) {
   if (isHexValue(val === null || val === void 0 ? void 0 : val.toString())) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.2.96-maitra-feb6-patch-1",
+  "version": "1.2.96-scroll",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",
@@ -15,7 +15,7 @@
     "dev": "father-build --watch"
   },
   "dependencies": {
-    "@fileverse-dev/formula-parser": "0.2.94-maitra-feb6-patch-1",
+    "@fileverse-dev/formula-parser": "0.2.94",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",