@lemon-fe/kits 1.0.9 → 1.0.10

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

@@ -0,0 +1,12 @@
+/// <reference types="react" />
+import type { AgGridReactProps } from '@ag-grid-community/react';
+import type { FilterProps } from '../Filter/typings';
+interface ContextProps {
+    /** 目前DataGrid由于是类组件，比较难处理，只支持ag-grid自带的属性 */
+    DataGrid?: Omit<AgGridReactProps<any>, 'rowSelection' | 'pagination'>;
+    Filter?: FilterProps<any>;
+}
+export declare const ComponentConfigureContext: import("react").Context<ContextProps>;
+export declare const ComponentConfigureProvider: import("react").Provider<ContextProps>;
+export declare const ComponentConfigureConsumer: import("react").Consumer<ContextProps>;
+export {};

package/es/components/ComponentConfigure/index.js

@@ -0,0 +1,4 @@
+import { createContext } from 'react';
+export var ComponentConfigureContext = /*#__PURE__*/createContext({});
+export var ComponentConfigureProvider = ComponentConfigureContext.Provider;
+export var ComponentConfigureConsumer = ComponentConfigureContext.Consumer;

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

@@ -1,4 +1,4 @@
-import type { ColDef, IRowNode } from '@ag-grid-community/core';
+import type { IRowNode } from '@ag-grid-community/core';
 import { GridApi, ColumnApi } from '@ag-grid-community/core';
 import React, { Component } from 'react';
 import EditorWrapper from './cell-editors/Wrapper';
@@ -19,32 +19,8 @@ export default class DataGrid<TData extends Record<string, any>> extends Compone
     private searchRef;
     private prevFocusedCell;
     private fields;
-    static defaultProps: {
-        stopEditingWhenCellsLoseFocus: boolean;
-        autoLoad: boolean;
-        localeText: {
-            copy: string;
-            copyWithHeaders: string;
-            copyWithGroupHeaders: string;
-            paste: string;
-            export: string;
-            csvExport: string;
-            searchOoo: string;
-            autosizeThiscolumn: string;
-            autosizeAllColumns: string;
-            resetColumns: string;
-            pinColumn: string;
-            pinLeft: string;
-            pinRight: string;
-            noPin: string;
-            expandAll: string;
-            collapseAll: string;
-            columns: string;
-        };
-        columnTypes: Record<string, ColDef<any>>;
-        defaultColDef: ColDef<any>;
-        components: Record<string, any>;
-    };
+    static contextType?: React.Context<any> | undefined;
+    static defaultProps: Partial<DataGridProps<any>>;
     static SummaryFlag: symbol;
     static IndexColId: string;
     static EmptyCol: ColType<any>;
@@ -52,7 +28,7 @@ export default class DataGrid<TData extends Record<string, any>> extends Compone
         Text: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & import("./typings").TextEditorParams<any> & React.RefAttributes<import("@ag-grid-community/react").ICellEditorReactComp>>;
         Date: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & import("./typings").DateEditorParams<any> & React.RefAttributes<import("@ag-grid-community/react").ICellEditorReactComp>>;
         Number: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & import("./typings").NumberEditorParams<any> & React.RefAttributes<import("@ag-grid-community/react").ICellEditorReactComp>>;
