@lemon-fe/kits 1.0.0-48 → 1.0.0-49

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

@@ -17,8 +17,7 @@ import { DatePicker } from 'antd';
 import EditorWrapper from "./Wrapper";
 import { editorPrefixClass } from "./utils";
 export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
-  var cellStartedEdit = props.cellStartedEdit,
-      _props$format = props.format,
+  var _props$format = props.format,
       format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
       disabled = props.disabled,
       api = props.api;
@@ -31,12 +30,10 @@ export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
   var elm = useRef(null);
   var isEdited = useRef(false);
   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();
+  }, []);
 
   var getValue = function getValue() {
     return value ? value.format(format) : '';
@@ -47,13 +44,12 @@ export default /*#__PURE__*/forwardRef(function DateEditor(props, ref) {
       getValue: getValue
     };
   });
-  return /*#__PURE__*/React.createElement(EditorWrapper, {
+  return /*#__PURE__*/React.createElement(EditorWrapper, null, /*#__PURE__*/React.createElement(DatePicker, {
     onKeyDown: function onKeyDown(e) {
       if (isEdited.current && e.key === 'Enter') {
         api.tabToNextCell();
       }
-    }
-  }, /*#__PURE__*/React.createElement(DatePicker, {
+    },
     style: {
       display: 'flex',
       paddingTop: 0,

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

@@ -1,11 +1,25 @@
-import type { ReactNode } from 'react';
 import React 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<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>>;
+import type { BaseOptionType, SelectProps } from 'antd/lib/select';
+export declare type SelectEditorParams = Pick<SelectProps<any, BaseOptionType>, 'disabled' | 'options' | 'virtual' | 'showSearch' | 'listHeight' | 'allowClear' | 'mode'> & {
+    fieldNames?: {
+        label: string;
+        value: string;
+    };
+    /**
+     * 是否是用options的数组成员作为value的值，此时传入的value也应该是数组成员的类型
+     */
+    valueByOption?: boolean;
+};
+declare const _default: React.ForwardRefExoticComponent<ICellEditorParams<any, any> & Pick<SelectProps<any, BaseOptionType>, "disabled" | "mode" | "allowClear" | "options" | "virtual" | "showSearch" | "listHeight"> & {
+    fieldNames?: {
+        label: string;
+        value: string;
+    } | undefined;
+    /**
+     * 是否是用options的数组成员作为value的值，此时传入的value也应该是数组成员的类型
+     */
+    valueByOption?: boolean | undefined;
+} & React.RefAttributes<ICellEditorReactComp>>;
 export default _default;

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

@@ -1,4 +1,4 @@
-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); }
+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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -12,14 +12,21 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+import { useMemo } from 'react';
 import React, { useEffect, useRef } from 'react';
 import { forwardRef, useImperativeHandle, useState } from 'react';
 import { Select } from 'antd';
 import EditorWrapper from "./Wrapper";
 import { editorPrefixClass } from "./utils";
 export default /*#__PURE__*/forwardRef(function SelectEditor(props, ref) {
-  var cellEditorParams = props.colDef.cellEditorParams,
-      api = props.api;
+  var api = props.api,
+      disabled = props.disabled,
+      options = props.options,
+      virtual = props.virtual,
+      allowClear = props.allowClear,
+      mode = props.mode,
+      fieldNames = props.fieldNames,
+      valueByOption = props.valueByOption;
 
   var _useState = useState(props.value),
       _useState2 = _slicedToArray(_useState, 2),
@@ -39,17 +46,53 @@ export default /*#__PURE__*/forwardRef(function SelectEditor(props, ref) {
       }
     };
   });
-  return /*#__PURE__*/React.createElement(EditorWrapper, null, /*#__PURE__*/React.createElement(Select, _extends({
+  var val = useMemo(function () {
+    var result = value;
+
+    if (valueByOption && result !== null && fieldNames !== undefined) {
+      var formatValue = function formatValue(item) {
+        if (item instanceof Object) {
+          return item[fieldNames.value];
+        }
+
+        return item;
+      };
+
+      if (Array.isArray(result)) {
+        result = result.map(function (item) {
+          return formatValue(item);
+        });
+      } else if (_typeof(result) === 'object') {
+        result = formatValue(result);
+      }
+    }
+
+    return result;
+  }, [value]);
+  return /*#__PURE__*/React.createElement(EditorWrapper, null, /*#__PURE__*/React.createElement(Select, {
     ref: elm,
     bordered: false,
-    className: editorPrefixClass('select')
-  }, cellEditorParams, {
-    value: value,
-    onSelect: function onSelect(val) {
-      setValue(val);
+    fieldNames: fieldNames,
+    disabled: disabled,
+    virtual: virtual,
+    allowClear: allowClear,
+    mode: mode,
+    className: editorPrefixClass('select'),
+    value: val,
+    options: options,
+    style: {
+      width: '100%'
+    },
+    onChange: function onChange(changedValue, opt) {
+      if (valueByOption) {
+        setValue(opt);
+      } else {
+        setValue(changedValue);
+      }
+
       requestAnimationFrame(function () {
         api.tabToNextCell();
       });
     }
-  })));
+  }));
 });

package/package.json

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