@zhenliang/sheet 0.2.5-beta.1 → 0.2.5-beta.10

package/dist/core/editor/InputOptionsEditor/index.d.ts

@@ -1,14 +1,5 @@
 import type { SheetType } from "../../../type";
 import './index.less';
-export interface OptionItem {
-    label: string;
-    value: string;
-    info?: string;
-    children?: OptionItem[];
-}
-export interface FormulaInputProps {
-    options: OptionItem[];
-    value?: string;
-}
-export declare const getFormulaInputEditor: (options: OptionItem[], replaceIndex?: string) => SheetType.CellEditor;
+import { OptionItem, inputProps } from './utils';
+export declare const getFormulaInputEditor: (options: OptionItem[], replaceIndex?: string, extraProps?: inputProps, getExtraProps?: ((props: SheetType.CellEditorProps) => inputProps) | undefined, choseEditor?: ((record: any) => boolean) | undefined) => SheetType.CellEditor;
 export default getFormulaInputEditor;

package/dist/core/editor/InputOptionsEditor/index.js

@@ -11,34 +11,54 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { Dropdown, Menu, Tooltip } from 'antd';
-import { head, isEmpty, isNil } from 'lodash';
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
 import { InfoCircleOutlined } from '@ant-design/icons';
-import { flattenOptions, getStringDiff, replaceLabelsWithValues, replaceLongestDiff, replaceValuesWithLabels, tokenize, validateVariables, getCursorPositionInSpan } from "./utils";
-import validateCalculationExpr from "./vaildFormula";
+import { Dropdown, Input, Menu, Tooltip } from 'antd';
+import { get, head, isEmpty, isNil } from 'lodash';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { formulaString } from "../numberEditor";
 import "./index.less";
