@zhenliang/sheet 0.1.92-beta.0 → 0.1.92-beta.5

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

@@ -8,16 +8,24 @@ function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("
 import { formatPrecision } from "../../../standardUtils";
 import { InputNumber as AntInputNumber, Input } from 'antd';
 import 'antd/es/input-number/style/index.css';
-import { isNil } from 'lodash';
+import { head, isNil } from 'lodash';
 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) {
   var curNumber = currentValue !== null && currentValue !== void 0 ? currentValue : 0;
-  var formula = String(value).replace('=', '').replace(/[xX]+/g, String(curNumber));
+  var headStr = head(String(value).trim());
+  var formula = String(value).replace('=', '');
+  var hasAdjacent = /\d+[xX]|[xX]+\d+/g.test(formula);
   try {
-    var result = evaluate(formula);
+    if (isNaN(value) && headStr !== '=' || hasAdjacent) {
+      throw false;
+    }
+    var result = evaluate(formula, {
+      x: curNumber,
+      X: curNumber
+    });
     if (max && result > max) {
       result = max;
     } else if (min && result < min) {
@@ -64,7 +72,8 @@ export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps)
   var NumberEditor = function NumberEditor(props) {
     var _ref3;
     var value = props.value,
-      onChange = props.onChange;
+      onChange = props.onChange,
+      isEditing = props.isEditing;
     var inputNumberRef = useRef(null);
     var _ref2 = getExtraProps ? getExtraProps(props) : extraProps !== null && extraProps !== void 0 ? extraProps : {},
       inputArgs = Object.assign({}, (_objectDestructuringEmpty(_ref2), _ref2));
@@ -72,9 +81,17 @@ export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps)
       onChange(!isNil(value) ? value : null);
     }, [onChange]);
     useEffect(function () {
-      var _inputNumberRef$curre2;
-      inputNumberRef === null || inputNumberRef === void 0 || (_inputNumberRef$curre2 = inputNumberRef.current) === null || _inputNumberRef$curre2 === void 0 || _inputNumberRef$curre2.focus();
-    }, []);
+      if (isEditing) {
+        var _inputNumberRef$curre2;
+        inputNumberRef === null || inputNumberRef === void 0 || (_inputNumberRef$curre2 = inputNumberRef.current) === null || _inputNumberRef$curre2 === void 0 || _inputNumberRef$curre2.focus();
+      }
+    }, [isEditing]);
+    var reFocus = useCallback(function () {
+      if (isEditing) {
+        var _inputNumberRef$curre3;
+        inputNumberRef === null || inputNumberRef === void 0 || (_inputNumberRef$curre3 = inputNumberRef.current) === null || _inputNumberRef$curre3 === void 0 || _inputNumberRef$curre3.focus();
+      }
+    }, [isEditing]);
     return /*#__PURE__*/_jsx(Input, _objectSpread(_objectSpread({
       ref: inputNumberRef
     }, inputArgs), {}, {
@@ -82,6 +99,7 @@ export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps)
       onMouseDown: function onMouseDown(e) {
         return e.stopPropagation();
       },
+      onBlur: reFocus,
       value: (_ref3 = value) !== null && _ref3 !== void 0 ? _ref3 : '',
       onChange: function onChange(e) {
         handleChange(e.target.value);

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

@@ -9,20 +9,25 @@
   text-align: inherit !important;
   padding-left: 0;
 
-  .ant-input-number-wrapper {
+  .ant-input-wrapper {
     text-align: inherit !important;
   }
 
-  .ant-input-number-input {
+  .ant-input {
     text-align: inherit !important;
   }
 
-  .ant-input-number-input-wrap > input {
+  .ant-input-wrapper > input {
     padding: 0;
     height: 38px;
+    border: none;
+    outline: none;
+    box-shadow: none;
+    background: transparent;
+    font-size: 12px;
   }
 
-  .ant-input-number-group-addon {
+  .ant-input-group-addon {
     background: transparent;
     border: none;
     padding: 0;

package/dist/core/reducers/keyboardReducer.js

@@ -30,8 +30,17 @@ export var keyboardReducer = {
         minCol++;
       }
     });
+    var lastEditing = state.lastEditing;
+    if (state.editing) {
+      lastEditing = _objectSpread(_objectSpread({}, state.editing), {}, {
+        confirm: true
+      });
+    }
     if (newRow > maxRow || newRow < 0 || newCol > maxCol || newCol < minCol) {
-      return state;
+      return _objectSpread(_objectSpread({}, state), {}, {
+        editing: undefined,
+        lastEditing: lastEditing
+      });
     }
     // 跟随滚动
     if (optCol !== 0) {
@@ -56,12 +65,6 @@ export var keyboardReducer = {
       row: newRow,
       col: newCol
     };
-    var lastEditing = state.lastEditing;
-    if (state.editing) {
-      lastEditing = _objectSpread(_objectSpread({}, state.editing), {}, {
-        confirm: true
-      });
-    }
     var isOut = isNil(currentPos.row);
     var newState = _objectSpread(_objectSpread({}, state), {}, {
       start: isOut ? undefined : currentPos,

package/dist/core/sheet/Cell.js

@@ -158,7 +158,8 @@ var Cell = function Cell(props) {
         value: value,
         record: cel.record,
         onConfirm: handleCommit,
-        onChange: setValue
+        onChange: setValue,
+        isEditing: isEditing
       });
     }
     return null;

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, "columns" | "dataSource" | "rowKey" | "showRemark" | "rowSelection"> & {
     checked: boolean[];
 }) => any[][];

package/dist/type/sheet.d.ts

@@ -51,6 +51,7 @@ export type CellEditorProps = {
     cell?: Cell;
     onChange: (value: unknown) => void;
     onConfirm: (value: unknown) => void;
+    isEditing?: boolean;
 } & CellViewerProps;
 export type CellEditor = React.FC<CellEditorProps> & {
     checker?: (value: unknown, record?: Record<string, unknown>, currentValue?: unknown) => boolean;

package/package.json

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