@lemon-fe/components 1.2.11-alpha.0 → 1.2.11-alpha.2

package/es/component-configure/index.d.ts

@@ -1,17 +1,17 @@
 /// <reference types="react" />
 import type { ActionsProps } from '../actions';
-import type { PaginationType } from '../data-grid/typings';
+import type { DataGridProps } from '../data-grid/typings';
 import type { FilterProps } from '../filter/typings';
-import type { AgGridReactProps } from '@ag-grid-community/react';
-interface ContextProps {
-    /** 目前DataGrid由于是类组件，比较难处理，只支持ag-grid自带的属性 */
-    DataGrid?: Omit<AgGridReactProps<any>, 'rowSelection' | 'pagination'> & {
-        pagination?: PaginationType;
-    };
-    Filter?: FilterProps<any>;
-    Actions?: Partial<ActionsProps>;
+import type { SelectViewProps } from '../select-view';
+declare type PropsGetter<T> = ((props: T) => T) | Partial<T>;
+export interface ComponentConfigureContextProps {
+    DataGrid?: PropsGetter<DataGridProps<unknown>>;
+    Filter?: PropsGetter<FilterProps<unknown>>;
+    Actions?: PropsGetter<ActionsProps>;
+    SelectView?: PropsGetter<SelectViewProps<unknown, unknown>>;
 }
-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 declare const ComponentConfigureContext: import("react").Context<ComponentConfigureContextProps>;
+export declare const ComponentConfigureProvider: import("react").Provider<ComponentConfigureContextProps>;
+export declare const ComponentConfigureConsumer: import("react").Consumer<ComponentConfigureContextProps>;
+export declare function useComponentDefaultProps<T>(key: keyof ComponentConfigureContextProps, originalProps: T): T;
 export {};

package/es/component-configure/index.js

@@ -1,4 +1,21 @@
-import { createContext } from 'react';
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { createContext, useContext } from 'react';
 export var ComponentConfigureContext = /*#__PURE__*/createContext({});
 export var ComponentConfigureProvider = ComponentConfigureContext.Provider;
-export var ComponentConfigureConsumer = ComponentConfigureContext.Consumer;
+export var ComponentConfigureConsumer = ComponentConfigureContext.Consumer;
+export function useComponentDefaultProps(key, originalProps) {
+  var defaultProps = useContext(ComponentConfigureContext);
+  var componentDefaultProps = defaultProps[key];
+  var props = originalProps;
+  if (typeof componentDefaultProps === 'function') {
+    props = componentDefaultProps(originalProps);
+  } else if (componentDefaultProps !== undefined) {
+    props = _objectSpread(_objectSpread({}, componentDefaultProps), originalProps);
+  }
+  return props;
+}

package/es/data-grid/index.js

@@ -35,8 +35,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Spin, Pagination } from 'antd';
-import React, { Component, createRef, forwardRef, useContext } from 'react';
-import { ComponentConfigureContext } from "../component-configure";
+import React, { Component, createRef, forwardRef } from 'react';
+import { useComponentDefaultProps } from "../component-configure";
 import { useLocaleReceiver } from "../locale-receiver";
 import { parseLocalTemplate } from "../locale/locale";
 import DateEditor from "./cell-editors/date";
@@ -184,7 +184,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
         toolPanel: CustomColumnPanel,
         toolPanelParams: {
           enableSave: !!_this.props.customColumnPanelStorage,
-          enableSummary: _this.isClientMode()
+          enableSummary: _this.isClientMode() || _this.props.enableCustomColumnSummary
         }
       }]
     });
@@ -1681,7 +1681,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
         enableCellEditingOnBackspace: true,
         maintainColumnOrder: true,
         suppressCsvExport: true,
-        suppressRowClickSelection: gridRowSelection === 'multiple',
+        rowMultiSelectWithClick: gridRowSelection === 'multiple',
         noRowsOverlayComponent: this.NoRowsOverlay,
         getMainMenuItems: this.getMainMenuItems,
         rowBuffer: 20,
@@ -1715,15 +1715,14 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
   }]);
   return InternalDataGrid;
 }(Component);
-var DataGrid = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _useContext = useContext(ComponentConfigureContext),
-    extraProps = _useContext.DataGrid;
+var DataGrid = /*#__PURE__*/forwardRef(function (originalProps, ref) {
   var _useLocaleReceiver3 = useLocaleReceiver('DataGrid'),
     _useLocaleReceiver4 = _slicedToArray(_useLocaleReceiver3, 1),
     dataGridLocale = _useLocaleReceiver4[0];
+  var props = useComponentDefaultProps('DataGrid', originalProps);
   return /*#__PURE__*/React.createElement(InternalDataGrid, _extends({
     ref: ref
-  }, extraProps, props, {
+  }, props, {
     locale: dataGridLocale
   }));
 });

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

