@lemon-fe/kits 1.0.0-92 → 1.0.0-93

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

@@ -5,5 +5,5 @@ export interface DateEditorParams {
     format: string;
     disabled?: boolean;
 }
-declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any> & DateEditorParams & React.RefAttributes<ICellEditorReactComp>>;
+declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any, any> & DateEditorParams & React.RefAttributes<ICellEditorReactComp>>;
 export default _default;

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

@@ -1,3 +1,9 @@
+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 _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."); }
@@ -15,7 +21,7 @@ import { forwardRef, useImperativeHandle, useState } from 'react';
 import moment from 'moment';
 import { DatePicker } from 'antd';
 import EditorWrapper from "./Wrapper";
-import { editorPrefixClass } from "./utils";
+import { editorPrefixClass, navigateCell } from "./utils";
 export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
   var _props$format = props.format,
       format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
@@ -36,7 +42,7 @@ export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
   }, []);
 
   var getValue = function getValue() {
-    return value ? value.format(format) : props.value;
+    return value ? value.format(format) : null;
   };
 
   useImperativeHandle(ref, function () {
@@ -46,8 +52,10 @@ export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
   });
   return /*#__PURE__*/React.createElement(EditorWrapper, null, /*#__PURE__*/React.createElement(DatePicker, {
     onKeyDown: function onKeyDown(e) {
-      if (isEdited.current && e.key === 'Enter') {
-        api.tabToNextCell();
+      if (isEdited) {
+        navigateCell(_objectSpread(_objectSpread({}, props), {}, {
+          event: e
+        }));
       }
     },
     style: {

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

@@ -27,5 +27,5 @@ export interface NumberEditorParams<TData = any> {
      */
     isCancelAfterEnd?: (newValue: number, data: TData) => boolean;
 }
-declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any> & NumberEditorParams<any> & React.RefAttributes<ICellEditorReactComp>>;
+declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any, any> & NumberEditorParams<any> & React.RefAttributes<ICellEditorReactComp>>;
 export default _default;

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

@@ -1,3 +1,9 @@
+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 _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."); }
@@ -13,22 +19,34 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useMemo, useRef } from 'react';
 import { forwardRef, useImperativeHandle, useState } from 'react';
 import EditorWrapper from "./Wrapper";
-import { editorPrefixClass } from "./utils";
+import { editorPrefixClass, navigateCell } from "./utils";
 export default /*#__PURE__*/forwardRef(function NumberEditor(props, ref) {
-  var _props$value;
-
   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,
       disabled = props.disabled,
-      api = props.api,
       precision = props.precision,
       _isCancelAfterEnd = props.isCancelAfterEnd,
       data = props.data;
 
-  var _useState = useState((_props$value = props.value) !== null && _props$value !== void 0 ? _props$value : null),
+  var _useMemo = useMemo(function () {
+    if (props.eventKey === 'BackSpace') {
+      return ['', false];
+    }
+
+    if (props.charPress && /^[0-9]$/.test(props.charPress)) {
+      return [props.charPress, false];
+    }
+
+    return [props.value, true];
+  }, []),
+      _useMemo2 = _slicedToArray(_useMemo, 2),
+      defaultValue = _useMemo2[0],
+      shouldSelect = _useMemo2[1];
+
+  var _useState = useState(defaultValue !== null && defaultValue !== void 0 ? defaultValue : null),
       _useState2 = _slicedToArray(_useState, 2),
       value = _useState2[0],
       setValue = _useState2[1];
@@ -36,9 +54,15 @@ export default /*#__PURE__*/forwardRef(function NumberEditor(props, ref) {
   var elm = useRef(null);
   var dirty = useRef(false);
   useEffect(function () {
-    var _elm$current;
+    if (elm.current === null) {
+      return;
+    }
 
-    (_elm$current = elm.current) === null || _elm$current === void 0 ? void 0 : _elm$current.select();
+    elm.current.focus();
+
+    if (shouldSelect) {
+      elm.current.select();
+    }
   }, []);
 
   var getFormatedValue = function getFormatedValue() {
@@ -100,14 +124,13 @@ export default /*#__PURE__*/forwardRef(function NumberEditor(props, ref) {
 
     return val;
   }, [value, precision]);
-  return /*#__PURE__*/React.createElement(EditorWrapper, {
-    onKeyDown: function onKeyDown(e) {
-      if (e.key === 'Enter') {
-        api.tabToNextCell();
-      }
-    }
-  }, /*#__PURE__*/React.createElement("input", {
+  return /*#__PURE__*/React.createElement(EditorWrapper, null, /*#__PURE__*/React.createElement("input", {
     type: "number",
+    onKeyDown: function onKeyDown(e) {
+      return navigateCell(_objectSpread(_objectSpread({}, props), {}, {
+        event: e
+      }));
+    },
     disabled: disabled,
     className: editorPrefixClass('text'),
     ref: elm,

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

@@ -1,3 +1,9 @@
+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 _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."); }
@@ -10,24 +16,44 @@ 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";
+import { editorPrefixClass, navigateCell } from "./utils";
 export default /*#__PURE__*/forwardRef(function TextEditor(props, ref) {
-  var disabled = props.disabled,
-      api = props.api;
+  var disabled = props.disabled;
+
+  var _useMemo = useMemo(function () {
+    if (props.eventKey === 'BackSpace') {
+      return ['', false];
+    }
+
+    if (props.charPress) {
+      return [props.charPress, false];
+    }
+
+    return [props.value, true];
+  }, []),
+      _useMemo2 = _slicedToArray(_useMemo, 2),
+      defaultValue = _useMemo2[0],
+      shouldSelect = _useMemo2[1];
 
-  var _useState = useState(props.value),
+  var _useState = useState(defaultValue),
       _useState2 = _slicedToArray(_useState, 2),
       value = _useState2[0],
       setValue = _useState2[1];
 
   var elm = useRef(null);
   useEffect(function () {
-    var _elm$current;
+    if (elm.current === null) {
+      return;
+    }
 
-    (_elm$current = elm.current) === null || _elm$current === void 0 ? void 0 : _elm$current.select();
+    elm.current.focus();
+
+    if (shouldSelect) {
+      elm.current.select();
+    }
   }, []);
   useImperativeHandle(ref, function () {
     return {
@@ -38,9 +64,9 @@ 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();
-      }
+      navigateCell(_objectSpread(_objectSpread({}, props), {}, {
+        event: e
+      }));
     },
     disabled: disabled,
     className: editorPrefixClass('text'),

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

@@ -1 +1,10 @@
+import type { Column, ColumnApi, GridApi, IRowNode } from '@ag-grid-community/core';
+import type { KeyboardEvent } from 'react';
 export declare const editorPrefixClass: (val?: string | undefined) => string;
+export declare function navigateCell(params: {
+    api: GridApi;
+    columnApi: ColumnApi;
+    event: KeyboardEvent;
+    node: IRowNode;
+    column: Column;
+}): void;

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

@@ -1,2 +1,57 @@
 import { prefixClassName } from "../../utils";
-export var editorPrefixClass = prefixClassName('grid-editor');
+export var editorPrefixClass = prefixClassName('grid-editor');
+export function navigateCell(params) {
+  var api = params.api,
+      event = params.event,
+      node = params.node,
+      column = params.column,
+      columnApi = params.columnApi;
+
+  if (event.key === 'Enter') {
+    api.tabToNextCell();
+    return;
+  }
+
+  if (node.rowIndex === null) {
+    return;
+  }
+
+  var columns = columnApi.getAllDisplayedColumns();
+  var nextColumnIndex = columns.findIndex(function (item) {
+    return item === column;
+  });
+
+  if (nextColumnIndex < 0) {
+    return;
+  }
+
+  var nextRowIndex = node.rowIndex;
+  var renderedRowCount = api.getModel().getRowCount();
+
+  switch (event.key) {
+    case 'ArrowUp':
+      nextRowIndex -= 1;
+      break;
+
+    case 'ArrowRight':
+      nextColumnIndex += 1;
+      break;
+
+    case 'ArrowDown':
+      nextRowIndex += 1;
+      break;
+
+    case 'ArrowLeft':
+      nextColumnIndex -= 1;
+      break;
+
+    default:
+      return;
+  }
+
+  if (nextRowIndex < 0 || nextRowIndex >= renderedRowCount || nextColumnIndex < 0 || nextColumnIndex >= columns.length) {
+    return;
+  }
+
+  api.setFocusedCell(nextRowIndex, columns[nextColumnIndex]);
+}

package/es/components/DataGrid/index.less

@@ -16,7 +16,7 @@
   min-height: 0;
 
   .@{ant-prefix}-table-column-sorter {
-    margin-right: 4px;
+    margin-left: 0;
   }
 
   &-cell-align-center {
@@ -179,6 +179,16 @@
         color: rgba(0, 0, 0, 0.25);
         cursor: not-allowed;
       }
+
+      &::-webkit-outer-spin-button,
+      &::-webkit-inner-spin-button {
+        margin: 0;
+        -webkit-appearance: none;
+      }
+
+      & {
+        -moz-appearance: textfield; /* Firefox */
+      }
     }
 
     &-date {

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

@@ -35,6 +35,7 @@ export interface FilterProps<T extends Record<string, any> = Record<string, any>
   simple?: boolean;
   /**
    * @description 是否自动生成placeholder
+   * @default false
    * 根据item.type以及item.label生成，自动注入到extraProps属性里，带有select则是请选择否则就是请输入
    */
   autoPlaceholder?: boolean;

package/es/components/Popup/index.js

@@ -195,14 +195,14 @@ function Popup(props) {
   var modalElm = /*#__PURE__*/React.createElement(Modal, _extends({
     destroyOnClose: true,
     open: shouldModalOpen,
-    width: 994,
+    width: 1000,
     centered: true,
     onCancel: handleCancel,
     onOk: function onOk() {
       return handleOk();
     },
     bodyStyle: {
-      height: '549px',
+      height: 550,
       padding: 0
     },
     footer: renderFooter ? renderFooter({

package/package.json

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