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

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/keyEventEffect.d.ts

@@ -0,0 +1,16 @@
+import type { KeyboardEvent as ReactKeyboardEvent } from 'react';
+import { OptionItem } from './utils';
+declare const useKeyEventEffect: ({ closeDorpDown, setOffsetX, setOpen, containerRef, tempSpanRef, inputAfterDropDownShow, options }: {
+    closeDorpDown: () => void;
+    setOffsetX: (value: React.SetStateAction<number>) => void;
+    setOpen: (value: React.SetStateAction<boolean>) => void;
+    containerRef: React.RefObject<HTMLDivElement>;
+    tempSpanRef: React.MutableRefObject<HTMLElement | null>;
+    inputAfterDropDownShow: string;
+    options: OptionItem[];
+}) => {
+    handleMouseUp: () => void;
+    handleKeyDown: (e: ReactKeyboardEvent<HTMLDivElement>) => void;
+    filteredHierarchyOptions: OptionItem[];
+};
+export { useKeyEventEffect };

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

@@ -0,0 +1,305 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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; }
+import { useCallback, useMemo } from 'react';
+import { getCursorPositionInSpan, getSpanAtCursor, moveCursorToSpan } from "./utils";
+var useKeyEventEffect = function useKeyEventEffect(_ref) {
+  var closeDorpDown = _ref.closeDorpDown,
+    setOffsetX = _ref.setOffsetX,
+    setOpen = _ref.setOpen,
+    containerRef = _ref.containerRef,
+    tempSpanRef = _ref.tempSpanRef,
+    inputAfterDropDownShow = _ref.inputAfterDropDownShow,
+    options = _ref.options;
+  // 鼠标释放时，如果光标在 label span 内，打开下拉框并记录 tempSpan
+  var handleMouseUp = useCallback(function () {
+    var div = containerRef.current;
+    if (!div) return;
+    closeDorpDown();
+    var selection = window.getSelection();
+    if (!selection || selection.rangeCount === 0) return;
+    var range = selection.getRangeAt(0);
+    var startContainer = range.startContainer;
+    var currentSpan = getSpanAtCursor(startContainer);
+    if (!currentSpan || currentSpan === div) return;
+    var isLabelSpan = currentSpan.classList.contains('formula-editor-token-label');
+
+    // 如果在 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) {
+        var nextSpan = allSpans[currentIndex + 1];
+        moveCursorToSpan(nextSpan, true, selection);
+      }
+    }
+  }, [closeDorpDown, setOffsetX, setOpen]);
+  var handleKeyDown = useCallback(function (e) {
+    var _currentSpan$textCont, _currentSpan$textCont2;
+    if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
+      e.preventDefault();
+      e.stopPropagation();
+      return;
+    }
+    var div = containerRef.current;
+    if (!div) return;
+    var selection = window.getSelection();
+    if (!selection || selection.rangeCount === 0) return;
+    var range = selection.getRangeAt(0);
+    var startContainer = range.startContainer,
+      startOffset = range.startOffset;
+    var currentSpan = getSpanAtCursor(startContainer);
+    if (!currentSpan || currentSpan === div) return;
+    var allSpans = Array.from(div.querySelectorAll('span'));
+    var currentIndex = allSpans.indexOf(currentSpan);
+    var textLen = (_currentSpan$textCont = (_currentSpan$textCont2 = currentSpan.textContent) === null || _currentSpan$textCont2 === void 0 ? void 0 : _currentSpan$textCont2.length) !== null && _currentSpan$textCont !== void 0 ? _currentSpan$textCont : 0;
+
+    // 方向键：跳过 label span
+    if (e.key === 'ArrowRight' || e.key === 'ArrowLeft') {
+      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')) {
+          targetIndex++;
+        }
+        if (targetIndex < allSpans.length && targetIndex !== currentIndex + 1) {
+          e.preventDefault();
+          var targetSpan = allSpans[targetIndex];
+          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 _targetSpan = allSpans[_targetIndex];
+          moveCursorToSpan(_targetSpan, true, selection);
+        }
+      } else if (e.key === 'ArrowLeft' && isAtStart) {
+        closeDorpDown();
+        // 向左 + 在开头 -> 跳到上一个 span 的末尾（跳过 label span）
+        var _targetIndex2 = currentIndex - 1;
+        while (_targetIndex2 >= 0 && allSpans[_targetIndex2].classList.contains('formula-editor-token-label')) {
+          _targetIndex2--;
+        }
+        if (_targetIndex2 >= 0 && _targetIndex2 !== currentIndex - 1) {
+          e.preventDefault();
+          var _targetSpan2 = allSpans[_targetIndex2];
+          moveCursorToSpan(_targetSpan2, 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];
+          moveCursorToSpan(_targetSpan3, false, selection);
+        }
+      }
+      return;
+    }
+
+    // 删除键逻辑
+    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) {
+      var prevSpan = allSpans[currentIndex - 1];
+      if (prevSpan.classList.contains('formula-editor-token-label')) {
+        e.preventDefault();
+        e.stopPropagation();
+        prevSpan.remove();
+        var newRange = document.createRange();
+
+        // 如果当前 span 有内容，光标放在开头；否则找最近的有内容的 span
+        if (currentSpan.textContent !== '') {
+          newRange.selectNodeContents(currentSpan);
+          newRange.collapse(true);
+        } else {
+          // 找前一个最近的有内容的 span
+          var _targetSpan4;
+          for (var i = currentIndex - 2; i >= 0; i--) {
+            if (allSpans[i].textContent !== '') {
+              _targetSpan4 = allSpans[i];
+              break;
+            }
+          }
+          if (_targetSpan4) {
+            newRange.selectNodeContents(_targetSpan4);
+            newRange.collapse(false);
+          } else {
+            newRange.selectNodeContents(div);
+            newRange.collapse(true);
+          }
+        }
+        selection.removeAllRanges();
+        selection.addRange(newRange);
+        return;
+      }
+    }
+
+    // 在 span 开头 + Delete 键，光标移到前一个 span 的末尾
+    if (startOffset === 0 && e.key === 'Backspace' && currentIndex > 0) {
+      var _prevSpan = allSpans[currentIndex - 1];
+      // 前一个 span 是非 label span 时，光标移到其末尾
+      if (!_prevSpan.classList.contains('formula-editor-token-label')) {
+        e.preventDefault();
+        e.stopPropagation();
+        var prevText = _prevSpan.textContent || '';
+        if (prevText.length > 0) {
+          _prevSpan.textContent = prevText.slice(0, -1);
+        }
+        moveCursorToSpan(_prevSpan, false, selection);
+      }
+    }
+
+    // 其他情况：等待浏览器完成默认删除后，检查当前 span 是否为空
+    setTimeout(function () {
+      var currentSpanNow = getSpanAtCursor(startContainer);
+      var allSpansNow = Array.from(div.querySelectorAll('span'));
+
+      // 如果 currentSpanNow 不在 allSpansNow 里（被浏览器删除了）
+      // 且还有 span 存在，用按下删除键时的 currentSpan 位置往前找
+      if (allSpansNow.length > 0 && !allSpansNow.includes(currentSpanNow)) {
+        // 如果光标在 span 开头 + Delete 键，currentIndex 指向的是被删 span 的后一个，所以要 -1
+        var searchIndex = startOffset === 0 ? currentIndex - 1 : currentIndex;
+        // 从 searchIndex 位置往前找
+        var _targetSpan5;
+        for (var _i = searchIndex; _i >= 0; _i--) {
+          var span = allSpansNow[_i];
+          if (span.textContent !== '') {
+            _targetSpan5 = span;
+            break;
+          }
+        }
+        // 如果找到的有内容 span 是 label，则把光标放在 label span 的后一个 span 的开头
+        if (_targetSpan5 && _targetSpan5.classList.contains('formula-editor-token-label')) {
+          var labelIndex = allSpansNow.indexOf(_targetSpan5);
+          if (labelIndex < allSpansNow.length - 1) {
+            var nextSpan = allSpansNow[labelIndex + 1];
+            moveCursorToSpan(nextSpan, true, selection);
+            return;
+          }
+        }
+
+        // 否则把光标放在找到的 span 的末尾
+        if (_targetSpan5) {
+          moveCursorToSpan(_targetSpan5, false, selection);
+          return;
+        }
+      }
+      if (!currentSpanNow || currentSpanNow === div) return;
+      if (currentSpanNow.textContent === '') {
+        var currentIndexNow = allSpansNow.indexOf(currentSpanNow);
+        var _newRange = document.createRange();
+        if (currentIndexNow > 0) {
+          // 移到前一个 span 的末尾，但如果前一个 span 是 label，则移到后一个 span 的开头
+          var _targetSpan6 = allSpansNow[currentIndexNow - 1];
+          if (_targetSpan6.classList.contains('formula-editor-token-label')) {
+            // 移到 label span 的后一个 span 的开头
+            if (currentIndexNow < allSpansNow.length - 1) {
+              var _nextSpan = allSpansNow[currentIndexNow + 1];
+              _newRange.selectNodeContents(_nextSpan);
+              _newRange.collapse(true);
+            } else {
+              _newRange.selectNodeContents(div);
+              _newRange.collapse(false);
+            }
+          } else {
+            _newRange.selectNodeContents(_targetSpan6);
+            _newRange.collapse(false);
+          }
+          currentSpanNow.remove();
+        } else if (allSpansNow.length > 1) {
+          // 第一个 span 为空，移到下一个 span 的开头
+          var _nextSpan2 = allSpansNow[currentIndexNow + 1];
+          _newRange.selectNodeContents(_nextSpan2);
+          _newRange.collapse(true);
+          currentSpanNow.remove();
+        } else {
+          // 只有一个空 span，保持空
+          _newRange.selectNodeContents(div);
+          _newRange.collapse(true);
+        }
+        selection.removeAllRanges();
+        selection.addRange(_newRange);
+      }
+    }, 0);
+  }, [closeDorpDown, containerRef.current]);
+  var filteredHierarchyOptions = useMemo(function () {
+    var searchText = inputAfterDropDownShow.trim();
+    // 如果搜索文本为空，显示所有选项（保持层级）
+    if (!searchText) {
+      return options;
+    }
+
+    // 根据搜索文本筛选，保持层级结构
+    var filterWithHierarchy = function filterWithHierarchy(items) {
+      var result = [];
+      var _iterator = _createForOfIteratorHelper(items),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var item = _step.value;
+          var labelMatch = item.label.includes(searchText);
+          // 筛选 children
+          var filteredChildren = item.children ? filterWithHierarchy(item.children) : [];
+          if (labelMatch || filteredChildren.length > 0) {
+            result.push(_objectSpread(_objectSpread({}, item), {}, {
+              children: filteredChildren.length > 0 ? filteredChildren : item.children
+            }));
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return result;
+    };
+    return filterWithHierarchy(options);
+  }, [inputAfterDropDownShow]);
+  return {
+    handleMouseUp: handleMouseUp,
+    handleKeyDown: handleKeyDown,
+    filteredHierarchyOptions: filteredHierarchyOptions
+  };
+};
+export { useKeyEventEffect };

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,23 @@ 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;
+export declare enum SpanType {
+    LABEL = "label",
+    OTHER = "other"
+}
+export declare const createSpan: (type: string, content: string) => HTMLElement;

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

