@lemon-fe/kits 1.0.0-57 → 1.0.0-58

package/es/components/DataGrid/cell-editors/Number.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { ICellEditorReactComp } from '@ag-grid-community/react';
 import type { ICellEditorParams } from '@ag-grid-community/core';
-export interface NumberEditorParams {
+export interface NumberEditorParams<TData = any> {
     disabled?: boolean;
     /**
      * @description 最小值
@@ -15,14 +15,17 @@ export interface NumberEditorParams {
      * @description 空值
      */
     emptyValue?: number;
-    /**
-     * @description 当值不合理时，不修改单元格
-     */
-    undoWhenError?: boolean;
     /**
      * @description 精度
      */
     precision?: number;
+    /**
+     * 可以在不使用min或者max的情况下，进行数值校验，可以用于错误提示
+     * @param newValue
+     * @param data
+     * @returns
+     */
+    isCancelAfterEnd?: (newValue: number, data: TData) => boolean;
 }
-declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any> & NumberEditorParams & React.RefAttributes<ICellEditorReactComp>>;
+declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any> & NumberEditorParams<any> & React.RefAttributes<ICellEditorReactComp>>;
 export default _default;

package/es/components/DataGrid/cell-editors/Number.js

@@ -10,7 +10,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useMemo, useRef } from 'react';
 import { forwardRef, useImperativeHandle, useState } from 'react';
 import EditorWrapper from "./Wrapper";
 import { editorPrefixClass } from "./utils";
@@ -22,10 +22,11 @@ export default /*#__PURE__*/forwardRef(function NumberEditor(props, ref) {
       _props$max = props.max,
       max = _props$max === void 0 ? 99999999 : _props$max,
       emptyValue = props.emptyValue,
-      undoWhenError = props.undoWhenError,
       disabled = props.disabled,
       api = props.api,
-      precision = props.precision;
+      precision = props.precision,
+      _isCancelAfterEnd = props.isCancelAfterEnd,
+      data = props.data;
 
   var _useState = useState((_props$value = props.value) !== null && _props$value !== void 0 ? _props$value : null),
       _useState2 = _slicedToArray(_useState, 2),
@@ -40,9 +41,8 @@ export default /*#__PURE__*/forwardRef(function NumberEditor(props, ref) {
     (_elm$current = elm.current) === null || _elm$current === void 0 ? void 0 : _elm$current.select();
   }, []);
 
-  var getValue = function getValue() {
+  var getFormatedValue = function getFormatedValue() {
     var val;
-    var error = false;
 
     if (value === '' || value === null) {
       val = emptyValue !== null && emptyValue !== void 0 ? emptyValue : null;
@@ -54,31 +54,40 @@ export default /*#__PURE__*/forwardRef(function NumberEditor(props, ref) {
       }
     }
 
-    if (val === null) {
-      error = true;
-    } else if (val < min) {
-      error = true;
-      val = min;
-    } else if (val > max) {
-      error = true;
-      val = max;
-    }
-
-    if (error && undoWhenError) {
-      return props.value;
-    }
-
     return val;
   };
 
   useImperativeHandle(ref, function () {
     return {
-      getValue: getValue,
+      getValue: function getValue() {
+        return getFormatedValue();
+      },
       isCancelAfterEnd: function isCancelAfterEnd() {
-        return !dirty.current;
+        if (!dirty.current) {
+          return true;
+        }
+
+        var val = getFormatedValue();
+
+        if (val === null || val < min || val > max) {
+          return true;
+        }
+
+        if (_isCancelAfterEnd !== undefined) {
+          return _isCancelAfterEnd(val, data);
+        }
+
+        return false;
       }
     };
   });
+  var text = useMemo(function () {
+    if (precision !== undefined && typeof value === 'number') {
+      return Math.round(value * Math.pow(10, precision)) / Math.pow(10, precision);
+    }
+
+    return value !== null && value !== void 0 ? value : '';
+  }, [value, precision]);
   return /*#__PURE__*/React.createElement(EditorWrapper, {
     onKeyDown: function onKeyDown(e) {
       if (e.key === 'Enter') {
@@ -90,7 +99,7 @@ export default /*#__PURE__*/forwardRef(function NumberEditor(props, ref) {
     disabled: disabled,
     className: editorPrefixClass('text'),
     ref: elm,
-    value: value !== null && value !== void 0 ? value : '',
+    value: text,
     onChange: function onChange(event) {
       dirty.current = true;
       setValue(event.target.value);

package/es/components/DataGrid/cell-editors/Row.d.ts

@@ -9,7 +9,7 @@ export declare class RowEditorData<T> {
 }
 export interface RowEditorParams<T = any, K = any> {
     suppressEnterEvent?: boolean;
-    isCancelAfterEnd?: (prevValue: T, nextValue: T) => boolean;
+    isCancelAfterEnd?: (newValue: T, data: T) => boolean;
     render: (val: K, data: T, params: ICellEditorParams<T, K> & {
         ref: MutableRefObject<{
             select?: () => void;

package/es/components/DataGrid/cell-editors/Row.js

@@ -78,7 +78,7 @@ export default /*#__PURE__*/forwardRef(function RowEditor(props, ref) {
         var prevValue = props.value;
         var nextValue = prevValue;
 
-        if (field === undefined || value === data || isCancelAfterEnd !== undefined && isCancelAfterEnd(data, _objectSpread(_objectSpread({}, data), value))) {
+        if (field === undefined || value === data || isCancelAfterEnd !== undefined && isCancelAfterEnd(_objectSpread(_objectSpread({}, data), value), data)) {
           return prevValue;
         }
 

package/es/components/DataGrid/typings.d.ts

@@ -23,7 +23,7 @@ interface EditorParamsType<T extends string, K extends Record<string, any>> {
     params?: K;
     component?: string;
 }
-declare type EditorType<TData> = EditorParamsType<'text-editor', TextEditorParams> | EditorParamsType<'number-editor', NumberEditorParams> | EditorParamsType<'date-editor', DateEditorParams> | EditorParamsType<'select-editor', SelectEditorParams> | EditorParamsType<'row-editor', RowEditorParams<TData>>;
+declare type EditorType<TData> = EditorParamsType<'text-editor', TextEditorParams> | EditorParamsType<'number-editor', NumberEditorParams<TData>> | EditorParamsType<'date-editor', DateEditorParams> | EditorParamsType<'select-editor', SelectEditorParams> | EditorParamsType<'row-editor', RowEditorParams<TData>>;
 export interface ColType<TData> extends Omit<ColDef<TData>, 'editable'> {
     title?: ReactNode | ((params: IHeaderParams) => ReactNode);
     dataIndex?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.0-57",
+  "version": "1.0.0-58",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",