@zhenliang/sheet 0.2.5-beta.12 → 0.2.5-beta.13

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

@@ -18,7 +18,7 @@ import { formulaString } from "../numberEditor";
 import DropMenu from "./DropMenu";
 import "./index.less";
 import { useKeyEventEffect } from "./keyEventEffect";
-import { createSpan, flattenOptions, getStringDiff, moveCursorToSpan, replaceLabelsWithValues, replaceLongestDiff, replaceValuesWithLabels, SpanType, tokenize, validateVariables } from "./utils";
+import { createSpan, flattenOptions, getStringDiff, moveCursorToSpan, replaceLabelsWithValues, replaceValuesWithLabels, SpanType, tokenize, validateVariables } from "./utils";
 import validateCalculationExpr from "./vaildFormula";
 import { jsx as _jsx } from "react/jsx-runtime";
 var OPERATORS = ['=', '+', '-', '*', '/', '('];
@@ -67,7 +67,6 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
       setInputAfterDropDownShow = _useState10[1];
     var tempSpanRef = useRef(null);
     var containerRef = useRef(null);
-    var inputOperatorPosition = useRef(0);
 
     // 扁平化所有选项
     var flatOptions = useMemo(function () {
@@ -124,12 +123,6 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
         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;
@@ -174,6 +167,11 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
         targetSpan = createSpan(OTHER, '');
         labelSpan.after(targetSpan);
       }
+      var newValueUser = container.textContent || '';
+      var expr = newValueUser;
+      var valueExprUser = replaceLabelsWithValues(expr, flatOptions);
+      setContainerValue(valueExprUser);
+      onChange(valueExprUser);
       moveCursorToSpan(targetSpan, true, selection);
       setOpen(false);
     }, [inputAfterDropDownShow]);
@@ -189,14 +187,6 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
       var processedValue = newValue;
       var expr = processedValue;
       var valueExpr = replaceLabelsWithValues(expr, flatOptions);
-      var oldLabelText = replaceValuesWithLabels(containerValue, flatOptions);
-      var firstDiffPosition = 0;
-      for (var i = 0; i < newValue.length; i++) {
-        if (newValue[i] !== oldLabelText[i]) {
-          firstDiffPosition = i;
-          break;
-        }
-      }
       var _getStringDiff = getStringDiff(containerValue, valueExpr),
         added = _getStringDiff.added,
         removed = _getStringDiff.removed;
@@ -215,7 +205,6 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
         // 按下了运算符，下拉框刚打开，重置输入记录
         containerValueSnapShot.current = expr;
         inputStringAfterDropDownShow = '';
-        inputOperatorPosition.current = firstDiffPosition;
 
         // 获取当前光标距离 containerRef 最左边的距离
         var selection = window.getSelection();
@@ -241,6 +230,7 @@ export var getFormulaInputEditor = function getFormulaInputEditor(options, repla
         closeDorpDown: closeDorpDown,
         setOffsetX: setOffsetX,
         setOpen: setOpen,
+        handleInput: handleInput,
         containerRef: containerRef,
         tempSpanRef: tempSpanRef,
         inputAfterDropDownShow: inputAfterDropDownShow,

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

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

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

@@ -13,6 +13,7 @@ var useKeyEventEffect = function useKeyEventEffect(_ref) {
   var closeDorpDown = _ref.closeDorpDown,
     setOffsetX = _ref.setOffsetX,
     setOpen = _ref.setOpen,
+    handleInput = _ref.handleInput,
     containerRef = _ref.containerRef,
     tempSpanRef = _ref.tempSpanRef,
     inputAfterDropDownShow = _ref.inputAfterDropDownShow,
@@ -187,6 +188,7 @@ var useKeyEventEffect = function useKeyEventEffect(_ref) {
           _prevSpan.textContent = prevText.slice(0, -1);
         }
         moveCursorToSpan(_prevSpan, false, selection);
+        handleInput();
       }
     }
 

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" | "showRemark" | "rowSelection" | "dataSource" | "rowKey"> & {
+export declare const formatSelectionData: (param: Pick<SheetTableType.TableProps, "dataSource" | "columns" | "rowKey" | "showRemark" | "rowSelection"> & {
     checked: boolean[];
 }) => any[][];

package/dist/example/basic.js

@@ -141,7 +141,7 @@ var data = [{
   age: 32,
   address: 'New York No. 1 Lake Park',
   tags: ['nice', 'developer'],
-  formula: '=price*qty',
+  formula: '=price*qty+wholesale',
   amount: 100
 }, {
   key: '2',

package/package.json

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