@zhenliang/sheet 0.1.92 → 0.1.93

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);
@@ -105,7 +123,7 @@ export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps)
     return result;
   };
   // 粘贴上去的时候触发
-  NumberEditor.parser = function (value, currentValue) {
+  NumberEditor.parser = function (value, record, currentValue) {
     var _String2;
     var result = (_String2 = String(value)) === null || _String2 === void 0 ? void 0 : _String2.replace(/,/g, '');
     result = formulaString(result, currentValue);

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

@@ -2,5 +2,5 @@ import type { SheetType } from "../../../type";
 import { SelectProps } from 'antd';
 import 'antd/es/select/style/index.css';
 import './index.less';
-export declare const getSelectEditor: (options: SheetType.Options[], valueKey?: string, extra?: React.ReactNode, selectProps?: Partial<SelectProps>, getCustomOptions?: ((props: SheetType.CellEditorProps) => SheetType.Options[]) | undefined) => SheetType.CellEditor;
+export declare const getSelectEditor: (options: SheetType.Options[], valueKey?: string, extra?: React.ReactNode, selectProps?: Partial<SelectProps>, getCustomOptions?: ((record: any) => SheetType.Options[]) | undefined) => SheetType.CellEditor;
 export default getSelectEditor;

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

@@ -26,6 +26,7 @@ export var getSelectEditor = function getSelectEditor(options) {
   var selectProps = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var getCustomOptions = arguments.length > 4 ? arguments[4] : undefined;
   var SelectEditor = function SelectEditor(props) {
+    var _props$record;
     var _useState = useState(true),
       _useState2 = _slicedToArray(_useState, 2),
       isOpen = _useState2[0],
@@ -50,7 +51,7 @@ export var getSelectEditor = function getSelectEditor(options) {
         children: [menu, extra]
       });
     };
-    var customOptions = getCustomOptions ? getCustomOptions(props) : options;
+    var customOptions = getCustomOptions ? getCustomOptions((_props$record = props === null || props === void 0 ? void 0 : props.record) !== null && _props$record !== void 0 ? _props$record : {}) : options;
     return /*#__PURE__*/_jsx(Select, _objectSpread({
       autoFocus: true,
       className: "select-editor",
@@ -67,29 +68,32 @@ export var getSelectEditor = function getSelectEditor(options) {
       allowClear: true
     }, selectProps));
   };
-  SelectEditor.checker = function (value) {
+  SelectEditor.checker = function (value, record) {
     if (isNil(value) && selectProps.allowClear !== false) return true;
-    return options.some(function (item) {
+    var customOptions = getCustomOptions ? getCustomOptions(record !== null && record !== void 0 ? record : {}) : options;
+    return customOptions.some(function (item) {
       return item.value == value;
-    }) || options.some(function (item) {
+    }) || customOptions.some(function (item) {
       return item.label === value;
     });
   };
-  SelectEditor.parser = function (value) {
-    var _options$find, _options$find2;
-    return ((_options$find = options.find(function (item) {
+  SelectEditor.parser = function (value, record) {
+    var _customOptions$find, _customOptions$find2;
+    var customOptions = getCustomOptions ? getCustomOptions(record !== null && record !== void 0 ? record : {}) : options;
+    return ((_customOptions$find = customOptions.find(function (item) {
       return item.value == value;
-    })) === null || _options$find === void 0 ? void 0 : _options$find[valueKey]) || ((_options$find2 = options.find(function (item) {
+    })) === null || _customOptions$find === void 0 ? void 0 : _customOptions$find[valueKey]) || ((_customOptions$find2 = customOptions.find(function (item) {
       return item.label === value;
-    })) === null || _options$find2 === void 0 ? void 0 : _options$find2[valueKey]);
+    })) === null || _customOptions$find2 === void 0 ? void 0 : _customOptions$find2[valueKey]);
   };
-  SelectEditor.formatter = function (value) {
-    var _options$find3, _options$find4;
-    return ((_options$find3 = options.find(function (item) {
+  SelectEditor.formatter = function (value, record) {
+    var _customOptions$find3, _customOptions$find4;
+    var customOptions = getCustomOptions ? getCustomOptions(record !== null && record !== void 0 ? record : {}) : options;
+    return ((_customOptions$find3 = customOptions.find(function (item) {
       return item.value == value;
-    })) === null || _options$find3 === void 0 ? void 0 : _options$find3.label) || ((_options$find4 = options.find(function (item) {
+    })) === null || _customOptions$find3 === void 0 ? void 0 : _customOptions$find3.label) || ((_customOptions$find4 = customOptions.find(function (item) {
       return item.label === value;
-    })) === null || _options$find4 === void 0 ? void 0 : _options$find4.label);
+    })) === null || _customOptions$find4 === void 0 ? void 0 : _customOptions$find4.label);
   };
   return SelectEditor;
 };

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/reducers/sideEffectReducer.js

@@ -263,7 +263,7 @@ 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].value) : 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].record, data[row][col].value) : value
               };
             });
             lastRow = extChanges === null || extChanges === void 0 || (_extChanges$ = extChanges[0]) === null || _extChanges$ === void 0 ? void 0 : _extChanges$.row;
@@ -290,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, data[row][col].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].record, data[row][col].value) : value,
                 id: -lastIndex
               };
             });

package/dist/core/sheet/Cell.js

@@ -60,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, valueRef.current) : 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, cell.record, valueRef.current) : eventInfo.value);
       }
       setEventState(eventInfo);
     };
@@ -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,11 +51,12 @@ 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;
     formatter?: (value: unknown, record?: Record<string, unknown>) => unknown;
-    parser?: (value: unknown, currentValue?: unknown) => unknown;
+    parser?: (value: unknown, record?: Record<string, unknown>, currentValue?: unknown) => unknown;
     formula?: (value: unknown, record?: Record<string, unknown>, currentValue?: unknown) => unknown;
 };
 export type CellViewer = React.FC<CellViewerProps>;

package/package.json

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