@fileverse-dev/fortune-core 1.2.50 → 1.2.51-patch-2

package/es/events/mouse.js

@@ -1,6 +1,6 @@
 import _ from "lodash";
 import { getFlowdata } from "../context";
-import { cancelActiveImgItem, cancelPaintModel, functionHTMLGenerate, israngeseleciton, rangeHightlightselected, rangeSetValue, onCommentBoxMove, onCommentBoxMoveEnd, onCommentBoxResize, onCommentBoxResizeEnd, onImageMove, onImageMoveEnd, onImageResize, onImageResizeEnd, removeEditingComment, overShowComment, removeOverShowComment, rangeDrag, onFormulaRangeDragEnd, createFormulaRangeSelect, createRangeHightlight, onCellsMoveEnd, onCellsMove, cellFocus, editComment, onIframeMoveEnd, onIframeResizeEnd, overShowError } from "../modules";
+import { cancelActiveImgItem, cancelPaintModel, functionHTMLGenerate, israngeseleciton, rangeHightlightselected, rangeSetValue, onCommentBoxMove, onCommentBoxMoveEnd, onCommentBoxResize, onCommentBoxResizeEnd, onImageMove, onImageMoveEnd, onImageResize, onImageResizeEnd, removeEditingComment, removeOverShowComment, rangeDrag, onFormulaRangeDragEnd, createFormulaRangeSelect, createRangeHightlight, onCellsMoveEnd, onCellsMove, cellFocus, editComment, onIframeMoveEnd, onIframeResizeEnd, overShowError } from "../modules";
 import { getFrozenHandleLeft, getFrozenHandleTop, scrollToFrozenRowCol } from "../modules/freeze";
 import { cancelFunctionrangeSelected, mergeBorder, mergeMoveMain, updateCell, luckysheetUpdateCell } from "../modules/cell";
 import { colLocation, colLocationByIndex, rowLocation, rowLocationByIndex } from "../modules/location";
@@ -156,7 +156,6 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
     return;
   }
   cellFocus(ctx, row_index, col_index, true);
