@lemon-fe/kits 1.0.0-33 → 1.0.0-35

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

@@ -3,6 +3,8 @@ import React from 'react';
 import type { ICellEditorReactComp } from '@ag-grid-community/react';
 import type { ICellEditorParams } from '@ag-grid-community/core';
 export interface CustomEditorParams<T = any, K = any> {
+    suppressEnterEvent?: boolean;
+    isCancelAfterEnd?: (prevValue: T, nextValue: T) => boolean;
     render: (val: K, data: T, params: ICellEditorParams<T, K> & {
         ref: MutableRefObject<{
             select?: () => void;

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

@@ -23,11 +23,11 @@ import EditorWrapper from "./Wrapper";
 import { useGridStore } from "../hooks";
 export default /*#__PURE__*/forwardRef(function CustomEditor(props, ref) {
   var api = props.api,
-      cellStartedEdit = props.cellStartedEdit,
+      suppressEnterEvent = props.suppressEnterEvent,
       stopEditing = props.stopEditing,
       data = props.data,
       render = props.render,
-      node = props.node,
+      isCancelAfterEnd = props.isCancelAfterEnd,
       field = props.colDef.field;
 
   var _useState = useState(data),
@@ -40,23 +40,38 @@ export default /*#__PURE__*/forwardRef(function CustomEditor(props, ref) {
   });
   var elm = useRef(null);
   useEffect(function () {
-    if (cellStartedEdit && elm.current !== null) {
+    if (elm.current !== null) {
       if (elm.current.select !== undefined) {
         elm.current.select();
       } else if (elm.current.focus !== undefined) {
         elm.current.focus();
       }
     }
-  }, [cellStartedEdit]);
+  }, []);
   useImperativeHandle(ref, function () {
     return {
       getValue: function getValue() {
         var newData = _objectSpread(_objectSpread({}, data), value);
 
+        var prevValue = props.value;
+        var nextValue = prevValue;
+
+        if (field === undefined) {
+          return prevValue;
+        }
+
+        nextValue = get(value, field);
+
+        if (nextValue == prevValue || isCancelAfterEnd !== undefined && isCancelAfterEnd(data, newData)) {
+          return prevValue;
+        }
+
         requestAnimationFrame(function () {
-          node.setData(newData);
+          api.applyTransaction({
+            update: [newData]
+          });
         });
-        return field ? get(newData, field) : props.value;
+        return prevValue;
       }
     };
   });
@@ -78,7 +93,13 @@ export default /*#__PURE__*/forwardRef(function CustomEditor(props, ref) {
     }
   };
 
-  return /*#__PURE__*/React.createElement(EditorWrapper, null, render(field ? get(value, field) : props.value, data, _objectSpread(_objectSpread({}, props), {}, {
+  return /*#__PURE__*/React.createElement(EditorWrapper, {
+    onKeyDown: function onKeyDown(e) {
+      if (!suppressEnterEvent && e.key === 'Enter') {
+        api.tabToNextCell();
+      }
+    }
+  }, render(field ? get(value, field) : props.value, data, _objectSpread(_objectSpread({}, props), {}, {
     context: context,
     ref: elm,
     onChange: handleChange

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

@@ -20,7 +20,8 @@ export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
   var cellStartedEdit = props.cellStartedEdit,
       _props$format = props.format,
       format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
-      disabled = props.disabled;
+      disabled = props.disabled,
+      api = props.api;
 
   var _useState = useState(props.value ? moment(props.value, format) : null),
       _useState2 = _slicedToArray(_useState, 2),
@@ -28,6 +29,7 @@ export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
       setValue = _useState2[1];
 
   var elm = useRef(null);
+  var isEdited = useRef(false);
   useEffect(function () {
     if (cellStartedEdit) {
       var _elm$current;
@@ -45,7 +47,13 @@ export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
       getValue: getValue
     };
   });
-  return /*#__PURE__*/React.createElement(EditorWrapper, null, /*#__PURE__*/React.createElement(DatePicker, {
+  return /*#__PURE__*/React.createElement(EditorWrapper, {
+    onKeyDown: function onKeyDown(e) {
+      if (isEdited.current && e.key === 'Enter') {
+        api.tabToNextCell();
+      }
+    }
+  }, /*#__PURE__*/React.createElement(DatePicker, {
     style: {
       display: 'flex',
       paddingTop: 0,
@@ -55,12 +63,21 @@ export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
     className: editorPrefixClass('date'),
     value: value,
     placeholder: format,
+    onOpenChange: function onOpenChange(val) {
+      if (!val) {
+        isEdited.current = true;
+      }
+    },
     onChange: function onChange(val) {
       if (val) {
         setValue(val);
       } else {
         setValue(null);
       }
+
+      requestAnimationFrame(function () {
+        api.tabToNextCell();
+      });
     },
     ref: elm,
     bordered: false

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

@@ -17,14 +17,14 @@ import { editorPrefixClass } from "./utils";
 export default /*#__PURE__*/forwardRef(function NumberEditor(props, ref) {
   var _props$value;
 
-  var cellStartedEdit = props.cellStartedEdit,
-      _props$min = props.min,
+  var _props$min = props.min,
       min = _props$min === void 0 ? -99999999 : _props$min,
       _props$max = props.max,
       max = _props$max === void 0 ? 99999999 : _props$max,
       emptyValue = props.emptyValue,
       undoWhenError = props.undoWhenError,
-      disabled = props.disabled;
+      disabled = props.disabled,
+      api = props.api;
 
   var _useState = useState((_props$value = props.value) !== null && _props$value !== void 0 ? _props$value : null),
       _useState2 = _slicedToArray(_useState, 2),
@@ -33,12 +33,10 @@ export default /*#__PURE__*/forwardRef(function NumberEditor(props, ref) {
 
   var elm = useRef(null);
   useEffect(function () {
-    if (cellStartedEdit) {
-      var _elm$current;
+    var _elm$current;
 
-      (_elm$current = elm.current) === null || _elm$current === void 0 ? void 0 : _elm$current.select();
-    }
-  }, [cellStartedEdit]);
+    (_elm$current = elm.current) === null || _elm$current === void 0 ? void 0 : _elm$current.select();
+  }, []);
 
   var getValue = function getValue() {
     var val;
@@ -74,7 +72,13 @@ export default /*#__PURE__*/forwardRef(function NumberEditor(props, ref) {
       getValue: getValue
     };
   });
-  return /*#__PURE__*/React.createElement(EditorWrapper, null, /*#__PURE__*/React.createElement("input", {
+  return /*#__PURE__*/React.createElement(EditorWrapper, {
+    onKeyDown: function onKeyDown(e) {
+      if (e.key === 'Enter') {
+        api.tabToNextCell();
+      }
+    }
+  }, /*#__PURE__*/React.createElement("input", {
     type: "number",
     disabled: disabled,
     className: editorPrefixClass('text'),

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

@@ -18,10 +18,8 @@ import { Select } from 'antd';
 import EditorWrapper from "./Wrapper";
 import { editorPrefixClass } from "./utils";
 export default /*#__PURE__*/forwardRef(function SelectEditor(props, ref) {
-  var cellStartedEdit = props.cellStartedEdit,
-      cellEditorParams = props.colDef.cellEditorParams,
-      column = props.column,
-      node = props.node;
+  var cellEditorParams = props.colDef.cellEditorParams,
+      api = props.api;
 
   var _useState = useState(props.value),
       _useState2 = _slicedToArray(_useState, 2),
@@ -30,12 +28,10 @@ export default /*#__PURE__*/forwardRef(function SelectEditor(props, ref) {
 
   var elm = useRef(null);
   useEffect(function () {
-    if (cellStartedEdit) {
-      var _elm$current;
+    var _elm$current;
 
-      (_elm$current = elm.current) === null || _elm$current === void 0 ? void 0 : _elm$current.focus();
-    }
-  }, [cellStartedEdit]);
+    (_elm$current = elm.current) === null || _elm$current === void 0 ? void 0 : _elm$current.focus();
+  }, []);
   useImperativeHandle(ref, function () {
     return {
       getValue: function getValue() {
@@ -49,9 +45,11 @@ export default /*#__PURE__*/forwardRef(function SelectEditor(props, ref) {
     className: editorPrefixClass('select')
   }, cellEditorParams, {
     value: value,
-    onChange: function onChange(val) {
+    onSelect: function onSelect(val) {
       setValue(val);
-      node.setDataValue(column, val);
+      requestAnimationFrame(function () {
+        api.tabToNextCell();
+      });
     }
   })));
 });

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

@@ -15,8 +15,8 @@ import { forwardRef, useImperativeHandle, useState } from 'react';
 import EditorWrapper from "./Wrapper";
 import { editorPrefixClass } from "./utils";
 export default /*#__PURE__*/forwardRef(function TextEditor(props, ref) {
-  var cellStartedEdit = props.cellStartedEdit,
-      disabled = props.disabled;
+  var disabled = props.disabled,
+      api = props.api;
 
   var _useState = useState(props.value),
       _useState2 = _slicedToArray(_useState, 2),
@@ -25,12 +25,10 @@ export default /*#__PURE__*/forwardRef(function TextEditor(props, ref) {
 
   var elm = useRef(null);
   useEffect(function () {
-    if (cellStartedEdit) {
-      var _elm$current;
+    var _elm$current;
 
-      (_elm$current = elm.current) === null || _elm$current === void 0 ? void 0 : _elm$current.select();
-    }
-  }, [cellStartedEdit]);
+    (_elm$current = elm.current) === null || _elm$current === void 0 ? void 0 : _elm$current.select();
+  }, []);
   useImperativeHandle(ref, function () {
     return {
       getValue: function getValue() {
@@ -39,6 +37,11 @@ export default /*#__PURE__*/forwardRef(function TextEditor(props, ref) {
     };
   });
   return /*#__PURE__*/React.createElement(EditorWrapper, null, /*#__PURE__*/React.createElement("input", {
+    onKeyDown: function onKeyDown(e) {
+      if (e.key === 'Enter') {
+        api.tabToNextCell();
+      }
+    },
     disabled: disabled,
     className: editorPrefixClass('text'),
     ref: elm,

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

@@ -1,4 +1,5 @@
-import { type ReactNode } from 'react';
+import { type ReactNode, type KeyboardEventHandler } from 'react';
 export default function EditorWrapper(props: {
     children: ReactNode;
+    onKeyDown?: KeyboardEventHandler<HTMLDivElement>;
 }): JSX.Element;

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

@@ -1,7 +1,9 @@
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
 import React from 'react';
 import { editorPrefixClass } from "./utils";
 export default function EditorWrapper(props) {
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", _extends({
     className: editorPrefixClass()
-  }, props.children);
+  }, props));
 }

package/es/components/DataGrid/index.js

@@ -1,5 +1,5 @@
 var _excluded = ["validator"],
-    _excluded2 = ["title", "key", "dataIndex", "align", "type", "fixed", "render", "ellipsis", "cellRenderer", "cellRendererParams", "className", "sorter", "editable"],
+    _excluded2 = ["title", "key", "dataIndex", "align", "type", "fixed", "render", "ellipsis", "cellRenderer", "cellRendererParams", "className", "sorter", "editable", "suppressKeyboardEvent"],
     _excluded3 = ["title", "children"],
     _excluded4 = ["rowSelection", "rowKey", "fetch", "dataSource", "summary", "rowActions", "context", "onGridReady", "pagination", "columnTypes", "defaultColDef", "components", "columns", "loading", "autoLoad", "sideBar"];
 
@@ -494,6 +494,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
                 className = item.className,
                 sorter = item.sorter,
                 editable = item.editable,
+                suppressKeyboardEvent = item.suppressKeyboardEvent,
                 _rest = _objectWithoutProperties(item, _excluded2);
 
             var _opts = {
@@ -562,6 +563,19 @@ var DataGrid = /*#__PURE__*/function (_Component) {
               _opts.cellClassRules = _defineProperty({}, prefix('editor-cell'), function () {
                 return true;
               });
+              /** 由于ag-grid注册事件使用的是js原生事件，不在React事件流内，会产生很多问题，所以默认关闭所有Enter导致关闭编辑，由组件内部自行实现回车 */
+
+              _opts.suppressKeyboardEvent = function (keyParmas) {
+                if (suppressKeyboardEvent !== undefined && suppressKeyboardEvent(keyParmas)) {
+                  return true;
+                }
+
+                if (keyParmas.editing && keyParmas.event.key === 'Enter') {
+                  return true;
+                }
+
+                return false;
+              };
 
               if (_opts.cellRenderer === undefined) {
                 _opts.cellRenderer = CellRenderer;

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

@@ -11,7 +11,6 @@ export type { TextEditorParams } from './cell-editors/Text';
 export type { NumberEditorParams } from './cell-editors/Number';
 export type { DateEditorParams } from './cell-editors/Date';
 export type { SelectEditorParams } from './cell-editors/Select';
-export type { CombinationEditorParams } from './cell-editors/Combination';
 export type { CustomEditorParams } from './cell-editors/Custom';
 export declare type GetRowId<T> = string | ((data: T) => string);
 export declare type PathType = string | (string | number)[];

package/package.json

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

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

@@ -1,8 +0,0 @@
-import type { ICellEditorReactComp } from '@ag-grid-community/react';
-import type { ICellEditorParams } from '@ag-grid-community/core';
-import { type ForwardedRef, type ReactElement } from 'react';
-export interface CombinationEditorParams<T = any> {
-    render: (props: ICellEditorParams<T>, ref: ForwardedRef<ICellEditorReactComp>) => ReactElement | null;
-}
-declare const _default: import("react").ForwardRefExoticComponent<ICellEditorParams<any, any> & CombinationEditorParams<any> & import("react").RefAttributes<ICellEditorReactComp>>;
-export default _default;

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

@@ -1,25 +0,0 @@
-var _excluded = ["render"];
-
-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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-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 { forwardRef } from 'react';
-import { useGridStore } from "../hooks";
-export default /*#__PURE__*/forwardRef(function CombinationEditor(props, ref) {
-  var render = props.render,
-      restProps = _objectWithoutProperties(props, _excluded);
-
-  var context = useGridStore(function (state) {
-    return state.context;
-  });
-  return render(_objectSpread(_objectSpread({}, restProps), {}, {
-    context: context
-  }), ref);
-});