@lemon-fe/kits 1.0.0-21 → 1.0.0-23

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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,25 @@
+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);
+});

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

@@ -1,9 +1,14 @@
-/// <reference types="react" />
+import React, { MutableRefObject, ReactElement } from 'react';
 import type { ICellEditorReactComp } from '@ag-grid-community/react';
 import type { ICellEditorParams } from '@ag-grid-community/core';
-import type { EditableRender } from '../typings';
-export interface CustomEditorParams {
-    render: EditableRender<any>;
+export interface CustomEditorParams<T = any, K = any> {
+    render: (val: K, data: T, params: ICellEditorParams<T, K> & {
+        ref: MutableRefObject<{
+            select?: () => void;
+            focus?: () => void;
+        } | null>;
+        onChange: (val: Partial<T>, action?: 'stop' | 'next') => void;
+    }) => ReactElement | null;
 }
-declare const _default: import("react").ForwardRefExoticComponent<ICellEditorParams<any, any> & CustomEditorParams & import("react").RefAttributes<ICellEditorReactComp>>;
+declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any> & CustomEditorParams<any, any> & React.RefAttributes<ICellEditorReactComp>>;
 export default _default;

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

@@ -1,25 +1,80 @@
-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 _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 _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; }
+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; }
 
-import { forwardRef } from 'react';
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import React, { useEffect, useRef } from 'react';
+import { get } from 'lodash';
+import { forwardRef, useImperativeHandle, useState } from 'react';
+import EditorWrapper from "./Wrapper";
 import { useGridStore } from "../hooks";
 export default /*#__PURE__*/forwardRef(function CustomEditor(props, ref) {
-  var render = props.render,
-      restProps = _objectWithoutProperties(props, _excluded);
+  var api = props.api,
+      cellStartedEdit = props.cellStartedEdit,
+      stopEditing = props.stopEditing,
+      data = props.data,
+      render = props.render,
+      field = props.colDef.field;
+
+  var _useState = useState(data),
+      _useState2 = _slicedToArray(_useState, 2),
+      value = _useState2[0],
+      setValue = _useState2[1];
 
   var context = useGridStore(function (state) {
     return state.context;
   });
-  return render(_objectSpread(_objectSpread({}, restProps), {}, {
-    context: context
-  }), ref);
+  var elm = useRef(null);
+  useEffect(function () {
+    if (cellStartedEdit && 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() {
+        return value;
+      }
+    };
+  });
+
+  var handleChange = function handleChange(val, action) {
+    setValue(val);
+
+    if (action !== undefined) {
+      requestAnimationFrame(function () {
+        switch (action) {
+          case 'stop':
+            stopEditing();
+            break;
+
+          case 'next':
+            api.tabToNextCell();
+        }
+      });
+    }
+  };
+
+  return /*#__PURE__*/React.createElement(EditorWrapper, null, render(field ? get(value, field) : null, data, _objectSpread(_objectSpread({}, props), {}, {
+    context: context,
+    ref: elm,
+    onChange: handleChange
+  })));
 });

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

@@ -1,7 +1,10 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import type { ICellEditorReactComp } from '@ag-grid-community/react';
 import type { ICellEditorParams } from '@ag-grid-community/core';
 import type { SelectProps } from 'antd/lib/select';
-export declare type SelectEditorParams = Pick<SelectProps, 'disabled' | 'options' | 'fieldNames' | 'virtual' | 'showSearch' | 'listHeight' | 'listItemHeight' | 'allowClear' | 'mode' | 'labelInValue'>;
+export declare type SelectEditorParams = Pick<SelectProps<any, {
+    label: ReactNode;
+    value?: string | number | null | boolean;
+}>, 'disabled' | 'options' | 'fieldNames' | 'virtual' | 'showSearch' | 'listHeight' | 'listItemHeight' | 'allowClear' | 'mode' | 'labelInValue'>;
 declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any> & SelectEditorParams & React.RefAttributes<ICellEditorReactComp>>;
 export default _default;

package/es/components/DataGrid/index.js

@@ -81,6 +81,7 @@ import NumberEditor from "./cell-editors/Number";
 import SelectEditor from "./cell-editors/Select";
 import Custom from "./cell-editors/Custom";
 import EditorWrapper from "./cell-editors/Wrapper";
+import Combination from "./cell-editors/Combination";
 import empty from "./empty.png";
 export { AgGridReact } from '@ag-grid-community/react';
 ModuleRegistry.registerModules([ClientSideRowModelModule, RowGroupingModule, InfiniteRowModelModule, ClipboardModule, MenuModule, SideBarModule, ColumnsToolPanelModule, ServerSideRowModelModule], false);
