@zhenliang/sheet 0.0.8 → 0.1.0

package/README.md

@@ -1,3 +1,4 @@
-# zsheet
+# @zhenliang/sheet
 
-zsheet is a excel-like table component write in react
+
+@zhenliang/sheet is a excel-like table component write in react

package/dist/core/config.js

@@ -10,5 +10,4 @@ export var BACKSPACE_KEY = 8;
 export var Z_KEY = 90;
 export var C_KEY = 67;
 export var V_KEY = 86;
-export var X_KEY = 88;
-//# sourceMappingURL=config.js.map
+export var X_KEY = 88;

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

@@ -1,7 +1,7 @@
 import { Cascader } from 'antd';
 import 'antd/es/cascader/style/index.css';
 import { useMemo } from 'react';
-import { optionsTransferToValue } from "../../util";
+import { optionsToValuesFromLabelOrValue, valuesTransferToLabel } from "../../util";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 var getCascaderEditor = function getCascaderEditor(options) {
@@ -9,10 +9,10 @@ var getCascaderEditor = function getCascaderEditor(options) {
     var value = props.value,
       onConfirm = props.onConfirm;
     var val = useMemo(function () {
-      return optionsTransferToValue(options, value);
+      var res = optionsToValuesFromLabelOrValue(options, value);
+      return res;
     }, [value, options]);
     var handleChange = function handleChange(opt) {
-      console.log(opt);
       onConfirm(opt ? opt[opt.length - 1] : null);
     };
     return /*#__PURE__*/_jsx(Cascader, {
@@ -35,11 +35,18 @@ var getCascaderEditor = function getCascaderEditor(options) {
       options: options
     });
   };
+  CascaderEditor.formatter = function (value) {
+    var res = optionsToValuesFromLabelOrValue(options, value);
+    return !(res !== null && res !== void 0 && res.length) ? '' : valuesTransferToLabel(options, res[res.length - 1]);
+  };
+  CascaderEditor.parser = function (value) {
+    var res = optionsToValuesFromLabelOrValue(options, value);
+    return res.length ? res[res.length - 1] : null;
+  };
   CascaderEditor.checker = function (value) {
-    var res = optionsTransferToValue(options, value);
-    return res && res.length > 0;
+    var res = optionsToValuesFromLabelOrValue(options, value);
+    return !!res.length;
   };
   return CascaderEditor;
 };
-export default getCascaderEditor;
-//# sourceMappingURL=index.js.map
+export default getCascaderEditor;

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

@@ -2,4 +2,4 @@ import { DatePickerProps } from 'antd';
 import 'antd/es/date-picker/style/index.css';
 import type { SheetType } from "../../../type";
 import './index.less';
-export declare const GetDateEditor: (dateProps?: Pick<DatePickerProps, 'disabledDate' | 'disabled' | 'allowClear' | 'placeholder'>) => SheetType.CellEditor;
+export declare const getDateEditor: (dateProps?: Pick<DatePickerProps, 'disabledDate' | 'disabled' | 'allowClear' | 'placeholder'>) => SheetType.CellEditor;

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

@@ -10,7 +10,7 @@ import moment from 'moment';
 import { useEffect, useMemo, useRef } from 'react';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
-export var GetDateEditor = function GetDateEditor(dateProps) {
+export var getDateEditor = function getDateEditor(dateProps) {
   var DateEditor = function DateEditor(props) {
     var value = props.value,
       onChange = props.onChange,
@@ -48,5 +48,4 @@ export var GetDateEditor = function GetDateEditor(dateProps) {
     return value.replace('/', '-').replace('/', '-');
   };
   return DateEditor;
-};
-//# sourceMappingURL=index.js.map
+};

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

@@ -1,4 +1,4 @@
 export { default as getCascaderEditor } from './cascaderEditor';
-export { GetDateEditor } from './dateEditor';
+export { getDateEditor } from './dateEditor';
 export { getNumberEditor, NumberEditor } from './numberEditor';
 export { default as getSelectEditor } from './selectEditor';

package/dist/core/editor/index.js

@@ -1,5 +1,4 @@
 export { default as getCascaderEditor } from "./cascaderEditor";
-export { GetDateEditor } from "./dateEditor";
+export { getDateEditor } from "./dateEditor";
 export { getNumberEditor, NumberEditor } from "./numberEditor";
-export { default as getSelectEditor } from "./selectEditor";
-//# sourceMappingURL=index.js.map
+export { default as getSelectEditor } from "./selectEditor";

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

@@ -1,13 +1,17 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+var _excluded = ["precision"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+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; }
+import { formatPrecision } from "../../../standardUtils";
 import { InputNumber as AntInputNumber } from 'antd';
 import 'antd/es/input-number/style/index.css';
 import { isNil } from 'lodash';
-import { useEffect, useRef } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 export var NumberEditor = function NumberEditor(props) {
@@ -39,21 +43,61 @@ export var getNumberEditor = function getNumberEditor(extraProps) {
       var _inputNumberRef$curre2;
       inputNumberRef === null || inputNumberRef === void 0 ? void 0 : (_inputNumberRef$curre2 = inputNumberRef.current) === null || _inputNumberRef$curre2 === void 0 ? void 0 : _inputNumberRef$curre2.focus();
     }, []);
+    var _ref = extraProps || {},
+      precision = _ref.precision,
+      inputArgs = _objectWithoutProperties(_ref, _excluded);
+    var valueFormatter = useCallback(function (value) {
+      if (!value) {
+        return '';
+      }
+      if (typeof value === 'string') {
+        return value;
+      }
+      var hasDecimal = value - Math.floor(value) > 0;
+      if (hasDecimal) {
+        return formatPrecision(value, precision);
+      }
+      return String(value);
+    }, []);
+    var handleChange = useCallback(function (value) {
+      onChange && onChange(value ? value : null);
+    }, [onChange]);
     return /*#__PURE__*/_jsx(AntInputNumber, _objectSpread(_objectSpread({
       ref: inputNumberRef
-    }, extraProps), {}, {
+    }, inputArgs), {}, {
+      formatter: valueFormatter,
       controls: false,
       className: "number-editor",
       onMouseDown: function onMouseDown(e) {
         return e.stopPropagation();
       },
       value: value,
-      onChange: onChange
+      onChange: handleChange
     }));
   };
   NumberEditor.formatter = function (value) {
-    return isNil(value) ? null : Number(value);
+    var _String;
+    if (isNil(value) || isNaN(value)) {
+      return null;
+    }
+    var result = parseFloat((_String = String(value)) === null || _String === void 0 ? void 0 : _String.replace(/,/g, ''));
+    return result;
+  };
+  NumberEditor.parser = function (value) {
+    var _extraProps$precision;
+    if (isNil(value) || isNaN(value)) {
+      return null;
+    }
+    return Number(formatPrecision(value, (_extraProps$precision = extraProps === null || extraProps === void 0 ? void 0 : extraProps.precision) !== null && _extraProps$precision !== void 0 ? _extraProps$precision : 0));
+  };
+  NumberEditor.checker = function (value) {
+    var _String2;
+    // parse number with thousands separator
+    var result = parseFloat((_String2 = String(value)) === null || _String2 === void 0 ? void 0 : _String2.replace(/,/g, ''));
+    if (isNaN(result) || isNaN(value)) {
+      return false;
+    }
+    return true;
   };
   return NumberEditor;