@@ -223,4 +223,8 @@ export interface DataGridProps<TData> extends Omit<AgGridReactProps<TData>, 'row
         set: (data: CustomColumnData) => Promise<void> | void;
         get: () => Promise<CustomColumnData | null | undefined> | CustomColumnData | null | undefined;
     };
+    /**
+     * @descriptioin 列定制启用汇总
+     */
+    enableCustomColumnSummary?: boolean;
 }

package/es/filter/index.d.ts

@@ -1,15 +1,15 @@
 /// <reference types="react" />
 import type { ComponentOption, FilterProps } from './typings';
-declare function FilterWrapper<T extends Record<string, any> = Record<string, any>>(props: FilterProps<T>): JSX.Element;
-declare namespace FilterWrapper {
+declare function Filter<T extends Record<string, any> = Record<string, any>>(originalProps: FilterProps<T>): JSX.Element;
+declare namespace Filter {
     var setComponents: (items: ComponentOption[]) => void;
     var setStorage: <T extends {
         title: string;
         value: Record<string | number, any>;
     }>(getData: (storageKey: string) => T[] | Promise<T[]>, setData: (storageKey: string, data: T[], action: {
-        type: "set" | "delete";
+        type: "delete" | "set";
         target: T;
     }) => void | Promise<void>) => void;
-    var defaultProps: Partial<FilterProps<Record<string, any>>>;
+    var defaultProps: Partial<FilterProps<unknown>>;
 }
-export default FilterWrapper;
+export default Filter;

package/es/filter/index.js

@@ -19,8 +19,8 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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); }
 import { Button, Checkbox, Form, Input, Popover, Space } from 'antd';
-import React, { useEffect, useMemo, useState, useContext } from 'react';
-import { ComponentConfigureContext } from "../component-configure";
+import React, { useEffect, useMemo, useState } from 'react';
+import { useComponentDefaultProps } from "../component-configure";
 import Dropdown from "../dropdown";
 import DurationPicker from "../duration-picker";
 import Empty from "../empty";
@@ -93,7 +93,8 @@ function setStorage(getData, setData) {
   setStorageData = setData;
 }
 var defaultData = [];
-function Filter(props) {
+function Filter(originalProps) {
+  var props = useComponentDefaultProps('Filter', originalProps);
   var _props$data = props.data,
     data = _props$data === void 0 ? defaultData : _props$data,
     defaultValueProp = props.defaultValue,
@@ -631,11 +632,7 @@ function Filter(props) {
     mask: "url(#filter-down-mask)"
   }))))))))));
 }
-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;
+Filter.setComponents = setComponents;
+Filter.setStorage = setStorage;
+Filter.defaultProps = {};
+export default Filter;

package/es/filter/typings.d.ts

