@lemon-fe/components 0.1.100 → 0.1.104

package/es/BaseTable/index.d.ts

@@ -1,7 +1,9 @@
 /// <reference path="../../typings.d.ts" />
-import type { BaseTableProps as Props } from './typings';
-declare function BaseTable<T extends Record<string, any>>(props: Props<T>): JSX.Element;
-declare namespace BaseTable {
-    var Summary: typeof import("rc-table/lib/Footer/Summary").default;
+import { Table as AntdTable } from 'antd';
+import type { BaseTableProps } from './typings';
+interface BaseTableType {
+    <T>(props: BaseTableProps<T>): JSX.Element;
+    Summary: typeof AntdTable.Summary;
 }
-export default BaseTable;
+declare const ForwardTable: BaseTableType;
+export default ForwardTable;

package/es/BaseTable/index.js

@@ -34,7 +34,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 /// <reference path="../../typings.d.ts" />
-import React, { useMemo, useState, useEffect, useRef } from 'react';
+import React, { useMemo, useState, useEffect, useRef, forwardRef } from 'react';
 import { Table as AntdTable } from 'antd';
 import classNames from 'classnames';
 import { get } from 'lodash';
@@ -101,7 +101,7 @@ function Th(props) {
   }), content));
 }
 
-function BaseTable(props) {
+function BaseTable(props, _ref) {
   var id = props.id,
       columns = props.columns,
       defaultColumnProps = props.defaultColumnProps,
@@ -415,7 +415,15 @@ function BaseTable(props) {
   }, [scrollY, rowHeight]);
   var tableNode = /*#__PURE__*/React.createElement(AntdTable, _objectSpread(_objectSpread({
     size: "small",
-    ref: fullTableRef,
+    ref: function ref(elm) {
+      fullTableRef.current = elm;
+
+      if (typeof _ref === 'function') {
+        _ref(elm);
+      } else if (_ref !== null) {
+        _ref.current = elm;
+      }
+    },
     className: classNames("".concat(PREFIX_CLS, "-table"), className),
     columns: formatedColumns,
     dataSource: dataSource,
@@ -463,5 +471,6 @@ function BaseTable(props) {
   }, tableNode);
 }
 
-BaseTable.Summary = AntdTable.Summary;
-export default BaseTable;
+var ForwardTable = /*#__PURE__*/forwardRef(BaseTable);
+ForwardTable.Summary = AntdTable.Summary;
+export default ForwardTable;

package/es/BaseTable/typings.d.ts

@@ -1,5 +1,5 @@
-import type { ReactElement, ReactText } from 'react';
-import { TableProps, TableColumnType, TableColumnGroupType, TableColumnsType } from 'antd';
+import type { ReactElement, ReactText, RefObject } from 'react';
+import type { TableProps, TableColumnType, TableColumnGroupType, TableColumnsType } from 'antd';
 
 export type ColumnType<T> = TableColumnType<T>;
 
@@ -44,4 +44,5 @@ export interface BaseTableProps<T> extends Omit<TableProps<T>, 'columns' | 'scro
    * @description 行操作按钮组
    */
   rowActions?: (RowAction<T> | null)[] | ((record: T, index: number) => (RowAction<T> | null)[]);
+  ref?: RefObject<HTMLDivElement>;
 }

package/es/EditableTable/Table.d.ts

@@ -1,7 +1,6 @@
-import { MutableRefObject } from 'react';
+import React, { ForwardedRef } from 'react';
 import type { EditableTableProps, EditableTableRef } from './typings';
-declare type RefType = ((instance: EditableTableRef | null) => void) | MutableRefObject<EditableTableRef | null> | null;
 declare const _default: <T>(props: EditableTableProps<T> & {
-    ref?: RefType | undefined;
+    ref?: React.ForwardedRef<EditableTableRef> | undefined;
 }) => JSX.Element;
 export default _default;

package/es/EditableTable/Table.js

@@ -22,12 +22,11 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { cloneElement, createContext, useContext, useEffect, useMemo, useState, memo, isValidElement, forwardRef, useImperativeHandle } from 'react';
+import React, { cloneElement, createContext, useContext, useEffect, useMemo, useState, memo, isValidElement, forwardRef, useImperativeHandle, useRef } from 'react';
 import { get, isEqual } from 'lodash';
 import BaseTable from '../BaseTable';
 import { FormStore } from './util';
 import { PREFIX_CLS } from '../constants';
-import { randomStr } from '../BaseTable/utils';
 import EditableCell from './EditableCell';
 var Context = /*#__PURE__*/createContext(null);
 
@@ -221,11 +220,9 @@ function EditableTable(props, ref) {
     return mCols;
   }, [columns, editable]); // 键盘事件
 
-  var tableID = useMemo(function () {
-    return randomStr();
-  }, []);
+  var tableRef = useRef(null);
   useEffect(function () {
-    var table = document.getElementById(tableID);
+    var table = tableRef.current;
 
     if (table === null) {
       return;
@@ -340,7 +337,7 @@ function EditableTable(props, ref) {
     return function () {
       table.removeEventListener('keyup', handleKeyUp);
     };
-  }, [tableID]);
+  }, []);
   useImperativeHandle(ref, function () {
     return {
       validate: function validate() {
@@ -356,7 +353,7 @@ function EditableTable(props, ref) {
     dataSource: rows,
     rowKey: "key"
   }, restProps), {}, {
-    id: tableID
+    ref: tableRef
   })));
 }
 

package/es/EditableTable/typings.d.ts

@@ -1,6 +1,6 @@
 import type { Key, ReactElement } from 'react';
 import type { BaseTableProps, ColumnType } from '../BaseTable/typings';
-import { RuleItem } from 'async-validator/dist-types/interface';
+import type { RuleItem } from 'async-validator/dist-types/interface';
 
 type RowType = {
   key: Key;

package/es/EditableTable/util.d.ts

@@ -1,5 +1,5 @@
 import type { Key } from 'react';
-import { EditableTableObserverHandler, EditableTableRule } from './typings';
+import type { EditableTableObserverHandler, EditableTableRule } from './typings';
 export declare class FormStore<T = Record<Key, any>> {
     private data;
     private keys;

package/es/SelectView/index.js

@@ -112,13 +112,11 @@ export default function SelectView(props) {
   };
 
   var handleChangeParams = function handleChangeParams(mParams) {
-    var nextParams = _objectSpread(_objectSpread({}, params), mParams);
-
     if (filter === null || filter === void 0 ? void 0 : filter.onChange) {
-      filter.onChange(nextParams);
+      filter.onChange(mParams);
     }
 
-    setParams(nextParams);
+    setParams(mParams);
   };
 
   var handleValuesChange = function handleValuesChange(changedValues, allValues) {
@@ -144,7 +142,9 @@ export default function SelectView(props) {
     if (filter.sider) {
       siderNode = filter.sider({
         value: params,
-        onChange: handleChangeParams
+        onChange: function onChange(val) {
+          return handleChangeParams(_objectSpread(_objectSpread({}, params), val));
+        }
       });
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.1.100",
+  "version": "0.1.104",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -39,5 +39,5 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
-  "gitHead": "5f53ecae92b68b912baebcad654b448b93973526"
+  "gitHead": "437d6fce894937122e473aa36da3d2bd4b3bc9f1"
 }