-};
-//# sourceMappingURL=index.js.map
+};

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

@@ -3,6 +3,7 @@
   background: transparent !important;
   width:100%;
   height: 38px;
+  font-size: 12px;
   box-shadow: none !important;
   text-align: inherit !important;
   

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

@@ -1,5 +1,5 @@
 import type { SheetType } from "../../../type";
 import 'antd/es/select/style/index.css';
 import './index.less';
-export declare const getSelectEditor: (options: SheetType.Options[], valueKey?: string) => SheetType.CellEditor;
+export declare const getSelectEditor: (options: SheetType.Options[], valueKey?: string, extra?: React.ReactNode) => SheetType.CellEditor;
 export default getSelectEditor;

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

@@ -2,10 +2,14 @@
 
 import { Select } from 'antd';
 import 'antd/es/select/style/index.css';
+import { isNil } from 'lodash';
 import "./index.less";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 export var getSelectEditor = function getSelectEditor(options) {
-  var valueKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'label';
+  var valueKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'value';
+  var extra = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : /*#__PURE__*/_jsx(_Fragment, {});
   var SelectEditor = function SelectEditor(props) {
     var value = props.value,
       onConfirm = props.onConfirm;
@@ -19,6 +23,11 @@ export var getSelectEditor = function getSelectEditor(options) {
         ev.persist();
       }
     };
+    var dropdown = function dropdown(menu) {
+      return /*#__PURE__*/_jsxs(_Fragment, {
+        children: [menu, extra]
+      });
+    };
     return /*#__PURE__*/_jsx(Select, {
       autoFocus: true,
       className: "select-editor",
@@ -32,17 +41,19 @@ export var getSelectEditor = function getSelectEditor(options) {
       onChange: handleChange,
       onKeyDown: handleKeyDown,
       options: options,
-      popupClassName: 'excelTablePopupClassName'
+      popupClassName: 'excelTablePopupClassName',
+      dropdownRender: dropdown
     });
   };
   SelectEditor.checker = function (value) {
+    if (isNil(value)) return true;
     return options.some(function (item) {
       return item.value == value;
     }) || options.some(function (item) {
       return item.label === value;
     });
   };
-  SelectEditor.formatter = function (value) {
+  SelectEditor.parser = function (value) {
     var _options$find, _options$find2;
     return ((_options$find = options.find(function (item) {
       return item.value == value;
@@ -50,7 +61,14 @@ export var getSelectEditor = function getSelectEditor(options) {
       return item.label === value;
     })) === null || _options$find2 === void 0 ? void 0 : _options$find2[valueKey]);
   };
+  SelectEditor.formatter = function (value) {
+    var _options$find3, _options$find4;
+    return ((_options$find3 = options.find(function (item) {
+      return item.value == value;
+    })) === null || _options$find3 === void 0 ? void 0 : _options$find3.label) || ((_options$find4 = options.find(function (item) {
+      return item.label === value;
+    })) === null || _options$find4 === void 0 ? void 0 : _options$find4.label);
+  };
   return SelectEditor;
 };
-export default getSelectEditor;
-//# sourceMappingURL=index.js.map
+export default getSelectEditor;

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

@@ -1,5 +1,5 @@
 import type { SheetType } from "../../type";
-export declare type SheetAction = 'change' | 'changes' | 'rowMove' | 'colMove' | 'editFinish' | 'pushHistory' | 'selectRow' | 'clearSelect' | 'clearSelectIfNotSingleRow' | 'clearEdit' | 'mouseDown' | 'mouseOver' | 'mouseUp' | 'loseFocus' | 'doubleClick' | 'mouseLeaveInterval' | 'move' | 'escape' | 'reverse' | 'delete' | 'enter' | 'otherInput' | 'none';
+export declare type SheetAction = 'change' | 'changes' | 'rowMove' | 'colMove' | 'editFinish' | 'pushHistory' | 'popHistory' | 'selectRow' | 'select' | 'clearSelect' | 'clearSelectIfNotSingleRow' | 'clearEdit' | 'mouseDown' | 'mouseOver' | 'mouseUp' | 'loseFocus' | 'doubleClick' | 'mouseLeaveInterval' | 'move' | 'escape' | 'reverse' | 'delete' | 'enter' | 'otherInput' | 'none';
 export declare 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

@@ -9,7 +9,9 @@ var sheetReducer = function sheetReducer(state, action) {
     case 'colMove':
     case 'editFinish':
     case 'pushHistory':
+    case 'popHistory':
     case 'selectRow':
+    case 'select':
     case 'clearSelect':
     case 'clearSelectIfNotSingleRow':
     case 'clearEdit':
@@ -33,5 +35,4 @@ var sheetReducer = function sheetReducer(state, action) {
   }
 };
 export default sheetReducer;
-export { sideEffectReducer } from "./sideEffectReducer";
-//# sourceMappingURL=index.js.map
+export { sideEffectReducer } from "./sideEffectReducer";

package/dist/core/reducers/keyboardReducer.js

@@ -17,7 +17,7 @@ export var keyboardReducer = {
       data = _state$data === void 0 ? [] : _state$data;
     var newRow = (((_state$start = state.start) === null || _state$start === void 0 ? void 0 : _state$start.row) || 0) + row;
     if (groupConfig) {
-      newRow = getNextVisibleRow(newRow, data.length, groupConfigToGroupMap(groupConfig));
+      newRow = getNextVisibleRow(newRow, data.length, groupConfigToGroupMap(groupConfig), row < 0 ? -1 : 1);
     }
     var currentPos = {
       row: newRow,
@@ -90,5 +90,4 @@ export var keyboardReducer = {
     if (state.editing) return state;
     return keyboardReducer.enter(state, payload);
   }
-};
-//# sourceMappingURL=keyboardReducer.js.map
+};

package/dist/core/reducers/mouseReducer.js

@@ -161,5 +161,4 @@ export var mouseReducer = {
       end: end
     });
   }