+import { flattenOptions, getCursorPositionInSpan, getSpanAtCursor, getStringDiff, moveCursorToSpan, replaceLabelsWithValues, replaceLongestDiff, replaceValuesWithLabels, tokenize, validateVariables } from "./utils";
+import validateCalculationExpr from "./vaildFormula";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var OPERATORS = ['=', '+', '-', '*', '/'];
-
-// 获取光标所在的 span
-var getSpanAtCursor = function getSpanAtCursor(startContainer) {
-  if (startContainer.nodeType === Node.TEXT_NODE) {
-    return startContainer.parentElement;
-  }
-  if (startContainer.nodeType === Node.ELEMENT_NODE) {
-    return startContainer;
-  }
-  return null;
-};
-export var getFormulaInputEditor = function getFormulaInputEditor(options, replaceIndex) {
+var OPERATORS = ['=', '+', '-', '*', '/', '('];
+
+// // 创建 label span
+// const createLabelSpan = (label: string): HTMLElement => {
+//   const span = document.createElement('span');
+//   span.className = 'formula-editor-token-label';
+//   span.textContent = label;
+//   return span;
+// };
+
+// // 创建 empty other span
+// const createEmptyOtherSpan = (): HTMLElement => {
+//   const span = document.createElement('span');
+//   span.className = 'formula-editor-token-other';
+//   span.textContent = '';
+//   return span;
+// };
+
+export var getFormulaInputEditor = function getFormulaInputEditor(options, replaceIndex, extraProps, getExtraProps, choseEditor) {
+  var _ref = extraProps || {},
+    warnMethod = _ref.warnMethod,
+    rangeMethod = _ref.rangeMethod,
+    precision = _ref.precision,
+    max = _ref.max,
+    min = _ref.min;
   var FormulaInputEditor = function FormulaInputEditor(props) {
+    var _get;
     var originValue = props.value,
       onChange = props.onChange,
       isEditing = props.isEditing,
       record = props.record;
-    var calcValue = replaceIndex ? record === null || record === void 0 ? void 0 : record[replaceIndex] : originValue;
+    // 兼容number
+    var inputNumberRef = useRef(null);
+    var _ref2 = getExtraProps ? getExtraProps(props) : extraProps !== null && extraProps !== void 0 ? extraProps : {},
+      inputArgs = Object.assign({}, (_objectDestructuringEmpty(_ref2), _ref2));
+    var replaceValue = replaceIndex ? (_get = get(record, [replaceIndex])) !== null && _get !== void 0 ? _get : '' : originValue;
+    var calcValue = replaceValue.startsWith('=') ? replaceValue : "=".concat(replaceValue);
     var _useState = useState(calcValue),
       _useState2 = _slicedToArray(_useState, 1),
       inputValue = _useState2[0];
@@ -47,7 +67,7 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
       offsetX = _useState4[0],
       setOffsetX = _useState4[1];
     // 为了不重新render，再写一个
-    var _useState5 = useState(calcValue),
+    var _useState5 = useState(replaceValue),
       _useState6 = _slicedToArray(_useState5, 2),
       containerValue = _useState6[0],
       setContainerValue = _useState6[1];
@@ -60,6 +80,7 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
       _useState10 = _slicedToArray(_useState9, 2),
       inputAfterDropDownShow = _useState10[0],
       setInputAfterDropDownShow = _useState10[1];
+    var tempSpanRef = useRef(null);
     var containerRef = useRef(null);
     var inputOperatorPosition = useRef(0);
 
@@ -74,7 +95,7 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
     }, [inputValue, flatOptions]);
     // 根据搜索文本获取筛选后的层级选项（保持层级结构）
     var filteredHierarchyOptions = useMemo(function () {
-      var searchText = inputAfterDropDownShow;
+      var searchText = inputAfterDropDownShow.trim();
       // 如果搜索文本为空，显示所有选项（保持层级）
       if (!searchText) {
         return options;
@@ -109,25 +130,55 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
     useEffect(function () {
       if (!open) {
         containerValueSnapShot.current = '';
+        tempSpanRef.current = null;
       }
       setInputAfterDropDownShow('');
     }, [open]);
+    var closeDorpDown = useCallback(function () {
+      setInputAfterDropDownShow('');
+      tempSpanRef.current = null;
+      // 点击div内直接关闭
+      setOpen(false);
+    }, []);
 
-    // 处理选项点击：删除用户刚输入的值，将选中的 label 放到运算符后面
+    // 处理选项点击
     var handleOptionClick = useCallback(function (opt) {
       var container = containerRef.current;
       if (!container) return;
-      var newValue = replaceLongestDiff(containerValueSnapShot.current, opt.label, inputOperatorPosition.current);
-      setOpen(false);
-      containerValueSnapShot.current = '';
-      var expr = newValue;
-      var valueExpr = replaceLabelsWithValues(expr, flatOptions);
-      setContainerValue(valueExpr);
-      onChange(valueExpr);
-
-      // 获取当前光标所在的 span
       var selection = window.getSelection();
       if (!selection || selection.rangeCount === 0) return;
+
+      // 如果有 tempSpanRef，用新逻辑：直接替换该 span 的内容
+      if (tempSpanRef.current) {
+        tempSpanRef.current.textContent = opt.label;
+        var replacedSpan = tempSpanRef.current;
+        tempSpanRef.current = null;
+
+        // 光标移到替换后的 span 后面
+        var _allSpans = Array.from(container.querySelectorAll('span'));
+        var replacedIndex = _allSpans.indexOf(replacedSpan);
+        var _targetSpan = _allSpans[replacedIndex + 1];
+        if (!_targetSpan || _targetSpan.classList.contains('formula-editor-token-label')) {
+          _targetSpan = document.createElement('span');
+          _targetSpan.className = 'formula-editor-token-other';
+          _targetSpan.textContent = '';
+          replacedSpan.after(_targetSpan);
+        }
+        moveCursorToSpan(_targetSpan, true, selection);
+        // 更新 containerValue
+        var newValue = container.textContent || '';
+        var valueExpr = replaceLabelsWithValues(newValue, flatOptions);
+        setContainerValue(valueExpr);
+        onChange(valueExpr);
+        setOpen(false);
+        return;
+      }
+      // 原逻辑：删除 inputAfterDropDownShow，插入新 label
+      var newValueUser = replaceLongestDiff(containerValueSnapShot.current, opt.label, inputOperatorPosition.current);
+      var expr = newValueUser;
+      var valueExprUser = replaceLabelsWithValues(expr, flatOptions);
+      setContainerValue(valueExprUser);
+      onChange(valueExprUser);
       var range = selection.getRangeAt(0);
       var startContainer = range.startContainer;
       var currentSpan = startContainer.nodeType === Node.TEXT_NODE ? startContainer.parentElement : startContainer;
@@ -180,19 +231,17 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
         targetSpan.textContent = '';
         labelSpan.after(targetSpan);
       }
-
-      // 将光标移到目标 span 的开头
-      var newRange = document.createRange();
-      newRange.selectNodeContents(targetSpan);
-      newRange.collapse(true);
-      selection.removeAllRanges();
-      selection.addRange(newRange);
+      moveCursorToSpan(targetSpan, true, selection);
+      setOpen(false);
     }, [inputAfterDropDownShow]);
 
     // 处理输入变化
     var handleInput = useCallback(function () {
       var container = containerRef.current;
       if (!container) return;
+      if (tempSpanRef.current) {
+        closeDorpDown();
+      }
       var newValue = container.textContent || '';
       var processedValue = newValue;
       var expr = processedValue;
@@ -216,7 +265,7 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
       if (open) {
         var _getStringDiff2 = getStringDiff(containerValueSnapShot.current, newValue),
           addedOnSnapShot = _getStringDiff2.added;
-        isBeginWithNumber = /^\d$/.test(head(addedOnSnapShot));
+        isBeginWithNumber = /^\d$/.test(head(addedOnSnapShot.join('').trim()));
         inputStringAfterDropDownShow = addedOnSnapShot.join('');
       }
       if (pressAOperator) {
@@ -253,12 +302,8 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
         (_containerRef$current2 = containerRef.current) === null || _containerRef$current2 === void 0 || _containerRef$current2.focus();
       }
     }, [isEditing]);
-    var closeDorpDown = useCallback(function () {
-      // 点击div内直接关闭
-      setOpen(false);
-    }, []);
 
-    // 鼠标释放时，如果光标在 label span 内，移动到后一个 span 的开头
+    // 鼠标释放时，如果光标在 label span 内，打开下拉框并记录 tempSpan
     var handleMouseUp = useCallback(function () {
       var div = containerRef.current;
       if (!div) return;
@@ -271,8 +316,20 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
       if (!currentSpan || currentSpan === div) return;
       var isLabelSpan = currentSpan.classList.contains('formula-editor-token-label');
 
-      // 如果在 label span 内，移动到下一个 span 的开头
+      // 如果在 label span 内，打开下拉框并记录 tempSpan
       if (isLabelSpan) {
+        // 更新 offsetX 位置
+        var containerRect = div.getBoundingClientRect();
+        var cursorRect = range.getBoundingClientRect();
+        var cursorDistance = cursorRect ? cursorRect.left - containerRect.left : 0;
+        setOffsetX(cursorDistance < 150 ? 0 : cursorDistance - 8);
+
+        // 记录当前 label span 作为 tempSpan
+        tempSpanRef.current = currentSpan;
+
+        // 打开下拉框
+        setOpen(true);
+        // 移动到下一个 span 的开头
         var allSpans = Array.from(div.querySelectorAll('span'));
         var currentIndex = allSpans.indexOf(currentSpan);
         if (currentIndex < allSpans.length - 1) {
@@ -284,10 +341,10 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
           selection.addRange(newRange);
         }
       }
-    }, [closeDorpDown]);
+    }, [closeDorpDown, setOffsetX, setOpen]);
     var handleKeyDown = useCallback(function (e) {
       var _currentSpan$textCont, _currentSpan$textCont2;
-      if (e.key === 'ArrowUp' || e.key === "ArrowDown") {
+      if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
         e.preventDefault();
         e.stopPropagation();
         return;
@@ -307,13 +364,13 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
 
       // 方向键：跳过 label span
       if (e.key === 'ArrowRight' || e.key === 'ArrowLeft') {
-        closeDorpDown();
         var position = getCursorPositionInSpan(currentSpan);
         var isAtEnd = startOffset >= textLen;
         var isAtStart = startOffset === 0;
         var isAlmostEnd = startOffset >= textLen - 1;
         var isAlmostStart = position === 1;
         if (e.key === 'ArrowRight' && isAtEnd) {
+          closeDorpDown();
           // 向右 + 在末尾 -> 跳到下一个 span 的开头（跳过 label span）
           var targetIndex = currentIndex + 1;
           while (targetIndex < allSpans.length && allSpans[targetIndex].classList.contains('formula-editor-token-label')) {
@@ -322,48 +379,35 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
           if (targetIndex < allSpans.length && targetIndex !== currentIndex + 1) {
             e.preventDefault();
             var targetSpan = allSpans[targetIndex];
-            var newRange = document.createRange();
-            newRange.selectNodeContents(targetSpan);
-            newRange.collapse(true);
-            selection.removeAllRanges();
-            selection.addRange(newRange);
+            moveCursorToSpan(targetSpan, true, selection);
+          }
+        } else if (e.key === 'ArrowRight' && isAlmostEnd) {
+          closeDorpDown();
+          var _targetIndex = currentIndex + 1;
+          if (_targetIndex < allSpans.length && !allSpans[_targetIndex].classList.contains('formula-editor-token-label')) {
+            e.preventDefault();
+            var _targetSpan2 = allSpans[_targetIndex];
+            moveCursorToSpan(_targetSpan2, true, selection);
           }
         } else if (e.key === 'ArrowLeft' && isAtStart) {
+          closeDorpDown();
           // 向左 + 在开头 -> 跳到上一个 span 的末尾（跳过 label span）
-          var _targetIndex = currentIndex - 1;
-          while (_targetIndex >= 0 && allSpans[_targetIndex].classList.contains('formula-editor-token-label')) {
-            _targetIndex--;
-          }
-          if (_targetIndex >= 0 && _targetIndex !== currentIndex - 1) {
-            e.preventDefault();
-            var _targetSpan = allSpans[_targetIndex];
-            var _newRange = document.createRange();
-            _newRange.selectNodeContents(_targetSpan);
-            _newRange.collapse(false);
-            selection.removeAllRanges();
-            selection.addRange(_newRange);
+          var _targetIndex2 = currentIndex - 1;
+          while (_targetIndex2 >= 0 && allSpans[_targetIndex2].classList.contains('formula-editor-token-label')) {
+            _targetIndex2--;
           }
-        } else if (e.key === 'ArrowRight' && isAlmostEnd) {
-          var _targetIndex2 = currentIndex + 1;
-          if (_targetIndex2 < allSpans.length && !allSpans[_targetIndex2].classList.contains('formula-editor-token-label')) {
+          if (_targetIndex2 >= 0 && _targetIndex2 !== currentIndex - 1) {
             e.preventDefault();
-            var _targetSpan2 = allSpans[_targetIndex2];
-            var _newRange2 = document.createRange();
-            _newRange2.selectNodeContents(_targetSpan2);
-            _newRange2.collapse(true);
-            selection.removeAllRanges();
-            selection.addRange(_newRange2);
+            var _targetSpan3 = allSpans[_targetIndex2];
+            moveCursorToSpan(_targetSpan3, false, selection);
           }
         } else if (e.key === 'ArrowLeft' && isAlmostStart) {
+          closeDorpDown();
           var _targetIndex3 = currentIndex - 1;
           if (_targetIndex3 >= 0 && !allSpans[_targetIndex3].classList.contains('formula-editor-token-label')) {
             e.preventDefault();
-            var _targetSpan3 = allSpans[_targetIndex3];
-            var _newRange3 = document.createRange();
-            _newRange3.selectNodeContents(_targetSpan3);
-            _newRange3.collapse(false);
-            selection.removeAllRanges();
-            selection.addRange(_newRange3);
+            var _targetSpan4 = allSpans[_targetIndex3];
+            moveCursorToSpan(_targetSpan4, false, selection);
           }
         }
         return;
@@ -371,6 +415,19 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
 
       // 删除键逻辑
       if (e.key !== 'Delete' && e.key !== 'Backspace') return;
+      if (e.key === 'Backspace' || e.key === 'Delete') {
+        if (tempSpanRef.current) {
+          closeDorpDown();
+        }
+        // 检查删除后是否只剩一个空的 span
+        var allSpansNow = Array.from(div.querySelectorAll('span'));
+        var isOnlyOneEmptySpan = allSpansNow.length === 1 && allSpansNow[0].textContent === '';
+        if (isOnlyOneEmptySpan) {
+          e.preventDefault();
+          e.stopPropagation();
+          return;
+        }
+      }
 
       // 不在 label span 内，在 span 开头且前一个是 label 时，删除整个 label span
       if (startOffset === 0 && e.key === 'Backspace' && currentIndex > 0) {
@@ -379,31 +436,31 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
           e.preventDefault();
           e.stopPropagation();
           prevSpan.remove();
-          var _newRange4 = document.createRange();
+          var newRange = document.createRange();
 
           // 如果当前 span 有内容，光标放在开头；否则找最近的有内容的 span
           if (currentSpan.textContent !== '') {
-            _newRange4.selectNodeContents(currentSpan);
-            _newRange4.collapse(true);
+            newRange.selectNodeContents(currentSpan);
+            newRange.collapse(true);
           } else {
             // 找前一个最近的有内容的 span
-            var _targetSpan4;
+            var _targetSpan5;
             for (var i = currentIndex - 2; i >= 0; i--) {
               if (allSpans[i].textContent !== '') {
-                _targetSpan4 = allSpans[i];
+                _targetSpan5 = allSpans[i];
                 break;
               }
             }
-            if (_targetSpan4) {
-              _newRange4.selectNodeContents(_targetSpan4);
-              _newRange4.collapse(false);
+            if (_targetSpan5) {
+              newRange.selectNodeContents(_targetSpan5);
+              newRange.collapse(false);
             } else {
-              _newRange4.selectNodeContents(div);
-              _newRange4.collapse(true);
+              newRange.selectNodeContents(div);
+              newRange.collapse(true);
             }
           }
           selection.removeAllRanges();
-          selection.addRange(_newRange4);
+          selection.addRange(newRange);
           return;
         }
       }
@@ -419,11 +476,11 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
           if (prevText.length > 0) {
             _prevSpan.textContent = prevText.slice(0, -1);
           }
-          var _newRange5 = document.createRange();
-          _newRange5.selectNodeContents(_prevSpan);
-          _newRange5.collapse(false);
+          var _newRange = document.createRange();
+          _newRange.selectNodeContents(_prevSpan);
+          _newRange.collapse(false);
           selection.removeAllRanges();
-          selection.addRange(_newRange5);
+          selection.addRange(_newRange);
         }
       }
 
@@ -438,76 +495,104 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
           // 如果光标在 span 开头 + Delete 键，currentIndex 指向的是被删 span 的后一个，所以要 -1
           var searchIndex = startOffset === 0 ? currentIndex - 1 : currentIndex;
           // 从 searchIndex 位置往前找
-          var _targetSpan5;
+          var _targetSpan6;
           for (var _i = searchIndex; _i >= 0; _i--) {
             var span = allSpansNow[_i];
             if (span.textContent !== '') {
-              _targetSpan5 = span;
+              _targetSpan6 = span;
               break;
             }
           }
           // 如果找到的有内容 span 是 label，则把光标放在 label span 的后一个 span 的开头
-          if (_targetSpan5 && _targetSpan5.classList.contains('formula-editor-token-label')) {
-            var labelIndex = allSpansNow.indexOf(_targetSpan5);
+          if (_targetSpan6 && _targetSpan6.classList.contains('formula-editor-token-label')) {
+            var labelIndex = allSpansNow.indexOf(_targetSpan6);
             if (labelIndex < allSpansNow.length - 1) {
               var nextSpan = allSpansNow[labelIndex + 1];
-              var _newRange6 = document.createRange();
-              _newRange6.selectNodeContents(nextSpan);
-              _newRange6.collapse(true);
+              var _newRange2 = document.createRange();
+              _newRange2.selectNodeContents(nextSpan);
+              _newRange2.collapse(true);
               selection.removeAllRanges();
-              selection.addRange(_newRange6);
+              selection.addRange(_newRange2);
               return;
             }
           }
 
           // 否则把光标放在找到的 span 的末尾
-          if (_targetSpan5) {
-            var _newRange7 = document.createRange();
-            _newRange7.selectNodeContents(_targetSpan5);
-            _newRange7.collapse(false);
+          if (_targetSpan6) {
+            var _newRange3 = document.createRange();
+            _newRange3.selectNodeContents(_targetSpan6);
+            _newRange3.collapse(false);
             selection.removeAllRanges();
-            selection.addRange(_newRange7);
+            selection.addRange(_newRange3);
             return;
           }
         }
         if (!currentSpanNow || currentSpanNow === div) return;
         if (currentSpanNow.textContent === '') {
           var currentIndexNow = allSpansNow.indexOf(currentSpanNow);
-          var _newRange8 = document.createRange();
+          var _newRange4 = document.createRange();
           if (currentIndexNow > 0) {
             // 移到前一个 span 的末尾，但如果前一个 span 是 label，则移到后一个 span 的开头
-            var _targetSpan6 = allSpansNow[currentIndexNow - 1];
-            if (_targetSpan6.classList.contains('formula-editor-token-label')) {
+            var _targetSpan7 = allSpansNow[currentIndexNow - 1];
+            if (_targetSpan7.classList.contains('formula-editor-token-label')) {
               // 移到 label span 的后一个 span 的开头
               if (currentIndexNow < allSpansNow.length - 1) {
                 var _nextSpan = allSpansNow[currentIndexNow + 1];
-                _newRange8.selectNodeContents(_nextSpan);
-                _newRange8.collapse(true);
+                _newRange4.selectNodeContents(_nextSpan);
+                _newRange4.collapse(true);
               } else {
-                _newRange8.selectNodeContents(div);
-                _newRange8.collapse(false);
+                _newRange4.selectNodeContents(div);
+                _newRange4.collapse(false);
               }
             } else {
-              _newRange8.selectNodeContents(_targetSpan6);
-              _newRange8.collapse(false);
+              _newRange4.selectNodeContents(_targetSpan7);
+              _newRange4.collapse(false);
             }
             currentSpanNow.remove();
           } else if (allSpansNow.length > 1) {
             // 第一个 span 为空，移到下一个 span 的开头
             var _nextSpan2 = allSpansNow[currentIndexNow + 1];
-            _newRange8.selectNodeContents(_nextSpan2);
-            _newRange8.collapse(true);
+            _newRange4.selectNodeContents(_nextSpan2);
+            _newRange4.collapse(true);
             currentSpanNow.remove();
           } else {
             // 只有一个空 span，保持空
-            _newRange8.selectNodeContents(div);
-            _newRange8.collapse(true);
+            _newRange4.selectNodeContents(div);
+            _newRange4.collapse(true);
           }
           selection.removeAllRanges();
-          selection.addRange(_newRange8);
+          selection.addRange(_newRange4);
         }
       }, 0);
     }, []);
+
+    // 递归渲染多级菜单
+    var renderMenuItems = function renderMenuItems(items) {
+      return items.map(function (opt) {
+        if (opt.children && opt.children.length > 0) {
+          return /*#__PURE__*/_jsx(Menu.SubMenu, {
+            title: opt.label,
+            className: "formula-editor-dropdown-submenu",
+            children: renderMenuItems(opt.children)
+          }, opt.value);
+        }
+        return /*#__PURE__*/_jsxs(Menu.Item, {
+          className: "formula-editor-dropdown-item",
+          onClick: function onClick() {
+            return handleOptionClick(opt);
+          },
+          children: [opt.label, opt.info ? /*#__PURE__*/_jsx(Tooltip, {
+            title: opt.info,
+            children: /*#__PURE__*/_jsx(InfoCircleOutlined, {
+              style: {
+                color: '#FF9900',
+                marginLeft: 4
+              }
+            })
+          }) : null]
+        }, opt.value);
+      });
+    };
     var dropdownContent = /*#__PURE__*/_jsx(Menu, {
       className: "formula-editor-dropdown",
       style: {
@@ -523,36 +608,39 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
           className: "formula-editor-dropdown-no-data",
           children: "\u6682\u65E0\u6570\u636E"
         })
-      }, "no-data") : filteredHierarchyOptions.map(function (opt) {
-        return opt.children && opt.children.length > 0 ? /*#__PURE__*/_jsx(Menu.SubMenu, {
-          title: opt.label,
-          className: "formula-editor-dropdown-submenu",
-          children: opt.children.map(function (child) {
-            return /*#__PURE__*/_jsx(Menu.Item, {
-              className: "formula-editor-dropdown-item",
-              onClick: function onClick() {
-                return handleOptionClick(child);
-              },
-              children: child.label
-            }, child.value);
-          })
-        }, opt.value) : /*#__PURE__*/_jsxs(Menu.Item, {
-          className: "formula-editor-dropdown-item",
-          onClick: function onClick() {
-            return handleOptionClick(opt);
-          },
-          children: [opt.label, opt.info ? /*#__PURE__*/_jsx(Tooltip, {
-            title: opt.info,
-            children: /*#__PURE__*/_jsx(InfoCircleOutlined, {
-              style: {
-                color: '#FF9900',
-                marginLeft: 4
-              }
-            })
-          }) : null]
-        }, opt.value);
-      })
+      }, "no-data") : renderMenuItems(filteredHierarchyOptions)
     });