-  editComment(ctx, globalCache, row_index, col_index);
   if (!inHorizontalFreeze && !inVerticalFreeze) {
     if (col_pre < ctx.scrollLeft) {
       ctx.scrollLeft = col_pre;
@@ -900,12 +899,35 @@ function mouseRender(ctx, globalCache, e, cellInput, scrollX, scrollY, container
   }
 }
 export function handleOverlayMouseMove(ctx, globalCache, e, cellInput, scrollX, scrollY, container, fxInput) {
+  var _a;
   if (onCommentBoxResize(ctx, globalCache, e)) return;
   if (onCommentBoxMove(ctx, globalCache, e)) return;
   if (onImageMove(ctx, globalCache, e)) return;
   if (onImageResize(ctx, globalCache, e)) return;
   onCellsMove(ctx, globalCache, e, scrollX, scrollY, container);
-  overShowComment(ctx, e, scrollX, scrollY, container);
+  var containerMain = document.getElementsByClassName('fortune-cell-area')[0];
+  var rect = containerMain === null || containerMain === void 0 ? void 0 : containerMain.getBoundingClientRect();
+  if (!rect) {
+    rect = container.getBoundingClientRect();
+  }
+  var mouseX = e.pageX - rect.left - window.scrollX;
+  var mouseY = e.pageY - rect.top - window.scrollY;
+  var _x = mouseX + ctx.scrollLeft;
+  var _y = mouseY + ctx.scrollTop;
+  if (_x >= rect.width + ctx.scrollLeft || _y >= rect.height + ctx.scrollTop) {
+    return;
+  }
+  var freeze = (_a = globalCache.freezen) === null || _a === void 0 ? void 0 : _a[ctx.currentSheetId];
+  var _b = fixPositionOnFrozenCells(freeze, _x, _y, mouseX, mouseY),
+    x = _b.x,
+    y = _b.y,
+    inHorizontalFreeze = _b.inHorizontalFreeze,
+    inVerticalFreeze = _b.inVerticalFreeze;
+  var row_location = rowLocation(y, ctx.visibledatarow);
+  var row_index = row_location[2];
+  var col_location = colLocation(x, ctx.visibledatacolumn);
+  var col_index = col_location[2];
+  editComment(ctx, globalCache, row_index, col_index);
   overShowError(ctx, e, scrollX, scrollY, container);
   onSearchDialogMove(globalCache, e);
   onRangeSelectionModalMove(globalCache, e);

package/es/modules/cell.js

@@ -104,6 +104,7 @@ export function getCellValue(r, c, data, attr) {
 }
 export function setCellValue(ctx, r, c, d, v) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+  console.log("setCellValue", r, c, __assign({}, v), __assign({}, v.ct));
   if (ctx.allowEdit === false || ctx.isFlvReadOnly) return;
   if (_.isNil(d)) {
     d = getFlowdata(ctx);

package/es/modules/comment.js

@@ -230,12 +230,12 @@ export function newComment(ctx, globalCache, r, c) {
   }
 }
 export function editComment(ctx, globalCache, r, c) {
-  var _a;
+  var _a, _b;
   var allowEdit = isAllowEdit(ctx);
   if (!allowEdit) return;
   var flowdata = getFlowdata(ctx);
-  removeEditingComment(ctx, globalCache);
-  var comment = (_a = flowdata === null || flowdata === void 0 ? void 0 : flowdata[r][c]) === null || _a === void 0 ? void 0 : _a.ps;
+  var comment = (_b = (_a = flowdata === null || flowdata === void 0 ? void 0 : flowdata[r]) === null || _a === void 0 ? void 0 : _a[c]) === null || _b === void 0 ? void 0 : _b.ps;
+  if (!comment) return;
   var commentBoxes = _.concat(ctx.commentBoxes, ctx.editingCommentBox);
   if (_.findIndex(commentBoxes, function (v) {
     return (v === null || v === void 0 ? void 0 : v.rc) === "".concat(r, "_").concat(c);

package/lib/events/mouse.js

@@ -175,7 +175,6 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
     return;
   }
   (0, _modules.cellFocus)(ctx, row_index, col_index, true);
-  (0, _modules.editComment)(ctx, globalCache, row_index, col_index);
   if (!inHorizontalFreeze && !inVerticalFreeze) {
     if (col_pre < ctx.scrollLeft) {
       ctx.scrollLeft = col_pre;
@@ -919,12 +918,35 @@ function mouseRender(ctx, globalCache, e, cellInput, scrollX, scrollY, container
   }
 }
 function handleOverlayMouseMove(ctx, globalCache, e, cellInput, scrollX, scrollY, container, fxInput) {
+  var _a;
   if ((0, _modules.onCommentBoxResize)(ctx, globalCache, e)) return;
   if ((0, _modules.onCommentBoxMove)(ctx, globalCache, e)) return;
   if ((0, _modules.onImageMove)(ctx, globalCache, e)) return;
   if ((0, _modules.onImageResize)(ctx, globalCache, e)) return;
   (0, _modules.onCellsMove)(ctx, globalCache, e, scrollX, scrollY, container);
-  (0, _modules.overShowComment)(ctx, e, scrollX, scrollY, container);
+  var containerMain = document.getElementsByClassName('fortune-cell-area')[0];
+  var rect = containerMain === null || containerMain === void 0 ? void 0 : containerMain.getBoundingClientRect();
+  if (!rect) {
+    rect = container.getBoundingClientRect();
+  }
+  var mouseX = e.pageX - rect.left - window.scrollX;
+  var mouseY = e.pageY - rect.top - window.scrollY;
+  var _x = mouseX + ctx.scrollLeft;
+  var _y = mouseY + ctx.scrollTop;
+  if (_x >= rect.width + ctx.scrollLeft || _y >= rect.height + ctx.scrollTop) {
+    return;
+  }
+  var freeze = (_a = globalCache.freezen) === null || _a === void 0 ? void 0 : _a[ctx.currentSheetId];
+  var _b = fixPositionOnFrozenCells(freeze, _x, _y, mouseX, mouseY),
+    x = _b.x,
+    y = _b.y,
+    inHorizontalFreeze = _b.inHorizontalFreeze,
+    inVerticalFreeze = _b.inVerticalFreeze;
+  var row_location = (0, _location.rowLocation)(y, ctx.visibledatarow);
+  var row_index = row_location[2];
+  var col_location = (0, _location.colLocation)(x, ctx.visibledatacolumn);
+  var col_index = col_location[2];
+  (0, _modules.editComment)(ctx, globalCache, row_index, col_index);
   (0, _modules.overShowError)(ctx, e, scrollX, scrollY, container);
   (0, _searchReplace.onSearchDialogMove)(globalCache, e);
   (0, _hyperlink.onRangeSelectionModalMove)(globalCache, e);

package/lib/modules/cell.js

@@ -137,6 +137,7 @@ function getCellValue(r, c, data, attr) {
 }
 function setCellValue(ctx, r, c, d, v) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+  console.log("setCellValue", r, c, __assign({}, v), __assign({}, v.ct));
   if (ctx.allowEdit === false || ctx.isFlvReadOnly) return;
   if (_lodash.default.isNil(d)) {
     d = (0, _context.getFlowdata)(ctx);

package/lib/modules/comment.js

@@ -258,12 +258,12 @@ function newComment(ctx, globalCache, r, c) {
   }
 }
 function editComment(ctx, globalCache, r, c) {
-  var _a;
+  var _a, _b;
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (!allowEdit) return;
   var flowdata = (0, _context.getFlowdata)(ctx);
-  removeEditingComment(ctx, globalCache);
-  var comment = (_a = flowdata === null || flowdata === void 0 ? void 0 : flowdata[r][c]) === null || _a === void 0 ? void 0 : _a.ps;
+  var comment = (_b = (_a = flowdata === null || flowdata === void 0 ? void 0 : flowdata[r]) === null || _a === void 0 ? void 0 : _a[c]) === null || _b === void 0 ? void 0 : _b.ps;
+  if (!comment) return;
   var commentBoxes = _lodash.default.concat(ctx.commentBoxes, ctx.editingCommentBox);
   if (_lodash.default.findIndex(commentBoxes, function (v) {
     return (v === null || v === void 0 ? void 0 : v.rc) === "".concat(r, "_").concat(c);

package/package.json

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