-};
-//# sourceMappingURL=mouseReducer.js.map
+};

package/dist/core/reducers/sideEffectReducer.js

@@ -23,13 +23,13 @@ export var sideEffectReducer = {
       dispatch(function () {
         var _getState2 = getState(),
           cellChangeHandler = _getState2.cellChangeHandler;
-        cellChangeHandler && cellChangeHandler([cell]);
         dispatch({
           type: 'editFinish',
           payload: {
             cell: cell
           }
         });
+        cellChangeHandler && cellChangeHandler([cell]);
       });
     });
     eventBus.on('cell-create', function (_ref) {
@@ -131,9 +131,13 @@ export var sideEffectReducer = {
       end = _getState7.end,
       data = _getState7.data,
       groupConfig = _getState7.groupConfig;
+    if (!start || !end) {
+      return;
+    }
     var cellIndex = flatRowColIndex(start, end);
     var groupMap = groupConfigToGroupMap(groupConfig);
     var copyData = cellIndex.reduce(function (left, _ref3) {
+      var _data$row$col$dataEdi, _data$row$col$dataEdi2, _data$row$col$dataEdi3;
       var _ref3$row = _ref3.row,
         row = _ref3$row === void 0 ? 0 : _ref3$row,
         _ref3$col = _ref3.col,
@@ -150,7 +154,9 @@ export var sideEffectReducer = {
           };
         }
       }
-      var currentValue = "".concat(value).concat(currentRow === row ? '\t' : '\n', " ").concat(defaultValueRenderer(data[row][col]));
+
+      // 复制到剪贴板的时候执行 formatter
+      var currentValue = "".concat(value).concat(currentRow === row ? '\t' : '\n', " ").concat((_data$row$col$dataEdi = data[row][col].dataEditor) !== null && _data$row$col$dataEdi !== void 0 && _data$row$col$dataEdi.formatter ? (_data$row$col$dataEdi2 = data[row][col].dataEditor) === null || _data$row$col$dataEdi2 === void 0 ? void 0 : (_data$row$col$dataEdi3 = _data$row$col$dataEdi2.formatter) === null || _data$row$col$dataEdi3 === void 0 ? void 0 : _data$row$col$dataEdi3.call(_data$row$col$dataEdi2, data[row][col].value) : defaultValueRenderer(data[row][col]));
       return {
         currentRow: row,
         value: currentValue
@@ -164,14 +170,21 @@ export var sideEffectReducer = {
   },
   paste: function paste(dispatch, getState) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _getState8, start, end, cellChangeHandler, history, _getState8$freePaste, freePaste, data, groupConfig, pasteData, changeInfo, changes, extChanges, legalChanges, legalExtChanges, newHistory;
+      var _extChanges$;
+      var _getState8, start, end, cellChangeHandler, history, _getState8$freePaste, freePaste, data, groupConfig, pasteData, changeInfo, changes, extChanges, legalChanges, lastRow, lastIndex, legalExtChanges, newHistory;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _getState8 = getState(), start = _getState8.start, end = _getState8.end, cellChangeHandler = _getState8.cellChangeHandler, history = _getState8.history, _getState8$freePaste = _getState8.freePaste, freePaste = _getState8$freePaste === void 0 ? false : _getState8$freePaste, data = _getState8.data, groupConfig = _getState8.groupConfig;
-            _context.next = 3;
-            return clipboardDataToString();
+            if (!(!start || !end)) {
+              _context.next = 3;
+              break;
+            }
+            return _context.abrupt("return");
           case 3:
+            _context.next = 5;
+            return clipboardDataToString();
+          case 5:
             pasteData = _context.sent;
             changeInfo = formatDataToCell(_objectSpread(_objectSpread({}, pick(getState(), ['data', 'start', 'end', 'editing'])), {}, {
               pasteData: pasteData,
@@ -179,11 +192,11 @@ export var sideEffectReducer = {
               freePaste: freePaste
             }));
             if (changeInfo) {
-              _context.next = 7;
+              _context.next = 9;
               break;
             }
             return _context.abrupt("return");
-          case 7:
+          case 9:
             changes = changeInfo.changes, extChanges = changeInfo.extChanges;
             legalChanges = changes.filter(function (_ref4) {
               var row = _ref4.row,
@@ -191,11 +204,11 @@ export var sideEffectReducer = {
                 value = _ref4.value;
               var editor = data[row][col].dataEditor;
               if (editor && editor.checker) {
-                return editor.checker(value);
+                return editor.checker(value, data[row][col].record);
               }
               return true;
             }).map(function (_ref5) {
-              var _editor$formatter;
+              var _data$row$col, _editor$parser;
               var row = _ref5.row,
                 col = _ref5.col,
                 value = _ref5.value;
@@ -203,9 +216,12 @@ export var sideEffectReducer = {
               return {
                 row: row,
                 col: col,
-                value: editor !== null && editor !== void 0 && editor.formatter ? editor === null || editor === void 0 ? void 0 : (_editor$formatter = editor.formatter) === null || _editor$formatter === void 0 ? void 0 : _editor$formatter.call(editor, value) : value
+                id: (_data$row$col = data[row][col]) === null || _data$row$col === void 0 ? void 0 : _data$row$col.id,
+                value: editor !== null && editor !== void 0 && editor.parser ? editor === null || editor === void 0 ? void 0 : (_editor$parser = editor.parser) === null || _editor$parser === void 0 ? void 0 : _editor$parser.call(editor, value) : value
               };
             });
+            lastRow = extChanges === null || extChanges === void 0 ? 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 (_ref6) {
               var value = _ref6.value,
                 col = _ref6.col;
@@ -214,8 +230,23 @@ export var sideEffectReducer = {
                 return editor.checker(value);
               }
               return true;
+            }).map(function (_ref7) {
+              var _editor$parser2;
+              var row = _ref7.row,
+                col = _ref7.col,
+                value = _ref7.value;
+              var editor = data[0][col].dataEditor;
+              if (lastRow !== row) {
+                lastRow = row;
+                lastIndex++;
+              }
+              return {
+                row: row,
+                col: col,
+                value: editor !== null && editor !== void 0 && editor.parser ? editor === null || editor === void 0 ? void 0 : (_editor$parser2 = editor.parser) === null || _editor$parser2 === void 0 ? void 0 : _editor$parser2.call(editor, value) : value,
+                id: -lastIndex
+              };
             });
-            cellChangeHandler && cellChangeHandler(legalChanges, legalExtChanges);
             newHistory = _toConsumableArray(history || []);
             newHistory.push({
               changes: legalChanges.map(function (item) {
@@ -237,7 +268,8 @@ export var sideEffectReducer = {
                 }
               }
             });
-          case 14:
+            cellChangeHandler && cellChangeHandler(legalChanges, freePaste ? legalExtChanges : []);
+          case 18:
           case "end":
             return _context.stop();
         }
@@ -265,12 +297,13 @@ export var sideEffectReducer = {
       var _groupMap$get3, _groupMap$get4;
       return !(groupMap.get(item.row) && !((_groupMap$get3 = groupMap.get(item.row)) !== null && _groupMap$get3 !== void 0 && _groupMap$get3.isStart) && !((_groupMap$get4 = groupMap.get(item.row)) !== null && _groupMap$get4 !== void 0 && _groupMap$get4.isOpen));
     }).map(function (item) {
-      var _data$item$row2;
+      var _data$item$row2, _data$item$row3;
       return {
         cell: data === null || data === void 0 ? void 0 : (_data$item$row2 = data[item.row]) === null || _data$item$row2 === void 0 ? void 0 : _data$item$row2[item.col],
         row: item.row,
         col: item.col,
-        value: ''
+        value: null,
+        id: data === null || data === void 0 ? void 0 : (_data$item$row3 = data[item.row]) === null || _data$item$row3 === void 0 ? void 0 : _data$item$row3[item.col].id
       };
     });
     var newHistory = _toConsumableArray(history || []);
@@ -282,13 +315,13 @@ export var sideEffectReducer = {
       }),
       type: 'Delete'
     });
-    cellChangeHandler && cellChangeHandler(changes);
     dispatch({
       type: 'changes',
       payload: {
         history: newHistory
       }
     });
+    cellChangeHandler && cellChangeHandler(changes);
   },
   reverse: function reverse(dispatch, getState) {
     var _getState10 = getState(),
@@ -298,19 +331,11 @@ export var sideEffectReducer = {
       cellChangeHandler = _getState10.cellChangeHandler,
       eventBus = _getState10.eventBus;
     if (!(history !== null && history !== void 0 && history.length)) return;
-    console.log(history.length);
     var changeHistory = _toConsumableArray(history);
     var change = changeHistory.pop();
     var type = change.type;
     if (!['Edit', 'Paste', 'Delete'].includes(type)) {
       eventBus.emit('reverse', change);
-      if (type === 'DeleteRow') {
-        // console.log(change.rowInfo?.deleteRow);
-        // dispatch({
-        //   type: 'selectRow',
-        //   payload: change.rowInfo?.deleteRow as number,
-        // });
-      }
       dispatch({
         type: 'changes',
         payload: {
@@ -333,5 +358,4 @@ export var sideEffectReducer = {
       }
     });
   }
-};
-//# sourceMappingURL=sideEffectReducer.js.map
+};

package/dist/core/reducers/stateReducer.js

@@ -10,7 +10,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import { SheetType } from "../../type";
+import { SheetType } from "../..";
 export var stateReducer = {
   change: function change(state, payload) {
     var _ref = payload,
@@ -52,15 +52,16 @@ export var stateReducer = {
       _ref2$cell = _ref2.cell,
       row = _ref2$cell.row,
       col = _ref2$cell.col,
-      confirm = _ref2$cell.confirm;
+      confirm = _ref2$cell.confirm,
+      id = _ref2$cell.id;
     var history = _toConsumableArray(state.history || []);
     var current = data === null || data === void 0 ? void 0 : (_data$row = data[row]) === null || _data$row === void 0 ? void 0 : _data$row[col].value;
-    console.log(history.length, current);
     history.push({
       changes: [{
         row: row,
         col: col,
-        value: current
+        value: current,
+        id: id
       }],
       type: 'Edit'
     });
@@ -75,19 +76,43 @@ export var stateReducer = {
       history: history
     });
   },
+  popHistory: function popHistory(state) {
+    var _state$history = state.history,
+      history = _state$history === void 0 ? [] : _state$history;
+    var newHistory = _toConsumableArray(history);
+    newHistory.pop();
+    return _objectSpread(_objectSpread({}, state), {}, {
+      history: newHistory
+    });
+  },
   pushHistory: function pushHistory(state, payload) {
     return _objectSpread(_objectSpread({}, state), {}, {
       history: [].concat(_toConsumableArray(state.history || []), [payload])
     });
   },
+  select: function select(state, payload) {
+    var oldStart = state.start,
+      oldEnd = state.end;
+    var _ref3 = payload,
+      start = _ref3.start,
+      end = _ref3.end;
+    return _objectSpread(_objectSpread({}, state), {}, {
+      start: start,
+      end: end,
+      lastSelected: {
+        start: oldStart,
+        end: oldEnd
+      }
+    });
+  },
   selectRow: function selectRow(state, payload) {
-    var _state$data4, _state$data4$, _state$data5, _state$data5$;
+    var _state$data4, _state$data4$, _state$data5, _state$data5$, _state$data6, _state$data6$;
     var startCol = ((_state$data4 = state.data) === null || _state$data4 === void 0 ? void 0 : (_state$data4$ = _state$data4[0]) === null || _state$data4$ === void 0 ? void 0 : _state$data4$.findIndex(function (item) {
       return !item.fixed;
     })) || 0;
     var endCol = (((_state$data5 = state.data) === null || _state$data5 === void 0 ? void 0 : (_state$data5$ = _state$data5[0]) === null || _state$data5$ === void 0 ? void 0 : _state$data5$.findIndex(function (item) {
       return item.fixed === SheetType.CellAlign.right;
-    })) || 0) - 1;
+    })) || ((_state$data6 = state.data) === null || _state$data6 === void 0 ? void 0 : (_state$data6$ = _state$data6[0]) === null || _state$data6$ === void 0 ? void 0 : _state$data6$.length) || 0) - 1;
     // const endCol = (state.data?.[0].length || 0) - 1;
     if (startCol >= 0 && endCol >= 0) {
       return _objectSpread(_objectSpread({}, state), {}, {
@@ -122,8 +147,8 @@ export var stateReducer = {
   clearSelectIfNotSingleRow: function clearSelectIfNotSingleRow(state) {
     var start = state.start,
       end = state.end;
-    if ((start === null || start === void 0 ? void 0 : start.row) === (end === null || end === void 0 ? void 0 : end.row)) {
-      return _objectSpread({}, state);
+    if (!start || !end || (start === null || start === void 0 ? void 0 : start.row) === (end === null || end === void 0 ? void 0 : end.row)) {
+      return state;
     }
     return _objectSpread(_objectSpread({}, state), {}, {
       start: undefined,
@@ -136,10 +161,10 @@ export var stateReducer = {
   },
   clearEdit: function clearEdit(state) {
     var editing = state.editing;
+    if (!editing) return state;
     return _objectSpread(_objectSpread({}, state), {}, {
       editing: undefined,
       lastEditing: editing
     });
   }
-};
-//# sourceMappingURL=stateReducer.js.map
+};