-        Select: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "allowClear" | "mode" | "options" | "virtual" | "showSearch" | "listHeight"> & {
+        Select: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "mode" | "showSearch" | "allowClear" | "options" | "virtual" | "listHeight"> & {
             fieldNames?: {
                 label: string;
                 value: string;

package/es/components/DataGrid/index.js

@@ -76,6 +76,7 @@ import { get, set } from 'lodash';
 import memoizeOne from 'memoize-one';
 import React, { Component, createRef } from 'react';
 import shallowEqual from 'shallowequal';
+import { ComponentConfigureContext } from "../ComponentConfigure";
 import DateEditor from "./cell-editors/Date";
 import NumberEditor from "./cell-editors/Number";
 import RowEditor, { RowEditorData } from "./cell-editors/Row";
@@ -1300,7 +1301,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           };
 
           fieldCol.valueFormatter = function (params) {
-            if (Number.isNaN(params.value) || !Number.isFinite(params.value) || BigNumber.isBigNumber(params.value) && (params.value.isNaN() || !params.value.isFinite())) {
+            if (Number.isNaN(params.value) || typeof params.value === 'number' && !Number.isFinite(params.value) || BigNumber.isBigNumber(params.value) && (params.value.isNaN() || !params.value.isFinite())) {
               return '-';
             }
 
@@ -1804,27 +1805,29 @@ var DataGrid = /*#__PURE__*/function (_Component) {
       var _this12 = this,
           _classNames;
 
-      var _this$props8 = this.props,
-          rowKey = _this$props8.rowKey,
-          fetch = _this$props8.fetch,
-          dataSource = _this$props8.dataSource,
-          rowActions = _this$props8.rowActions,
-          columns = _this$props8.columns,
-          autoLoad = _this$props8.autoLoad,
-          loadingProp = _this$props8.loading,
-          summary = _this$props8.summary,
-          detailCell = _this$props8.detailCell,
-          pagination = _this$props8.pagination,
-          rowSelection = _this$props8.rowSelection,
-          columnTypesProp = _this$props8.columnTypes,
-          defaultColDefProp = _this$props8.defaultColDef,
-          componentsProp = _this$props8.components,
-          sideBarProp = _this$props8.sideBar,
-          detailCellRendererParams = _this$props8.detailCellRendererParams,
-          context = _this$props8.context,
-          showSearch = _this$props8.showSearch,
-          cellDisplayFlex = _this$props8.cellDisplayFlex,
-          restProps = _objectWithoutProperties(_this$props8, _excluded4);
+      var reactCtx = this.context;
+
+      var _reactCtx$DataGrid$th = _objectSpread(_objectSpread({}, reactCtx.DataGrid), this.props),
+          rowKey = _reactCtx$DataGrid$th.rowKey,
+          fetch = _reactCtx$DataGrid$th.fetch,
+          dataSource = _reactCtx$DataGrid$th.dataSource,
+          rowActions = _reactCtx$DataGrid$th.rowActions,
+          columns = _reactCtx$DataGrid$th.columns,
+          autoLoad = _reactCtx$DataGrid$th.autoLoad,
+          loadingProp = _reactCtx$DataGrid$th.loading,
+          summary = _reactCtx$DataGrid$th.summary,
+          detailCell = _reactCtx$DataGrid$th.detailCell,
+          pagination = _reactCtx$DataGrid$th.pagination,
+          rowSelection = _reactCtx$DataGrid$th.rowSelection,
+          columnTypesProp = _reactCtx$DataGrid$th.columnTypes,
+          defaultColDefProp = _reactCtx$DataGrid$th.defaultColDef,
+          componentsProp = _reactCtx$DataGrid$th.components,
+          sideBarProp = _reactCtx$DataGrid$th.sideBar,
+          detailCellRendererParams = _reactCtx$DataGrid$th.detailCellRendererParams,
+          context = _reactCtx$DataGrid$th.context,
+          showSearch = _reactCtx$DataGrid$th.showSearch,
+          cellDisplayFlex = _reactCtx$DataGrid$th.cellDisplayFlex,
+          restProps = _objectWithoutProperties(_reactCtx$DataGrid$th, _excluded4);
 
       var _this$state2 = this.state,
           enablePagination = _this$state2.pagination,
@@ -1956,6 +1959,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   return DataGrid;
 }(Component);
 
+_defineProperty(DataGrid, "contextType", ComponentConfigureContext);
+
 _defineProperty(DataGrid, "defaultProps", {
   stopEditingWhenCellsLoseFocus: true,
   autoLoad: false,
@@ -1977,10 +1982,7 @@ _defineProperty(DataGrid, "defaultProps", {
     expandAll: '展开所有',
     collapseAll: '折叠所有',
     columns: '列'
-  },
-  columnTypes: {},
-  defaultColDef: {},
-  components: {}
+  }
 });
 
 _defineProperty(DataGrid, "SummaryFlag", Symbol('summary'));

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

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import type { ComponentOption, FilterProps } from './typings';
-declare function Filter<T extends Record<string, any> = Record<string, any>>(props: FilterProps<T>): JSX.Element;
-declare namespace Filter {
+declare function FilterWrapper<T extends Record<string, any> = Record<string, any>>(props: FilterProps<T>): JSX.Element;
+declare namespace FilterWrapper {
     var setComponents: (items: ComponentOption[]) => void;
     var setStorage: <T extends {
         title: string;
@@ -12,4 +12,4 @@ declare namespace Filter {
     }) => void | Promise<void>) => void;
     var defaultProps: Partial<FilterProps<Record<string, any>>>;
 }
-export default Filter;
+export default FilterWrapper;

package/es/components/Filter/index.js

@@ -38,7 +38,8 @@ import { useDebounce, useRequest } from '@lemon-fe/hooks';
 import { Button, Checkbox, Form, Input, Popover, Space, Modal, message, Select, Empty } from 'antd';
 import classNames from 'classnames';
 import ResizeObserver from 'rc-resize-observer';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useState, useContext } from 'react';
+import { ComponentConfigureContext } from "../ComponentConfigure";
 import Dropdown from "../Dropdown";
 import DurationPicker from "../DurationPicker";
 import FormLayout from "../FormLayout";
@@ -130,7 +131,8 @@ function Filter(props) {
       autoPlaceholder = props.autoPlaceholder,
       _props$preserveFields = props.preserveFields,
       preserveFields = _props$preserveFields === void 0 ? true : _props$preserveFields,
-      legacyReset = props.legacyReset;
+      legacyReset = props.legacyReset,
+      componentOptions = props.componentOptions;
   var prefix = prefixClassName('filter');
   var emptyValue = useMemo(function () {
     return Object.fromEntries(data.map(function (item) {
@@ -148,10 +150,18 @@ function Filter(props) {
     return null;
   }, []);
   var compMap = useMemo(function () {
-    return new Map(components.map(function (item) {
+    var result = new Map(components.map(function (item) {
       return [item.type, item];
     }));
-  }, []);
+
+    if (componentOptions) {
+      componentOptions.forEach(function (item) {
+        result.set(item.type, item);
+      });
+    }
+
+    return result;
+  }, [componentOptions]);
 
   var _useState = useState(defaultKeys),
       _useState2 = _slicedToArray(_useState, 2),
@@ -491,7 +501,7 @@ function Filter(props) {
     }
 
     return [getSet(result.slice(0, end)), btnsVisible];
-  }, [data, width, collapsed, activeKeys]),
+  }, [data, width, collapsed, activeKeys, compMap]),
       _useMemo2 = _slicedToArray(_useMemo, 2),
       cols = _useMemo2[0],
       showCollapse = _useMemo2[1];
@@ -697,7 +707,12 @@ function Filter(props) {
   }))))))))));
 }
 
