@zhenliang/sheet 0.1.89 → 0.1.90-beta.0

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

@@ -2,7 +2,13 @@ import type { SheetType } from "../../../type";
 import { InputNumberProps } from 'antd';
 import 'antd/es/input-number/style/index.css';
 import './index.less';
-type inputProps = Partial<Pick<InputNumberProps, 'max' | 'min' | 'addonBefore' | 'addonAfter' | 'precision'>>;
+type inputProps = Partial<Pick<InputNumberProps, 'max' | 'min' | 'addonBefore' | 'addonAfter' | 'precision'> & {
+    warnMethod?: (record: any) => void;
+    rangeMethod?: (record: any) => {
+        max: number;
+        min: number;
+    };
+}>;
 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

@@ -1,22 +1,38 @@
 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); }
-var _excluded = ["precision"];
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
 import { formatPrecision } from "../../../standardUtils";
-import { InputNumber as AntInputNumber } from 'antd';
+import { InputNumber as AntInputNumber, Input } from 'antd';
 import 'antd/es/input-number/style/index.css';
-import { isNil, isNumber } from 'lodash';
+import { 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 isNumeric = function isNumeric(str) {
-  // 使用正则表达式匹配数字，包括整数和小数
-  return /^-?\d+(\.\d+)?$/.test(str);
+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(/x/g, String(curNumber));
+  try {
+    var result = evaluate(formula);
+    if (max && result > max) {
+      result = max;
+    } else if (min && result < min) {
+      result = min;
+    }
+    if (precision) {
+      result = formatPrecision(result);
+    }
+    return parseFloat(result);
+  } catch (_unused) {
+    if (isEdit) {
+      return Infinity;
+    }
+    return currentValue;
+  }
 };
 export var NumberEditor = function NumberEditor(props) {
   var value = props.value,
@@ -39,15 +55,19 @@ export var NumberEditor = function NumberEditor(props) {
   });
 };
 export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps) {
+  var _ref = extraProps || {},
+    warnMethod = _ref.warnMethod,
+    rangeMethod = _ref.rangeMethod,
+    precision = _ref.precision,
+    max = _ref.max,
+    min = _ref.min;
   var NumberEditor = function NumberEditor(props) {
+    var _ref3;
     var value = props.value,
       onChange = props.onChange;
     var inputNumberRef = useRef(null);
-    var _ref = getExtraProps ? getExtraProps(props) : extraProps !== null && extraProps !== void 0 ? extraProps : {},
-      precision = _ref.precision,
-      inputArgs = _objectWithoutProperties(_ref, _excluded);
-    var max = inputArgs.max,
-      min = inputArgs.min;
+    var _ref2 = getExtraProps ? getExtraProps(props) : extraProps !== null && extraProps !== void 0 ? extraProps : {},
+      inputArgs = Object.assign({}, (_objectDestructuringEmpty(_ref2), _ref2));
     var handleChange = useCallback(function (value) {
       onChange(!isNil(value) ? value : null);
     }, [onChange]);
@@ -55,57 +75,27 @@ export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps)
       var _inputNumberRef$curre2;
       inputNumberRef === null || inputNumberRef === void 0 || (_inputNumberRef$curre2 = inputNumberRef.current) === null || _inputNumberRef$curre2 === void 0 || _inputNumberRef$curre2.focus();
     }, []);
