@fileverse-dev/fortune-core 1.1.51 → 1.1.53-patch-1

package/lib/events/paste.js

@@ -7,8 +7,8 @@ exports.handlePaste = handlePaste;
 exports.handlePasteByClick = handlePasteByClick;
 exports.parseAsLinkIfUrl = parseAsLinkIfUrl;
 var _lodash = _interopRequireDefault(require("lodash"));
+var _pasteTableHelpers = require("../paste-table-helpers");
 var _context = require("../context");
-var _locale = require("../locale");
 var _formula = require("../modules/formula");
 var _cell = require("../modules/cell");
 var _format = require("../modules/format");
@@ -18,7 +18,6 @@ var _validation = require("../modules/validation");
 var _border = require("../modules/border");
 var _sheet = require("../modules/sheet");
 var _refresh = require("../modules/refresh");
-var _api = require("../api");
 var _modules = require("../modules");
 var _clipboard = _interopRequireDefault(require("../modules/clipboard"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -1019,9 +1018,75 @@ function parseAsLinkIfUrl(txtdata, ctx) {
     }
   }
 }
+function autoFitUsingGetCellTextInfo(ctx, sheetId, r1, r2, c1, c2, maxColWidth) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+  var _k, _l;
+  if (maxColWidth === void 0) {
+    maxColWidth = 1200;
+  }
+  var sheetIdx = (0, _utils.getSheetIndex)(ctx, sheetId);
+  if (sheetIdx == null) return;
+  var file = ctx.luckysheetfile[sheetIdx];
+  file.config || (file.config = {});
+  var rowlen = (_k = file.config).rowlen || (_k.rowlen = {});
+  var columnlen = (_l = file.config).columnlen || (_l.columnlen = {});
+  var defaultRowH = (_a = file.defaultRowHeight) !== null && _a !== void 0 ? _a : 19;
+  var defaultColW = (_b = ctx.defaultcollen) !== null && _b !== void 0 ? _b : 73;
+  var d = (0, _context.getFlowdata)(ctx) || file.data;
+  var measureCtx = ctx.__offscreenMeasureCtx || document.createElement("canvas").getContext("2d");
+  ctx.__offscreenMeasureCtx = measureCtx;
+  var H_PAD = 8;
+  for (var c = c1; c <= c2; c++) {
+    var curW = (_c = columnlen[c]) !== null && _c !== void 0 ? _c : defaultColW;
+    var wantW = curW;
+    for (var r = r1; r <= r2; r++) {
+      var cell = (_d = d === null || d === void 0 ? void 0 : d[r]) === null || _d === void 0 ? void 0 : _d[c];
+      if ((cell === null || cell === void 0 ? void 0 : cell.mc) && cell.mc.rs == null) continue;
+      var tb = cell === null || cell === void 0 ? void 0 : cell.tb;
+      if (tb === 2 || tb === "2") continue;
+      var info = (0, _modules.getCellTextInfo)(cell, measureCtx, ctx, {
+        r: r,
+        c: c
+      }, ctx);
+      var w = (_e = info === null || info === void 0 ? void 0 : info.textWidthAll) !== null && _e !== void 0 ? _e : 0;
+      if (w + H_PAD > wantW) wantW = w + H_PAD;
+    }
+    if (wantW > curW) {
+      columnlen[c] = Math.min(Math.ceil(wantW), maxColWidth);
+    }
+  }
+  var V_PAD = 4;
+  for (var r = r1; r <= r2; r++) {
+    var curH = (_f = rowlen[r]) !== null && _f !== void 0 ? _f : defaultRowH;
+    var needH = curH;
+    for (var c = c1; c <= c2; c++) {
+      var cell = (_g = d === null || d === void 0 ? void 0 : d[r]) === null || _g === void 0 ? void 0 : _g[c];
+      if ((cell === null || cell === void 0 ? void 0 : cell.mc) && cell.mc.rs == null) continue;
+      var widthForCell = (_h = columnlen[c]) !== null && _h !== void 0 ? _h : defaultColW;
+      var info = (0, _modules.getCellTextInfo)(cell, measureCtx, ctx, {
+        r: r,
+        c: c,
+        cellWidth: widthForCell,
+        cellHeight: curH
+      }, ctx);
+      var h = (_j = info === null || info === void 0 ? void 0 : info.textHeightAll) !== null && _j !== void 0 ? _j : 0;
+      if (h + V_PAD > needH) needH = Math.ceil(h + V_PAD);
+    }
+    if (needH > curH) {
+      rowlen[r] = needH;
+    }
+  }
+  if (typeof window.jfrefreshgrid === "function") {
+    window.jfrefreshgrid(ctx, null, [{
+      row: [r1, r2],
+      column: [c1, c2]
+    }], true, undefined, "resize");
+  }
+}
 function handlePaste(ctx, e) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