-Filter.setComponents = setComponents;
-Filter.setStorage = setStorage;
-Filter.defaultProps = {};
-export default Filter;
+function FilterWrapper(props) {
+  var contextProps = useContext(ComponentConfigureContext).Filter;
+  return /*#__PURE__*/React.createElement(Filter, _extends({}, contextProps, props));
+}
+
+FilterWrapper.setComponents = setComponents;
+FilterWrapper.setStorage = setStorage;
+FilterWrapper.defaultProps = {};
+export default FilterWrapper;

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

@@ -60,6 +60,7 @@ export interface FilterProps<T extends Record<string, any> = Record<string, any>
    * 当前reset行为是通过内部的emptyValue以及defaultValue
    */
   legacyReset?: true;
+  componentOptions?: ComponentOption[];
 }
 
 export interface ComponentOption {

package/es/index.d.ts

@@ -52,3 +52,4 @@ export { default as Breadcrumb } from './layouts/Breadcrumb';
 export { default as useBatchOperator } from './hooks/useBatchOperator';
 export { default as useHistoryBlock } from './hooks/useHistoryBlock';
 export { TabInstance } from './layouts/TabInstance';
+export * from './components/ComponentConfigure';

package/es/index.js

@@ -43,4 +43,5 @@ export { default as MicroLayout } from "./layouts/MicroLayout";
 export { default as Breadcrumb } from "./layouts/Breadcrumb";
 export { default as useBatchOperator } from "./hooks/useBatchOperator";
 export { default as useHistoryBlock } from "./hooks/useHistoryBlock";
-export { TabInstance } from "./layouts/TabInstance";
+export { TabInstance } from "./layouts/TabInstance";
+export * from "./components/ComponentConfigure";

package/package.json

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