@lemon-fe/kits 1.0.0-169 → 1.0.0-171

package/es/components/DataGrid/components/Selected.js

@@ -24,9 +24,9 @@ export default /*#__PURE__*/memo(function Selected(props) {
   useEffect(function () {
     return selection.listen(setKeys);
   }, []);
-  return /*#__PURE__*/React.createElement("span", {
+  return keys.length > 0 ? /*#__PURE__*/React.createElement("span", {
     className: prefix('selected')
-  }, "\u5DF2\u9009", keys.length, "\u6761 ", /*#__PURE__*/React.createElement("a", {
+  }, "\u5DF2\u9009", keys.length, "\u6761", /*#__PURE__*/React.createElement("a", {
     onClick: onClear
-  }, "\u6E05\u7A7A\u5DF2\u9009"));
+  }, "\u6E05\u7A7A\u5DF2\u9009")) : null;
 });

package/es/components/DataGrid/index.js

@@ -104,6 +104,7 @@ var defaultColDef = {
 };
 var defaultComponents = {
   agColumnHeader: HeaderRenderer,
+  agColumnGroupHeader: HeaderRenderer,
   'text-editor': TextEditor,
   'number-editor': NumberEditor,
   'date-editor': DateEditor,
@@ -803,7 +804,12 @@ var DataGrid = /*#__PURE__*/function (_Component) {
             children: map(children)
           };
 
-          if (title !== undefined) {
+          if (_typeof(title) === 'object' || typeof title === 'function') {
+            opts.headerGroupComponentParams = _objectSpread(_objectSpread({}, opts.headerGroupComponentParams), {}, {
+              title: title
+            });
+            opts.headerGroupComponent = HeaderRenderer;
+          } else if (title !== undefined) {
             opts.headerName = title.toString();
           }
 
@@ -1410,7 +1416,10 @@ var DataGrid = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/React.createElement(AgGridReact, _extends({
         singleClickEdit: true,
         suppressPaginationPanel: true,
-        suppressCopyRowsToClipboard: true,
+        suppressCopyRowsToClipboard: true
+        /** 防止粘贴错误的值到可编辑表格 */
+        ,
+        suppressClipboardPaste: true,
         enableCellEditingOnBackspace: true,
         loadingOverlayComponent: this.LoadingOverlay,
         noRowsOverlayComponent: this.NoRowsOverlay,

package/es/components/DataGrid/index.less

@@ -91,7 +91,7 @@
   }
 
   &-selected {
-    color: #a5a5a5;
+    color: #666;
 
     a {
       margin-left: @space-h;

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

@@ -50,7 +50,7 @@ export interface ColType<TData> extends Omit<ColDef<TData>, 'editable'> {
     };
 }
 export interface ColGroupType<T> extends Omit<ColGroupDef<T>, 'children'> {
-    title?: string | number;
+    title?: ReactNode | ((params: IHeaderParams) => ReactNode);
     children: ColsType<T>;
     key?: string;
 }

package/es/components/Filter/index.js

@@ -49,7 +49,10 @@ import { prefixClassName } from "../utils";
 var components = [{
   type: 'input',
   render: function render(item) {
-    return /*#__PURE__*/React.createElement(Input, item.extraProps);
+    return /*#__PURE__*/React.createElement(Input, _extends({
+      allowClear: true,
+      maxLength: 125
+    }, item.extraProps));
   }
 }, {
   type: 'input-number',
@@ -126,13 +129,14 @@ function Filter(props) {
       defaultCollapsed = _props$defaultCollaps === void 0 ? true : _props$defaultCollaps,
       autoPlaceholder = props.autoPlaceholder,
       _props$preserveFields = props.preserveFields,
-      preserveFields = _props$preserveFields === void 0 ? true : _props$preserveFields;
+      preserveFields = _props$preserveFields === void 0 ? true : _props$preserveFields,
+      legacyReset = props.legacyReset;
   var prefix = prefixClassName('filter');
   var emptyValue = useMemo(function () {
     return Object.fromEntries(data.map(function (item) {
       return [item.key, undefined];
     }));
-  }, []);
+  }, [data]);
   var defaultValue = useMemo(function () {
     return defaultValueProp || value;
   }, []);
@@ -346,7 +350,12 @@ function Filter(props) {
   };
 
   var handleReset = function handleReset() {
-    form.resetFields();
+    if (legacyReset) {
+      form.resetFields();
+    } else {
+      form.setFieldsValue(_objectSpread(_objectSpread({}, emptyValue), defaultValue));
+    }
+
     handleFinish(form.getFieldsValue(), 'reset');
   };
 

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

@@ -55,6 +55,11 @@ export interface FilterProps<T extends Record<string, any> = Record<string, any>
    * @default true
    */
   preserveFields?: boolean;
+  /**
+   * @description reset行为通过form.resetFields实现，与原先保持一致
+   * 当前reset行为是通过内部的emptyValue以及defaultValue
+   */
+  legacyReset?: true;
 }
 
 export interface ComponentOption {

package/es/components/State/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 interface Props {
     shape?: 'default' | 'order' | 'text';
-    type?: 'default' | 'success' | 'warning' | 'error' | 'disabled';
+    type?: 'default' | 'success' | 'warning' | 'error' | 'disabled' | 'processing';
     children?: string;
 }
 export default function State(props: Props): JSX.Element;

package/es/components/State/index.less

@@ -1,6 +1,7 @@
 @color-success: #2ca471;
 @color-warning: #e37319;
 @color-error: #d54a42;
+@color-processing: #16c0ff;
 @color-disabled: rgba(51, 51, 51, 0.5);
 
 .@{prefixCls}-state {
@@ -74,6 +75,10 @@
     .defaultShapeColor(@color-success);
   }
 
+  &-type-processing&-shape-default {
+    .defaultShapeColor(@color-processing);
+  }
+
   &-type-warning&-shape-default {
     .defaultShapeColor(@color-warning);
   }

package/package.json

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