@@ -367,17 +368,27 @@ var DataGrid = /*#__PURE__*/function (_Component) {
             var id = getColField(item);
 
             if (id !== undefined) {
-              descriptor[id] = rules.map(function (rule) {
-                var validator = rule.validator,
-                    restRule = _objectWithoutProperties(rule, _excluded);
-
-                return _objectSpread(_objectSpread({}, restRule), {}, {
-                  asyncValidator: validator ? function (mRule, value, _, record) {
-                    return validator(mRule, value, record);
-                  } : undefined,
-                  validator: undefined
+              var path = id.split('.');
+              var node = {};
+
+              for (var i = path.length - 1; i >= 0; i -= 1) {
+                node = _defineProperty({}, path[i], i === path.length - 1 ? rules.map(function (rule) {
+                  var validator = rule.validator,
+                      restRule = _objectWithoutProperties(rule, _excluded);
+
+                  return _objectSpread(_objectSpread({}, restRule), {}, {
+                    asyncValidator: validator ? function (mRule, value, _, record) {
+                      return validator(mRule, value, record);
+                    } : undefined,
+                    validator: undefined
+                  });
+                }) : {
+                  type: 'object',
+                  fields: node
                 });
-              });
+              }
+
+              Object.assign(descriptor, node);
             }
           }
 
@@ -533,9 +544,9 @@ var DataGrid = /*#__PURE__*/function (_Component) {
             if (_typeof(editable) === 'object') {
               var _type = editable.type,
                   params = editable.params,
-                  _render = editable.render,
                   valueSetter = editable.valueSetter;
               _opts.editable = true;
+              _opts.cellEditorParams = params;
               _opts.cellClassRules = _defineProperty({}, prefix('editor-cell'), function () {
                 return true;
               });
@@ -563,17 +574,14 @@ var DataGrid = /*#__PURE__*/function (_Component) {
               switch (_type) {
                 case 'text':
                   _opts.cellEditor = TextEditor;
-                  _opts.cellEditorParams = params;
                   break;
 
                 case 'number':
                   _opts.cellEditor = NumberEditor;
-                  _opts.cellEditorParams = params;
                   break;
 
                 case 'date':
                   _opts.cellEditor = DateEditor;
-                  _opts.cellEditorParams = params;
 
                   _opts.suppressKeyboardEvent = function (_ref2) {
                     var editing = _ref2.editing,
@@ -590,7 +598,6 @@ var DataGrid = /*#__PURE__*/function (_Component) {
 
                 case 'select':
                   _opts.cellEditor = SelectEditor;
-                  _opts.cellEditorParams = params;
 
                   _opts.suppressKeyboardEvent = function (_ref3) {
                     var editing = _ref3.editing,
@@ -605,13 +612,19 @@ var DataGrid = /*#__PURE__*/function (_Component) {
 
                   break;
 
+                case 'combination':
+                  _opts.cellEditor = Combination;
+                  break;
+
                 case 'custom':
-                  if (_render !== undefined) {
-                    _opts.cellEditor = Custom;
-                    _opts.cellEditorParams = _objectSpread(_objectSpread({}, params), {}, {
-                      render: _render
-                    });
-                  }
+                  _opts.cellEditor = Custom;
+
+                  _opts.valueSetter = function (mParams) {
+                    Object.assign(mParams.data, mParams.newValue);
+                    return true;
+                  };
+
+                  break;
 
                 default:
               }

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

@@ -1,18 +1,33 @@
-import type { AgGridReactProps, ICellEditorReactComp } from '@ag-grid-community/react';
-import type { ColDef, ColGroupDef, ICellEditorParams, ICellRendererParams, IHeaderParams } from '@ag-grid-community/core';
+import type { AgGridReactProps } from '@ag-grid-community/react';
+import type { ColDef, ColGroupDef, ICellRendererParams, IHeaderParams } from '@ag-grid-community/core';
 import type { RuleItem } from 'async-validator/dist-types/interface';
-import type { ForwardedRef, ReactElement, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
 export type { ColDef, ColGroupDef, ColumnState, GridApi, ICellEditorParams, ICellRendererParams, } from '@ag-grid-community/core';
+export type { AgGridReactProps, ICellEditorReactComp } from '@ag-grid-community/react';
+import type { TextEditorParams } from './cell-editors/Text';
+import type { NumberEditorParams } from './cell-editors/Number';
+import type { DateEditorParams } from './cell-editors/Date';
+import type { SelectEditorParams } from './cell-editors/Select';
+import type { CustomEditorParams } from './cell-editors/Custom';
+import type { CombinationEditorParams } from './cell-editors/Combination';
 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 GetRowKey<T> = string | ((data: T) => string);
 export declare type PathType = string | (string | number)[];
 export declare type ValidateRule<T> = Pick<RuleItem, 'required' | 'message' | 'pattern' | 'min' | 'max' | 'len' | 'type'> & {
     validator?: (rule: any, val: any, record: T) => void | Promise<void>;
 };
-export declare type EditableRender<T> = (params: ICellEditorParams<T>, ref: ForwardedRef<ICellEditorReactComp>) => ReactElement | null;
+export declare type EditableParams<T extends {
+    type: string;
+    params?: any;
+}, K> = T & {
+    rules?: ValidateRule<K>[];
+    valueSetter?: (val: any, data: K) => Partial<K>;
+};
 export interface ColumnType<TData> extends Omit<ColDef<TData>, 'editable'> {
     title?: ReactNode | ((params: IHeaderParams) => ReactNode);
     dataIndex?: PathType;
@@ -25,19 +40,31 @@ export interface ColumnType<TData> extends Omit<ColDef<TData>, 'editable'> {
     /**
      * @description
      * @en cell renderer. it should be a pure function, do not use the state from the closure but from cellContext
-     * @zh 单元格渲染函数. 建议是一个纯函数，不使用闭包中的状态变量，而是通过cellContext引入
+     * @zh 单元格渲染函数. 需要是一个纯函数，不使用外部组件的状态变量，而是通过context引入
      */
     render?: (val: any, record: TData, index: number, params: ICellRendererParams) => ReactElement | string | number | null;
     /**
      * @description 可编辑单元格
      */
-    editable?: boolean | {
-        type?: string;
-        params?: any;
-        rules?: ValidateRule<TData>[];
-        render?: EditableRender<TData>;
-        valueSetter?: (val: any, data: TData) => Partial<TData>;
-    };
+    editable?: boolean | EditableParams<{
+        type: 'text';
+        params?: TextEditorParams;
+    }, TData> | EditableParams<{
+        type: 'number';
+        params?: NumberEditorParams;
+    }, TData> | EditableParams<{
+        type: 'date';
+        params?: DateEditorParams;
+    }, TData> | EditableParams<{
+        type: 'select';
+        params?: SelectEditorParams;
+    }, TData> | EditableParams<{
+        type: 'combination';
+        params?: CombinationEditorParams<TData>;
+    }, TData> | EditableParams<{
+        type: 'custom';
+        params?: CustomEditorParams<TData>;
+    }, TData>;
 }
 export interface ColumnGroupType<T> extends Omit<ColGroupDef<T>, 'children'> {
     title?: string | number;

package/es/components/Popup/index.js

@@ -26,11 +26,12 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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 React, { useState, cloneElement, useRef, isValidElement, useEffect } from 'react';
-import { Modal, Input, message } from 'antd';
+import React, { useState, cloneElement, useRef, isValidElement, useEffect, useContext } from 'react';
+import { Modal, Input, message, ConfigProvider } from 'antd';
 import { CloseCircleFilled } from '@ant-design/icons';
-import { PREFIX_CLS } from "../../constants";
 import SearchIcon from "../Icons/Search";
+import { prefixClassName } from "../utils";
+var prefix = prefixClassName('popup');
 
 function Popup(props) {
   var valueProp = props.value,
@@ -55,8 +56,6 @@ function Popup(props) {
       emptyValue = props.emptyValue,
       restProps = _objectWithoutProperties(props, _excluded);
 
-  var prefixCls = "".concat(PREFIX_CLS, "-popup");
-
   var _useState = useState(valueProp || emptyValue),
       _useState2 = _slicedToArray(_useState, 2),
       value = _useState2[0],
@@ -69,6 +68,9 @@ function Popup(props) {
 
   var inputRef = useRef(null);
 
+  var _useContext = useContext(ConfigProvider.ConfigContext),
+      getPrefixCls = _useContext.getPrefixCls;
+
   var handleCancel = function handleCancel() {
     setVisible(false);
   };
@@ -180,7 +182,7 @@ function Popup(props) {
     trigger = showLabel ? /*#__PURE__*/cloneElement(children, undefined, label) : children;
   } else {
     trigger = /*#__PURE__*/React.createElement(Input, {
-      className: "".concat(prefixCls, "-input"),
+      className: prefix('input'),
       value: label,
       readOnly: true,
       ref: inputRef,
@@ -189,7 +191,7 @@ function Popup(props) {
       placeholder: placeholder,
       bordered: bordered,
       suffix: /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && allowClear && label && /*#__PURE__*/React.createElement(CloseCircleFilled, {
-        className: "ant-input-clear-icon",
+        className: "".concat(getPrefixCls('input'), "-clear-icon"),
         onClick: handleClear
       }), /*#__PURE__*/React.createElement(SearchIcon, null))
     });
@@ -201,11 +203,11 @@ function Popup(props) {
     }
   }, [valueProp]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-wrapper"),
+    className: prefix('wrapper'),
     onClick: handleOpen
   }, trigger), /*#__PURE__*/React.createElement(Modal, _extends({
     destroyOnClose: true,
-    visible: visible,
+    open: visible,
     width: 994,
     centered: true,
     onCancel: handleCancel,

package/package.json

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