@zhenliang/sheet 0.1.6 → 0.1.7-3.beta.0

package/dist/assets/arrow-mac-down.svg

@@ -0,0 +1,19 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g filter="url(#filter0_d_932_2301)">
+        <path d="M10 5.5V12.5H6L12 18.5L18 12.5H14V5.5H10Z" fill="white" />
+        <path d="M13.0002 6.5V13.5H15.5902L12.0002 17.09L8.41016 13.5H11.0002V6.5H13.0002Z" fill="black" />
+    </g>
+    <defs>
+        <filter id="filter0_d_932_2301" x="4.2" y="4.7" width="15.6" height="16.6" filterUnits="userSpaceOnUse"
+            color-interpolation-filters="sRGB">
+            <feFlood flood-opacity="0" result="BackgroundImageFix" />
+            <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+                result="hardAlpha" />
+            <feOffset dy="1" />
+            <feGaussianBlur stdDeviation="0.9" />
+            <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.65 0" />
+            <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_932_2301" />
+            <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_932_2301" result="shape" />
+        </filter>
+    </defs>
+</svg>

package/dist/assets/arrow-mac-right.svg

@@ -0,0 +1,17 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_932_2297)">
+<path d="M12.5 18L18.5 12L12.5 6V10H5.5V14H12.5V18Z" fill="white"/>
+<path d="M6.5 11H13.5V8.40997L17.09 12L13.5 15.59V13H6.5V11Z" fill="black"/>
+</g>
+<defs>
+<filter id="filter0_d_932_2297" x="3.7" y="5.2" width="16.6" height="15.6" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="0.9"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.65 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_932_2297"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_932_2297" result="shape"/>
+</filter>
+</defs>
+</svg>

package/dist/assets/arrow-windows-down.svg

@@ -0,0 +1,17 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_932_2293)">
+<path d="M10 5.5V12.5H6L12 18.5L18 12.5H14V5.5H10Z" fill="black"/>
+<path d="M13.0002 6.5V13.5H15.5902L12.0002 17.09L8.41016 13.5H11.0002V6.5H13.0002Z" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_d_932_2293" x="4.2" y="4.7" width="15.6" height="16.6" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="0.9"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.65 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_932_2293"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_932_2293" result="shape"/>
+</filter>
+</defs>
+</svg>

package/dist/assets/arrow-windows-right.svg

@@ -0,0 +1,17 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_932_2289)">
+<path d="M12.5 18L18.5 12L12.5 6V10H5.5V14H12.5V18Z" fill="black"/>
+<path d="M6.5 11H13.5V8.40997L17.09 12L13.5 15.59V13H6.5V11Z" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_d_932_2289" x="3.7" y="5.2" width="16.6" height="15.6" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="0.9"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.65 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_932_2289"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_932_2289" result="shape"/>
+</filter>
+</defs>
+</svg>

package/dist/core/config.d.ts

@@ -8,6 +8,9 @@ export declare const DOWN_KEY = 40;
 export declare const DELETE_KEY = 46;
 export declare const BACKSPACE_KEY = 8;
 export declare const Z_KEY = 90;
+export declare const F_KEY = 70;
 export declare const C_KEY = 67;
 export declare const V_KEY = 86;
 export declare const X_KEY = 88;
+export declare const A_KEY = 65;
+export declare const Y_KEY = 89;

package/dist/core/config.js

@@ -8,6 +8,9 @@ export var DOWN_KEY = 40;
 export var DELETE_KEY = 46;
 export var BACKSPACE_KEY = 8;
 export var Z_KEY = 90;
+export var F_KEY = 70;
 export var C_KEY = 67;
 export var V_KEY = 86;
-export var X_KEY = 88;
+export var X_KEY = 88;
+export var A_KEY = 65;
+export var Y_KEY = 89;

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

@@ -1,5 +1,5 @@
 import type { SheetType } from "../../../type";
 import 'antd/es/cascader/style/index.css';
 import './index.less';
-declare const getCascaderEditor: (options: SheetType.OptionsType[]) => SheetType.CellEditor;
+declare const getCascaderEditor: (options: SheetType.OptionsType[], getCustomOptions?: ((props: SheetType.CellEditorProps) => SheetType.OptionsType[]) | undefined) => SheetType.CellEditor;
 export default getCascaderEditor;

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

@@ -1,10 +1,11 @@
 import { Cascader } from 'antd';
 import 'antd/es/cascader/style/index.css';
-import { useMemo } from 'react';
+import { isNil } from 'lodash';
+import { useMemo } from "../../../../node_modules/@types/react";
 import { optionsToValuesFromLabelOrValue, valuesTransferToLabel } from "../../util";
 import "./index.less";
