@fileverse-dev/fortune-core 1.0.2-mod-13 → 1.0.2-mod-15

package/dist/index.esm.js

@@ -68952,6 +68952,7 @@ function drawArrow(rc, _ref, color, theta, headlen) {
     fromY = _ref.fromY,
     toX = _ref.toX,
     toY = _ref.toY;
+  if (rc) return;
   var canvas = document.getElementById("arrowCanvas-".concat(rc));
   var ctx = canvas.getContext("2d");
   if (!canvas || !ctx) return;
@@ -69097,7 +69098,9 @@ function newComment(ctx, globalCache, r, c) {
   if (((_ctx$hooks$beforeInse = (_ctx$hooks3 = ctx.hooks).beforeInsertComment) === null || _ctx$hooks$beforeInse === void 0 ? void 0 : _ctx$hooks$beforeInse.call(_ctx$hooks3, r, c)) === false) {
     return;
   }
-  removeEditingComment(ctx, globalCache);
+  if (globalCache) {
+    removeEditingComment(ctx, globalCache);
+  }
   var flowdata = getFlowdata(ctx);
   if (!flowdata) return;
   var cell = flowdata[r][c];
@@ -69235,8 +69238,11 @@ function showHideAllComments(ctx) {
     }
   }
 }
+function removeOverShowComment(ctx) {
+  ctx.hoveredCommentBox = undefined;
+}
 function overShowComment(ctx, e, scrollX, scrollY, container) {
-  var _flowdata$r, _flowdata$r$c4, _ctx$editingCommentBo, _ctx$hoveredCommentBo;
+  var _ctx$luckysheet_selec, _flowdata$r, _flowdata$r$c4, _ctx$editingCommentBo, _ctx$hoveredCommentBo;
   var flowdata = getFlowdata(ctx);
   if (!flowdata) return;
   var scrollLeft = scrollX.scrollLeft;
@@ -69257,6 +69263,13 @@ function overShowComment(ctx, e, scrollX, scrollY, container) {
     var _margeset$column2 = _slicedToArray(margeset.column, 3);
     c = _margeset$column2[2];
   }
+  var firstSelection = (_ctx$luckysheet_selec = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec === void 0 ? void 0 : _ctx$luckysheet_selec[0];
+  var row_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.row_focus;
+  var col_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
+  if (r === row_index && c === col_index) {
+    ctx.hoveredCommentBox = undefined;
+    return;
+  }
   var rc = "".concat(r, "_").concat(c);
   var comment = (_flowdata$r = flowdata[r]) === null || _flowdata$r === void 0 ? void 0 : (_flowdata$r$c4 = _flowdata$r[c]) === null || _flowdata$r$c4 === void 0 ? void 0 : _flowdata$r$c4.ps;
   if (comment == null || comment.isShow || _.findIndex(ctx.commentBoxes, function (v) {
@@ -72862,13 +72875,13 @@ var Canvas = /*#__PURE__*/function () {
         renderCtx.fillText(_.isNil(value) ? "" : value, horizonAlignPos, verticalAlignPos);
       }
       if (flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r2 = flowdata[r]) === null || _flowdata$r2 === void 0 ? void 0 : (_flowdata$r2$c = _flowdata$r2[c]) === null || _flowdata$r2$c === void 0 ? void 0 : _flowdata$r2$c.ps) {
-        var ps_w = 8 * this.sheetCtx.zoomRatio;
-        var ps_h = 8 * this.sheetCtx.zoomRatio;
+        var ps_w = 12 * this.sheetCtx.zoomRatio;
+        var ps_h = 12 * this.sheetCtx.zoomRatio;
         renderCtx.beginPath();
         renderCtx.moveTo(endX + offsetLeft - 1 - ps_w, startY + offsetTop);
         renderCtx.lineTo(endX + offsetLeft - 1, startY + offsetTop);
         renderCtx.lineTo(endX + offsetLeft - 1, startY + offsetTop + ps_h);
-        renderCtx.fillStyle = "#FC6666";
+        renderCtx.fillStyle = "#EFC703";
         renderCtx.fill();
         renderCtx.closePath();
       }
@@ -72948,30 +72961,30 @@ var Canvas = /*#__PURE__*/function () {
       var index = getSheetIndex(this.sheetCtx, this.sheetCtx.currentSheetId);
       var dataVerification = this.sheetCtx.luckysheetfile[index].dataVerification;
       if ((dataVerification === null || dataVerification === void 0 ? void 0 : dataVerification["".concat(r, "_").concat(c)]) && !validateCellData(this.sheetCtx, dataVerification["".concat(r, "_").concat(c)], value)) {
-        var dv_w = 5 * this.sheetCtx.zoomRatio;
-        var dv_h = 5 * this.sheetCtx.zoomRatio;
+        var dv_w = 9 * this.sheetCtx.zoomRatio;
+        var dv_h = 9 * this.sheetCtx.zoomRatio;
         renderCtx.beginPath();
         renderCtx.moveTo(startX + offsetLeft, startY + offsetTop);
         renderCtx.lineTo(startX + offsetLeft + dv_w, startY + offsetTop);
         renderCtx.lineTo(startX + offsetLeft, startY + offsetTop + dv_h);
-        renderCtx.fillStyle = "#FC6666";
+        renderCtx.fillStyle = "#EFC703";
         renderCtx.fill();
         renderCtx.closePath();
       }
       if (cell === null || cell === void 0 ? void 0 : cell.ps) {
-        var ps_w = 8 * this.sheetCtx.zoomRatio;
-        var ps_h = 8 * this.sheetCtx.zoomRatio;
+        var ps_w = 12 * this.sheetCtx.zoomRatio;
+        var ps_h = 12 * this.sheetCtx.zoomRatio;
         renderCtx.beginPath();
         renderCtx.moveTo(endX + offsetLeft - ps_w, startY + offsetTop);
         renderCtx.lineTo(endX + offsetLeft, startY + offsetTop);
         renderCtx.lineTo(endX + offsetLeft, startY + offsetTop + ps_h);
-        renderCtx.fillStyle = "#FC6666";
+        renderCtx.fillStyle = "#EFC703";
         renderCtx.fill();
         renderCtx.closePath();
       }
       if ((cell === null || cell === void 0 ? void 0 : cell.qp) === 1 && isRealNum$1(cell === null || cell === void 0 ? void 0 : cell.v)) {
-        var _ps_w = 6 * this.sheetCtx.zoomRatio;
-        var _ps_h = 6 * this.sheetCtx.zoomRatio;
+        var _ps_w = 10 * this.sheetCtx.zoomRatio;
+        var _ps_h = 10 * this.sheetCtx.zoomRatio;
         renderCtx.beginPath();
         renderCtx.moveTo(startX + offsetLeft + _ps_w - 1, startY + offsetTop);
         renderCtx.lineTo(startX + offsetLeft - 1, startY + offsetTop);
@@ -76299,8 +76312,8 @@ var defaultSettings = {
   defaultColWidth: 73,
   defaultRowHeight: 19,
   defaultFontSize: 10,
-  toolbarItems: ["undo", "redo", "format-painter", "|", "currency-format", "percentage-format", "number-decrease", "number-increase", "format", "|", "font", "|", "font-size", "|", "bold", "italic", "strike-through", "|", "font-color", "background", "border", "merge-cell", "|", "horizontal-align", "vertical-align", "text-wrap", "|", "conditionFormat", "filter", "link", "image", "quick-formula", "dataVerification", "screenshot", "search"],
-  cellContextMenu: ["copy", "paste", "|", "insert-row", "insert-column", "delete-row", "delete-column", "delete-cell", "hide-row", "hide-column", "set-row-height", "set-column-width", "|", "clear", "sort", "orderAZ", "orderZA", "filter", "chart", "image", "link", "data", "cell-format"],
+  toolbarItems: ["undo", "redo", "format-painter", "clear-format", "|", "currency-format", "percentage-format", "number-decrease", "number-increase", "format", "|", "font", "|", "font-size", "|", "bold", "italic", "strike-through", "underline", "|", "font-color", "background", "border", "merge-cell", "|", "horizontal-align", "vertical-align", "text-wrap", "text-rotation", "|", "freeze", "conditionFormat", "filter", "link", "image", "comment", "quick-formula", "dataVerification", "splitColumn", "locationCondition", "screenshot", "search"],
+  cellContextMenu: ["copy", "paste", "|", "insert-row", "insert-column", "delete-row", "delete-column", "delete-cell", "hide-row", "hide-column", "set-row-height", "set-column-width", "|", "clear", "sort", "orderAZ", "orderZA", "filter", "chart", "image", "link", "data", "cell-format", "comment"],
   headerContextMenu: ["copy", "paste", "|", "insert-row", "insert-column", "delete-row", "delete-column", "delete-cell", "hide-row", "hide-column", "set-row-height", "set-column-width", "|", "clear", "sort", "orderAZ", "orderZA"],
   sheetTabContextMenu: ["delete", "copy", "rename", "color", "hide", "|", "move"],
   filterContextMenu: ["sort-by-asc", "sort-by-desc", "|", "filter-by-color", "|", "filter-by-value"],
@@ -76309,7 +76322,8 @@ var defaultSettings = {
   },
   hooks: {},
   customToolbarItems: [],
-  currency: "¥"
+  currency: "¥",
+  getCommentCellUI: null
 };
 
 function handleCopy(ctx) {
@@ -76710,6 +76724,7 @@ var mouseWheelUniqueTimeout;
 var scrollLockTimeout;
 function handleGlobalWheel(ctx, e, cache, scrollbarX, scrollbarY) {
   var _cache$searchDialog;
+  removeEditingComment(ctx, cache);
   if (((_cache$searchDialog = cache.searchDialog) === null || _cache$searchDialog === void 0 ? void 0 : _cache$searchDialog.mouseEnter) && ctx.showSearch && ctx.showReplace) return;
   if (ctx.filterContextMenu != null) return;
   var scrollLeft = scrollbarX.scrollLeft;
@@ -76854,6 +76869,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
     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;
@@ -77150,6 +77166,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
 }
 function handleCellAreaDoubleClick(ctx, globalCache, settings, e, container) {
   var _globalCache$freezen2;
+  console.log("handleCellAreaDoubleClick");
   var flowdata = getFlowdata(ctx);
   if (!flowdata) return;
   if (ctx.luckysheetCellUpdate.length > 0 && ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || israngeseleciton(ctx)) {
@@ -77170,6 +77187,8 @@ function handleCellAreaDoubleClick(ctx, globalCache, settings, e, container) {
   var row_index = row_location[2];
   var col_location = colLocation(x, ctx.visibledatacolumn);
   var col_index = col_location[2];
+  removeOverShowComment(ctx);
+  removeEditingComment(ctx, globalCache);
   var index = getSheetIndex(ctx, ctx.currentSheetId);
   var dataVerification = ctx.luckysheetfile[index].dataVerification;
   if (dataVerification) {
@@ -77622,6 +77641,7 @@ function handleOverlayMouseMove(ctx, globalCache, e, cellInput, scrollX, scrollY
   if (onImageMove(ctx, globalCache, e)) return;
   if (onImageResize(ctx, globalCache, e)) return;
   onCellsMove(ctx, globalCache, e, scrollX, scrollY, container);
+  var inputBoxContainer = document.getElementsByClassName("luckysheet-input-box")[0];
   overShowComment(ctx, e, scrollX, scrollY, container);
   onSearchDialogMove(globalCache, e);
   onRangeSelectionModalMove(globalCache, e);
@@ -79824,4 +79844,4 @@ function handlePasteByClick(ctx, clipboardData, triggerType) {
   } else ;
 }
 
-export { CFSplitRange, Canvas, FormulaCache, MAX_ZOOM_RATIO, MIN_ZOOM_RATIO, addSheet, index as api, applyLocation, attrToCssName, autoSelectionFormula, calcSelectionInfo, cancelActiveImgItem, cancelFunctionrangeSelected, cancelNormalSelected, cancelPaintModel, cellFocus, cfSplitRange, changeSheet, chatatABC, checkCF, checkCellIsLocked, checkProtectionAllSelected, checkProtectionFormatCells, checkProtectionSelectLockedOrUnLockedCells, checkboxChange, clearFilter, clearMeasureTextCache, colHasMerged, colLocation, colLocationByIndex, colors, columnCharToIndex, commentBoxProps, compute, computeRowlenArr, confirmMessage, convertCssToStyleList, convertSpanToShareString, copy, createDropCellRange, createFilter, createFilterOptions, createFormulaRangeSelect, createRangeHightlight, dataRangeSelection, datenum_local, defaultContext, defaultFont, defaultSettings, defaultStyle, delFunctionGroup, deleteCellInSave, deleteComment, deleteRowCol, deleteSelectedCellText, deleteSheet, diff, drawArrow, drawLineInfo, dropCellCache, editComment, editSheetName, ensureSheetIndex, error, escapeHTMLTag, escapeScriptTag, execFunctionGroup, execfunction, expandRowsAndColumns, extractFormulaCellOps, filterPatch, fixColumnStyleOverflowInFreeze, fixPositionOnFrozenCells, fixRowStyleOverflowInFreeze, functionCopy, functionHTMLGenerate, functionStrChange, genarate, generateRandomId, generateRandomSheetName, getAllFunctionGroup, getArrowCanvasSize, getBorderInfoCompute, getBorderInfoComputeRange, getCellHyperlink, getCellRowColumn, getCellTextInfo, getCellTopRightPostion, getCellValue, getColMerge, getColorGradation, getCommentBoxByRC, getCommentBoxPosition, getComputeMap, getCurrentRules, getDataArr, getDataBySelectionNoCopy, getDropdownList, getFailureText, getFilterColumnColors, getFilterColumnValues, getFlattenedRange, getFlowdata, getFontSet, getFontStyleByCell, getFrozenHandleLeft, getFrozenHandleTop, getHintText, getHistoryRules, getInlineStringHTML, getInlineStringNoStyle, getMeasureText, getNowDateTime, getNullData, getOptionValue, getOrigincell, getQKBorder, getRange, getRangeArr, getRangeByTxt, getRangetxt, getRealCellValue, getRegExpStr, getRegStr, getRowMerge, getSearchIndexArr, getSelectRange, getSheetByIndex, getSheetIdByName, getSheetIndex, getStyleByCell, getTypeItemHide, getcellFormula, getcellrange, getdatabyselection, getrangeseleciton, goToLink, groupValuesRefresh, handleArrowKey, handleBold, handleBorder, handleCellAreaDoubleClick, handleCellAreaMouseDown, handleClearFormat, handleColFreezeHandleMouseDown, handleColSizeHandleMouseDown, handleColumnHeaderMouseDown, handleContextMenu, handleCopy, handleCurrencyFormat, handleFormatPainter, handleFormulaInput, handleFreeze, handleGlobalEnter, handleGlobalKeyDown, handleGlobalWheel, handleHorizontalAlign, handleItalic, handleKeydownForZoom, handleLink, handleMerge, handleNumberDecrease, handleNumberIncrease, handleOverlayMouseMove, handleOverlayMouseUp, handleOverlayTouchEnd, handleOverlayTouchMove, handleOverlayTouchStart, handlePaste, handlePasteByClick, handlePercentageFormat, handleRowFreezeHandleMouseDown, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, handleScreenShot, handleSort, handleStrikeThrough, handleSum, handleTextBackground, handleTextColor, handleTextSize, handleUnderline, handleVerticalAlign, handleWithCtrlOrMetaKey, hasChinaword, hasPartMC, hideCRCount, hideDropCellSelection, hideSelected, imageProps, indexToColumnChar, initFreeze, initSheetIndex, inlineStyleAffectAttribute, inlineStyleAffectCssName, insertImage, insertRowCol, insertUpdateFunctionGroup, inverseRowColOptions, isAllSelectedCellsInStatus, isAllowEdit, isInlineStringCT, isInlineStringCell, isLinkValid, isRealNull, isRealNum, isShowHidenCR, isSupportBoundingBox, is_date, iscelldata, isdatatype, isdatatypemulti, isdatetime, israngeseleciton, jfrefreshgrid, labelFilterOptionState, locale, luckysheetUpdateCell, mergeBorder, mergeCells, mergeMoveMain, mousePosition, moveHighlightCell, moveHighlightRange, moveToEnd, newComment, normalizeSelection, normalizedAttr, normalizedCellAttr, onCellsMove, onCellsMoveEnd, onCellsMoveStart, onCommentBoxMove, onCommentBoxMoveEnd, onCommentBoxMoveStart, onCommentBoxResize, onCommentBoxResizeEnd, onCommentBoxResizeStart, onDropCellSelect, onDropCellSelectEnd, onFormulaRangeDragEnd, onImageMove, onImageMoveEnd, onImageMoveStart, onImageResize, onImageResizeEnd, onImageResizeStart, onRangeSelectionModalMove, onRangeSelectionModalMoveEnd, onRangeSelectionModalMoveStart, onSearchDialogMove, onSearchDialogMoveEnd, onSearchDialogMoveStart, opToPatch, orderbydata, orderbydatafiler, overShowComment, pasteHandlerOfPaintModel, patchToOp, rangeDrag, rangeDragColumn, rangeDragRow, rangeHightlightselected, rangeSetValue, rangeValueToHtml, removeActiveImage, removeEditingComment, removeHyperlink, replace, replaceAll, replaceHtml, rgbToHex, rowHasMerged, rowLocation, rowLocationByIndex, saveFilter, saveHyperlink, saveImage, scrollToFrozenRowCol, scrollToHighlightCell, searchAll, searchNext, selectAll, selectIsOverlap, selectTextContent, selectTextContentCross, selectTitlesMap, selectTitlesRange, selectionCache, selectionCopyShow, seletedHighlistByindex, setCaretPosition, setCellValue, setConditionRules, setDropcownValue, setEditingComment, showComments, showDropCellSelection, showHideAllComments, showHideComment, showImgChooser, showLinkCard, showSelected, sortDataRange, sortSelection, storeSheetParamALL, toolbarItemClickHandler, toolbarItemSelectedFunc, update, updateCell, updateContextWithCanvas, updateContextWithSheetData, updateDropCell, updateFormat, updateFormatCell, updateInlineStringFormat, updateInlineStringFormatOutside, updateItem, updateMoreCell, updateSheet, validateCellData, validateIdCard, valueIsError, valueShowEs };
+export { CFSplitRange, Canvas, FormulaCache, MAX_ZOOM_RATIO, MIN_ZOOM_RATIO, addSheet, index as api, applyLocation, attrToCssName, autoSelectionFormula, calcSelectionInfo, cancelActiveImgItem, cancelFunctionrangeSelected, cancelNormalSelected, cancelPaintModel, cellFocus, cfSplitRange, changeSheet, chatatABC, checkCF, checkCellIsLocked, checkProtectionAllSelected, checkProtectionFormatCells, checkProtectionSelectLockedOrUnLockedCells, checkboxChange, clearFilter, clearMeasureTextCache, colHasMerged, colLocation, colLocationByIndex, colors, columnCharToIndex, commentBoxProps, compute, computeRowlenArr, confirmMessage, convertCssToStyleList, convertSpanToShareString, copy, createDropCellRange, createFilter, createFilterOptions, createFormulaRangeSelect, createRangeHightlight, dataRangeSelection, datenum_local, defaultContext, defaultFont, defaultSettings, defaultStyle, delFunctionGroup, deleteCellInSave, deleteComment, deleteRowCol, deleteSelectedCellText, deleteSheet, diff, drawArrow, drawLineInfo, dropCellCache, editComment, editSheetName, ensureSheetIndex, error, escapeHTMLTag, escapeScriptTag, execFunctionGroup, execfunction, expandRowsAndColumns, extractFormulaCellOps, filterPatch, fixColumnStyleOverflowInFreeze, fixPositionOnFrozenCells, fixRowStyleOverflowInFreeze, functionCopy, functionHTMLGenerate, functionStrChange, genarate, generateRandomId, generateRandomSheetName, getAllFunctionGroup, getArrowCanvasSize, getBorderInfoCompute, getBorderInfoComputeRange, getCellHyperlink, getCellRowColumn, getCellTextInfo, getCellTopRightPostion, getCellValue, getColMerge, getColorGradation, getCommentBoxByRC, getCommentBoxPosition, getComputeMap, getCurrentRules, getDataArr, getDataBySelectionNoCopy, getDropdownList, getFailureText, getFilterColumnColors, getFilterColumnValues, getFlattenedRange, getFlowdata, getFontSet, getFontStyleByCell, getFrozenHandleLeft, getFrozenHandleTop, getHintText, getHistoryRules, getInlineStringHTML, getInlineStringNoStyle, getMeasureText, getNowDateTime, getNullData, getOptionValue, getOrigincell, getQKBorder, getRange, getRangeArr, getRangeByTxt, getRangetxt, getRealCellValue, getRegExpStr, getRegStr, getRowMerge, getSearchIndexArr, getSelectRange, getSheetByIndex, getSheetIdByName, getSheetIndex, getStyleByCell, getTypeItemHide, getcellFormula, getcellrange, getdatabyselection, getrangeseleciton, goToLink, groupValuesRefresh, handleArrowKey, handleBold, handleBorder, handleCellAreaDoubleClick, handleCellAreaMouseDown, handleClearFormat, handleColFreezeHandleMouseDown, handleColSizeHandleMouseDown, handleColumnHeaderMouseDown, handleContextMenu, handleCopy, handleCurrencyFormat, handleFormatPainter, handleFormulaInput, handleFreeze, handleGlobalEnter, handleGlobalKeyDown, handleGlobalWheel, handleHorizontalAlign, handleItalic, handleKeydownForZoom, handleLink, handleMerge, handleNumberDecrease, handleNumberIncrease, handleOverlayMouseMove, handleOverlayMouseUp, handleOverlayTouchEnd, handleOverlayTouchMove, handleOverlayTouchStart, handlePaste, handlePasteByClick, handlePercentageFormat, handleRowFreezeHandleMouseDown, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, handleScreenShot, handleSort, handleStrikeThrough, handleSum, handleTextBackground, handleTextColor, handleTextSize, handleUnderline, handleVerticalAlign, handleWithCtrlOrMetaKey, hasChinaword, hasPartMC, hideCRCount, hideDropCellSelection, hideSelected, imageProps, indexToColumnChar, initFreeze, initSheetIndex, inlineStyleAffectAttribute, inlineStyleAffectCssName, insertImage, insertRowCol, insertUpdateFunctionGroup, inverseRowColOptions, isAllSelectedCellsInStatus, isAllowEdit, isInlineStringCT, isInlineStringCell, isLinkValid, isRealNull, isRealNum, isShowHidenCR, isSupportBoundingBox, is_date, iscelldata, isdatatype, isdatatypemulti, isdatetime, israngeseleciton, jfrefreshgrid, labelFilterOptionState, locale, luckysheetUpdateCell, mergeBorder, mergeCells, mergeMoveMain, mousePosition, moveHighlightCell, moveHighlightRange, moveToEnd, newComment, normalizeSelection, normalizedAttr, normalizedCellAttr, onCellsMove, onCellsMoveEnd, onCellsMoveStart, onCommentBoxMove, onCommentBoxMoveEnd, onCommentBoxMoveStart, onCommentBoxResize, onCommentBoxResizeEnd, onCommentBoxResizeStart, onDropCellSelect, onDropCellSelectEnd, onFormulaRangeDragEnd, onImageMove, onImageMoveEnd, onImageMoveStart, onImageResize, onImageResizeEnd, onImageResizeStart, onRangeSelectionModalMove, onRangeSelectionModalMoveEnd, onRangeSelectionModalMoveStart, onSearchDialogMove, onSearchDialogMoveEnd, onSearchDialogMoveStart, opToPatch, orderbydata, orderbydatafiler, overShowComment, pasteHandlerOfPaintModel, patchToOp, rangeDrag, rangeDragColumn, rangeDragRow, rangeHightlightselected, rangeSetValue, rangeValueToHtml, removeActiveImage, removeEditingComment, removeHyperlink, removeOverShowComment, replace, replaceAll, replaceHtml, rgbToHex, rowHasMerged, rowLocation, rowLocationByIndex, saveFilter, saveHyperlink, saveImage, scrollToFrozenRowCol, scrollToHighlightCell, searchAll, searchNext, selectAll, selectIsOverlap, selectTextContent, selectTextContentCross, selectTitlesMap, selectTitlesRange, selectionCache, selectionCopyShow, seletedHighlistByindex, setCaretPosition, setCellValue, setConditionRules, setDropcownValue, setEditingComment, showComments, showDropCellSelection, showHideAllComments, showHideComment, showImgChooser, showLinkCard, showSelected, sortDataRange, sortSelection, storeSheetParamALL, toolbarItemClickHandler, toolbarItemSelectedFunc, update, updateCell, updateContextWithCanvas, updateContextWithSheetData, updateDropCell, updateFormat, updateFormatCell, updateInlineStringFormat, updateInlineStringFormatOutside, updateItem, updateMoreCell, updateSheet, validateCellData, validateIdCard, valueIsError, valueShowEs };

package/dist/index.js

@@ -68962,6 +68962,7 @@ function drawArrow(rc, _ref, color, theta, headlen) {
     fromY = _ref.fromY,
     toX = _ref.toX,
     toY = _ref.toY;
+  if (rc) return;
   var canvas = document.getElementById("arrowCanvas-".concat(rc));
   var ctx = canvas.getContext("2d");
   if (!canvas || !ctx) return;
@@ -69107,7 +69108,9 @@ function newComment(ctx, globalCache, r, c) {
   if (((_ctx$hooks$beforeInse = (_ctx$hooks3 = ctx.hooks).beforeInsertComment) === null || _ctx$hooks$beforeInse === void 0 ? void 0 : _ctx$hooks$beforeInse.call(_ctx$hooks3, r, c)) === false) {
     return;
   }
-  removeEditingComment(ctx, globalCache);
+  if (globalCache) {
+    removeEditingComment(ctx, globalCache);
+  }
   var flowdata = getFlowdata(ctx);
   if (!flowdata) return;
   var cell = flowdata[r][c];
@@ -69245,8 +69248,11 @@ function showHideAllComments(ctx) {
     }
   }
 }
+function removeOverShowComment(ctx) {
+  ctx.hoveredCommentBox = undefined;
+}
 function overShowComment(ctx, e, scrollX, scrollY, container) {
-  var _flowdata$r, _flowdata$r$c4, _ctx$editingCommentBo, _ctx$hoveredCommentBo;
+  var _ctx$luckysheet_selec, _flowdata$r, _flowdata$r$c4, _ctx$editingCommentBo, _ctx$hoveredCommentBo;
   var flowdata = getFlowdata(ctx);
   if (!flowdata) return;
   var scrollLeft = scrollX.scrollLeft;
@@ -69267,6 +69273,13 @@ function overShowComment(ctx, e, scrollX, scrollY, container) {
     var _margeset$column2 = _slicedToArray(margeset.column, 3);
     c = _margeset$column2[2];
   }
+  var firstSelection = (_ctx$luckysheet_selec = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec === void 0 ? void 0 : _ctx$luckysheet_selec[0];
+  var row_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.row_focus;
+  var col_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
+  if (r === row_index && c === col_index) {
+    ctx.hoveredCommentBox = undefined;
+    return;
+  }
   var rc = "".concat(r, "_").concat(c);
   var comment = (_flowdata$r = flowdata[r]) === null || _flowdata$r === void 0 ? void 0 : (_flowdata$r$c4 = _flowdata$r[c]) === null || _flowdata$r$c4 === void 0 ? void 0 : _flowdata$r$c4.ps;
   if (comment == null || comment.isShow || ___default['default'].findIndex(ctx.commentBoxes, function (v) {
@@ -72872,13 +72885,13 @@ var Canvas = /*#__PURE__*/function () {
         renderCtx.fillText(___default['default'].isNil(value) ? "" : value, horizonAlignPos, verticalAlignPos);
       }
       if (flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r2 = flowdata[r]) === null || _flowdata$r2 === void 0 ? void 0 : (_flowdata$r2$c = _flowdata$r2[c]) === null || _flowdata$r2$c === void 0 ? void 0 : _flowdata$r2$c.ps) {
-        var ps_w = 8 * this.sheetCtx.zoomRatio;
-        var ps_h = 8 * this.sheetCtx.zoomRatio;
+        var ps_w = 12 * this.sheetCtx.zoomRatio;
+        var ps_h = 12 * this.sheetCtx.zoomRatio;
         renderCtx.beginPath();
         renderCtx.moveTo(endX + offsetLeft - 1 - ps_w, startY + offsetTop);
         renderCtx.lineTo(endX + offsetLeft - 1, startY + offsetTop);
         renderCtx.lineTo(endX + offsetLeft - 1, startY + offsetTop + ps_h);
-        renderCtx.fillStyle = "#FC6666";
+        renderCtx.fillStyle = "#EFC703";
         renderCtx.fill();
         renderCtx.closePath();
       }
@@ -72958,30 +72971,30 @@ var Canvas = /*#__PURE__*/function () {
       var index = getSheetIndex(this.sheetCtx, this.sheetCtx.currentSheetId);
       var dataVerification = this.sheetCtx.luckysheetfile[index].dataVerification;
       if ((dataVerification === null || dataVerification === void 0 ? void 0 : dataVerification["".concat(r, "_").concat(c)]) && !validateCellData(this.sheetCtx, dataVerification["".concat(r, "_").concat(c)], value)) {
-        var dv_w = 5 * this.sheetCtx.zoomRatio;
-        var dv_h = 5 * this.sheetCtx.zoomRatio;
+        var dv_w = 9 * this.sheetCtx.zoomRatio;
+        var dv_h = 9 * this.sheetCtx.zoomRatio;
         renderCtx.beginPath();
         renderCtx.moveTo(startX + offsetLeft, startY + offsetTop);
         renderCtx.lineTo(startX + offsetLeft + dv_w, startY + offsetTop);
         renderCtx.lineTo(startX + offsetLeft, startY + offsetTop + dv_h);
-        renderCtx.fillStyle = "#FC6666";
+        renderCtx.fillStyle = "#EFC703";
         renderCtx.fill();
         renderCtx.closePath();
       }
       if (cell === null || cell === void 0 ? void 0 : cell.ps) {
-        var ps_w = 8 * this.sheetCtx.zoomRatio;
-        var ps_h = 8 * this.sheetCtx.zoomRatio;
+        var ps_w = 12 * this.sheetCtx.zoomRatio;
+        var ps_h = 12 * this.sheetCtx.zoomRatio;
         renderCtx.beginPath();
         renderCtx.moveTo(endX + offsetLeft - ps_w, startY + offsetTop);
         renderCtx.lineTo(endX + offsetLeft, startY + offsetTop);
         renderCtx.lineTo(endX + offsetLeft, startY + offsetTop + ps_h);
-        renderCtx.fillStyle = "#FC6666";
+        renderCtx.fillStyle = "#EFC703";
         renderCtx.fill();
         renderCtx.closePath();
       }
       if ((cell === null || cell === void 0 ? void 0 : cell.qp) === 1 && isRealNum$1(cell === null || cell === void 0 ? void 0 : cell.v)) {
-        var _ps_w = 6 * this.sheetCtx.zoomRatio;
-        var _ps_h = 6 * this.sheetCtx.zoomRatio;
+        var _ps_w = 10 * this.sheetCtx.zoomRatio;
+        var _ps_h = 10 * this.sheetCtx.zoomRatio;
         renderCtx.beginPath();
         renderCtx.moveTo(startX + offsetLeft + _ps_w - 1, startY + offsetTop);
         renderCtx.lineTo(startX + offsetLeft - 1, startY + offsetTop);
@@ -76309,8 +76322,8 @@ var defaultSettings = {
   defaultColWidth: 73,
   defaultRowHeight: 19,
   defaultFontSize: 10,
-  toolbarItems: ["undo", "redo", "format-painter", "|", "currency-format", "percentage-format", "number-decrease", "number-increase", "format", "|", "font", "|", "font-size", "|", "bold", "italic", "strike-through", "|", "font-color", "background", "border", "merge-cell", "|", "horizontal-align", "vertical-align", "text-wrap", "|", "conditionFormat", "filter", "link", "image", "quick-formula", "dataVerification", "screenshot", "search"],
-  cellContextMenu: ["copy", "paste", "|", "insert-row", "insert-column", "delete-row", "delete-column", "delete-cell", "hide-row", "hide-column", "set-row-height", "set-column-width", "|", "clear", "sort", "orderAZ", "orderZA", "filter", "chart", "image", "link", "data", "cell-format"],
+  toolbarItems: ["undo", "redo", "format-painter", "clear-format", "|", "currency-format", "percentage-format", "number-decrease", "number-increase", "format", "|", "font", "|", "font-size", "|", "bold", "italic", "strike-through", "underline", "|", "font-color", "background", "border", "merge-cell", "|", "horizontal-align", "vertical-align", "text-wrap", "text-rotation", "|", "freeze", "conditionFormat", "filter", "link", "image", "comment", "quick-formula", "dataVerification", "splitColumn", "locationCondition", "screenshot", "search"],
+  cellContextMenu: ["copy", "paste", "|", "insert-row", "insert-column", "delete-row", "delete-column", "delete-cell", "hide-row", "hide-column", "set-row-height", "set-column-width", "|", "clear", "sort", "orderAZ", "orderZA", "filter", "chart", "image", "link", "data", "cell-format", "comment"],
   headerContextMenu: ["copy", "paste", "|", "insert-row", "insert-column", "delete-row", "delete-column", "delete-cell", "hide-row", "hide-column", "set-row-height", "set-column-width", "|", "clear", "sort", "orderAZ", "orderZA"],
   sheetTabContextMenu: ["delete", "copy", "rename", "color", "hide", "|", "move"],
   filterContextMenu: ["sort-by-asc", "sort-by-desc", "|", "filter-by-color", "|", "filter-by-value"],
@@ -76319,7 +76332,8 @@ var defaultSettings = {
   },
   hooks: {},
   customToolbarItems: [],
-  currency: "¥"
+  currency: "¥",
+  getCommentCellUI: null
 };
 
 function handleCopy(ctx) {
@@ -76720,6 +76734,7 @@ var mouseWheelUniqueTimeout;
 var scrollLockTimeout;
 function handleGlobalWheel(ctx, e, cache, scrollbarX, scrollbarY) {
   var _cache$searchDialog;
+  removeEditingComment(ctx, cache);
   if (((_cache$searchDialog = cache.searchDialog) === null || _cache$searchDialog === void 0 ? void 0 : _cache$searchDialog.mouseEnter) && ctx.showSearch && ctx.showReplace) return;
   if (ctx.filterContextMenu != null) return;
   var scrollLeft = scrollbarX.scrollLeft;
@@ -76864,6 +76879,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
     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;
@@ -77160,6 +77176,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
 }
 function handleCellAreaDoubleClick(ctx, globalCache, settings, e, container) {
   var _globalCache$freezen2;
+  console.log("handleCellAreaDoubleClick");
   var flowdata = getFlowdata(ctx);
   if (!flowdata) return;
   if (ctx.luckysheetCellUpdate.length > 0 && ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || israngeseleciton(ctx)) {
@@ -77180,6 +77197,8 @@ function handleCellAreaDoubleClick(ctx, globalCache, settings, e, container) {
   var row_index = row_location[2];
   var col_location = colLocation(x, ctx.visibledatacolumn);
   var col_index = col_location[2];
+  removeOverShowComment(ctx);
+  removeEditingComment(ctx, globalCache);
   var index = getSheetIndex(ctx, ctx.currentSheetId);
   var dataVerification = ctx.luckysheetfile[index].dataVerification;
   if (dataVerification) {
@@ -77632,6 +77651,7 @@ function handleOverlayMouseMove(ctx, globalCache, e, cellInput, scrollX, scrollY
   if (onImageMove(ctx, globalCache, e)) return;
   if (onImageResize(ctx, globalCache, e)) return;
   onCellsMove(ctx, globalCache, e, scrollX, scrollY, container);
+  var inputBoxContainer = document.getElementsByClassName("luckysheet-input-box")[0];
   overShowComment(ctx, e, scrollX, scrollY, container);
   onSearchDialogMove(globalCache, e);
   onRangeSelectionModalMove(globalCache, e);
@@ -80102,6 +80122,7 @@ exports.rangeValueToHtml = rangeValueToHtml;
 exports.removeActiveImage = removeActiveImage;
 exports.removeEditingComment = removeEditingComment;
 exports.removeHyperlink = removeHyperlink;
+exports.removeOverShowComment = removeOverShowComment;
 exports.replace = replace;
 exports.replaceAll = replaceAll;
 exports.replaceHtml = replaceHtml;

package/dist/modules/comment.d.ts

@@ -63,7 +63,7 @@ export declare function getCommentBoxByRC(ctx: Context, flowdata: CellMatrix, r:
 };
 export declare function setEditingComment(ctx: Context, flowdata: CellMatrix, r: number, c: number): void;
 export declare function removeEditingComment(ctx: Context, globalCache: GlobalCache): void;
-export declare function newComment(ctx: Context, globalCache: GlobalCache, r: number, c: number): void;
+export declare function newComment(ctx: Context, globalCache: GlobalCache | undefined, r: number, c: number): void;
 export declare function editComment(ctx: Context, globalCache: GlobalCache, r: number, c: number): void;
 export declare function deleteComment(ctx: Context, globalCache: GlobalCache, r: number, c: number): void;
 export declare function showComments(ctx: Context, commentShowCells: {
@@ -72,6 +72,7 @@ export declare function showComments(ctx: Context, commentShowCells: {
 }[]): void;
 export declare function showHideComment(ctx: Context, globalCache: GlobalCache, r: number, c: number): void;
 export declare function showHideAllComments(ctx: Context): void;
+export declare function removeOverShowComment(ctx: Context): void;
 export declare function overShowComment(ctx: Context, e: MouseEvent, scrollX: HTMLDivElement, scrollY: HTMLDivElement, container: HTMLDivElement): void;
 export declare function getCommentBoxPosition(commentId: string): {
     left: number;

package/dist/settings.d.ts

@@ -80,6 +80,7 @@ export type Settings = {
     headerContextMenu?: string[];
     sheetTabContextMenu?: string[];
     filterContextMenu?: string[];
+    getCommentCellUI?: ((row: number, column: number) => React.ReactNode) | null;
     generateSheetId?: () => string;
     hooks?: Hooks;
     customToolbarItems?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.0.2-mod-13",
+  "version": "1.0.2-mod-15",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",