@lemon-fe/components 1.4.28 → 1.4.29

package/es/data-grid/index.d.ts

@@ -17,7 +17,7 @@ declare const Editors: {
     Text: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("..").TextEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
     Date: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("..").DateEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
     Number: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("..").NumberEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
-    Select: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "mode" | "allowClear" | "showSearch" | "optionFilterProp" | "options" | "virtual" | "listHeight"> & {
+    Select: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "mode" | "virtual" | "allowClear" | "showSearch" | "optionFilterProp" | "options" | "listHeight"> & {
         fieldNames?: {
             label: string;
             value: string;

package/es/filter/index.js

@@ -491,7 +491,7 @@ function Filter(originalProps) {
   var handleTabChange = function handleTabChange(index) {
     if (index !== active) {
       setActive(index);
-      var result = _objectSpread(_objectSpread({}, emptyValue), tabs[index].value);
+      var result = _objectSpread(_objectSpread(_objectSpread({}, emptyValue), defaultValue), tabs[index].value);
       form.setFieldsValue(result);
       handleFinish(form.getFieldsValue(), 'reset');
     }

package/es/select-view/index.d.ts

@@ -78,7 +78,9 @@ export interface SelectViewProps<RecordType, ParamsType> extends Pick<DataGridPr
      * @description 表格顶部header区域自定义
      * @default null
      */
-    header?: ReactElement | null;
+    header?: ReactElement | ((opts: {
+        filter: ReactElement | null;
+    }) => ReactElement) | null;
     /**
      * @description 自定义已选择datagrid
      */

package/es/select-view/index.js

@@ -160,10 +160,9 @@ function SelectView(originalProps, ref) {
   };
   var headerNode = null;
   var siderNode = null;
+  var filterNode = null;
   if (filter && filter.data) {
-    headerNode = /*#__PURE__*/React.createElement(React.Fragment, null, headerProp && /*#__PURE__*/React.createElement("div", {
-      className: prefix('head-wrapper')
-    }, headerProp), /*#__PURE__*/React.createElement(Filter, _extends({
+    filterNode = /*#__PURE__*/React.createElement(Filter, _extends({
       simple: true,
       autoPlaceholder: true,
       form: filterForm
@@ -172,9 +171,16 @@ function SelectView(originalProps, ref) {
       onChange: function onChange(val, actionType) {
         return handleChangeParams(_objectSpread(_objectSpread({}, cParams), val), actionType);
       }
-    })));
-  } else if (headerProp) {
-    headerNode = headerProp;
+    }));
+  }
+  if (headerProp && typeof headerProp === 'function') {
+    headerNode = headerProp({
+      filter: filterNode
+    });
+  } else if (headerProp || filterNode) {
+    headerNode = /*#__PURE__*/React.createElement(React.Fragment, null, headerProp && /*#__PURE__*/React.createElement("div", {
+      className: prefix('head-wrapper')
+    }, headerProp), filterNode);
   }
   if (filter && filter.sider) {
     siderNode = filter.sider({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.4.28",
+  "version": "1.4.29",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "8569d6f611b682d2b0213d7ada70f43b23ad7933"
+  "gitHead": "dae2c5d9ba0de9059c879c6148a0e0df01ebe0f1"
 }