-import { jsx as _jsx } from "react/jsx-runtime";
-var getCascaderEditor = function getCascaderEditor(options) {
+import { jsx as _jsx } from "../../../../node_modules/@types/react/jsx-runtime";
+var getCascaderEditor = function getCascaderEditor(options, getCustomOptions) {
   var CascaderEditor = function CascaderEditor(props) {
     var value = props.value,
       onConfirm = props.onConfirm;
@@ -15,6 +16,7 @@ var getCascaderEditor = function getCascaderEditor(options) {
     var handleChange = function handleChange(opt) {
       onConfirm(opt ? opt[opt.length - 1] : null);
     };
+    var customOptions = getCustomOptions ? getCustomOptions(props) : options;
     return /*#__PURE__*/_jsx(Cascader, {
       autoFocus: true,
       open: true,
@@ -22,17 +24,13 @@ var getCascaderEditor = function getCascaderEditor(options) {
       onMouseDown: function onMouseDown(event) {
         event.stopPropagation();
       },
-      value: val
-      // allowClear={false}
-      ,
+      value: val,
+      allowClear: true,
       displayRender: function displayRender(label) {
         return label[label.length - 1];
       },
-      onChange: handleChange
-      // onBlur={handleBlur}
-      // onKeyDown={handleKeyDown}
-      ,
-      options: options
+      onChange: handleChange,
+      options: customOptions
     });
   };
   CascaderEditor.formatter = function (value) {
@@ -44,6 +42,9 @@ var getCascaderEditor = function getCascaderEditor(options) {
     return res.length ? res[res.length - 1] : null;
   };
   CascaderEditor.checker = function (value) {
+    if (isNil(value)) {
+      return true;
+    }
     var res = optionsToValuesFromLabelOrValue(options, value);
     return !!res.length;
   };

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

@@ -1,19 +1,23 @@
-.cascader-editor{
+.harvest-sheet-container .cascader-editor{
   width: 100%;
-  padding: 0;
-  height: 20px !important;
-
+  height: 38px;
+  display: block;
 
   .ant-select-selector{
     .ant-select-selection-search{
-      height: 16px !important;
+      height: 38px;
+    }
+
+    .ant-select-selection-item{
+      height: inherit;
+      line-height: 38px;
+      font-size: 12px;
     }
 
     border: none !important;
     background: transparent !important;
     box-shadow: none !important;
     color: #292c33;
-    height: 20px !important;
     padding:0 !important; 
 
     input{
@@ -21,4 +25,8 @@
     }
   }
 
-}
+  .ant-cascader-menu {
+    font-size: 12px;
+  }
+
+}

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

@@ -1,15 +1,16 @@
-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); }
-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 _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); }
+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(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 _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); }
 import { DatePicker } from 'antd';
 import 'antd/es/date-picker/style/index.css';
+import { isNil } from 'lodash';
 import moment from 'moment';