+  console.log("handlePaste -> allowEdit", "jjjj");
   if (!allowEdit) return;
   if (_selection.selectionCache.isPasteAction) {
     ctx.luckysheetCellUpdate = [];
@@ -1105,7 +1170,6 @@ function handlePaste(ctx, e) {
         }
       }
     }
-    var locale_fontjson_1 = (0, _locale.locale)(ctx).fontjson;
     if (((_o = (_m = ctx.hooks).beforePaste) === null || _o === void 0 ? void 0 : _o.call(_m, ctx.luckysheet_select_save, txtdata)) === false) {
       return;
     }
@@ -1117,256 +1181,35 @@ function handlePaste(ctx, e) {
       } else {
         pasteHandlerOfCopyPaste(ctx, ctx.luckysheet_copy_save);
       }
+      var last = (_q = ctx.luckysheet_select_save) === null || _q === void 0 ? void 0 : _q[ctx.luckysheet_select_save.length - 1];
+      if (last) {
+        autoFitUsingGetCellTextInfo(ctx, ctx.currentSheetId, last.row[0], last.row[1], last.column[0], last.column[1]);
+      }
     } else if (txtdata.indexOf("fortune-copy-action-image") > -1) {} else {
       if (txtdata.indexOf("table") > -1) {
-        var ele = document.createElement("div");
-        ele.innerHTML = txtdata;
-        var trList = ele.querySelectorAll("table tr");
-        if (trList.length === 0) {
-          ele.remove();
-          return;
-        }
-        var data_1 = new Array(trList.length);
-        var colLen_1 = 0;
-        _lodash.default.forEach(trList[0].querySelectorAll("td, th"), function (td) {
-          var colspan = td.colSpan;
-          if (Number.isNaN(colspan)) {
-            colspan = 1;
-          }
-          colLen_1 += colspan;
-        });
-        for (var i = 0; i < data_1.length; i += 1) {
-          data_1[i] = new Array(colLen_1);
-        }
-        var r_1 = 0;
-        var borderInfo_1 = {};
-        var styleInner = ((_q = ele.querySelectorAll("style")[0]) === null || _q === void 0 ? void 0 : _q.innerHTML) || "";
-        var patternReg = /{([^}]*)}/g;
-        var patternStyle = styleInner.match(patternReg);
-        var nameReg = /^[^\t].*/gm;
-        var patternName = _lodash.default.initial(styleInner.match(nameReg));
-        var allStyleList_1 = patternName.length === (patternStyle === null || patternStyle === void 0 ? void 0 : patternStyle.length) && _typeof(patternName) === _typeof(patternStyle) ? _lodash.default.fromPairs(_lodash.default.zip(patternName, patternStyle)) : {};
-        var index_1 = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
-        if (!_lodash.default.isNil(index_1)) {
-          if (_lodash.default.isNil(ctx.luckysheetfile[index_1].config)) {
-            ctx.luckysheetfile[index_1].config = {};
-          }
-          if (_lodash.default.isNil(ctx.luckysheetfile[index_1].config.rowlen)) {
-            ctx.luckysheetfile[index_1].config.rowlen = {};
-          }
-          var rowHeightList_1 = ctx.luckysheetfile[index_1].config.rowlen;
-          _lodash.default.forEach(trList, function (tr) {
-            var c = 0;
-            var targetR = ctx.luckysheet_select_save[0].row[0] + r_1;
-            var targetRowHeight = !_lodash.default.isNil(tr.getAttribute("height")) ? parseInt(tr.getAttribute("height"), 10) : null;
-            if (_lodash.default.has(ctx.luckysheetfile[index_1].config.rowlen, targetR) && ctx.luckysheetfile[index_1].config.rowlen[targetR] !== targetRowHeight || !_lodash.default.has(ctx.luckysheetfile[index_1].config.rowlen, targetR) && ctx.luckysheetfile[index_1].defaultRowHeight !== targetRowHeight) {
-              rowHeightList_1[targetR] = targetRowHeight;
-            }
-            _lodash.default.forEach(tr.querySelectorAll("td, th"), function (element) {
-              var td = element;
-              var className = td.className;
-              var cell = {};
-              var txt = td.innerText || td.innerHTML;
-              if (_lodash.default.trim(txt).length === 0) {
-                cell.v = undefined;
-                cell.m = "";
-              } else {
-                var mask = (0, _format.genarate)(txt);
-                cell.m = mask[0], cell.ct = mask[1], cell.v = mask[2];
-                if (/^0x?[a-fA-F0-9]+$/.test(txt)) {
-                  cell.ct = {
-                    fa: "@",
-                    t: "s"
-                  };
-                  cell.m = txt;
-                  cell.v = txt;
-                }
-              }
-              var styleString = typeof allStyleList_1[".".concat(className)] === "string" ? allStyleList_1[".".concat(className)].substring(1, allStyleList_1[".".concat(className)].length - 1).split("\n\t") : [];
-              var styles = {};
-              _lodash.default.forEach(styleString, function (s) {
-                var styleList = s.split(":");
-                styles[styleList[0]] = styleList === null || styleList === void 0 ? void 0 : styleList[1].replace(";", "");
-              });
-              if (!_lodash.default.isNil(styles.border)) td.style.border = styles.border;
-              var bg = td.style.backgroundColor || styles.background;
-              if (bg === "rgba(0, 0, 0, 0)" || _lodash.default.isEmpty(bg)) {
-                bg = undefined;
-              }
-              cell.bg = bg;
-              var fontWight = td.style.fontWeight;
-              cell.bl = (fontWight.toString() === "400" || fontWight === "normal" || _lodash.default.isEmpty(fontWight)) && !_lodash.default.includes(styles["font-style"], "bold") && (!styles["font-weight"] || styles["font-weight"] === "400") ? 0 : 1;
-              cell.it = (td.style.fontStyle === "normal" || _lodash.default.isEmpty(td.style.fontStyle)) && !_lodash.default.includes(styles["font-style"], "italic") ? 0 : 1;
-              cell.un = !_lodash.default.includes(styles["text-decoration"], "underline") ? undefined : 1;
-              cell.cl = !_lodash.default.includes(td.innerHTML, "<s>") ? undefined : 1;
-              var ff = td.style.fontFamily || styles["font-family"] || "";
-              var ffs = ff.split(",");
-              for (var i = 0; i < ffs.length; i += 1) {
-                var fa = _lodash.default.trim(ffs[i].toLowerCase());
-                fa = locale_fontjson_1[fa];
-                if (_lodash.default.isNil(fa)) {
-                  cell.ff = 0;
-                } else {
-                  cell.ff = fa;
-                  break;
-                }
-              }
-              var fs = Math.round(styles["font-size"] ? parseInt(styles["font-size"].replace("pt", ""), 10) : parseInt(td.style.fontSize || "13", 10) * 72 / 96);
-              cell.fs = fs;
-              cell.fc = td.style.color || styles.color;
-              var ht = td.style.textAlign || styles["text-align"] || "left";
-              if (ht === "center") {
-                cell.ht = 0;
-              } else if (ht === "right") {
-                cell.ht = 2;
-              } else {
-                cell.ht = 1;
-              }
-              var regex = /vertical-align:\s*(.*?);/;
-              var vt = td.style.verticalAlign || styles["vertical-align"] || !_lodash.default.isNil(allStyleList_1.td) && allStyleList_1.td.match(regex).length > 0 && allStyleList_1.td.match(regex)[1] || "top";
-              if (vt === "middle") {
-                cell.vt = 0;
-              } else if (vt === "top" || vt === "text-top") {
-                cell.vt = 1;
-              } else {
-                cell.vt = 2;
-              }
-              if ("mso-rotate" in styles) {
-                var rt = styles["mso-rotate"];
-                cell.rt = parseFloat(rt);
-              }
-              while (c < colLen_1 && !_lodash.default.isNil(data_1[r_1][c])) {
-                c += 1;
-              }
-              if (c === colLen_1) {
-                return true;
-              }
-              if (_lodash.default.isNil(data_1[r_1][c])) {
-                data_1[r_1][c] = cell;
-                var rowspan = parseInt(td.getAttribute("rowspan"), 10);
-                var colspan = parseInt(td.getAttribute("colspan"), 10);
-                if (Number.isNaN(rowspan)) {
-                  rowspan = 1;
-                }
-                if (Number.isNaN(colspan)) {
-                  colspan = 1;
-                }
-                var r_ab = ctx.luckysheet_select_save[0].row[0] + r_1;
-                var c_ab = ctx.luckysheet_select_save[0].column[0] + c;
-                for (var rp = 0; rp < rowspan; rp += 1) {
-                  for (var cp = 0; cp < colspan; cp += 1) {
-                    if (rp === 0) {
-                      var bt = td.style.borderTop;
-                      if (!_lodash.default.isEmpty(bt) && bt.substring(0, 3).toLowerCase() !== "0px") {
-                        var width = td.style.borderTopWidth;
-                        var type = td.style.borderTopStyle;
-                        var color = td.style.borderTopColor;
-                        var borderconfig = (0, _cell.getQKBorder)(width, type, color);
-                        if (!borderInfo_1["".concat(r_1 + rp, "_").concat(c + cp)]) {
-                          borderInfo_1["".concat(r_1 + rp, "_").concat(c + cp)] = {};
-                        }
-                        borderInfo_1["".concat(r_1 + rp, "_").concat(c + cp)].t = {
-                          style: borderconfig[0],
-                          color: borderconfig[1]
-                        };
-                      }
-                    }
-                    if (rp === rowspan - 1) {
-                      var bb = td.style.borderBottom;
-                      if (!_lodash.default.isEmpty(bb) && bb.substring(0, 3).toLowerCase() !== "0px") {
-                        var width = td.style.borderBottomWidth;
-                        var type = td.style.borderBottomStyle;
-                        var color = td.style.borderBottomColor;
-                        var borderconfig = (0, _cell.getQKBorder)(width, type, color);
-                        if (!borderInfo_1["".concat(r_1 + rp, "_").concat(c + cp)]) {
-                          borderInfo_1["".concat(r_1 + rp, "_").concat(c + cp)] = {};
-                        }
-                        borderInfo_1["".concat(r_1 + rp, "_").concat(c + cp)].b = {
-                          style: borderconfig[0],
-                          color: borderconfig[1]
-                        };
-                      }
-                    }
-                    if (cp === 0) {
-                      var bl = td.style.borderLeft;
-                      if (!_lodash.default.isEmpty(bl) && bl.substring(0, 3).toLowerCase() !== "0px") {
-                        var width = td.style.borderLeftWidth;
-                        var type = td.style.borderLeftStyle;
-                        var color = td.style.borderLeftColor;
-                        var borderconfig = (0, _cell.getQKBorder)(width, type, color);
-                        if (!borderInfo_1["".concat(r_1 + rp, "_").concat(c + cp)]) {
-                          borderInfo_1["".concat(r_1 + rp, "_").concat(c + cp)] = {};
-                        }
-                        borderInfo_1["".concat(r_1 + rp, "_").concat(c + cp)].l = {
-                          style: borderconfig[0],
-                          color: borderconfig[1]
-                        };
-                      }
-                    }
-                    if (cp === colspan - 1) {
-                      var br = td.style.borderLeft;
-                      if (!_lodash.default.isEmpty(br) && br.substring(0, 3).toLowerCase() !== "0px") {
-                        var width = td.style.borderRightWidth;
-                        var type = td.style.borderRightStyle;
-                        var color = td.style.borderRightColor;
-                        var borderconfig = (0, _cell.getQKBorder)(width, type, color);
-                        if (!borderInfo_1["".concat(r_1 + rp, "_").concat(c + cp)]) {
-                          borderInfo_1["".concat(r_1 + rp, "_").concat(c + cp)] = {};
-                        }
-                        borderInfo_1["".concat(r_1 + rp, "_").concat(c + cp)].r = {
-                          style: borderconfig[0],
-                          color: borderconfig[1]
-                        };
-                      }
-                    }
-                    if (rp === 0 && cp === 0) {
-                      continue;
-                    }
-                    data_1[r_1 + rp][c + cp] = {
-                      mc: {
-                        r: r_ab,
-                        c: c_ab
-                      }
-                    };
-                  }
-                }
-                if (rowspan > 1 || colspan > 1) {
-                  var first = {
-                    rs: rowspan,
-                    cs: colspan,
-                    r: r_ab,
-                    c: c_ab
-                  };
-                  data_1[r_1][c].mc = first;
-                }
-              }
-              c += 1;
-              if (c === colLen_1) {
-                return true;
-              }
-              return true;
-            });
-            r_1 += 1;
-          });
-          (0, _api.setRowHeight)(ctx, rowHeightList_1);
-        }
-        ctx.luckysheet_selection_range = [];
-        pasteHandler(ctx, data_1, borderInfo_1);
-        ele.remove();
+        (0, _pasteTableHelpers.pasteHtmlTableAndAutoFit)(ctx, txtdata, pasteHandler);
       } else if (clipboardData.files.length === 1 && clipboardData.files[0].type.indexOf("image") > -1) {} else {
         txtdata = clipboardData.getData("text/plain");
         var isExcelFormula = txtdata.startsWith("=");
         if (isExcelFormula) {
           handleFormulaStringPaste(ctx, txtdata);
+          var last = (_r = ctx.luckysheet_select_save) === null || _r === void 0 ? void 0 : _r[ctx.luckysheet_select_save.length - 1];
+          if (last) {
+            autoFitUsingGetCellTextInfo(ctx, ctx.currentSheetId, last.row[0], last.row[1], last.column[0], last.column[1]);
+          }
         } else {
           pasteHandler(ctx, txtdata);
+          var last = (_s = ctx.luckysheet_select_save) === null || _s === void 0 ? void 0 : _s[ctx.luckysheet_select_save.length - 1];
+          if (last) {
+            autoFitUsingGetCellTextInfo(ctx, ctx.currentSheetId, last.row[0], last.row[1], last.column[0], last.column[1]);
+          }
           var _txtdata = clipboardData.getData("text/html") || clipboardData.getData("text/plain");
           var embedUrl = (0, _modules.sanitizeDuneUrl)(_txtdata);
           if (embedUrl) {
-            var last = (_r = ctx.luckysheet_select_save) === null || _r === void 0 ? void 0 : _r[ctx.luckysheet_select_save.length - 1];
-            if (last) {
-              var rowIndex = (_u = (_s = last.row_focus) !== null && _s !== void 0 ? _s : (_t = last.row) === null || _t === void 0 ? void 0 : _t[0]) !== null && _u !== void 0 ? _u : 0;
-              var colIndex = (_x = (_v = last.column_focus) !== null && _v !== void 0 ? _v : (_w = last.column) === null || _w === void 0 ? void 0 : _w[0]) !== null && _x !== void 0 ? _x : 0;
+            var _last = (_t = ctx.luckysheet_select_save) === null || _t === void 0 ? void 0 : _t[ctx.luckysheet_select_save.length - 1];
+            if (_last) {
+              var rowIndex = (_w = (_u = _last.row_focus) !== null && _u !== void 0 ? _u : (_v = _last.row) === null || _v === void 0 ? void 0 : _v[0]) !== null && _w !== void 0 ? _w : 0;
+              var colIndex = (_z = (_x = _last.column_focus) !== null && _x !== void 0 ? _x : (_y = _last.column) === null || _y === void 0 ? void 0 : _y[0]) !== null && _z !== void 0 ? _z : 0;
               var left = colIndex === 0 ? 0 : ctx.visibledatacolumn[colIndex - 1];
               var top_1 = rowIndex === 0 ? 0 : ctx.visibledatarow[rowIndex + 5];
               ctx.showDunePreview = {

package/lib/modules/formula.js

@@ -38,6 +38,7 @@ var _locale = require("../locale");
 var _color = require("./color");
 var _location = require("./location");
 var _2 = require(".");
+var _index = require("../utils/index");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var __assign = void 0 && (void 0).__assign || function () {
@@ -1276,7 +1277,9 @@ function setCaretPosition(ctx, textDom, children, pos) {
     el.focus();
   } catch (err) {
     console.error(err);
-    moveCursorToEnd(textDom);
+    setTimeout(function () {
+      moveCursorToEnd(textDom);
+    }, 10);
   }
 }
 function functionRange(ctx, obj, v, vp) {
@@ -1978,6 +1981,14 @@ function functionStrChange(txt, type, rc, orient, stindex, step) {
 }
 function rangeSetValue(ctx, cellInput, selected, fxInput) {
   var _a, _b, _c, _d, _e;
+  var parser = new DOMParser();
+  var doc = parser.parseFromString("<div>".concat(cellInput.innerHTML, "</div>"), "text/html");
+  var spans = doc.querySelectorAll("span");
+  var lastSpan = spans[spans.length - 1];
+  if (lastSpan && (0, _index.isLetterNumberPattern)(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText)) {
+    var htmlR = (0, _index.removeLastSpan)(cellInput.innerHTML);
+    cellInput.innerHTML = "".concat(htmlR);
+  }
   var $editor = cellInput;
   var $copyTo = fxInput;
   if (((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.id) === "luckysheet-functionbox-cell") {

package/lib/paste-table-helpers.d.ts

@@ -0,0 +1,2 @@
+import { Context } from "./context";
+export declare function pasteHtmlTableAndAutoFit(ctx: Context, html: string, pasteHandler: (context: Context, data: any, borderInfo?: any) => void): void;