@fileverse-dev/fortune-core 1.2.24 → 1.2.26

package/es/modules/toolbar.js

@@ -13,10 +13,10 @@ import { sortSelection } from "./sort";
 import { hasPartMC, isdatatypemulti, isRealNull, isRealNum } from "./validation";
 import { showLinkCard } from "./hyperlink";
 import { cfSplitRange } from "./conditionalFormat";
-import { getCellTextInfo } from "./text";
+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;
-  var _z;
+  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;
   if (_.isNil(d) || _.isNil(attr)) {
     return;
   }
@@ -127,7 +127,7 @@ export function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_
         if (value && _.isPlainObject(value)) {
           updateInlineStringFormatOutside(value, attr, foucsStatus);
           value[attr] = foucsStatus;
-          (_z = ctx.luckysheetfile[sheetIndex]).config || (_z.config = {});
+          (_0 = ctx.luckysheetfile[sheetIndex]).config || (_0.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 === "fs" && canvas) {
@@ -144,6 +144,24 @@ export function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_
               _.set(cfg, "rowlen.".concat(r), rowHeight);
             }
           }
+          if (attr === "tb" && canvas) {
+            clearMeasureTextCache();
+            var textInfo = getCellTextInfo(d[r][c], canvas, ctx, {
+              r: r,
+              c: c,
+              cellWidth: cellWidth || 104
+            });
+            if (!textInfo) 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 shouldResize = foucsStatus === "2" ? newHeight > oldHeight : true;
+            if (shouldResize && (!cfg.customHeight || cfg.customHeight[r] !== 1)) {
+              var padding = 12;
+              var height = newHeight + padding;
+              if (_.isUndefined(cfg.rowlen)) cfg.rowlen = {};
+              _.set(cfg, "rowlen.".concat(r), height);
+            }
+          }
         } else {
           d[r][c] = {
             v: value

package/es/settings.d.ts

@@ -57,6 +57,7 @@ export type Hooks = {
     beforeUpdateSheetName?: (id: string, oldName: string, newName: string) => boolean;
     afterUpdateSheetName?: (id: string, oldName: string, newName: string) => void;
 };
+type CommentUIDragFn = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
 export type Settings = {
     column?: number;
     row?: number;
@@ -80,7 +81,7 @@ export type Settings = {
     headerContextMenu?: string[];
     sheetTabContextMenu?: string[];
     filterContextMenu?: string[];
-    getCommentCellUI?: ((row: number, column: number) => React.ReactNode) | null;
+    getCommentCellUI?: ((row: number, column: number, dragHandler: CommentUIDragFn) => React.ReactNode) | null;
     generateSheetId?: () => string;
     hooks?: Hooks;
     customToolbarItems?: {
@@ -98,3 +99,4 @@ export type Settings = {
     isFlvReadOnly?: boolean;
 };
 export declare const defaultSettings: Required<Settings>;
+export {};

package/es/utils/index.js

@@ -169,7 +169,7 @@ export function isAllowEdit(ctx, range) {
       }
     }
     return true;
-  }) && (_.isUndefined(ctx.allowEdit) ? true : ctx.allowEdit);
+  }) && (_.isUndefined(ctx.allowEdit) ? true : ctx.allowEdit) && !ctx.isFlvReadOnly;
 }
 export function isAllowEditReadOnly(ctx, range) {
   var cfg = ctx.config;

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;
-  var _z;
+  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;
   if (_lodash.default.isNil(d) || _lodash.default.isNil(attr)) {
     return;
   }
@@ -160,7 +160,7 @@ function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_st, col
         if (value && _lodash.default.isPlainObject(value)) {
           (0, _inlineString.updateInlineStringFormatOutside)(value, attr, foucsStatus);
           value[attr] = foucsStatus;
-          (_z = ctx.luckysheetfile[sheetIndex]).config || (_z.config = {});
+          (_0 = ctx.luckysheetfile[sheetIndex]).config || (_0.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 === "fs" && canvas) {
@@ -177,6 +177,24 @@ function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_st, col
               _lodash.default.set(cfg, "rowlen.".concat(r), rowHeight);
             }
           }
+          if (attr === "tb" && canvas) {
+            (0, _text.clearMeasureTextCache)();
+            var textInfo = (0, _text.getCellTextInfo)(d[r][c], canvas, ctx, {
+              r: r,
+              c: c,
+              cellWidth: cellWidth || 104
+            });
+            if (!textInfo) 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 shouldResize = foucsStatus === "2" ? newHeight > oldHeight : true;
+            if (shouldResize && (!cfg.customHeight || cfg.customHeight[r] !== 1)) {
+              var padding = 12;
+              var height = newHeight + padding;
+              if (_lodash.default.isUndefined(cfg.rowlen)) cfg.rowlen = {};
+              _lodash.default.set(cfg, "rowlen.".concat(r), height);
+            }
+          }
         } else {
           d[r][c] = {
             v: value

package/lib/settings.d.ts

@@ -57,6 +57,7 @@ export type Hooks = {
     beforeUpdateSheetName?: (id: string, oldName: string, newName: string) => boolean;
     afterUpdateSheetName?: (id: string, oldName: string, newName: string) => void;
 };
+type CommentUIDragFn = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
 export type Settings = {
     column?: number;
     row?: number;
@@ -80,7 +81,7 @@ export type Settings = {
     headerContextMenu?: string[];
     sheetTabContextMenu?: string[];
     filterContextMenu?: string[];
-    getCommentCellUI?: ((row: number, column: number) => React.ReactNode) | null;
+    getCommentCellUI?: ((row: number, column: number, dragHandler: CommentUIDragFn) => React.ReactNode) | null;
     generateSheetId?: () => string;
     hooks?: Hooks;
     customToolbarItems?: {
@@ -98,3 +99,4 @@ export type Settings = {
     isFlvReadOnly?: boolean;
 };
 export declare const defaultSettings: Required<Settings>;
+export {};

package/lib/utils/index.js

@@ -241,7 +241,7 @@ function isAllowEdit(ctx, range) {
       }
     }
     return true;
-  }) && (_lodash.default.isUndefined(ctx.allowEdit) ? true : ctx.allowEdit);
+  }) && (_lodash.default.isUndefined(ctx.allowEdit) ? true : ctx.allowEdit) && !ctx.isFlvReadOnly;
 }
 function isAllowEditReadOnly(ctx, range) {
   var cfg = ctx.config;

package/package.json

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