-    var baseFormatter = useCallback(function (value) {
-      if (!value) {
-        return '';
-      }
-      if (!isNumeric("".concat(value))) {
-        return value;
-      }
-      var hasDecimal = +value - Math.floor(+value) > 0;
-      if (hasDecimal) {
-        return formatPrecision(value, precision);
-      }
-      return String(value);
-    }, []);
-    // 去掉多余的0
-    var valueFormatter = useCallback(function (value) {
-      var baseValue = baseFormatter(value);
-      return baseValue ? "".concat(parseFloat(baseValue)) : '';
-    }, []);
-    /**
-     * 重新声明，后面有需求可以改一下
-     */
-    var valueParser = baseFormatter;
-    return /*#__PURE__*/_jsx(AntInputNumber, _objectSpread(_objectSpread({
+    return /*#__PURE__*/_jsx(Input, _objectSpread(_objectSpread({
       ref: inputNumberRef
     }, inputArgs), {}, {
-      formatter: valueFormatter,
-      parser: valueParser,
-      controls: false,
       className: "number-editor",
       onMouseDown: function onMouseDown(e) {
         return e.stopPropagation();
       },
-      value: value,
-      onChange: handleChange,
-      onInput: function onInput(value) {
-        // 将截断最大最小放到 input 事件中
-        if (!isNumber(+value)) {
-          return;
-        }
-        if (!value) {
-          handleChange(null);
-          return;
-        }
-        if (max && +value > max) {
-          handleChange(max);
-        } else if (min && +value < min) {
-          handleChange(min);
-        }
+      value: (_ref3 = value) !== null && _ref3 !== void 0 ? _ref3 : '',
+      onChange: function onChange(e) {
+        handleChange(e.target.value);
       }
     }));
   };
+  NumberEditor.formula = function (value, currentValue) {
+    if (isNil(value)) {
+      return null;
+    }
+    return formulaString(value, currentValue, precision, max, min, true);
+  };
+
+  // 复制的时候会触发
   NumberEditor.formatter = function (value) {
     var _String;
     if (isNil(value) || isNaN(value)) {
@@ -114,21 +104,36 @@ export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps)
     var result = parseFloat((_String = String(value)) === null || _String === void 0 ? void 0 : _String.replace(/,/g, ''));
     return result;
   };
-  NumberEditor.parser = function (value) {
-    var _String2, _extraProps$precision;
-    var result = parseFloat((_String2 = String(value)) === null || _String2 === void 0 ? void 0 : _String2.replace(/,/g, ''));
+  // 粘贴上去的时候触发
+  NumberEditor.parser = function (value, currentValue) {
+    var _String2;
+    var result = (_String2 = String(value)) === null || _String2 === void 0 ? void 0 : _String2.replace(/,/g, '');
+    result = formulaString(result, currentValue);
     if (isNil(result) || isNaN(result)) {
       return null;
     }
-    return Number(formatPrecision(result, (_extraProps$precision = extraProps === null || extraProps === void 0 ? void 0 : extraProps.precision) !== null && _extraProps$precision !== void 0 ? _extraProps$precision : 0));
+    return result;
   };
-  NumberEditor.checker = function (value) {
+  NumberEditor.checker = function (value, record, currentValue) {
     var _String3;
     if (isNil(value)) {
       return true;
     }
+    var result = (_String3 = String(value)) === null || _String3 === void 0 ? void 0 : _String3.replace(/,/g, '');
+    result = formulaString(result, currentValue);
     // parse number with thousands separator
-    var result = parseFloat((_String3 = String(value)) === null || _String3 === void 0 ? void 0 : _String3.replace(/,/g, ''));
+    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;
     }

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

@@ -1,30 +1,30 @@
-.harvest-sheet-container .number-editor{
+.harvest-sheet-container .number-editor {
   border: none !important;
   background: transparent !important;
-  width:100%;
-  height:var(--cell-inner-height) ; 
-  display: block;
-  font-size: 12px;
+  width: 100% !important;
+  height: var(--cell-inner-height) !important;
+  display: block !important;
+  font-size: 12px !important;
   box-shadow: none !important;
   text-align: inherit !important;
-  
-  .ant-input-number-wrapper{
-    text-align: inherit !important;
+  padding-left: 0;
 
+  .ant-input-number-wrapper {
+    text-align: inherit !important;
   }
 
-  .ant-input-number-input{
+  .ant-input-number-input {
     text-align: inherit !important;
   }
 
-  .ant-input-number-input-wrap >input{
-    padding:0;
+  .ant-input-number-input-wrap > input {
+    padding: 0;
     height: 38px;
   }
-  
-  .ant-input-number-group-addon{
+
+  .ant-input-number-group-addon {
     background: transparent;
     border: none;
-    padding:0
+    padding: 0;
   }
-}
+}

package/dist/core/reducers/index.d.ts

@@ -1,5 +1,5 @@
 import type { SheetType } from "../../type";
-export type SheetAction = 'change' | 'changes' | 'rowMove' | 'colMove' | 'editFinish' | 'pushHistory' | 'popHistory' | 'select' | 'selectOneRow' | 'changeSearch' | 'closeSearch' | 'openSearch' | 'changeFixedPosition' | 'clearSelect' | 'clearSelectIfNotSingleRow' | 'clearEdit' | 'mouseDown' | 'mouseOver' | 'mouseUp' | 'selectRow' | 'selectCol' | 'loseFocus' | 'doubleClick' | 'mouseLeaveInterval' | 'move' | 'selectAll' | 'escape' | 'reverse' | 'delete' | 'enter' | 'otherInput' | 'none';
+export type SheetAction = 'change' | 'changes' | 'rowMove' | 'colMove' | 'editFinish' | 'pushHistory' | 'popHistory' | 'select' | 'selectOneRow' | 'changeSearch' | 'closeSearch' | 'openSearch' | 'changeFixedPosition' | 'clearSelect' | 'clearSelectIfNotSingleRow' | 'clearEdit' | 'selectEdit' | 'mouseDown' | 'mouseOver' | 'mouseUp' | 'selectRow' | 'selectCol' | 'loseFocus' | 'doubleClick' | 'mouseLeaveInterval' | 'move' | 'selectAll' | 'escape' | 'reverse' | 'delete' | 'enter' | 'otherInput' | 'none';
 export type reducerAction = (type: Partial<SheetType.UpdateStateType>, payload?: unknown) => Partial<SheetType.UpdateStateType>;
 declare const sheetReducer: (state: Partial<SheetType.UpdateStateType>, action: {
     type: SheetAction;

package/dist/core/reducers/index.js

@@ -15,6 +15,7 @@ var sheetReducer = function sheetReducer(state, action) {
     case 'clearSelect':
     case 'clearSelectIfNotSingleRow':
     case 'clearEdit':
+    case 'selectEdit':
     case 'changeSearch':
     case 'closeSearch':
     case 'openSearch':

package/dist/core/reducers/sideEffectReducer.js

@@ -133,6 +133,9 @@ export var sideEffectReducer = {
         value: editing.value
       });
     }
+    if ((editing === null || editing === void 0 ? void 0 : editing.col) === (lastEditing === null || lastEditing === void 0 ? void 0 : lastEditing.col) && (editing === null || editing === void 0 ? void 0 : editing.row) === (lastEditing === null || lastEditing === void 0 ? void 0 : lastEditing.row)) {
+      return;
+    }
     if (!isNil(lastEditing === null || lastEditing === void 0 ? void 0 : lastEditing.col) && !isNil(lastEditing === null || lastEditing === void 0 ? void 0 : lastEditing.row)) {
       //清空上一个编辑cell的状态
       eventBus.emit("cell-".concat(lastEditing.row, "-").concat(lastEditing.col, "-change"), {
@@ -247,7 +250,7 @@ export var sideEffectReducer = {
                 return false;
               }
               if (editor && editor.checker) {
-                return editor.checker(value, data[row][col].record);
+                return editor.checker(value, data[row][col].record, data[row][col].value);
               }
               return true;
             }).map(function (_ref6) {
@@ -260,17 +263,18 @@ export var sideEffectReducer = {
                 row: row,
                 col: col,
                 id: (_data$row$col2 = data[row][col]) === null || _data$row$col2 === void 0 ? void 0 : _data$row$col2.id,
-                value: editor !== null && editor !== void 0 && editor.parser ? editor === null || editor === void 0 || (_editor$parser = editor.parser) === null || _editor$parser === void 0 ? void 0 : _editor$parser.call(editor, value, data[row][col].record) : value
+                value: editor !== null && editor !== void 0 && editor.parser ? editor === null || editor === void 0 || (_editor$parser = editor.parser) === null || _editor$parser === void 0 ? void 0 : _editor$parser.call(editor, value, data[row][col].value) : value
               };
             });
             lastRow = extChanges === null || extChanges === void 0 || (_extChanges$ = extChanges[0]) === null || _extChanges$ === void 0 ? void 0 : _extChanges$.row;
             lastIndex = 1;
             legalExtChanges = extChanges === null || extChanges === void 0 ? void 0 : extChanges.filter(function (_ref7) {
-              var value = _ref7.value,
+              var row = _ref7.row,
+                value = _ref7.value,
                 col = _ref7.col;
               var editor = data[0][col].dataEditor;
               if (editor && editor.checker) {
-                return editor.checker(value);
+                return editor.checker(value, data[row][col].record, data[row][col].value);
               }
               return true;
             }).map(function (_ref8) {
@@ -286,7 +290,7 @@ export var sideEffectReducer = {
               return {
                 row: row,
                 col: col,
-                value: editor !== null && editor !== void 0 && editor.parser ? editor === null || editor === void 0 || (_editor$parser2 = editor.parser) === null || _editor$parser2 === void 0 ? void 0 : _editor$parser2.call(editor, value) : value,
+                value: editor !== null && editor !== void 0 && editor.parser ? editor === null || editor === void 0 || (_editor$parser2 = editor.parser) === null || _editor$parser2 === void 0 ? void 0 : _editor$parser2.call(editor, value, data[row][col].value) : value,
                 id: -lastIndex
               };
             });

package/dist/core/reducers/stateReducer.js

@@ -265,5 +265,29 @@ export var stateReducer = _objectSpread({
       editing: undefined,
       lastEditing: editing
     });
+  },
+  selectEdit: function selectEdit(state, payload) {
+    var _ref4 = payload,
+      row = _ref4.row,
+      col = _ref4.col;
+    return _objectSpread(_objectSpread({}, state), {}, {
+      editing: {
+        row: row,
+        col: col
+      },
+      start: {
+        row: row,
+        col: col
+      },
+      end: {
+        row: row,
+        col: col
+      },
+      lastSelected: {
+        start: state.start,
+        end: state.end
+      },
+      lastEditing: undefined
+    });
   }
 }, searchReducer);

package/dist/core/sheet/Cell.js

@@ -4,6 +4,8 @@ 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 { ExclamationCircleOutlined } from '@ant-design/icons';
+import { Modal } from 'antd';
 import { isNil } from 'lodash';
 import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useSetState, useSheetEvent } from "../../hooks";
@@ -12,6 +14,7 @@ import DataEditor from "./DataEditor";
 import DefaultCell from "./DefaultCell";
 import ValueViewer from "./ValueViewer";
 import { jsx as _jsx } from "react/jsx-runtime";
+var antConfirm = Modal.confirm;
 function initialData(_ref) {
   var cell = _ref.cell;
   return renderValue(cell);
@@ -57,7 +60,7 @@ var Cell = function Cell(props) {
       } else if (eventInfo.value && eventInfo.editing) {
         var _cell$dataEditor, _cell$dataEditor2, _cell$dataEditor2$par;
         // 单元格直接键盘编辑，设置为输入值
-        setValue((_cell$dataEditor = cell.dataEditor) !== null && _cell$dataEditor !== void 0 && _cell$dataEditor.parser ? cell === null || cell === void 0 || (_cell$dataEditor2 = cell.dataEditor) === null || _cell$dataEditor2 === void 0 || (_cell$dataEditor2$par = _cell$dataEditor2.parser) === null || _cell$dataEditor2$par === void 0 ? void 0 : _cell$dataEditor2$par.call(_cell$dataEditor2, eventInfo.value, cell.record) : eventInfo.value);
+        setValue((_cell$dataEditor = cell.dataEditor) !== null && _cell$dataEditor !== void 0 && _cell$dataEditor.parser ? cell === null || cell === void 0 || (_cell$dataEditor2 = cell.dataEditor) === null || _cell$dataEditor2 === void 0 || (_cell$dataEditor2$par = _cell$dataEditor2.parser) === null || _cell$dataEditor2$par === void 0 ? void 0 : _cell$dataEditor2$par.call(_cell$dataEditor2, eventInfo.value, valueRef.current) : eventInfo.value);
       }
       setEventState(eventInfo);
     };
@@ -75,12 +78,44 @@ var Cell = function Cell(props) {
       return;
     }
     if (confirm) {
+      var _cell$dataEditor3;
       setEventState({
         confirm: false
       });
-      if (value !== valueRef.current) {
-        var _cell$dataEditor3, _cell$dataEditor4, _cell$dataEditor4$che;
-        if (cell !== null && cell !== void 0 && (_cell$dataEditor3 = cell.dataEditor) !== null && _cell$dataEditor3 !== void 0 && _cell$dataEditor3.checker && !((_cell$dataEditor4 = cell.dataEditor) !== null && _cell$dataEditor4 !== void 0 && (_cell$dataEditor4$che = _cell$dataEditor4.checker) !== null && _cell$dataEditor4$che !== void 0 && _cell$dataEditor4$che.call(_cell$dataEditor4, value, cell.record))) {
+      var newValue = value;
+      // 转化一下公式
+      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);
+        if (newValue === Infinity) {
+          antConfirm({
+            title: '公式有误',
+            icon: /*#__PURE__*/_jsx(ExclamationCircleOutlined, {}),
+            content: '当前录入的公式有误，请检查后再试。',
+            onOk: function onOk() {
+              eventBus.emit('select-edit', {
+                row: row,
+                col: col
+              });
+            },
+            onCancel: function onCancel() {
+              eventBus.emit('cell-change', {
+                row: row,
+                col: col,
+                id: cell.id,
+                value: valueRef.current,
+                key: cell.dataIndex
+              });
+            },
+            okText: '重新编辑',
+            cancelText: '取消'
+          });
+          return;
+        }
+      }
+      if (newValue !== valueRef.current) {
+        var _cell$dataEditor5, _cell$dataEditor6, _cell$dataEditor6$che;
+        if (cell !== null && cell !== void 0 && (_cell$dataEditor5 = cell.dataEditor) !== null && _cell$dataEditor5 !== void 0 && _cell$dataEditor5.checker && ((_cell$dataEditor6 = cell.dataEditor) === null || _cell$dataEditor6 === void 0 || (_cell$dataEditor6$che = _cell$dataEditor6.checker) === null || _cell$dataEditor6$che === void 0 ? void 0 : _cell$dataEditor6$che.call(_cell$dataEditor6, newValue, cell.record)) === false) {
           setValue(valueRef.current);
           return;
         }
@@ -88,22 +123,18 @@ var Cell = function Cell(props) {
           row: row,
           col: col,
           id: cell.id,
-          value: value,
+          value: newValue,
           key: cell.dataIndex
-          // 没必要format value 已经是legal 的值了
-          // value: cell.dataEditor?.formatter
-          //   ? cell.dataEditor.formatter?.(value)
-          //   : value,
         });
       }
     }
   }, [confirm, eventBus, value, cell]);
   var handleCommit = useCallback(function (value) {
-    var _cell$dataEditor5, _cell$dataEditor6, _cell$dataEditor6$che;
+    var _cell$dataEditor7, _cell$dataEditor8, _cell$dataEditor8$che;
     if (valueRef.current === value) {
       return;
     }
-    if (value !== null && cell !== null && cell !== void 0 && (_cell$dataEditor5 = cell.dataEditor) !== null && _cell$dataEditor5 !== void 0 && _cell$dataEditor5.checker && !((_cell$dataEditor6 = cell.dataEditor) !== null && _cell$dataEditor6 !== void 0 && (_cell$dataEditor6$che = _cell$dataEditor6.checker) !== null && _cell$dataEditor6$che !== void 0 && _cell$dataEditor6$che.call(_cell$dataEditor6, value, cell.record))) {
+    if (value !== null && cell !== null && cell !== void 0 && (_cell$dataEditor7 = cell.dataEditor) !== null && _cell$dataEditor7 !== void 0 && _cell$dataEditor7.checker && !((_cell$dataEditor8 = cell.dataEditor) !== null && _cell$dataEditor8 !== void 0 && (_cell$dataEditor8$che = _cell$dataEditor8.checker) !== null && _cell$dataEditor8$che !== void 0 && _cell$dataEditor8$che.call(_cell$dataEditor8, value, cell.record))) {
       setValue(valueRef.current);
       return;
     }

package/dist/core/sheet/index.js

@@ -406,6 +406,12 @@ var Sheet = function Sheet(props) {
     if (sheetWrapperRef.current) {
       handleScroll();
     }
+    eventBus.on('select-edit', function (value) {
+      dispatch({
+        type: 'selectEdit',
+        payload: value
+      });
+    });
   }, []);
   var _useMemo = useMemo(function () {
       var history = state.history,

package/dist/example/basic.js

@@ -14,7 +14,7 @@ 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 { Table } from "./..";
+import { Table, getNumberEditor } from "./..";
 import { Space, Tag } from 'antd';
 import 'antd/dist/antd.css';
 import React, { useCallback, useState } from 'react';
@@ -37,7 +37,12 @@ var columns = [{
   title: 'Age',
   dataIndex: 'age',
   key: 'age',
-  width: 100
+  width: 100,
+  editor: getNumberEditor({
+    max: 1000000,
+    min: 0,
+    precision: 2
+  })
 }, {
   title: 'Address',
   editable: false,

package/dist/type/sheet.d.ts

@@ -53,9 +53,10 @@ export type CellEditorProps = {
     onConfirm: (value: unknown) => void;
 } & CellViewerProps;
 export type CellEditor = React.FC<CellEditorProps> & {
-    checker?: (value: unknown, record?: Record<string, unknown>) => boolean;
+    checker?: (value: unknown, record?: Record<string, unknown>, currentValue?: unknown) => boolean;
     formatter?: (value: unknown, record?: Record<string, unknown>) => unknown;
-    parser?: (value: unknown, record?: Record<string, unknown>) => unknown;
+    parser?: (value: unknown, currentValue?: unknown) => unknown;
+    formula?: (value: unknown, record?: Record<string, unknown>, currentValue?: unknown) => unknown;
 };
 export type CellViewer = React.FC<CellViewerProps>;
 export type CellPosition = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhenliang/sheet",
-  "version": "0.1.89",
+  "version": "0.1.90-beta.0",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -51,8 +51,9 @@
     "antd": "^4.24.0",
     "events": "^3.3.0",
     "lodash": "^4.17.21",
+    "mathjs": "^14.6.0",
     "moment": "^2.29.4",
-    "react": "17.x",
+    "react": "^17.0.2",
     "react-dom": "17.x",
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.4.2"
@@ -61,8 +62,8 @@
     "@commitlint/cli": "^17.1.2",
     "@commitlint/config-conventional": "^17.1.0",
     "@types/lodash": "^4.14.195",
-    "@types/react": "17.0.40",
-    "@types/react-dom": "17.0.13",
+    "@types/react": "^17.0.40",
+    "@types/react-dom": "^17.0.13",
     "@umijs/lint": "^4.0.0",
     "dumi": "^2.2.0",
     "eslint": "^8.23.0",
@@ -75,7 +76,6 @@
     "stylelint": "^14.9.1"
   },
   "peerDependencies": {
-    "react": "17.x",
     "react-dom": "17.x"
   },
   "publishConfig": {
@@ -85,5 +85,4 @@
     "fizz.zhou@ap.jll.com"
   ],
   "preid": "beta"
-
-}
+}