@@ -5,6 +5,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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; }
+import { get } from "lodash";
+
 // 运算符列表
 export var OPERATORS = ['+', '-', '*', '/'];
 
@@ -38,7 +40,7 @@ export var replaceValuesWithLabels = function replaceValuesWithLabels(expr, flat
   } finally {
     _iterator.f();
   }
-  return result.replace(/\s/g, '');
+  return result.trim();
 };
 
 /**
@@ -115,6 +117,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 +209,7 @@ export var validateVariables = function validateVariables(expr, flatOptions) {
 };
 
 /**
- * 扁平化选项列表（将 children 展开）
+ * 扁平化选项列表（只获取叶子节点）
  */
 export var flattenOptions = function flattenOptions(options) {
   var result = [];
@@ -213,12 +218,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 +340,41 @@ 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);
+};
+export var SpanType = /*#__PURE__*/function (SpanType) {
+  SpanType["LABEL"] = "label";
+  SpanType["OTHER"] = "other";
+  return SpanType;
+}({});
+var spanTypeStyle = {
+  label: 'formula-editor-token-label',
+  other: 'formula-editor-token-other'
+};
+export var createSpan = function createSpan(type, content) {
+  var span = document.createElement('span');
+  span.className = get(spanTypeStyle, [type]);
+  span.textContent = content;
+  return span;
 };

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/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.11",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",