@fileverse-dev/fortune-react 1.0.2-mod-89-patch-005 → 1.0.2-mod-92

package/dist/components/Workbook/api.d.ts

@@ -88,6 +88,7 @@ export declare function generateAPIs(context: Context, setContext: (recipe: (ctx
         luckysheet_conditionformat_save?: any[] | undefined;
         luckysheet_alternateformat_save?: any[] | undefined;
         dataVerification?: any;
+        conditionRules?: import("@fileverse-dev/fortune-core").ConditionRulesProps | undefined;
         hyperlink?: Record<string, {
             linkType: string;
             linkAddress: string;

package/dist/components/Workbook/index.d.ts

@@ -95,6 +95,7 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
         luckysheet_conditionformat_save?: any[] | undefined;
         luckysheet_alternateformat_save?: any[] | undefined;
         dataVerification?: any;
+        conditionRules?: import("@fileverse-dev/fortune-core").ConditionRulesProps | undefined;
         hyperlink?: Record<string, {
             linkType: string;
             linkAddress: string;

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import { defaultContext, defaultSettings, getSheetIndex, colLocationByIndex, fixPositionOnFrozenCells, colLocation, getFlowdata, isAllowEdit, handleColumnHeaderMouseDown, handleColSizeHandleMouseDown, handleColFreezeHandleMouseDown, selectTitlesMap, selectTitlesRange, fixColumnStyleOverflowInFreeze, rowLocationByIndex, rowLocation, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, handleRowFreezeHandleMouseDown, handleContextMenu, fixRowStyleOverflowInFreeze, locale, getStyleByCell, getCellValue, createRangeHightlight, isInlineStringCell, getInlineStringHTML, valueShowEs, escapeHTMLTag, escapeScriptTag, moveToEnd, isShowHidenCR, getrangeseleciton, cancelNormalSelected, moveHighlightCell, israngeseleciton, handleFormulaInput, onSearchDialogMoveStart, replaceAll, replace, searchAll, searchNext, normalizeSelection, scrollToHighlightCell, isLinkValid, goToLink, replaceHtml, removeHyperlink, saveHyperlink, createFilterOptions, onImageMoveStart, onImageResizeStart, showComments, setEditingComment, onCommentBoxMoveStart, confirmMessage, getRangeByTxt, getDropdownList, setCellValue, getRangetxt, setConditionRules, mergeBorder, setDropdownValue, onIframeMoveStart, onIframeResizeStart, saveIframe, onIframeMove, onIframeMoveEnd, onIframeResize, onIframeResizeEnd, handleCellAreaMouseDown, handleCellAreaDoubleClick, selectAll, showLinkCard, getCellRowColumn, getCellHyperlink, handleOverlayMouseMove, handleOverlayMouseUp, handleKeydownForZoom, handleOverlayTouchStart, handleOverlayTouchMove, handleOverlayTouchEnd, insertRowCol, drawArrow, onCellsMoveStart, createDropCellRange, updateContextWithSheetData, updateContextWithCanvas, initFreeze, Canvas, handleGlobalWheel, getDataArr, updateMoreCell, getRegStr, getOptionValue, getSelectRange, applyLocation, updateItem, update, sanitizeDuneUrl, normalizedCellAttr, updateFormat, handleTextSize, handleHorizontalAlign, handleVerticalAlign, handleScreenShot, showImgChooser, insertImage, editComment, deleteComment, showHideComment, showHideAllComments, newComment, handleSum, autoSelectionFormula, handleMerge, handleBorder, handleFreeze, handleSort, createFilter, clearFilter, toolbarItemSelectedFunc, toolbarItemClickHandler, insertDuneChart, handleTextColor, handleTextBackground, getInlineStringNoStyle, rangeHightlightselected, updateCell, editSheetName, cancelActiveImgItem, MAX_ZOOM_RATIO, MIN_ZOOM_RATIO, addSheet, api, getFreezeState, toggleFreeze, jfrefreshgrid, handleCopy, removeActiveImage, deleteSelectedCellText, deleteRowCol, hideSelected, showSelected, sortSelection, handleLink, handlePasteByClick, deleteSheet, opToPatch, setCaretPosition, orderbydatafiler, getFilterColumnValues, getFilterColumnColors, saveFilter, calcSelectionInfo, patchToOp, filterPatch, inverseRowColOptions, ensureSheetIndex, initSheetIndex, handleGlobalKeyDown, handlePaste, groupValuesRefresh } from '@fileverse-dev/fortune-core';
+import { defaultContext, defaultSettings, getSheetIndex, colLocationByIndex, fixPositionOnFrozenCells, colLocation, getFlowdata, isAllowEdit, handleColumnHeaderMouseDown, handleColSizeHandleMouseDown, handleColFreezeHandleMouseDown, selectTitlesMap, selectTitlesRange, fixColumnStyleOverflowInFreeze, rowLocationByIndex, rowLocation, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, handleRowFreezeHandleMouseDown, handleContextMenu, fixRowStyleOverflowInFreeze, locale, getStyleByCell, getCellValue, createRangeHightlight, isInlineStringCell, getInlineStringHTML, valueShowEs, escapeHTMLTag, escapeScriptTag, moveToEnd, isShowHidenCR, getrangeseleciton, cancelNormalSelected, moveHighlightCell, israngeseleciton, handleFormulaInput, onSearchDialogMoveStart, replaceAll, replace, searchAll, searchNext, normalizeSelection, scrollToHighlightCell, isLinkValid, goToLink, replaceHtml, removeHyperlink, saveHyperlink, createFilterOptions, onImageMoveStart, onImageResizeStart, showComments, setEditingComment, onCommentBoxMoveStart, confirmMessage, getRangeByTxt, getDropdownList, setCellValue, getRangetxt, setConditionRules, mergeBorder, setDropdownValue, onIframeMoveStart, onIframeResizeStart, onIframeMove, onIframeMoveEnd, onIframeResize, onIframeResizeEnd, handleCellAreaMouseDown, handleCellAreaDoubleClick, selectAll, showLinkCard, getCellRowColumn, getCellHyperlink, handleOverlayMouseMove, handleOverlayMouseUp, handleKeydownForZoom, handleOverlayTouchStart, handleOverlayTouchMove, handleOverlayTouchEnd, insertRowCol, drawArrow, onCellsMoveStart, createDropCellRange, updateContextWithSheetData, updateContextWithCanvas, initFreeze, Canvas, handleGlobalWheel, getDataArr, updateMoreCell, getRegStr, getOptionValue, getSelectRange, applyLocation, updateItem, update, sanitizeDuneUrl, normalizedCellAttr, updateFormat, handleTextSize, handleHorizontalAlign, handleVerticalAlign, handleScreenShot, showImgChooser, insertImage, editComment, deleteComment, showHideComment, showHideAllComments, newComment, handleSum, autoSelectionFormula, handleMerge, handleBorder, handleFreeze, handleSort, createFilter, clearFilter, toolbarItemSelectedFunc, toolbarItemClickHandler, insertDuneChart, handleTextColor, handleTextBackground, getInlineStringNoStyle, rangeHightlightselected, updateCell, editSheetName, cancelActiveImgItem, MAX_ZOOM_RATIO, MIN_ZOOM_RATIO, addSheet, api, getFreezeState, toggleFreeze, jfrefreshgrid, handleCopy, removeActiveImage, deleteSelectedCellText, deleteRowCol, hideSelected, showSelected, sortSelection, handleLink, handlePasteByClick, deleteSheet, opToPatch, setCaretPosition, orderbydatafiler, getFilterColumnValues, getFilterColumnColors, saveFilter, calcSelectionInfo, patchToOp, filterPatch, inverseRowColOptions, ensureSheetIndex, initSheetIndex, handleGlobalKeyDown, handlePaste, groupValuesRefresh } from '@fileverse-dev/fortune-core';
 export { PROMOTED_CRYPTO_FUNCTIONS } from '@fileverse-dev/fortune-core';
 import { SERVICE_API_KEY } from '@fileverse-dev/formulajs/crypto-constants';
 export * from '@fileverse-dev/formulajs/crypto-constants';
@@ -813,8 +813,8 @@ var FormulaSearch = function FormulaSearch(props) {
     top = _useState2[0],
     setTop = _useState2[1];
   var calcuatePopUpPlacement = function calcuatePopUpPlacement() {
-    var _hintRef$current;
-    if (!(firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.top) || !firstSelection.height_move || !hintRef.current) return;
+    var _firstSelection$top, _firstSelection$heigh, _hintRef$current;
+    if (!(firstSelection === null || firstSelection === void 0 ? void 0 : (_firstSelection$top = firstSelection.top) === null || _firstSelection$top === void 0 ? void 0 : _firstSelection$top.toString()) || !((_firstSelection$heigh = firstSelection.height_move) === null || _firstSelection$heigh === void 0 ? void 0 : _firstSelection$heigh.toString()) || !hintRef.current) return;
     var hintHeight = 360;
     var inputBottom = firstSelection.top + firstSelection.height_move;
     var availableBelow = window.innerHeight - inputBottom;
@@ -1046,8 +1046,8 @@ var FormulaHint = function FormulaHint(props) {
     top = _useState0[0],
     setTop = _useState0[1];
   var calcuatePopUpPlacement = function calcuatePopUpPlacement() {
-    var _hintRef$current;
-    if (!(firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.top) || !firstSelection.height_move || !hintRef.current) return;
+    var _firstSelection$top, _firstSelection$heigh, _hintRef$current;
+    if (!(firstSelection === null || firstSelection === void 0 ? void 0 : (_firstSelection$top = firstSelection.top) === null || _firstSelection$top === void 0 ? void 0 : _firstSelection$top.toString()) || !((_firstSelection$heigh = firstSelection.height_move) === null || _firstSelection$heigh === void 0 ? void 0 : _firstSelection$heigh.toString()) || !hintRef.current) return;
     var hintHeight = 360;
     var inputBottom = firstSelection.top + firstSelection.height_move;
     var availableBelow = window.innerHeight - inputBottom;
@@ -1436,32 +1436,44 @@ var InputBox = function InputBox() {
     return document.querySelector(".luckysheet-formula-search-item-active");
   }, []);
   var insertSelectedFormula = useCallback(function (formulaName) {
-    var _getrangeseleciton;
+    var _selection, _getrangeseleciton;
     var textEditor = document.getElementById("luckysheet-rich-text-editor");
     if (!textEditor) return;
-    var searchTxt = ((_getrangeseleciton = getrangeseleciton()) === null || _getrangeseleciton === void 0 ? void 0 : _getrangeseleciton.textContent) || "";
-    var deleteCount = searchTxt === "=" ? 0 : searchTxt.length;
     textEditor.focus();
     var selection = window.getSelection();
-    if (!selection || selection.rangeCount === 0) return;
-    var range = selection.getRangeAt(0);
-    if (deleteCount !== 0 && range) {
+    var range = ((_selection = selection) === null || _selection === void 0 ? void 0 : _selection.rangeCount) ? selection.getRangeAt(0) : null;
+    if (!selection || !range || !textEditor.contains(range.startContainer)) {
+      var _selection2, _selection3;
+      range = document.createRange();
+      range.selectNodeContents(textEditor);
+      range.collapse(false);
+      selection = window.getSelection();
+      (_selection2 = selection) === null || _selection2 === void 0 ? void 0 : _selection2.removeAllRanges();
+      (_selection3 = selection) === null || _selection3 === void 0 ? void 0 : _selection3.addRange(range);
+    }
+    var searchTxt = ((_getrangeseleciton = getrangeseleciton()) === null || _getrangeseleciton === void 0 ? void 0 : _getrangeseleciton.textContent) || "";
+    var deleteCount = searchTxt === "=" ? 0 : searchTxt.length;
+    if (deleteCount > 0 && range.startContainer.nodeType === Node.TEXT_NODE && textEditor.contains(range.startContainer)) {
       var startOffset = Math.max(range.startOffset - deleteCount, 0);
       var endOffset = range.startOffset;
       range.setStart(range.startContainer, startOffset);
       range.setEnd(range.startContainer, endOffset);
       range.deleteContents();
     }
+    textEditor.querySelectorAll(".luckysheet-formula-text-func, .luckysheet-formula-text-lpar").forEach(function (el) {
+      return el.remove();
+    });
     var funcNode = new DOMParser().parseFromString("<span dir=\"auto\" class=\"luckysheet-formula-text-func\">".concat(formulaName, "</span>"), "text/html").body.firstChild;
     var parNode = new DOMParser().parseFromString("<span dir=\"auto\" class=\"luckysheet-formula-text-lpar\">(</span>", "text/html").body.firstChild;
-    if (range === null || range === void 0 ? void 0 : range.startContainer.parentNode) {
-      range.setStart(range.startContainer.parentNode, 1);
-    }
-    if (parNode) range.insertNode(parNode);
-    if (funcNode) range.insertNode(funcNode);
-    range.collapse();
-    selection.removeAllRanges();
-    selection.addRange(range);
+    if (range && parNode && funcNode) {
+      var _selection4, _selection5;
+      range.insertNode(funcNode);
+      range.collapse(false);
+      range.insertNode(parNode);
+      range.collapse(false);
+      (_selection4 = selection) === null || _selection4 === void 0 ? void 0 : _selection4.removeAllRanges();
+      (_selection5 = selection) === null || _selection5 === void 0 ? void 0 : _selection5.addRange(range);
+    }
     setContext(function (draftCtx) {
       draftCtx.functionCandidates = [];
       draftCtx.defaultCandidates = [];
@@ -1543,11 +1555,16 @@ var InputBox = function InputBox() {
       e.preventDefault();
     }
   }, [clearSearchItemActiveClass, context.luckysheetCellUpdate.length, selectActiveFormula, setContext, firstSelection]);
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    showCrypoModal = _useState4[0],
+    setShowCryptoModal = _useState4[1];
   var onChange = useCallback(function (__, isBlur) {
     var e = lastKeyDownEventRef.current;
     if (!e) return;
     var kcode = e.keyCode;
     if (!kcode) return;
+    setShowCryptoModal(!document.getElementById("luckysheet-formula-search-c"));
     if (!(kcode >= 112 && kcode <= 123 || kcode <= 46 || kcode === 144 || kcode === 108 || e.ctrlKey || e.altKey || e.shiftKey && (kcode === 37 || kcode === 38 || kcode === 39 || kcode === 40)) || kcode === 8 || kcode === 32 || kcode === 46 || e.ctrlKey && kcode === 86) {
       setContext(function (draftCtx) {
         if ((draftCtx.formulaCache.rangestart || draftCtx.formulaCache.rangedrag_column_start || draftCtx.formulaCache.rangedrag_row_start || israngeseleciton(draftCtx)) && isBlur) return;
@@ -1609,7 +1626,7 @@ var InputBox = function InputBox() {
     onKeyDown: onKeyDown,
     onPaste: onPaste,
     allowEdit: edit ? !isHidenRC : edit
-  })), (context.functionCandidates.length > 0 || context.functionHint || context.defaultCandidates.length > 0) && (/*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormulaSearch, {
+  })), (context.functionCandidates.length > 0 || context.functionHint || context.defaultCandidates.length > 0) && showCrypoModal && (/*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormulaSearch, {
     onMouseOver: function onMouseOver(e) {
       if (document.getElementById("luckysheet-formula-search-c")) {
         var hoveredItem = e.target.closest(".luckysheet-formula-search-item");
@@ -3846,7 +3863,6 @@ var IframeBoxs = function IframeBoxs() {
             });
           }
           ctx.activeIframe = undefined;
-          saveIframe(ctx);
         });
       },
       variant: "ghost",

package/dist/index.js

@@ -823,8 +823,8 @@ var FormulaSearch = function FormulaSearch(props) {
     top = _useState2[0],
     setTop = _useState2[1];
   var calcuatePopUpPlacement = function calcuatePopUpPlacement() {
-    var _hintRef$current;
-    if (!(firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.top) || !firstSelection.height_move || !hintRef.current) return;
+    var _firstSelection$top, _firstSelection$heigh, _hintRef$current;
+    if (!(firstSelection === null || firstSelection === void 0 ? void 0 : (_firstSelection$top = firstSelection.top) === null || _firstSelection$top === void 0 ? void 0 : _firstSelection$top.toString()) || !((_firstSelection$heigh = firstSelection.height_move) === null || _firstSelection$heigh === void 0 ? void 0 : _firstSelection$heigh.toString()) || !hintRef.current) return;
     var hintHeight = 360;
     var inputBottom = firstSelection.top + firstSelection.height_move;
     var availableBelow = window.innerHeight - inputBottom;
@@ -1056,8 +1056,8 @@ var FormulaHint = function FormulaHint(props) {
     top = _useState0[0],
     setTop = _useState0[1];
   var calcuatePopUpPlacement = function calcuatePopUpPlacement() {
-    var _hintRef$current;
-    if (!(firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.top) || !firstSelection.height_move || !hintRef.current) return;
+    var _firstSelection$top, _firstSelection$heigh, _hintRef$current;
+    if (!(firstSelection === null || firstSelection === void 0 ? void 0 : (_firstSelection$top = firstSelection.top) === null || _firstSelection$top === void 0 ? void 0 : _firstSelection$top.toString()) || !((_firstSelection$heigh = firstSelection.height_move) === null || _firstSelection$heigh === void 0 ? void 0 : _firstSelection$heigh.toString()) || !hintRef.current) return;
     var hintHeight = 360;
     var inputBottom = firstSelection.top + firstSelection.height_move;
     var availableBelow = window.innerHeight - inputBottom;
@@ -1446,32 +1446,44 @@ var InputBox = function InputBox() {
     return document.querySelector(".luckysheet-formula-search-item-active");
   }, []);
   var insertSelectedFormula = React.useCallback(function (formulaName) {
-    var _getrangeseleciton;
+    var _selection, _getrangeseleciton;
     var textEditor = document.getElementById("luckysheet-rich-text-editor");
     if (!textEditor) return;
-    var searchTxt = ((_getrangeseleciton = fortuneCore.getrangeseleciton()) === null || _getrangeseleciton === void 0 ? void 0 : _getrangeseleciton.textContent) || "";
-    var deleteCount = searchTxt === "=" ? 0 : searchTxt.length;
     textEditor.focus();
     var selection = window.getSelection();
-    if (!selection || selection.rangeCount === 0) return;
-    var range = selection.getRangeAt(0);
-    if (deleteCount !== 0 && range) {
+    var range = ((_selection = selection) === null || _selection === void 0 ? void 0 : _selection.rangeCount) ? selection.getRangeAt(0) : null;
+    if (!selection || !range || !textEditor.contains(range.startContainer)) {
+      var _selection2, _selection3;
+      range = document.createRange();
+      range.selectNodeContents(textEditor);
+      range.collapse(false);
+      selection = window.getSelection();
+      (_selection2 = selection) === null || _selection2 === void 0 ? void 0 : _selection2.removeAllRanges();
+      (_selection3 = selection) === null || _selection3 === void 0 ? void 0 : _selection3.addRange(range);
+    }
+    var searchTxt = ((_getrangeseleciton = fortuneCore.getrangeseleciton()) === null || _getrangeseleciton === void 0 ? void 0 : _getrangeseleciton.textContent) || "";
+    var deleteCount = searchTxt === "=" ? 0 : searchTxt.length;
+    if (deleteCount > 0 && range.startContainer.nodeType === Node.TEXT_NODE && textEditor.contains(range.startContainer)) {
       var startOffset = Math.max(range.startOffset - deleteCount, 0);
       var endOffset = range.startOffset;
       range.setStart(range.startContainer, startOffset);
       range.setEnd(range.startContainer, endOffset);
       range.deleteContents();
     }
+    textEditor.querySelectorAll(".luckysheet-formula-text-func, .luckysheet-formula-text-lpar").forEach(function (el) {
+      return el.remove();
+    });
     var funcNode = new DOMParser().parseFromString("<span dir=\"auto\" class=\"luckysheet-formula-text-func\">".concat(formulaName, "</span>"), "text/html").body.firstChild;
     var parNode = new DOMParser().parseFromString("<span dir=\"auto\" class=\"luckysheet-formula-text-lpar\">(</span>", "text/html").body.firstChild;
-    if (range === null || range === void 0 ? void 0 : range.startContainer.parentNode) {
-      range.setStart(range.startContainer.parentNode, 1);
-    }
-    if (parNode) range.insertNode(parNode);
-    if (funcNode) range.insertNode(funcNode);
-    range.collapse();
-    selection.removeAllRanges();
-    selection.addRange(range);
+    if (range && parNode && funcNode) {
+      var _selection4, _selection5;
+      range.insertNode(funcNode);
+      range.collapse(false);
+      range.insertNode(parNode);
+      range.collapse(false);
+      (_selection4 = selection) === null || _selection4 === void 0 ? void 0 : _selection4.removeAllRanges();
+      (_selection5 = selection) === null || _selection5 === void 0 ? void 0 : _selection5.addRange(range);
+    }
     setContext(function (draftCtx) {
       draftCtx.functionCandidates = [];
       draftCtx.defaultCandidates = [];
@@ -1553,11 +1565,16 @@ var InputBox = function InputBox() {
       e.preventDefault();
     }
   }, [clearSearchItemActiveClass, context.luckysheetCellUpdate.length, selectActiveFormula, setContext, firstSelection]);
+  var _useState3 = React.useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    showCrypoModal = _useState4[0],
+    setShowCryptoModal = _useState4[1];
   var onChange = React.useCallback(function (__, isBlur) {
     var e = lastKeyDownEventRef.current;
     if (!e) return;
     var kcode = e.keyCode;
     if (!kcode) return;
+    setShowCryptoModal(!document.getElementById("luckysheet-formula-search-c"));
     if (!(kcode >= 112 && kcode <= 123 || kcode <= 46 || kcode === 144 || kcode === 108 || e.ctrlKey || e.altKey || e.shiftKey && (kcode === 37 || kcode === 38 || kcode === 39 || kcode === 40)) || kcode === 8 || kcode === 32 || kcode === 46 || e.ctrlKey && kcode === 86) {
       setContext(function (draftCtx) {
         if ((draftCtx.formulaCache.rangestart || draftCtx.formulaCache.rangedrag_column_start || draftCtx.formulaCache.rangedrag_row_start || fortuneCore.israngeseleciton(draftCtx)) && isBlur) return;
@@ -1619,7 +1636,7 @@ var InputBox = function InputBox() {
     onKeyDown: onKeyDown,
     onPaste: onPaste,
     allowEdit: edit ? !isHidenRC : edit
-  })), (context.functionCandidates.length > 0 || context.functionHint || context.defaultCandidates.length > 0) && (/*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(FormulaSearch, {
+  })), (context.functionCandidates.length > 0 || context.functionHint || context.defaultCandidates.length > 0) && showCrypoModal && (/*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(FormulaSearch, {
     onMouseOver: function onMouseOver(e) {
       if (document.getElementById("luckysheet-formula-search-c")) {
         var hoveredItem = e.target.closest(".luckysheet-formula-search-item");
@@ -3856,7 +3873,6 @@ var IframeBoxs = function IframeBoxs() {
             });
           }
           ctx.activeIframe = undefined;
-          fortuneCore.saveIframe(ctx);
         });
       },
       variant: "ghost",