@fileverse-dev/fortune-core 1.2.64-patch-12 → 1.2.65

package/es/modules/cell.js

@@ -538,7 +538,7 @@ export function cancelNormalSelected(ctx) {
   ctx.formulaCache.rangedrag_row_start = false;
 }
 export function updateCell(ctx, r, c, $input, value, canvas) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
   if (ctx.allowEdit === false || ctx.isFlvReadOnly) return;
   var inputText = $input === null || $input === void 0 ? void 0 : $input.innerText;
   var inputHtml = $input === null || $input === void 0 ? void 0 : $input.innerHTML;
@@ -546,6 +546,13 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
   if (!flowdata) return;
   var index = getSheetIndex(ctx, ctx.currentSheetId);
   var dataVerification = ctx.luckysheetfile[index].dataVerification;
+  var sheetFile = ctx.luckysheetfile[index];
+  var getUrlFromText = function getUrlFromText(text) {
+    var t = (text !== null && text !== void 0 ? 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);
+  };
   if (!_.isNil(dataVerification)) {
     var dvItem = dataVerification["".concat(r, "_").concat(c)];
     if (!_.isNil(dvItem) && dvItem.prohibitInput && !validateCellData(ctx, dvItem, inputText)) {
@@ -803,13 +810,30 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
   } catch (e) {
     console.log("[updateCell] spill failed; falling back", e);
   }
+  var url = getUrlFromText($input === null || $input === void 0 ? void 0 : $input.innerText);
+  if (url && _typeof(value) === "object" && value) {
+    value.hl = 1;
+    if (!sheetFile.hyperlink) sheetFile.hyperlink = {};
+    sheetFile.hyperlink["".concat(r, "_").concat(c)] = {
+      linkType: "webpage",
+      linkAddress: url
+    };
+    if (typeof value.v !== "string") {
+      value.v = (_r = $input === null || $input === void 0 ? void 0 : $input.innerText) !== null && _r !== void 0 ? _r : url;
+    }
+    if (value.m == null) {
+      value.m = value.v;
+    }
+    if (value.fc == null) value.fc = "rgb(0, 0, 255)";
+    if (value.un == null) value.un = 1;
+  }
   setCellValue(ctx, r, c, d, value);
   cancelNormalSelected(ctx);
   if ((curv === null || curv === void 0 ? void 0 : curv.tb) === "2" && curv.v || isInlineStringCell(d[r][c])) {
     var defaultrowlen = ctx.defaultrowlen;
     var cfg = ctx.luckysheetfile[getSheetIndex(ctx, ctx.currentSheetId)].config || {};
-    if (!(((_r = cfg.columnlen) === null || _r === void 0 ? void 0 : _r[c]) && ((_s = cfg.rowlen) === null || _s === void 0 ? void 0 : _s[r]))) {
-      var cellWidth = ((_t = cfg.columnlen) === null || _t === void 0 ? void 0 : _t[c]) || ctx.defaultcollen;
+    if (!(((_s = cfg.columnlen) === null || _s === void 0 ? void 0 : _s[c]) && ((_t = cfg.rowlen) === null || _t === void 0 ? void 0 : _t[r]))) {
+      var cellWidth = ((_u = cfg.columnlen) === null || _u === void 0 ? void 0 : _u[c]) || ctx.defaultcollen;
       var textInfo = canvas ? getCellTextInfo(d[r][c], canvas, ctx, {
         r: r,
         c: c,
@@ -820,7 +844,7 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
         currentRowLen = textInfo.textHeightAll + 2;
       }
       var previousRowHeight = getRowHeight(ctx, [r])[r];
-      if (currentRowLen > defaultrowlen && !((_u = cfg.customHeight) === null || _u === void 0 ? void 0 : _u[r]) && previousRowHeight < currentRowLen) {
+      if (currentRowLen > defaultrowlen && !((_v = cfg.customHeight) === null || _v === void 0 ? void 0 : _v[r]) && previousRowHeight < currentRowLen) {
         if (_.isNil(cfg.rowlen)) cfg.rowlen = {};
         cfg.rowlen[r] = currentRowLen;
       }

package/es/modules/text.js

@@ -343,7 +343,6 @@ export function getCellTextInfo(cell, renderCtx, sheetCtx, option, ctx) {
     fontset = getFontSet(cell, sheetCtx.defaultFontSize, ctx);
     renderCtx.font = fontset;
     cancelLine = normalizedCellAttr(cell, "cl");
-    console.log("cancelLine yoooo", cancelLine);
     underLine = normalizedCellAttr(cell, "un");
     fontSize = normalizedCellAttr(cell, "fs");
     if (cell instanceof Object) {

package/es/types.d.ts

@@ -144,12 +144,6 @@ export type ConditionRulesProps = {
         check: boolean;
         color: string;
     };
-    font: {
-        bold: boolean;
-        italic: boolean;
-        underline: boolean;
-        strikethrough: boolean;
-    };
     betweenValue: {
         value1: string;
         value2: string;

package/lib/canvas.d.ts

@@ -38,7 +38,7 @@ export declare class Canvas {
         stc: number | undefined;
         edc: number | undefined;
     };
-    cellTextRender(textInfo: any, ctx: CanvasRenderingContext2D, option: any, checkCF: any): void;
+    cellTextRender(textInfo: any, ctx: CanvasRenderingContext2D, option: any): void;
     drawFreezeLine({ horizontalTop, verticalLeft, }: {
         horizontalTop?: number;
         verticalLeft?: number;

package/lib/canvas.js

@@ -15,16 +15,6 @@ var _border = require("./modules/border");
 var _modules = require("./modules");
 var _animate = require("./animate");
 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);
-};
 var defaultStyle = exports.defaultStyle = {
   fillStyle: "#000000",
   textBaseline: "middle",
@@ -900,7 +890,6 @@ var Canvas = exports.Canvas = function () {
     }, renderCtx)) === false) {
       return;
     }
-    console.log("cellsize", fillStyle);
     renderCtx.fillRect(cellsize[0], cellsize[1], cellsize[2], cellsize[3]);
     var index = (0, _utils.getSheetIndex)(this.sheetCtx, this.sheetCtx.currentSheetId);
     var dataVerification = this.sheetCtx.luckysheetfile[index].dataVerification;
@@ -1154,27 +1143,6 @@ var Canvas = exports.Canvas = function () {
       renderCtx.rect(pos_x, pos_y, cellWidth, cellHeight);
       renderCtx.clip();
       renderCtx.scale(this.sheetCtx.zoomRatio, this.sheetCtx.zoomRatio);
-      console.log("pos_x, pos_y, cellWidth, cellHeight", cell);
-      if (checksCF === null || checksCF === void 0 ? void 0 : checksCF.strikethrough) {
-        cell = __assign(__assign({}, cell), {
-          cl: 1
-        });
-      }
-      if (checksCF === null || checksCF === void 0 ? void 0 : checksCF.italic) {
-        cell = __assign(__assign({}, cell), {
-          it: 1
-        });
-      }
-      if (checksCF === null || checksCF === void 0 ? void 0 : checksCF.underline) {
-        cell = __assign(__assign({}, cell), {
-          un: 1
-        });
-      }
-      if (checksCF === null || checksCF === void 0 ? void 0 : checksCF.bold) {
-        cell = __assign(__assign({}, cell), {
-          bl: 1
-        });
-      }
       var textInfo = cell ? (0, _text.getCellTextInfo)(cell, renderCtx, this.sheetCtx, {
         cellWidth: cellWidth,
         cellHeight: cellHeight,
@@ -1217,15 +1185,14 @@ var Canvas = exports.Canvas = function () {
           this.cellTextRender(textInfo, renderCtx, {
             pos_x: pos_x,
             pos_y: pos_y
-          }, checksCF);
+          });
         }
         renderCtx.restore();
       } else if (!isDataVlidationAvailable) {
-        console.log('checksCF', checksCF);
         this.cellTextRender(textInfo, renderCtx, {
           pos_x: pos_x,
           pos_y: pos_y
-        }, checksCF);
+        });
       }
       renderCtx.restore();
     }
@@ -1341,13 +1308,13 @@ var Canvas = exports.Canvas = function () {
       this.cellTextRender(textInfo, renderCtx, {
         pos_x: pos_x,
         pos_y: pos_y
-      }, checksAF);
+      });
       renderCtx.restore();
     } else {
       this.cellTextRender(textInfo, renderCtx, {
         pos_x: pos_x,
         pos_y: pos_y
-      }, checksCF);
+      });
     }
     renderCtx.restore();
   };