@@ -24,7 +24,7 @@ export interface FilterItemType<T = any> {
 
 export type ActionType = 'submit' | 'reset';
 
-export interface FilterProps<T extends Record<string, any> = Record<string, any>> {
+export interface FilterProps<T> {
   data?: FilterItemType<T>[];
   defaultValue?: T;
   value?: T;

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

@@ -2,7 +2,7 @@ import type { CSSProperties, ReactElement } from 'react';
 import type { ColType, CustomColumnData, DataGridProps, PaginationType, SortType } from '../data-grid/typings';
 import type { FilterProps } from '../filter/typings';
 import type { SideBarDef } from '@ag-grid-community/core';
-interface Props<RecordType, ParamsType extends Record<string, any>> extends Pick<DataGridProps<RecordType>, 'defaultColDef' | 'rowHeight' | 'cellDisplayFlex' | 'isRowSelectable'> {
+export interface SelectViewProps<RecordType, ParamsType> extends Pick<DataGridProps<RecordType>, 'defaultColDef' | 'rowHeight' | 'cellDisplayFlex' | 'isRowSelectable'> {
     value?: RecordType[];
     onChange?: (value: RecordType[], rowDoubleClicked?: boolean) => void;
     /**
@@ -72,11 +72,5 @@ interface Props<RecordType, ParamsType extends Record<string, any>> extends Pick
         set: (data: CustomColumnData) => Promise<void> | void;
         get: () => Promise<CustomColumnData | null | undefined> | CustomColumnData | null | undefined;
     };
-    /**
-     * @description 表格顶部header区域自定义
-     * @default null
-     */
-    header?: ReactElement | null;
 }
-export default function SelectView<RecordType extends Record<string | number, any>, ParamsType extends Record<string, any>>(props: Props<RecordType, ParamsType>): JSX.Element;
-export {};
+export default function SelectView<RecordType extends Record<string | number, any>, ParamsType extends Record<string, any>>(originalProps: SelectViewProps<RecordType, ParamsType>): JSX.Element;

package/es/select-view/index.js

@@ -18,6 +18,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Form, Spin, Tabs } from 'antd';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { Resizable } from 'react-resizable';
+import { useComponentDefaultProps } from "../component-configure";
 import DataGrid from "../data-grid";
 import Filter from "../filter";
 import { useLocaleReceiver } from "../locale-receiver";
@@ -25,10 +26,11 @@ import { parseLocalTemplate } from "../locale/locale";
 import { mergeProp, prefixClassName } from "../utils";
 import classNames from 'classnames';
 import { get } from 'lodash';
-export default function SelectView(props) {
+export default function SelectView(originalProps) {
   var emptyValue = useMemo(function () {
     return [];
   }, []);
+  var props = useComponentDefaultProps('SelectView', originalProps);
   var value = props.value,
     onChange = props.onChange,
     _props$pagination = props.pagination,
@@ -51,9 +53,7 @@ export default function SelectView(props) {
     isRowSelectable = props.isRowSelectable,
     checkSearchParams = props.checkSearchParams,
     sideBar = props.sideBar,
-    customColumnPanelStorage = props.customColumnPanelStorage,
-    _props$header = props.header,
-    headerProp = _props$header === void 0 ? null : _props$header;
+    customColumnPanelStorage = props.customColumnPanelStorage;
   var prefix = prefixClassName("select-view");
   var _useState = useState(value || emptyValue),
     _useState2 = _slicedToArray(_useState, 2),
@@ -152,32 +152,30 @@ export default function SelectView(props) {
   };
   var headerNode = null;
   var siderNode = 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({
-      simple: true,
-      autoPlaceholder: true,
-      form: filterForm
-    }, filter, {
-      value: cParams,
-      onChange: function onChange(val) {
-        return handleChangeParams(_objectSpread(_objectSpread({}, cParams), val));
-      }
-    })));
-  } else if (headerProp) {
-    headerNode = headerProp;
-  }
-  if (filter && filter.sider) {
-    siderNode = filter.sider({
-      /**
-       * 原则上这里使用cParams也会有问题，不排除Filter中的条件可能会影响Sider的渲染，但此种情况先忽略，尽可能避免这个情况
-       */
-      value: cParams,
-      onChange: function onChange(val) {
-        handleChangeParams(_objectSpread(_objectSpread(_objectSpread({}, cParams), filterForm.getFieldsValue()), val));
-      }
-    });
+  if (filter) {
+    if (filter.data) {
+      headerNode = /*#__PURE__*/React.createElement(Filter, _extends({
+        simple: true,
+        autoPlaceholder: true,
+        form: filterForm
+      }, filter, {
+        value: cParams,
+        onChange: function onChange(val) {
+          return handleChangeParams(_objectSpread(_objectSpread({}, cParams), val));
+        }
+      }));
+    }
+    if (filter.sider) {
+      siderNode = filter.sider({
+        /**
+         * 原则上这里使用cParams也会有问题，不排除Filter中的条件可能会影响Sider的渲染，但此种情况先忽略，尽可能避免这个情况
+         */
+        value: cParams,
+        onChange: function onChange(val) {
+          handleChangeParams(_objectSpread(_objectSpread(_objectSpread({}, cParams), filterForm.getFieldsValue()), val));
+        }
+      });
+    }
   }
   var dataKeys = useMemo(function () {
     return data.map(getRowKey);
@@ -238,8 +236,6 @@ export default function SelectView(props) {
           handleChangeData([node.id], [node.data], true);
         }
       },
-      rowMultiSelectWithClick: true,
-      suppressRowClickSelection: false,
       sideBar: sideBar,
       rowHeight: rowHeight,
       defaultColDef: defaultColDef,

package/es/select-view/index.less

@@ -68,12 +68,6 @@
     margin-top: @padding-md;
   }
 
-  &-head {
-    &-wrapper {
-      margin-bottom: 4px;
-    }
-  }
-
   &-body {
     flex: 1;
     min-height: 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.2.11-alpha.0",
+  "version": "1.2.11-alpha.2",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -27,7 +27,7 @@
     "@ag-grid-community/react": "29.2.0",
     "@ag-grid-community/styles": "29.2.0",
     "@dnd-kit/core": "^6.0.8",
-    "@lemon-fe/hooks": "^1.2.0",
+    "@lemon-fe/hooks": "^1.2.11-alpha.2",
     "@lemon-fe/utils": "^1.1.0",
     "async-validator": "^4.2.5",
     "bignumber.js": ">=9.0.0",
@@ -67,5 +67,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "084f158755b14b82bca352d812f0da492b120b66"
+  "gitHead": "ae15ff1f11ac069128da561e6afeb1515c77a36e"
 }