+    var handleChange = useCallback(function (value) {
+      onChange(!isNil(value) ? value : null);
+    }, [onChange]);
+    useEffect(function () {
+      if (isEditing) {
+        var _inputNumberRef$curre;
+        inputNumberRef === null || inputNumberRef === void 0 || (_inputNumberRef$curre = inputNumberRef.current) === null || _inputNumberRef$curre === void 0 || _inputNumberRef$curre.focus();
+      }
+    }, [isEditing]);
+    var reFocus = useCallback(function () {
+      if (isEditing) {
+        var _inputNumberRef$curre2;
+        inputNumberRef === null || inputNumberRef === void 0 || (_inputNumberRef$curre2 = inputNumberRef.current) === null || _inputNumberRef$curre2 === void 0 || _inputNumberRef$curre2.focus();
+      }
+    }, [isEditing]);
+    if (choseEditor && choseEditor(record)) {
+      var _ref3;
+      return /*#__PURE__*/_jsx(Input, _objectSpread(_objectSpread({
+        ref: inputNumberRef,
+        onBlur: reFocus
+      }, inputArgs), {}, {
+        className: "number-editor",
+        onMouseDown: function onMouseDown(e) {
+          return e.stopPropagation();
+        },
+        value: (_ref3 = originValue) !== null && _ref3 !== void 0 ? _ref3 : '',
+        onChange: function onChange(e) {
+          handleChange(e.target.value);
+        }
+      }));
+    }
     return /*#__PURE__*/_jsx(Dropdown, {
       overlayClassName: "dropDownOffset",
       overlay: dropdownContent,
@@ -571,13 +659,13 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
         spellCheck: false,
         children: isEmpty(tokens) ? /*#__PURE__*/_jsx("span", {
           style: {
-            minWidth: 8,
+            minWidth: 1,
             height: 40
           }
         }) : tokens.map(function (token, index) {
           return token.type === 'end' ? /*#__PURE__*/_jsx("span", {
             style: {
-              minWidth: 8,
+              minWidth: 1,
               height: 40
             }
           }, index) : /*#__PURE__*/_jsx("span", {
@@ -593,22 +681,40 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
   var flatOptions = flattenOptions(options);
 
   // checker：使用 validateCalculationExpr 校验语法 + 校验变量是否都在 options 中
-  FormulaInputEditor.checker = function (value) {
+  FormulaInputEditor.checker = function (value, record, currentValue) {
     if (isNil(value)) return true;
+    if (choseEditor && choseEditor(record)) {
+      var _String;
+      var result = (_String = String(value)) === null || _String === void 0 ? void 0 : _String.replace(/,/g, '');
+      result = formulaString(result, currentValue, precision);
+      // parse number with thousands separator
+      var range = rangeMethod === null || rangeMethod === void 0 ? void 0 : rangeMethod(record);
+      if (!isNil(range === null || range === void 0 ? void 0 : range.max) && !isNil(range === null || range === void 0 ? void 0 : range.min)) {
+        var _ref4 = range || {},
+          _ref4$max = _ref4.max,
+          _max = _ref4$max === void 0 ? 0 : _ref4$max,
+          _ref4$min = _ref4.min,
+          _min = _ref4$min === void 0 ? 0 : _ref4$min;
+        if (result < _min || result > _max) {
+          warnMethod === null || warnMethod === void 0 || warnMethod(record);
+          return false;
+        }
+      }
+      if (isNaN(result)) {
+        return false;
+      }
+      return true;
+    }
     var strValue = String(value);
-
     // 如果以 = 开头，去掉 = 后校验
     var expr = strValue.startsWith('=') ? strValue.slice(1) : strValue;
     var parsedExpr = replaceLabelsWithValues(expr, flatOptions);
-
     // 空表达式不校验
     if (!parsedExpr.trim()) return true;
-
     // 1. 语法校验
     if (!validateCalculationExpr(parsedExpr)) {
       return false;
     }
-
     // 2. 变量校验：所有变量必须在 options 中
     if (!validateVariables(parsedExpr, flatOptions)) {
       return false;
@@ -617,10 +723,15 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
   };
 
   // formula：校验公式，校验成功返回 currentValue
-  FormulaInputEditor.formula = function (value, currentValue) {
+  FormulaInputEditor.formula = function (value, record, currentValue) {
     if (isNil(value)) {
       return null;
     }
+    if (choseEditor && choseEditor(record)) {
+      var _String2;
+      var formatValue = (_String2 = String(value)) === null || _String2 === void 0 ? void 0 : _String2.replace(/,/g, '');
+      return formulaString(formatValue, currentValue, precision, max, min, true);
+    }
     var strValue = String(value);
     var hasEqualSign = strValue.startsWith('=');
     var expr = hasEqualSign ? strValue.slice(1) : strValue;
@@ -645,8 +756,17 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
   };
 
   // parser：粘贴时处理，将 label 转换为 value
-  FormulaInputEditor.parser = function (value) {
+  FormulaInputEditor.parser = function (value, record, currentValue) {
     if (isNil(value)) return null;
+    if (choseEditor && choseEditor(record)) {
+      var _String3;
+      var result = (_String3 = String(value)) === null || _String3 === void 0 ? void 0 : _String3.replace(/[,|%]/g, '');
+      result = formulaString(result, currentValue, precision);
+      if (isNil(result) || isNaN(result)) {
+        return null;
+      }
+      return result;
+    }
     var strValue = String(value);
     var hasEqualSign = strValue.startsWith('=');
     var expr = hasEqualSign ? strValue.slice(1) : strValue;
@@ -657,15 +777,24 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
   };
 
   // formatter：复制时触发，将 value 转换为 label
-  FormulaInputEditor.formatter = function (value) {
-    if (isNil(value)) return null;
-    var strValue = String(value);
+  FormulaInputEditor.formatter = function (value, record) {
+    if (choseEditor && choseEditor(record)) {
+      var _String4;
+      if (isNil(value) || isNaN(value)) {
+        return null;
+      }
+      var result = parseFloat((_String4 = String(value)) === null || _String4 === void 0 ? void 0 : _String4.replace(/,/g, ''));
+      return result;
+    }
+    var replaceValue = replaceIndex ? get(record, [replaceIndex]) : value;
+    if (isNil(replaceValue)) return null;
+    var strValue = String(replaceValue);
     var hasEqualSign = strValue.startsWith('=');
     var expr = hasEqualSign ? strValue.slice(1) : strValue;
 
     // 将 value 替换为 label
     var displayExpr = replaceValuesWithLabels(expr, flatOptions);
-    return hasEqualSign ? '=' + displayExpr : displayExpr;
+    return hasEqualSign ? displayExpr : '=' + displayExpr;
   };
   return FormulaInputEditor;
 };

package/dist/core/editor/InputOptionsEditor/index.less

@@ -4,12 +4,13 @@
   white-space: nowrap;
   overflow: hidden;
   outline: none;
-  min-width: 95%;
+  min-width: 90%;
   max-height: 100%;
   box-shadow: inset 0 -100px 0 rgba(33, 133, 208, 15%);
   position: absolute;
   top: 0;
   background: #fff;
+  padding-right: 8px;
 }
 
 .formula-editor-equal {

package/dist/core/editor/InputOptionsEditor/utils.d.ts

@@ -1,3 +1,4 @@
+import { InputNumberProps } from "antd";
 export declare const OPERATORS: string[];
 export declare const VARIABLE_REGEX: RegExp;
 export declare const NUMBER_REGEX: RegExp;
@@ -40,7 +41,7 @@ export declare const validateVariables: (expr: string, flatOptions: {
     value: string;
 }[]) => boolean;
 /**
- * 扁平化选项列表（将 children 展开）
+ * 扁平化选项列表（只获取叶子节点）
  */
 export declare const flattenOptions: (options: {
     label: string;
@@ -57,3 +58,18 @@ export declare const longestCommonSubsequence: (arr1: string, arr2: string) => s
 export declare const getStringDiff: (str1: any, str2: any, mode?: string) => any;
 export declare const replaceLongestDiff: (a: string, str: string, position: number) => string;
 export declare const getCursorPositionInSpan: (span: any) => any;
+export interface OptionItem {
+    label: string;
+    value: string;
+    info?: string;
+    children?: OptionItem[];
+}
+export type inputProps = Partial<Pick<InputNumberProps, 'max' | 'min' | 'addonBefore' | 'addonAfter' | 'precision'> & {
+    warnMethod?: (record: any) => void;
+    rangeMethod?: (record: any) => {
+        max?: number;
+        min?: number;
+    };
+}>;
+export declare const getSpanAtCursor: (startContainer: any) => HTMLElement | null;
+export declare const moveCursorToSpan: (targetSpan: HTMLElement, atStart: boolean | undefined, selection: any) => void;

package/dist/core/editor/InputOptionsEditor/utils.js

@@ -38,7 +38,7 @@ export var replaceValuesWithLabels = function replaceValuesWithLabels(expr, flat
   } finally {
     _iterator.f();
   }
-  return result.replace(/\s/g, '');
+  return result.trim();
 };
 
 /**
@@ -115,6 +115,9 @@ var splitSegmentByLabels = function splitSegmentByLabels(segment, sortedLabels)
  * 有效 label 为 type 'label'，其他为 'other'
  */
 export var tokenize = function tokenize(text, flatOptions) {
+  if (!text) {
+    return [];
+  }
   var tokens = [];
 
   // 将 value 转换为 label
@@ -204,7 +207,7 @@ export var validateVariables = function validateVariables(expr, flatOptions) {
 };
 
 /**
- * 扁平化选项列表（将 children 展开）
+ * 扁平化选项列表（只获取叶子节点）
  */
 export var flattenOptions = function flattenOptions(options) {
   var result = [];
@@ -213,12 +216,15 @@ export var flattenOptions = function flattenOptions(options) {
   try {
     for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
       var opt = _step5.value;
-      result.push({
-        label: opt.label,
-        value: opt.value
-      });
       if (opt.children && opt.children.length > 0) {
+        // 有 children，递归获取叶子节点，不添加当前节点
         result.push.apply(result, _toConsumableArray(flattenOptions(opt.children)));
+      } else {
+        // 没有 children，是叶子节点，添加到结果
+        result.push({
+          label: opt.label,
+          value: opt.value
+        });
       }
     }
   } catch (err) {
@@ -332,4 +338,26 @@ export var getCursorPositionInSpan = function getCursorPositionInSpan(span) {
   preCaretRange.selectNodeContents(span);
   preCaretRange.setEnd(range.startContainer, range.startOffset);
   return preCaretRange.toString().length;
+};
+// 获取光标所在的 span
+export var getSpanAtCursor = function getSpanAtCursor(startContainer) {
+  if (startContainer.nodeType === Node.TEXT_NODE) {
+    return startContainer.parentElement;
+  }
+  if (startContainer.nodeType === Node.ELEMENT_NODE) {
+    return startContainer;
+  }
+  return null;
+};
+
+// 将光标移到目标 span 的开头或末尾
+export var moveCursorToSpan = function moveCursorToSpan(targetSpan) {
+  var atStart = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  var selection = arguments.length > 2 ? arguments[2] : undefined;
+  if (!selection) return;
+  var newRange = document.createRange();
+  newRange.selectNodeContents(targetSpan);
+  newRange.collapse(atStart);
+  selection.removeAllRanges();
+  selection.addRange(newRange);
 };

package/dist/core/editor/InputOptionsEditor/vaildFormula.js

@@ -257,14 +257,26 @@ var Parser = /*#__PURE__*/function () {
       return true;
     }
 
-    // 解析基本表达式（括号、数字、百分比、变量）
-    // factor: '(' expr ')' | NUMBER | PERCENT | REFVAR
+    // 解析基本表达式（括号、数字、百分比、变量、带符号的数字）
+    // factor: '(' expr ')' | NUMBER | PERCENT | REFVAR | ('+' | '-') factor
+    // 注意：一元正负号后不能紧跟另一个一元正负号
   }, {
     key: "parseFactor",
     value: function parseFactor() {
       var token = this.currentToken();
       if (!token) return false;
 
+      // 处理一元正负号
+      if (token.type === 'ADD' || token.type === 'SUB') {
+        this.pos++;
+        var nextToken = this.currentToken();
+        // 一元正负号后不能是另一个一元正负号
+        if (nextToken && (nextToken.type === 'ADD' || nextToken.type === 'SUB')) {
+          return false;
+        }
+        return this.parseFactor();
+      }
+
       // 处理括号表达式
       if (token.type === 'LPAREN') {
         this.pos++;

package/dist/core/editor/numberEditor/index.d.ts

@@ -9,6 +9,7 @@ type inputProps = Partial<Pick<InputNumberProps, 'max' | 'min' | 'addonBefore' |
         min?: number;
     };
 }>;
+export declare const formulaString: (value: unknown, currentValue: unknown, precision?: number, max?: number, min?: number, isEdit?: boolean) => unknown;
 export declare const NumberEditor: SheetType.CellEditor;
 export declare const getNumberEditor: (extraProps?: inputProps, getExtraProps?: ((props: SheetType.CellEditorProps) => inputProps) | undefined) => SheetType.CellEditor;
 export {};

package/dist/core/editor/numberEditor/index.js

@@ -13,7 +13,7 @@ import { evaluate } from 'mathjs';
 import { useCallback, useEffect, useRef } from 'react';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
-var formulaString = function formulaString(value, currentValue, precision, max, min, isEdit) {
+export var formulaString = function formulaString(value, currentValue, precision, max, min, isEdit) {
   var curNumber = currentValue !== null && currentValue !== void 0 ? currentValue : 0;
   var headStr = head(String(value).trim());
   var formula = String(value).replace('=', '');
@@ -106,7 +106,7 @@ export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps)
       }
     }));
   };
-  NumberEditor.formula = function (value, currentValue) {
+  NumberEditor.formula = function (value, record, currentValue) {
     var _String;
     if (isNil(value)) {
       return null;

package/dist/core/sheet/Cell.js

@@ -89,7 +89,7 @@ var Cell = function Cell(props) {
       // 转化一下公式
       if (cell !== null && cell !== void 0 && (_cell$dataEditor3 = cell.dataEditor) !== null && _cell$dataEditor3 !== void 0 && _cell$dataEditor3.formula) {
         var _cell$dataEditor4;
-        newValue = cell === null || cell === void 0 || (_cell$dataEditor4 = cell.dataEditor) === null || _cell$dataEditor4 === void 0 ? void 0 : _cell$dataEditor4.formula(value, valueRef.current);
+        newValue = cell === null || cell === void 0 || (_cell$dataEditor4 = cell.dataEditor) === null || _cell$dataEditor4 === void 0 ? void 0 : _cell$dataEditor4.formula(value, cell.record, valueRef.current);
         if (newValue === Infinity) {
           antConfirm({
             title: '公式有误',

package/dist/core/table/useRowSelection.d.ts

@@ -1,5 +1,5 @@
 import { SheetTableType } from "../..";
 export declare const useRowSelection: (dataSource: Record<string, unknown>[], rowSelection?: SheetTableType.TableRowSelection, hasChildren?: boolean) => [boolean[], (value: boolean[]) => void];
-export declare const formatSelectionData: (param: Pick<SheetTableType.TableProps, "columns" | "dataSource" | "rowKey" | "showRemark" | "rowSelection"> & {
+export declare const formatSelectionData: (param: Pick<SheetTableType.TableProps, "columns" | "showRemark" | "rowSelection" | "dataSource" | "rowKey"> & {
     checked: boolean[];
 }) => any[][];

package/dist/example/basic.js

@@ -175,6 +175,14 @@ var data = [{
   tags: ['cool', 'teacher'],
   formula: '=(123 + 456) * price + 888',
   amount: 100
+}, {
+  key: '6',
+  name: 'Joe 23',
+  age: 41,
+  address: 'Sidney No. 1 Lake Park',
+  tags: ['cool', 'teacher'],
+  formula: '=(123 + -456) * price *-discount',
+  amount: 100
 }];
 var App = function App() {
   var _useState = useState(data),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhenliang/sheet",
-  "version": "0.2.5-beta.1",
+  "version": "0.2.5-beta.10",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",