npm - @fileverse-dev/fortune-core - Versions diffs - 1.2.64-linkPasteFix-patch-1 → 1.2.64-linkPasteFix-patch-2 - Mend

@fileverse-dev/fortune-core 1.2.64-linkPasteFix-patch-1 → 1.2.64-linkPasteFix-patch-2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/es/events/paste.js CHANGED Viewed

@@ -354,12 +354,21 @@ function pasteHandler(ctx, data, borderInfo) {
       expandRowsAndColumns(d, addr, addc);
     }
     if (!d) return;
+    var getUrlFromText = function getUrlFromText(text) {
+      var t = String(text).trim();
+      if (!t || /[\s\r\n]/.test(t)) return null;
+      if (!/^(https?:\/\/|www\.)\S+$/i.test(t)) return null;
+      return t.startsWith("http") ? t : "https://".concat(t);
+    };
     for (var r = 0; r < rlen; r += 1) {
       var x = d[r + curR];
       for (var c = 0; c < clen; c += 1) {
         var originCell = x[c + curC];
         var value = dataChe[r][c];
-        if (isRealNum(value)) {
+        var originalValueStr = String(value);
+        var url = getUrlFromText(originalValueStr);
+        var isUrl = url !== null;
+        if (!isUrl && isRealNum(value)) {
           if (originCell && originCell.ct && originCell.ct.fa === "@") {
             value = String(value);
           } else if (!/^0x?[a-fA-F0-9]+$/.test(value)) {
@@ -367,26 +376,59 @@ function pasteHandler(ctx, data, borderInfo) {
           }
         }
         if (originCell) {
-          originCell.v = value;
+          originCell.v = isUrl ? originalValueStr : value;
           if (originCell.ct != null && originCell.ct.fa != null) {
-            originCell.m = update(originCell.ct.fa, value);
+            originCell.m = update(originCell.ct.fa, originCell.v);
           } else {
-            originCell.m = value;
+            originCell.m = typeof originCell.v === "boolean" ? String(originCell.v) : originCell.v;
           }
           if (originCell.f != null && originCell.f.length > 0) {
             originCell.f = "";
           }
+          if (isUrl && url) {
+            var targetRow = r + curR;
+            var targetCol = c + curC;
+            saveHyperlink(ctx, targetRow, targetCol, url, "webpage", originalValueStr);
+            originCell.hl = {
+              r: targetRow,
+              c: targetCol,
+              id: ctx.currentSheetId
+            };
+            originCell.fc = originCell.fc || "rgb(0, 0, 255)";
+            originCell.un = originCell.un !== undefined ? originCell.un : 1;
+          }
         } else {
           var cell = {};
-          var mask = genarate(value);
-          _a = mask, cell.m = _a[0], cell.ct = _a[1], cell.v = _a[2];
-          if (/^0x?[a-fA-F0-9]+$/.test(value)) {
-            cell.m = value;
+          if (isUrl) {
+            cell.v = originalValueStr;
+            cell.m = originalValueStr;
             cell.ct = {
               fa: "@",
               t: "s"
             };
-            cell.v = value;
+          } else {
+            var mask = genarate(value);
+            _a = mask, cell.m = _a[0], cell.ct = _a[1], cell.v = _a[2];
+            if (/^0x?[a-fA-F0-9]+$/.test(value)) {
+              cell.m = value;
+              cell.ct = {
+                fa: "@",
+                t: "s"
+              };
+              cell.v = value;
+            }
+          }
+          if (isUrl && url) {
+            var targetRow = r + curR;
+            var targetCol = c + curC;
+            saveHyperlink(ctx, targetRow, targetCol, url, "webpage", originalValueStr);
+            cell.hl = {
+              r: targetRow,
+              c: targetCol,
+              id: ctx.currentSheetId
+            };
+            cell.fc = cell.fc || "rgb(0, 0, 255)";
+            cell.un = cell.un !== undefined ? cell.un : 1;
           }
           x[c + curC] = cell;
         }

package/lib/events/paste.js CHANGED Viewed

@@ -367,12 +367,21 @@ function pasteHandler(ctx, data, borderInfo) {
       (0, _sheet.expandRowsAndColumns)(d, addr, addc);
     }
     if (!d) return;
+    var getUrlFromText = function getUrlFromText(text) {
+      var t = String(text).trim();
+      if (!t || /[\s\r\n]/.test(t)) return null;
+      if (!/^(https?:\/\/|www\.)\S+$/i.test(t)) return null;
+      return t.startsWith("http") ? t : "https://".concat(t);
+    };
     for (var r = 0; r < rlen; r += 1) {
       var x = d[r + curR];
       for (var c = 0; c < clen; c += 1) {
         var originCell = x[c + curC];
         var value = dataChe[r][c];
-        if ((0, _validation.isRealNum)(value)) {
+        var originalValueStr = String(value);
+        var url = getUrlFromText(originalValueStr);
+        var isUrl = url !== null;
+        if (!isUrl && (0, _validation.isRealNum)(value)) {
           if (originCell && originCell.ct && originCell.ct.fa === "@") {
             value = String(value);
           } else if (!/^0x?[a-fA-F0-9]+$/.test(value)) {
@@ -380,26 +389,59 @@ function pasteHandler(ctx, data, borderInfo) {
           }
         }
         if (originCell) {
-          originCell.v = value;
+          originCell.v = isUrl ? originalValueStr : value;
           if (originCell.ct != null && originCell.ct.fa != null) {
-            originCell.m = (0, _format.update)(originCell.ct.fa, value);
+            originCell.m = (0, _format.update)(originCell.ct.fa, originCell.v);
           } else {
-            originCell.m = value;
+            originCell.m = typeof originCell.v === "boolean" ? String(originCell.v) : originCell.v;
           }
           if (originCell.f != null && originCell.f.length > 0) {
             originCell.f = "";
           }
+          if (isUrl && url) {
+            var targetRow = r + curR;
+            var targetCol = c + curC;
+            (0, _modules.saveHyperlink)(ctx, targetRow, targetCol, url, "webpage", originalValueStr);
+            originCell.hl = {
+              r: targetRow,
+              c: targetCol,
+              id: ctx.currentSheetId
+            };
+            originCell.fc = originCell.fc || "rgb(0, 0, 255)";
+            originCell.un = originCell.un !== undefined ? originCell.un : 1;
+          }
         } else {
           var cell = {};
-          var mask = (0, _format.genarate)(value);
-          _a = mask, cell.m = _a[0], cell.ct = _a[1], cell.v = _a[2];
-          if (/^0x?[a-fA-F0-9]+$/.test(value)) {
-            cell.m = value;
+          if (isUrl) {
+            cell.v = originalValueStr;
+            cell.m = originalValueStr;
             cell.ct = {
               fa: "@",
               t: "s"
             };
-            cell.v = value;
+          } else {
+            var mask = (0, _format.genarate)(value);
+            _a = mask, cell.m = _a[0], cell.ct = _a[1], cell.v = _a[2];
+            if (/^0x?[a-fA-F0-9]+$/.test(value)) {
+              cell.m = value;
+              cell.ct = {
+                fa: "@",
+                t: "s"
+              };
+              cell.v = value;
+            }
+          }
+          if (isUrl && url) {
+            var targetRow = r + curR;
+            var targetCol = c + curC;
+            (0, _modules.saveHyperlink)(ctx, targetRow, targetCol, url, "webpage", originalValueStr);
+            cell.hl = {
+              r: targetRow,
+              c: targetCol,
+              id: ctx.currentSheetId
+            };
+            cell.fc = cell.fc || "rgb(0, 0, 255)";
+            cell.un = cell.un !== undefined ? cell.un : 1;
           }
           x[c + curC] = cell;
         }

package/package.json CHANGED Viewed

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