-import { useEffect, useMemo, useRef } from 'react';
+import { useEffect, useMemo, useRef } from "../../../../node_modules/@types/react";
 import "./index.less";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx } from "../../../../node_modules/@types/react/jsx-runtime";
 export var getDateEditor = function getDateEditor(dateProps) {
   var DateEditor = function DateEditor(props) {
     var value = props.value,
@@ -18,7 +19,7 @@ export var getDateEditor = function getDateEditor(dateProps) {
     var dateRef = useRef(null);
     useEffect(function () {
       var _dateRef$current;
-      dateRef === null || dateRef === void 0 ? void 0 : (_dateRef$current = dateRef.current) === null || _dateRef$current === void 0 ? void 0 : _dateRef$current.focus();
+      dateRef === null || dateRef === void 0 || (_dateRef$current = dateRef.current) === null || _dateRef$current === void 0 || _dateRef$current.focus();
     }, []);
     var val = useMemo(function () {
       return value && moment(value);
@@ -29,6 +30,18 @@ export var getDateEditor = function getDateEditor(dateProps) {
     };
     return /*#__PURE__*/_jsx(DatePicker, _objectSpread({
       open: true,
+      inputRender: function inputRender(props) {
+        return /*#__PURE__*/_jsx("input", _objectSpread(_objectSpread({}, props), {}, {
+          onKeyDownCapture: function onKeyDownCapture(e) {
+            if (e.key !== 'Enter') {
+              e.nativeEvent.stopImmediatePropagation();
+            } else {
+              onChange(e.target.value);
+              onConfirm(e.target.value);
+            }
+          }
+        }));
+      },
       ref: dateRef,
       className: "date-editor",
       value: val,
@@ -39,13 +52,23 @@ export var getDateEditor = function getDateEditor(dateProps) {
     }, dateProps));
   };
   DateEditor.checker = function (value) {
+    if (isNil(value)) {
+      return true;
+    }
     var reg = /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1])$/;
     return reg.test(value);
   };
   DateEditor.formatter = function (value) {
     var _DateEditor$checker;
+    if (isNil(value)) return value;
     if (!(DateEditor !== null && DateEditor !== void 0 && (_DateEditor$checker = DateEditor.checker) !== null && _DateEditor$checker !== void 0 && _DateEditor$checker.call(DateEditor, value))) return null;
     return value.replace('/', '-').replace('/', '-');
   };
+  DateEditor.parser = function (value) {
+    var _DateEditor$checker2;
+    if (isNil(value)) return value;
+    if (!(DateEditor !== null && DateEditor !== void 0 && (_DateEditor$checker2 = DateEditor.checker) !== null && _DateEditor$checker2 !== void 0 && _DateEditor$checker2.call(DateEditor, value))) return null;
+    return value.replace('/', '-').replace('/', '-');
+  };
   return DateEditor;
 };

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

@@ -1,11 +1,18 @@
-.date-editor{
+.harvest-sheet-container .date-editor{
   width:100%;
   border:none !important;
   box-shadow: none !important;
   background: transparent !important;
-  height: 20px;
+  padding:4px 0;
+  height: 38px;
+  display: block;
 
   input{
     font-size: var(--cell-font-size);
   }
+  
+  .ant-picker-input{
+    height: 30px;
+
+  }
 }

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

@@ -2,5 +2,7 @@ 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'>>;
 export declare const NumberEditor: SheetType.CellEditor;
-export declare const getNumberEditor: (extraProps?: Partial<Pick<InputNumberProps, 'max' | 'min' | 'addonBefore' | 'addonAfter' | 'precision'>>) => 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,26 +1,30 @@
-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); }
+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(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 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(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 _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; }
 import { formatPrecision } from "../../../standardUtils";
 import { InputNumber as AntInputNumber } from 'antd';
 import 'antd/es/input-number/style/index.css';
-import { isNil } from 'lodash';
-import { useCallback, useEffect, useRef } from 'react';
+import { isNil, isNumber } from 'lodash';
+import { useCallback, useEffect, useRef } from "../../../../node_modules/@types/react";
 import "./index.less";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx } from "../../../../node_modules/@types/react/jsx-runtime";
+var isNumeric = function isNumeric(str) {
+  // 使用正则表达式匹配数字，包括整数和小数
+  return /^-?\d+(\.\d+)?$/.test(str);
+};
 export var NumberEditor = function NumberEditor(props) {
   var value = props.value,
     onChange = props.onChange;
   var inputNumberRef = useRef(null);
   useEffect(function () {
     var _inputNumberRef$curre;
-    inputNumberRef === null || inputNumberRef === void 0 ? void 0 : (_inputNumberRef$curre = inputNumberRef.current) === null || _inputNumberRef$curre === void 0 ? void 0 : _inputNumberRef$curre.focus();
+    inputNumberRef === null || inputNumberRef === void 0 || (_inputNumberRef$curre = inputNumberRef.current) === null || _inputNumberRef$curre === void 0 || _inputNumberRef$curre.focus();
   }, []);
   return /*#__PURE__*/_jsx(AntInputNumber, {
     ref: inputNumberRef,
@@ -34,45 +38,72 @@ export var NumberEditor = function NumberEditor(props) {
     onChange: onChange
   });
 };
-export var getNumberEditor = function getNumberEditor(extraProps) {
+export var getNumberEditor = function getNumberEditor(extraProps, getExtraProps) {
   var NumberEditor = function NumberEditor(props) {
     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 handleChange = useCallback(function (value) {
+      onChange(!isNil(value) ? value : null);
+    }, [onChange]);
     useEffect(function () {
       var _inputNumberRef$curre2;
-      inputNumberRef === null || inputNumberRef === void 0 ? void 0 : (_inputNumberRef$curre2 = inputNumberRef.current) === null || _inputNumberRef$curre2 === void 0 ? void 0 : _inputNumberRef$curre2.focus();
+      inputNumberRef === null || inputNumberRef === void 0 || (_inputNumberRef$curre2 = inputNumberRef.current) === null || _inputNumberRef$curre2 === void 0 || _inputNumberRef$curre2.focus();
     }, []);
-    var _ref = extraProps || {},
-      precision = _ref.precision,
-      inputArgs = _objectWithoutProperties(_ref, _excluded);
-    var valueFormatter = useCallback(function (value) {
+    var baseFormatter = useCallback(function (value) {
       if (!value) {
         return '';
       }
-      if (typeof value === 'string') {
+      if (!isNumeric("".concat(value))) {
         return value;
       }
-      var hasDecimal = value - Math.floor(value) > 0;
+      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]);
+    // 去掉多余的0
+    var valueFormatter = useCallback(function (value) {
+      var baseValue = baseFormatter(value);
+      return baseValue ? "".concat(parseFloat(baseValue)) : '';
+    }, []);
+    /**
+     * 重新声明，后面有需求可以改一下
+     */
+    var valueParser = baseFormatter;
     return /*#__PURE__*/_jsx(AntInputNumber, _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
+      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);
+        }
+      }
     }));
   };
   NumberEditor.formatter = function (value) {
@@ -84,17 +115,21 @@ export var getNumberEditor = function getNumberEditor(extraProps) {
     return result;
   };
   NumberEditor.parser = function (value) {
-    var _extraProps$precision;
-    if (isNil(value) || isNaN(value)) {
+    var _String2, _extraProps$precision;
+    var result = parseFloat((_String2 = String(value)) === null || _String2 === void 0 ? void 0 : _String2.replace(/,/g, ''));
+    if (isNil(result) || isNaN(result)) {
       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));
+    return Number(formatPrecision(result, (_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;
+    var _String3;
+    if (isNil(value)) {
+      return true;
+    }
     // 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)) {
+    var result = parseFloat((_String3 = String(value)) === null || _String3 === void 0 ? void 0 : _String3.replace(/,/g, ''));
+    if (isNaN(result)) {
       return false;
     }
     return true;

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

@@ -1,8 +1,9 @@
-.number-editor{
+.harvest-sheet-container .number-editor{
   border: none !important;
   background: transparent !important;
   width:100%;
-  height: 38px;
+  height:var(--cell-inner-height) ; 
+  display: block;
   font-size: 12px;
   box-shadow: none !important;
   text-align: inherit !important;

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>) => SheetType.CellEditor;
+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 default getSelectEditor;

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

@@ -1,23 +1,35 @@
-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); }
-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 _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); }
+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(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 _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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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; }
 /* eslint-disable eqeqeq */
 
 import { Select } from 'antd';
 import 'antd/es/select/style/index.css';
 import { isNil } from 'lodash';
+import { useState } from "../../../../node_modules/@types/react";
 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";
+import { Fragment as _Fragment } from "../../../../node_modules/@types/react/jsx-runtime";
+import { jsx as _jsx } from "../../../../node_modules/@types/react/jsx-runtime";
+import { jsxs as _jsxs } from "../../../../node_modules/@types/react/jsx-runtime";
 export var getSelectEditor = function getSelectEditor(options) {
   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 selectProps = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  var getCustomOptions = arguments.length > 4 ? arguments[4] : undefined;
   var SelectEditor = function SelectEditor(props) {
+    var _useState = useState(true),
+      _useState2 = _slicedToArray(_useState, 2),
+      isOpen = _useState2[0],
+      setIsOpen = _useState2[1];
     var value = props.value,
       onConfirm = props.onConfirm;
     var handleChange = function handleChange(opt) {
@@ -31,29 +43,32 @@ export var getSelectEditor = function getSelectEditor(options) {
       }
     };
     var dropdown = function dropdown(menu) {
-      return /*#__PURE__*/_jsxs(_Fragment, {
+      return /*#__PURE__*/_jsxs("div", {
+        onClick: function onClick() {
+          setIsOpen(false);
+        },
         children: [menu, extra]
       });
     };
-    return /*#__PURE__*/_jsx(Select, _objectSpread(_objectSpread({}, selectProps), {}, {
+    var customOptions = getCustomOptions ? getCustomOptions(props) : options;
+    return /*#__PURE__*/_jsx(Select, _objectSpread({
       autoFocus: true,
       className: "select-editor",
-      defaultOpen: true,
-      allowClear: true,
-      open: true,
+      open: isOpen,
       onMouseDown: function onMouseDown(e) {
         e.stopPropagation();
       },
-      value: SelectEditor.formatter ? SelectEditor.formatter(value) : value,
+      value: SelectEditor.parser ? SelectEditor.parser(value) : value,
       onChange: handleChange,
       onKeyDown: handleKeyDown,
-      options: options,
-      popupClassName: 'excelTablePopupClassName',
-      dropdownRender: dropdown
-    }));
+      options: customOptions,
+      popupClassName: "select-editor-dropdown",
+      dropdownRender: dropdown,
+      allowClear: true
+    }, selectProps));
   };
   SelectEditor.checker = function (value) {
-    if (isNil(value)) return true;
+    if (isNil(value) && selectProps.allowClear !== false) return true;
     return options.some(function (item) {
       return item.value == value;
     }) || options.some(function (item) {