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

package/es/events/mouse.js

@@ -156,7 +156,6 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
     return;
   }
   cellFocus(ctx, row_index, col_index, true);
-  console.log("handleCellAreaMouseDown", row_index, col_index);
   if (!inHorizontalFreeze && !inVerticalFreeze) {
     if (col_pre < ctx.scrollLeft) {
       ctx.scrollLeft = col_pre;
@@ -900,21 +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);
-  var row_location = rowLocation(e.pageY, ctx.visibledatarow);
-  var row = row_location[1];
-  var row_pre = row_location[0];
+  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(e.pageX, ctx.visibledatacolumn);
-  var col = col_location[1];
-  var col_pre = col_location[0];
+  var col_location = colLocation(x, ctx.visibledatacolumn);
   var col_index = col_location[2];
-  console.log('mousemove row_index:', row_index, 'col_index:', col_index);
-  editComment(ctx, globalCache, row_index - 4, col_index - 1);
+  editComment(ctx, globalCache, row_index, col_index);
   overShowError(ctx, e, scrollX, scrollY, container);
   onSearchDialogMove(globalCache, e);
   onRangeSelectionModalMove(globalCache, e);

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);
-  console.log("handleCellAreaMouseDown", row_index, col_index);
   if (!inHorizontalFreeze && !inVerticalFreeze) {
     if (col_pre < ctx.scrollLeft) {
       ctx.scrollLeft = col_pre;
@@ -919,21 +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);
-  var row_location = (0, _location.rowLocation)(e.pageY, ctx.visibledatarow);
-  var row = row_location[1];
-  var row_pre = row_location[0];
+  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)(e.pageX, ctx.visibledatacolumn);
-  var col = col_location[1];
-  var col_pre = col_location[0];
+  var col_location = (0, _location.colLocation)(x, ctx.visibledatacolumn);
   var col_index = col_location[2];
-  console.log('mousemove row_index:', row_index, 'col_index:', col_index);
-  (0, _modules.editComment)(ctx, globalCache, row_index - 4, col_index - 1);
+  (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/package.json

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