@fileverse-dev/fortune-core 1.2.27 → 1.2.29

package/es/modules/text.js

@@ -308,15 +308,19 @@ export function getCellTextInfo(cell, renderCtx, sheetCtx, option, ctx) {
           });
           similarIndex += 1;
         } else {
-          inlineStringArr.push({
-            fontset: scfontset,
-            fc: !fc ? "#000" : fc,
-            cl: !cl ? 0 : cl,
-            un: !un ? 0 : un,
-            v: newValue,
-            si: similarIndex,
-            fs: !fs ? 11 : fs
-          });
+          var newValueArray = newValue.split("");
+          for (var n = 0; n < newValueArray.length; n += 1) {
+            var nv = newValueArray[n];
+            inlineStringArr.push({
+              fontset: scfontset,
+              fc: !fc ? "#000" : fc,
+              cl: !cl ? 0 : cl,
+              un: !un ? 0 : un,
+              v: nv,
+              si: similarIndex,
+              fs: !fs ? 11 : fs
+            });
+          }
           if (x !== splitArr.length - 1) {
             inlineStringArr.push({
               fontset: scfontset,

package/es/modules/toolbar.js

@@ -1,7 +1,7 @@
 import _ from "lodash";
 import { mergeCells } from "./merge";
 import { getFlowdata } from "../context";
-import { getSheetIndex, isAllowEdit } from "../utils";
+import { getSheetIndex, isAllowEdit, getLineCount } from "../utils";
 import { getRangetxt, isAllSelectedCellsInStatus, normalizedAttr, setCellValue } from "./cell";
 import { colors } from "./color";
 import { genarate, is_date, update } from "./format";
@@ -15,8 +15,8 @@ import { showLinkCard } from "./hyperlink";
 import { cfSplitRange } from "./conditionalFormat";
 import { clearMeasureTextCache, getCellTextInfo } from "./text";
 export function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_st, col_ed, canvas) {
-  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 _0;
+  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, _0, _1, _2, _3, _4, _5, _6;
+  var _7;
   if (_.isNil(d) || _.isNil(attr)) {
     return;
   }
@@ -122,23 +122,51 @@ export function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_
       if (!_.isNil(ctx.config.rowhidden) && !_.isNil(ctx.config.rowhidden[r])) {
         continue;
       }
-      for (var c = col_st; c <= col_ed; c += 1) {
+      var _loop_1 = function _loop_1(c) {
         var value = d[r][c];
         if (value && _.isPlainObject(value)) {
           updateInlineStringFormatOutside(value, attr, foucsStatus);
           value[attr] = foucsStatus;
-          (_0 = ctx.luckysheetfile[sheetIndex]).config || (_0.config = {});
+          (_7 = ctx.luckysheetfile[sheetIndex]).config || (_7.config = {});
           var cfg = ctx.luckysheetfile[sheetIndex].config;
           var cellWidth = ((_x = cfg.columnlen) === null || _x === void 0 ? void 0 : _x[c]) || ctx.luckysheetfile[sheetIndex].defaultColWidth;
+          if (attr === "tb" && canvas && foucsStatus === "2") {
+            var currentColWidth_1 = ((_y = cfg.columnlen) === null || _y === void 0 ? void 0 : _y[c]) || ctx.luckysheetfile[sheetIndex].defaultColWidth || 100;
+            var lineCount_1 = 1;
+            var fontString_1 = '10px Arial';
+            if (value.fs) {
+              fontString_1 = value.fs * 1.5 + "px Arial";
+            }
+            if (value === null || value === void 0 ? void 0 : value.bl) {
+              lineCount_1 = lineCount_1 + 1;
+            }
+            if (value.m) {
+              lineCount_1 = getLineCount(value.m, currentColWidth_1, fontString_1);
+              var hOffset = lineCount_1 < 4 ? 2 : 1.8;
+              lineCount_1 = lineCount_1 * hOffset + 1;
+            } else if ((_1 = (_0 = (_z = value === null || value === void 0 ? void 0 : value.ct) === null || _z === void 0 ? void 0 : _z.s) === null || _0 === void 0 ? void 0 : _0[0]) === null || _1 === void 0 ? void 0 : _1.v) {
+              lineCount_1 = lineCount_1 - 1;
+              var line = (_4 = (_3 = (_2 = value === null || value === void 0 ? void 0 : value.ct) === null || _2 === void 0 ? void 0 : _2.s) === null || _3 === void 0 ? void 0 : _3[0]) === null || _4 === void 0 ? void 0 : _4.v.split("\n");
+              line.forEach(function (item) {
+                var subLineCount = getLineCount(item, currentColWidth_1, fontString_1);
+                lineCount_1 = lineCount_1 + subLineCount;
+              });
+              var hOffset = lineCount_1 < 4 ? 2.2 : 1.9;
+              lineCount_1 = lineCount_1 * 1.9;
+            }
+            var fontSize = (value === null || value === void 0 ? void 0 : value.fs) || 10;
+            var rowHeight = fontSize * lineCount_1;
+            _.set(cfg, "rowlen.".concat(r), rowHeight);
+          }
           if (attr === "fs" && canvas) {
             var textInfo = getCellTextInfo(d[r][c], canvas, ctx, {
               r: r,
               c: c,
               cellWidth: cellWidth
             });
-            if (!textInfo) continue;
+            if (!textInfo) return "continue";
             var rowHeight = _.round(textInfo.textHeightAll);
-            var currentRowHeight = ((_y = cfg.rowlen) === null || _y === void 0 ? void 0 : _y[r]) || ctx.luckysheetfile[sheetIndex].defaultRowHeight || 19;
+            var currentRowHeight = ((_5 = cfg.rowlen) === null || _5 === void 0 ? void 0 : _5[r]) || ctx.luckysheetfile[sheetIndex].defaultRowHeight || 19;
             if (!_.isUndefined(rowHeight) && rowHeight > currentRowHeight && (!cfg.customHeight || cfg.customHeight[r] !== 1)) {
               if (_.isUndefined(cfg.rowlen)) cfg.rowlen = {};
               _.set(cfg, "rowlen.".concat(r), rowHeight);
@@ -151,9 +179,9 @@ export function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_
               c: c,
               cellWidth: cellWidth || 104
             });
-            if (!textInfo) continue;
+            if (!textInfo) return "continue";
             var newHeight = _.round(textInfo.textHeightAll);
-            var oldHeight = ((_z = cfg.rowlen) === null || _z === void 0 ? void 0 : _z[r]) || ctx.luckysheetfile[sheetIndex].defaultRowHeight || 19;
+            var oldHeight = ((_6 = cfg.rowlen) === null || _6 === void 0 ? void 0 : _6[r]) || ctx.luckysheetfile[sheetIndex].defaultRowHeight || 19;
             var shouldResize = foucsStatus === "2" ? newHeight > oldHeight : true;
             if (shouldResize && (!cfg.customHeight || cfg.customHeight[r] !== 1)) {
               var padding = 12;
@@ -168,6 +196,9 @@ export function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_
           };
           d[r][c][attr] = foucsStatus;
         }
+      };
+      for (var c = col_st; c <= col_ed; c += 1) {
+        _loop_1(c);
       }
     }
   }

package/es/utils/index.d.ts

@@ -23,3 +23,4 @@ export declare function getContentInParentheses(str: string | null): string | nu
 export declare function processArray(cellReferences: any, d: any, flowData: any): undefined;
 export declare function getNumberFormat(strValue: any, commaPresent: boolean): string;
 export declare function checkIsCol(str: string): boolean | null;
+export declare function getLineCount(sentence: string, maxWidthPx: number, font?: string): number;

package/es/utils/index.js

@@ -331,4 +331,29 @@ export function checkIsCol(str) {
   if (col1 === col2 && row1 !== row2) return false;
   if (row1 === row2 && col1 !== col2) return true;
   return null;
+}
+export function getLineCount(sentence, maxWidthPx, font) {
+  if (font === void 0) {
+    font = '12px Arial';
+  }
+  var canvas = document.createElement('canvas');
+  var context = canvas.getContext('2d');
+  if (context) {
+    context.font = font;
+  }
+  var words = sentence.split(' ');
+  var currentLine = '';
+  var lineCount = 0;
+  words.forEach(function (word) {
+    var testLine = currentLine ? currentLine + ' ' + word : word;
+    var testWidth = context === null || context === void 0 ? void 0 : context.measureText(testLine).width;
+    if (testWidth && testWidth > maxWidthPx && currentLine) {
+      lineCount++;
+      currentLine = word;
+    } else {
+      currentLine = testLine;
+    }
+  });
+  if (currentLine) lineCount++;
+  return lineCount;
 }

package/lib/modules/text.js

@@ -322,15 +322,19 @@ function getCellTextInfo(cell, renderCtx, sheetCtx, option, ctx) {
           });
           similarIndex += 1;
         } else {
-          inlineStringArr.push({
-            fontset: scfontset,
-            fc: !fc ? "#000" : fc,
-            cl: !cl ? 0 : cl,
-            un: !un ? 0 : un,
-            v: newValue,
-            si: similarIndex,
-            fs: !fs ? 11 : fs
-          });
+          var newValueArray = newValue.split("");
+          for (var n = 0; n < newValueArray.length; n += 1) {
+            var nv = newValueArray[n];
+            inlineStringArr.push({
+              fontset: scfontset,
+              fc: !fc ? "#000" : fc,
+              cl: !cl ? 0 : cl,
+              un: !un ? 0 : un,
+              v: nv,
+              si: similarIndex,
+              fs: !fs ? 11 : fs
+            });
+          }
           if (x !== splitArr.length - 1) {
             inlineStringArr.push({
               fontset: scfontset,

package/lib/modules/toolbar.js

@@ -48,8 +48,8 @@ var _conditionalFormat = require("./conditionalFormat");
 var _text = require("./text");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_st, col_ed, canvas) {
-  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 _0;
+  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, _0, _1, _2, _3, _4, _5, _6;
+  var _7;
   if (_lodash.default.isNil(d) || _lodash.default.isNil(attr)) {
     return;
   }
@@ -155,23 +155,51 @@ function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_st, col
       if (!_lodash.default.isNil(ctx.config.rowhidden) && !_lodash.default.isNil(ctx.config.rowhidden[r])) {
         continue;
       }
-      for (var c = col_st; c <= col_ed; c += 1) {
+      var _loop_1 = function _loop_1(c) {
         var value = d[r][c];
         if (value && _lodash.default.isPlainObject(value)) {
           (0, _inlineString.updateInlineStringFormatOutside)(value, attr, foucsStatus);
           value[attr] = foucsStatus;
-          (_0 = ctx.luckysheetfile[sheetIndex]).config || (_0.config = {});
+          (_7 = ctx.luckysheetfile[sheetIndex]).config || (_7.config = {});
           var cfg = ctx.luckysheetfile[sheetIndex].config;
           var cellWidth = ((_x = cfg.columnlen) === null || _x === void 0 ? void 0 : _x[c]) || ctx.luckysheetfile[sheetIndex].defaultColWidth;
+          if (attr === "tb" && canvas && foucsStatus === "2") {
+            var currentColWidth_1 = ((_y = cfg.columnlen) === null || _y === void 0 ? void 0 : _y[c]) || ctx.luckysheetfile[sheetIndex].defaultColWidth || 100;
+            var lineCount_1 = 1;
+            var fontString_1 = '10px Arial';
+            if (value.fs) {
+              fontString_1 = value.fs * 1.5 + "px Arial";
+            }
+            if (value === null || value === void 0 ? void 0 : value.bl) {
+              lineCount_1 = lineCount_1 + 1;
+            }
+            if (value.m) {
+              lineCount_1 = (0, _utils.getLineCount)(value.m, currentColWidth_1, fontString_1);
+              var hOffset = lineCount_1 < 4 ? 2 : 1.8;
+              lineCount_1 = lineCount_1 * hOffset + 1;
+            } else if ((_1 = (_0 = (_z = value === null || value === void 0 ? void 0 : value.ct) === null || _z === void 0 ? void 0 : _z.s) === null || _0 === void 0 ? void 0 : _0[0]) === null || _1 === void 0 ? void 0 : _1.v) {
+              lineCount_1 = lineCount_1 - 1;
+              var line = (_4 = (_3 = (_2 = value === null || value === void 0 ? void 0 : value.ct) === null || _2 === void 0 ? void 0 : _2.s) === null || _3 === void 0 ? void 0 : _3[0]) === null || _4 === void 0 ? void 0 : _4.v.split("\n");
+              line.forEach(function (item) {
+                var subLineCount = (0, _utils.getLineCount)(item, currentColWidth_1, fontString_1);
+                lineCount_1 = lineCount_1 + subLineCount;
+              });
+              var hOffset = lineCount_1 < 4 ? 2.2 : 1.9;
+              lineCount_1 = lineCount_1 * 1.9;
+            }
+            var fontSize = (value === null || value === void 0 ? void 0 : value.fs) || 10;
+            var rowHeight = fontSize * lineCount_1;
+            _lodash.default.set(cfg, "rowlen.".concat(r), rowHeight);
+          }
           if (attr === "fs" && canvas) {
             var textInfo = (0, _text.getCellTextInfo)(d[r][c], canvas, ctx, {
               r: r,
               c: c,
               cellWidth: cellWidth
             });
-            if (!textInfo) continue;
+            if (!textInfo) return "continue";
             var rowHeight = _lodash.default.round(textInfo.textHeightAll);
-            var currentRowHeight = ((_y = cfg.rowlen) === null || _y === void 0 ? void 0 : _y[r]) || ctx.luckysheetfile[sheetIndex].defaultRowHeight || 19;
+            var currentRowHeight = ((_5 = cfg.rowlen) === null || _5 === void 0 ? void 0 : _5[r]) || ctx.luckysheetfile[sheetIndex].defaultRowHeight || 19;
             if (!_lodash.default.isUndefined(rowHeight) && rowHeight > currentRowHeight && (!cfg.customHeight || cfg.customHeight[r] !== 1)) {
               if (_lodash.default.isUndefined(cfg.rowlen)) cfg.rowlen = {};
               _lodash.default.set(cfg, "rowlen.".concat(r), rowHeight);
@@ -184,9 +212,9 @@ function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_st, col
               c: c,
               cellWidth: cellWidth || 104
             });
-            if (!textInfo) continue;
+            if (!textInfo) return "continue";
             var newHeight = _lodash.default.round(textInfo.textHeightAll);
-            var oldHeight = ((_z = cfg.rowlen) === null || _z === void 0 ? void 0 : _z[r]) || ctx.luckysheetfile[sheetIndex].defaultRowHeight || 19;
+            var oldHeight = ((_6 = cfg.rowlen) === null || _6 === void 0 ? void 0 : _6[r]) || ctx.luckysheetfile[sheetIndex].defaultRowHeight || 19;
             var shouldResize = foucsStatus === "2" ? newHeight > oldHeight : true;
             if (shouldResize && (!cfg.customHeight || cfg.customHeight[r] !== 1)) {
               var padding = 12;
@@ -201,6 +229,9 @@ function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_st, col
           };
           d[r][c][attr] = foucsStatus;
         }
+      };
+      for (var c = col_st; c <= col_ed; c += 1) {
+        _loop_1(c);
       }
     }
   }

package/lib/utils/index.d.ts

@@ -23,3 +23,4 @@ export declare function getContentInParentheses(str: string | null): string | nu
 export declare function processArray(cellReferences: any, d: any, flowData: any): undefined;
 export declare function getNumberFormat(strValue: any, commaPresent: boolean): string;
 export declare function checkIsCol(str: string): boolean | null;
+export declare function getLineCount(sentence: string, maxWidthPx: number, font?: string): number;

package/lib/utils/index.js

@@ -24,7 +24,8 @@ var _exportNames = {
   getContentInParentheses: true,
   processArray: true,
   getNumberFormat: true,
-  checkIsCol: true
+  checkIsCol: true,
+  getLineCount: true
 };
 exports.chatatABC = chatatABC;
 exports.checkIsCol = checkIsCol;
@@ -33,6 +34,7 @@ exports.escapeHTMLTag = escapeHTMLTag;
 exports.escapeScriptTag = escapeScriptTag;
 exports.generateRandomSheetName = generateRandomSheetName;
 exports.getContentInParentheses = getContentInParentheses;
+exports.getLineCount = getLineCount;
 exports.getNowDateTime = getNowDateTime;
 exports.getNumberFormat = getNumberFormat;
 exports.getRegExpStr = getRegExpStr;
@@ -403,4 +405,29 @@ function checkIsCol(str) {
   if (col1 === col2 && row1 !== row2) return false;
   if (row1 === row2 && col1 !== col2) return true;
   return null;
+}
+function getLineCount(sentence, maxWidthPx, font) {
+  if (font === void 0) {
+    font = '12px Arial';
+  }
+  var canvas = document.createElement('canvas');
+  var context = canvas.getContext('2d');
+  if (context) {
+    context.font = font;
+  }
+  var words = sentence.split(' ');
+  var currentLine = '';
+  var lineCount = 0;
+  words.forEach(function (word) {
+    var testLine = currentLine ? currentLine + ' ' + word : word;
+    var testWidth = context === null || context === void 0 ? void 0 : context.measureText(testLine).width;
+    if (testWidth && testWidth > maxWidthPx && currentLine) {
+      lineCount++;
+      currentLine = word;
+    } else {
+      currentLine = testLine;
+    }
+  });
+  if (currentLine) lineCount++;
+  return lineCount;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.2.27",
+  "version": "1.2.29",
   "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.81",
+    "@fileverse-dev/formula-parser": "0.2.82",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",