@@ -1461,8 +1428,7 @@ var Canvas = exports.Canvas = function () {
       edc: edc
     };
   };
-  Canvas.prototype.cellTextRender = function (textInfo, ctx, option, checkCF) {
-    console.log("textInfo===hahahahha", textInfo, checkCF);
+  Canvas.prototype.cellTextRender = function (textInfo, ctx, option) {
     if (!textInfo) {
       return;
     }
@@ -1489,7 +1455,6 @@ var Canvas = exports.Canvas = function () {
       var txt = _lodash.default.isPlainObject(word.content) ? word.content.m : word.content;
       ctx.fillText(txt, (pos_x + word.left) / this.sheetCtx.zoomRatio, (pos_y + word.top) / this.sheetCtx.zoomRatio);
       if (word.cancelLine) {
-        console.log("word.cancelLine", word.cancelLine, word);
         var c = word.cancelLine;
         ctx.beginPath();
         ctx.moveTo(Math.floor((pos_x + c.startX) / this.sheetCtx.zoomRatio) + 0.5, Math.floor((pos_y + c.startY) / this.sheetCtx.zoomRatio) + 0.5);

package/lib/context.js

@@ -175,12 +175,6 @@ function defaultContext(refs) {
         check: true,
         color: "#000000"
       },
-      font: {
-        bold: false,
-        italic: false,
-        underline: false,
-        strikethrough: false
-      },
       betweenValue: {
         value1: "",
         value2: ""

package/lib/events/paste.js

@@ -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;
         }
@@ -799,7 +841,7 @@ function pasteHandlerOfCutPaste(ctx, copyRange) {
   }
 }
 function pasteHandlerOfCopyPaste(ctx, copyRange) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (!allowEdit || ctx.isFlvReadOnly) return;
   if (!copyRange) return;
@@ -1098,21 +1140,64 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
   file.luckysheet_conditionformat_save = cdformat;
   file.dataVerification = __assign(__assign({}, file.dataVerification), dataVerification);
   if (((_l = ctx.luckysheet_select_save) === null || _l === void 0 ? void 0 : _l.length) === 1 && ((_m = ctx.luckysheet_copy_save) === null || _m === void 0 ? void 0 : _m.copyRange.length) === 1) {
-    _lodash.default.forEach((_o = ctx.luckysheet_copy_save) === null || _o === void 0 ? void 0 : _o.copyRange, function (range) {
-      var _a, _b, _c;
-      var srcIndex = (0, _utils.getSheetIndex)(ctx, (_a = ctx.luckysheet_copy_save) === null || _a === void 0 ? void 0 : _a.dataSheetId);
-      for (var r = 0; r <= range.row[1] - range.row[0]; r += 1) {
-        for (var c = 0; c <= range.column[1] - range.column[0]; c += 1) {
-          var srcRow = r + range.row[0];
-          var srcCol = c + range.column[0];
-          var srcLink = (_b = ctx.luckysheetfile[srcIndex].hyperlink) === null || _b === void 0 ? void 0 : _b["".concat(srcRow, "_").concat(srcCol)];
-          if (!srcLink) continue;
-          var targetR = r + ctx.luckysheet_select_save[0].row[0];
-          var targetC = c + ctx.luckysheet_select_save[0].column[0];
-          setCellHyperlink(ctx, (_c = ctx.luckysheet_copy_save) === null || _c === void 0 ? void 0 : _c.dataSheetId, targetR, targetC, srcLink);
+    var srcIndex = (0, _utils.getSheetIndex)(ctx, (_o = ctx.luckysheet_copy_save) === null || _o === void 0 ? void 0 : _o.dataSheetId);
+    var targetSheetIndex = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
+    var srcHyperlinks = ctx.luckysheetfile[srcIndex].hyperlink;
+    var srcData = ctx.luckysheetfile[srcIndex].data;
+    if (!ctx.luckysheetfile[targetSheetIndex].hyperlink) {
+      ctx.luckysheetfile[targetSheetIndex].hyperlink = {};
+    }
+    var targetHyperlinks = ctx.luckysheetfile[targetSheetIndex].hyperlink;
+    var isSingleCell = copyh === 1 && copyc === 1;
+    var cachedSrcLinkKey = isSingleCell ? "".concat(c_r1, "_").concat(c_c1) : null;
+    var cachedSrcLink = isSingleCell && srcHyperlinks ? srcHyperlinks[cachedSrcLinkKey] : null;
+    var cachedSrcCell = isSingleCell && srcData ? (_p = srcData[c_r1]) === null || _p === void 0 ? void 0 : _p[c_c1] : null;
+    for (var th = 1; th <= timesH; th += 1) {
+      for (var tc = 1; tc <= timesC; tc += 1) {
+        var linkMth = minh + (th - 1) * copyh;
+        var linkMtc = minc + (tc - 1) * copyc;
+        var linkMaxRow = minh + th * copyh;
+        var linkMaxCol = minc + tc * copyc;
+        for (var h = linkMth; h < linkMaxRow; h += 1) {
+          for (var c = linkMtc; c < linkMaxCol; c += 1) {
+            var srcLink = void 0;
+            if (isSingleCell && cachedSrcLink) {
+              srcLink = cachedSrcLink;
+            } else {
+              var srcRow = c_r1 + (h - linkMth);
+              var srcCol = c_c1 + (c - linkMtc);
+              srcLink = srcHyperlinks === null || srcHyperlinks === void 0 ? void 0 : srcHyperlinks["".concat(srcRow, "_").concat(srcCol)];
+            }
+            if (!srcLink) continue;
+            var targetKey = "".concat(h, "_").concat(c);
+            targetHyperlinks[targetKey] = srcLink;
+            var cell = (_q = d[h]) === null || _q === void 0 ? void 0 : _q[c];
+            if (cell) {
+              var srcCell = void 0;
+              if (isSingleCell && cachedSrcCell) {
+                srcCell = cachedSrcCell;
+              } else {
+                var srcRow = c_r1 + (h - linkMth);
+                var srcCol = c_c1 + (c - linkMtc);
+                srcCell = (_r = srcData === null || srcData === void 0 ? void 0 : srcData[srcRow]) === null || _r === void 0 ? void 0 : _r[srcCol];
+              }
+              cell.hl = {
+                r: h,
+                c: c,
+                id: ctx.currentSheetId
+              };
+              if (srcCell) {
+                if (srcCell.fc) cell.fc = srcCell.fc;
+                if (srcCell.un !== undefined) cell.un = srcCell.un;
+              } else {
+                cell.fc = cell.fc || "rgb(0, 0, 255)";
+                cell.un = cell.un !== undefined ? cell.un : 1;
+              }
+            }
+          }
         }
       }
-    });
+    }
   }
   if (copyRowlChange || addr > 0 || addc > 0) {
     (0, _refresh.jfrefreshgrid)(ctx, d, ctx.luckysheet_select_save);
@@ -1149,11 +1234,17 @@ function parseAsLinkIfUrl(txtdata, ctx) {
   var _a, _b, _c, _d, _e, _f, _g;
   var urlRegex = /^(https?:\/\/[^\s]+)/;
   if (urlRegex.test(txtdata)) {
-    var last = (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1];
-    if (last) {
-      var rowIndex = (_d = (_b = last.row_focus) !== null && _b !== void 0 ? _b : (_c = last.row) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : 0;
-      var colIndex = (_g = (_e = last.column_focus) !== null && _e !== void 0 ? _e : (_f = last.column) === null || _f === void 0 ? void 0 : _f[0]) !== null && _g !== void 0 ? _g : 0;
+    if (ctx.luckysheetCellUpdate.length === 2) {
+      var rowIndex = ctx.luckysheetCellUpdate[0];
+      var colIndex = ctx.luckysheetCellUpdate[1];
       (0, _modules.saveHyperlink)(ctx, rowIndex, colIndex, txtdata, "webpage", txtdata);
+    } else {
+      var last = (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1];
+      if (last) {
+        var rowIndex = (_d = (_b = last.row_focus) !== null && _b !== void 0 ? _b : (_c = last.row) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : 0;
+        var colIndex = (_g = (_e = last.column_focus) !== null && _e !== void 0 ? _e : (_f = last.column) === null || _f === void 0 ? void 0 : _f[0]) !== null && _g !== void 0 ? _g : 0;
+        (0, _modules.saveHyperlink)(ctx, rowIndex, colIndex, txtdata, "webpage", txtdata);
+      }
     }
   }
 }