@douyinfe/semi-ui 2.51.4 → 2.52.0-beta.1

package/lib/es/dropdown/dropdownItem.js

@@ -37,7 +37,8 @@ class DropdownItem extends BaseComponent {
     const events = {};
     if (!disabled) {
       ['onClick', 'onMouseEnter', 'onMouseLeave', 'onContextMenu'].forEach(eventName => {
-        if (eventName === "onClick") {
+        const isInAnotherDropdown = this.context.level !== 1;
+        if (isInAnotherDropdown && eventName === "onClick") {
           events["onMouseDown"] = e => {
             var _a, _b;
             if (e.button === 0) {

package/lib/es/form/hoc/withField.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-import type { WithFieldOption } from '@douyinfe/semi-foundation/lib/es/form/interface';
-import type { CommonFieldProps, CommonexcludeType } from '../interface';
-import type { Subtract } from 'utility-types';
+import { WithFieldOption } from '@douyinfe/semi-foundation/lib/es/form/interface';
+import { CommonFieldProps, CommonexcludeType } from '../interface';
+import { Subtract } from 'utility-types';
 /**
  * withFiled is used to inject components
  * 1. Takes over the value and onChange of the component and synchronizes them to Form Foundation

package/lib/es/input/index.d.ts

@@ -51,6 +51,7 @@ export interface InputProps extends Omit<React.InputHTMLAttributes<HTMLInputElem
     preventScroll?: boolean;
     /** internal prop, DatePicker use it */
     showClearIgnoreDisabled?: boolean;
+    onlyBorder?: number;
 }
 export interface InputState {
     value: React.ReactText;

package/lib/es/input/index.js

@@ -333,9 +333,10 @@ class Input extends BaseComponent {
         getValueLength,
         preventScroll,
         borderless,
-        showClearIgnoreDisabled
+        showClearIgnoreDisabled,
+        onlyBorder
       } = _a,
-      rest = __rest(_a, ["addonAfter", "addonBefore", "autoFocus", "clearIcon", "className", "disabled", "defaultValue", "placeholder", "prefix", "mode", "insetLabel", "insetLabelId", "validateStatus", "type", "readonly", "size", "suffix", "style", "showClear", "onEnterPress", "onClear", "hideSuffix", "inputStyle", "forwardRef", "maxLength", "getValueLength", "preventScroll", "borderless", "showClearIgnoreDisabled"]);
+      rest = __rest(_a, ["addonAfter", "addonBefore", "autoFocus", "clearIcon", "className", "disabled", "defaultValue", "placeholder", "prefix", "mode", "insetLabel", "insetLabelId", "validateStatus", "type", "readonly", "size", "suffix", "style", "showClear", "onEnterPress", "onClear", "hideSuffix", "inputStyle", "forwardRef", "maxLength", "getValueLength", "preventScroll", "borderless", "showClearIgnoreDisabled", "onlyBorder"]);
     const {
       value,
       isFocus,
@@ -363,7 +364,8 @@ class Input extends BaseComponent {
       [`${wrapperPrefix}-modebtn`]: mode === 'password',
       [`${wrapperPrefix}-hidden`]: type === 'hidden',
       [`${wrapperPrefix}-${size}`]: size,
-      [`${prefixCls}-borderless`]: borderless
+      [`${prefixCls}-borderless`]: borderless,
+      [`${prefixCls}-only_border`]: onlyBorder !== undefined && onlyBorder !== null
     });
     const inputCls = cls(prefixCls, {
       [`${prefixCls}-${size}`]: size,
@@ -397,12 +399,18 @@ class Input extends BaseComponent {
     if (validateStatus === 'error') {
       inputProps['aria-invalid'] = 'true';
     }
+    let wrapperStyle = Object.assign({}, style);
+    if (onlyBorder !== undefined) {
+      wrapperStyle = Object.assign({
+        borderWidth: onlyBorder
+      }, style);
+    }
     return (
       /*#__PURE__*/
       // eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions
       React.createElement("div", {
         className: wrapperCls,
-        style: style,
+        style: wrapperStyle,
         onMouseEnter: e => this.handleMouseOver(e),
         onMouseLeave: e => this.handleMouseLeave(e),
         onClick: e => this.handleClick(e)

package/lib/es/modal/Modal.d.ts

@@ -66,6 +66,7 @@ declare class Modal extends BaseComponent<ModalReactProps, ModalState> {
         lazyRender: PropTypes.Requireable<boolean>;
         direction: PropTypes.Requireable<string>;
         fullScreen: PropTypes.Requireable<boolean>;
+        footerFill: PropTypes.Requireable<boolean>;
     };
     static defaultProps: {
         zIndex: number;

package/lib/es/modal/Modal.js

@@ -26,7 +26,6 @@ export const destroyFns = [];
 class Modal extends BaseComponent {
   constructor(props) {
     super(props);
-    this.bodyOverflow = null;
     this.handleCancel = e => {
       this.foundation.handleCancel(e);
     };
@@ -46,7 +45,8 @@ class Modal extends BaseComponent {
         cancelText,
         confirmLoading,
         cancelLoading,
-        hasCancel
+        hasCancel,
+        footerFill
       } = this.props;
       const getCancelButton = locale => {
         if (!hasCancel) {
@@ -57,6 +57,7 @@ class Modal extends BaseComponent {
             onClick: this.handleCancel,
             loading: cancelLoading === undefined ? this.state.onCancelReturnPromiseStatus === "pending" : cancelLoading,
             type: "tertiary",
+            block: footerFill,
             autoFocus: true
           }, this.props.cancelButtonProps, {
             "x-semi-children-alias": "cancelText"
@@ -65,10 +66,15 @@ class Modal extends BaseComponent {
       };
       return /*#__PURE__*/React.createElement(LocaleConsumer, {
         componentName: "Modal"
-      }, (locale, localeCode) => /*#__PURE__*/React.createElement("div", null, getCancelButton(locale), /*#__PURE__*/React.createElement(Button, Object.assign({
+      }, (locale, localeCode) => /*#__PURE__*/React.createElement("div", {
+        className: cls({
+          [`${cssClasses.DIALOG}-footerfill`]: footerFill
+        })
+      }, getCancelButton(locale), /*#__PURE__*/React.createElement(Button, Object.assign({
         "aria-label": "confirm",
         type: okType,
         theme: "solid",
+        block: footerFill,
         loading: confirmLoading === undefined ? this.state.onOKReturnPromiseStatus === "pending" : confirmLoading,
         onClick: this.handleOk
       }, this.props.okButtonProps, {
@@ -166,6 +172,7 @@ class Modal extends BaseComponent {
     };
     this.foundation = new ModalFoundation(this.adapter);
     this.modalRef = /*#__PURE__*/React.createRef();
+    this.bodyOverflow = '';
     this.scrollBarWidth = 0;
     this.originBodyWidth = '100%';
   }
@@ -186,7 +193,7 @@ class Modal extends BaseComponent {
         const {
           getPopupContainer
         } = this.props;
-        if (!getPopupContainer && this.bodyOverflow !== null && this.bodyOverflow !== 'hidden') {
+        if (!getPopupContainer && this.bodyOverflow !== 'hidden') {
           document.body.style.overflow = this.bodyOverflow;
           document.body.style.width = this.originBodyWidth;
         }
@@ -301,7 +308,8 @@ Modal.propTypes = {
   keepDOM: PropTypes.bool,
   lazyRender: PropTypes.bool,
   direction: PropTypes.oneOf(strings.directions),
-  fullScreen: PropTypes.bool
+  fullScreen: PropTypes.bool,
+  footerFill: PropTypes.bool
 };
 Modal.defaultProps = {
   zIndex: 1000,

package/lib/es/modal/confirm.d.ts

@@ -51,6 +51,7 @@ export declare function withInfo(props: ModalReactProps): {
     direction?: any;
     fullScreen?: boolean;
     preventScroll?: boolean;
+    footerFill?: boolean;
     type: "info";
 };
 export declare function withSuccess(props: ModalReactProps): {
@@ -94,6 +95,7 @@ export declare function withSuccess(props: ModalReactProps): {
     direction?: any;
     fullScreen?: boolean;
     preventScroll?: boolean;
+    footerFill?: boolean;
     type: "success";
 };
 export declare function withWarning(props: ModalReactProps): {
@@ -137,6 +139,7 @@ export declare function withWarning(props: ModalReactProps): {
     direction?: any;
     fullScreen?: boolean;
     preventScroll?: boolean;
+    footerFill?: boolean;
     type: "warning";
 };
 export declare function withError(props: ModalReactProps): {
@@ -179,6 +182,7 @@ export declare function withError(props: ModalReactProps): {
     onOk?: (e: React.MouseEvent<Element, MouseEvent>) => void | Promise<any>;
     lazyRender?: boolean;
     fullScreen?: boolean;
+    footerFill?: boolean;
     type: "error";
     okButtonProps: {
         id?: string;
@@ -506,5 +510,6 @@ export declare function withConfirm(props: ModalReactProps): {
     direction?: any;
     fullScreen?: boolean;
     preventScroll?: boolean;
+    footerFill?: boolean;
     type: "confirm";
 };

package/lib/es/select/option.js

@@ -101,8 +101,7 @@ class Option extends PureComponent {
           value,
           label,
           children
-        }, rest), e),
-        className
+        }, rest), e)
       }, rest));
     }
     const config = {

package/lib/es/slider/index.js

@@ -28,6 +28,7 @@ export default class Slider extends BaseComponent {
   constructor(props) {
     super(props);
     this.renderHandle = () => {
+      var _a, _b, _c, _d, _e, _f, _g, _h;
       const {
         vertical,
         range,
@@ -126,6 +127,14 @@ export default class Slider extends BaseComponent {
         "aria-valuenow": currentValue,
         "aria-valuemax": max,
         "aria-valuemin": min
+      }), this.props.handleDot && /*#__PURE__*/React.createElement("div", {
+        className: cssClasses.HANDLE_DOT,
+        style: Object.assign(Object.assign({}, ((_a = this.props.handleDot) === null || _a === void 0 ? void 0 : _a.size) ? {
+          width: this.props.handleDot.size,
+          height: this.props.handleDot.size
+        } : {}), ((_b = this.props.handleDot) === null || _b === void 0 ? void 0 : _b.color) ? {
+          backgroundColor: this.props.handleDot.color
+        } : {})
       }))) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tooltip, {
         content: tipChildren.min,
         position: "top",
@@ -177,6 +186,14 @@ export default class Slider extends BaseComponent {
         "aria-valuenow": currentValue[0],
         "aria-valuemax": currentValue[1],
         "aria-valuemin": min
+      }), ((_c = this.props.handleDot) === null || _c === void 0 ? void 0 : _c[0]) && /*#__PURE__*/React.createElement("div", {
+        className: cssClasses.HANDLE_DOT,
+        style: Object.assign(Object.assign({}, ((_d = this.props.handleDot[0]) === null || _d === void 0 ? void 0 : _d.size) ? {
+          width: this.props.handleDot[0].size,
+          height: this.props.handleDot[0].size
+        } : {}), ((_e = this.props.handleDot[0]) === null || _e === void 0 ? void 0 : _e.color) ? {
+          backgroundColor: this.props.handleDot[0].color
+        } : {})
       }))), /*#__PURE__*/React.createElement(Tooltip, {
         content: tipChildren.max,
         position: "top",
@@ -228,6 +245,14 @@ export default class Slider extends BaseComponent {
         "aria-valuenow": currentValue[1],
         "aria-valuemax": max,
         "aria-valuemin": currentValue[0]
+      }), ((_f = this.props.handleDot) === null || _f === void 0 ? void 0 : _f[1]) && /*#__PURE__*/React.createElement("div", {
+        className: cssClasses.HANDLE_DOT,
+        style: Object.assign(Object.assign({}, ((_g = this.props.handleDot[1]) === null || _g === void 0 ? void 0 : _g.size) ? {
+          width: this.props.handleDot[1].size,
+          height: this.props.handleDot[1].size
+        } : {}), ((_h = this.props.handleDot[1]) === null || _h === void 0 ? void 0 : _h.color) ? {
+          backgroundColor: this.props.handleDot[1].color
+        } : {})
       }))));
       return handleContents;
     };
@@ -644,7 +669,14 @@ Slider.propTypes = {
   showBoundary: PropTypes.bool,
   railStyle: PropTypes.object,
   verticalReverse: PropTypes.bool,
-  getAriaValueText: PropTypes.func
+  getAriaValueText: PropTypes.func,
+  handleDot: PropTypes.oneOfType([PropTypes.shape({
+    size: PropTypes.string,
+    color: PropTypes.string
+  }), PropTypes.arrayOf(PropTypes.shape({
+    size: PropTypes.string,
+    color: PropTypes.string
+  }))])
 };
 Slider.defaultProps = {
   // allowClear: false,

package/lib/es/table/ColumnFilter.d.ts

@@ -1,34 +1,50 @@
 import React from 'react';
 import { DropdownProps } from '../dropdown';
-import { Trigger, Position } from '../tooltip';
 import { FilterIcon, Filter, OnFilterDropdownVisibleChange, RenderFilterDropdownItem } from './interface';
-export interface ColumnFilterProps {
+export default function ColumnFilter(props?: ColumnFilterProps): React.ReactElement;
+export interface ColumnFilterProps extends Omit<RenderDropdownProps, keyof RenderFilterDropdownProps> {
     prefixCls?: string;
     filteredValue?: any[];
     filterIcon?: FilterIcon;
     filterDropdown?: React.ReactElement;
-    renderFilterDropdown?: (props: RenderDropdownProps, options: {
-        iconElem: React.ReactNode;
-    }) => React.ReactElement;
-    filterDropdownProps?: DropdownProps;
-    onFilterDropdownVisibleChange?: OnFilterDropdownVisibleChange;
-    onSelect?: (data: OnSelectData) => void;
-}
-export default function ColumnFilter(props?: ColumnFilterProps): React.ReactElement;
-export interface OnSelectData {
-    value: any;
-    filteredValue: any;
-    included: boolean;
-    domEvent: React.MouseEvent<HTMLElement>;
+    filterDropdownProps?: FilterDropdownProps;
+    filters?: Filter[];
 }
-export interface RenderDropdownProps {
+export interface RenderDropdownProps extends FilterDropdownProps, RenderFilterDropdownProps {
     filterMultiple?: boolean;
     filters?: Filter[];
     filteredValue?: any[];
     filterDropdownVisible?: boolean;
     onSelect?: (data: OnSelectData) => void;
     onFilterDropdownVisibleChange?: OnFilterDropdownVisibleChange;
-    trigger?: Trigger;
-    position?: Position;
+    renderFilterDropdown?: (props?: RenderFilterDropdownProps) => React.ReactNode;
     renderFilterDropdownItem?: RenderFilterDropdownItem;
 }
+export interface FilterDropdownProps extends Omit<DropdownProps, 'render' | 'onVisibleChange'> {
+}
+export interface OnSelectData {
+    value?: any;
+    /** only this value is used now  */
+    filteredValue: any;
+    included?: boolean;
+    domEvent?: React.MouseEvent<HTMLElement>;
+}
+export interface RenderFilterDropdownProps {
+    /** temporary filteredValue  */
+    tempFilteredValue: any[];
+    /** set temporary filteredValue  */
+    setTempFilteredValue: (tempFilteredValue: any[]) => void;
+    /** set tempFilteredValue to filteredValue. You can also pass filteredValue to directly set the filteredValue  */
+    confirm: (props?: {
+        closeDropdown?: boolean;
+        filteredValue?: any[];
+    }) => void;
+    /** clear tempFilteredValue and filteredValue  */
+    clear: (props?: {
+        closeDropdown?: boolean;
+    }) => void;
+    /** close dropdown  */
+    close: () => void;
+    /** column filters  */
+    filters?: RenderDropdownProps['filters'];
+}

package/lib/es/table/ColumnFilter.js

@@ -1,13 +1,14 @@
+import _pick from "lodash/pick";
 import _noop from "lodash/noop";
-import React, { isValidElement } from 'react';
+import _isEqual from "lodash/isEqual";
+import React, { isValidElement, useEffect, useState } from 'react';
 import cls from 'classnames';
 import { IconFilter } from '@douyinfe/semi-icons';
 import { cssClasses } from '@douyinfe/semi-foundation/lib/es/table/constants';
 import Dropdown from '../dropdown';
 import { Radio } from '../radio';
 import { Checkbox } from '../checkbox';
-function renderDropdown() {
-  let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+function renderDropdown(props) {
   let nestedElem = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   let level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
   const {
@@ -19,77 +20,80 @@ function renderDropdown() {
     onFilterDropdownVisibleChange = _noop,
     trigger = 'click',
     position = 'bottom',
+    renderFilterDropdown,
     renderFilterDropdownItem
-  } = props;
+  } = props !== null && props !== void 0 ? props : {};
+  const renderFilterDropdownProps = _pick(props, ['tempFilteredValue', 'setTempFilteredValue', 'confirm', 'clear', 'close', 'filters']);
+  const render = typeof renderFilterDropdown === 'function' ? renderFilterDropdown(renderFilterDropdownProps) : /*#__PURE__*/React.createElement(Dropdown.Menu, null, Array.isArray(filters) && filters.map((filter, index) => {
+    const changeFn = e => {
+      const domEvent = e && e.nativeEvent;
+      if (domEvent) {
+        // Block this event to prevent the pop-up layer from closing
+        domEvent.stopImmediatePropagation();
+        // Prevent bubbling and default events to prevent label click events from triggering twice
+        domEvent.stopPropagation();
+        domEvent.preventDefault();
+      }
+      let values = [...filteredValue];
+      const included = values.includes(filter.value);
+      const idx = values.indexOf(filter.value);
+      if (idx > -1) {
+        values.splice(idx, 1);
+      } else if (filterMultiple) {
+        values.push(filter.value);
+      } else {
+        values = [filter.value];
+      }
+      return onSelect({
+        value: filter.value,
+        filteredValue: values,
+        included: !included,
+        domEvent
+      });
+    };
+    const checked = filteredValue.includes(filter.value);
+    const {
+      text
+    } = filter;
+    const {
+      value
+    } = filter;
+    const key = `${level}_${index}`;
+    const dropdownItem = typeof renderFilterDropdownItem === 'function' ? renderFilterDropdownItem({
+      onChange: changeFn,
+      filterMultiple,
+      value,
+      text,
+      checked,
+      filteredValue,
+      level
+    }) : null;
+    let item = dropdownItem && /*#__PURE__*/React.isValidElement(dropdownItem) ? /*#__PURE__*/React.cloneElement(dropdownItem, {
+      key
+    }) : /*#__PURE__*/React.createElement(Dropdown.Item, {
+      key: key,
+      onClick: changeFn
+    }, filterMultiple ? /*#__PURE__*/React.createElement(Checkbox, {
+      checked: checked
+    }, text) : /*#__PURE__*/React.createElement(Radio, {
+      checked: checked
+    }, text));
+    if (Array.isArray(filter.children) && filter.children.length) {
+      const childrenDropdownProps = Object.assign(Object.assign({}, props), {
+        filters: filter.children,
+        trigger: 'hover',
+        position: 'right'
+      });
+      delete childrenDropdownProps.filterDropdownVisible;
+      item = renderDropdown(childrenDropdownProps, item, level + 1);
+    }
+    return item;
+  }));
   const dropdownProps = Object.assign(Object.assign({}, props), {
     onVisibleChange: visible => onFilterDropdownVisibleChange(visible),
     trigger,
     position,
-    render: /*#__PURE__*/React.createElement(Dropdown.Menu, null, Array.isArray(filters) && filters.map((filter, index) => {
-      const changeFn = e => {
-        const domEvent = e && e.nativeEvent;
-        if (domEvent) {
-          // Block this event to prevent the pop-up layer from closing
-          domEvent.stopImmediatePropagation();
-          // Prevent bubbling and default events to prevent label click events from triggering twice
-          domEvent.stopPropagation();
-          domEvent.preventDefault();
-        }
-        let values = [...filteredValue];
-        const included = values.includes(filter.value);
-        const idx = values.indexOf(filter.value);
-        if (idx > -1) {
-          values.splice(idx, 1);
-        } else if (filterMultiple) {
-          values.push(filter.value);
-        } else {
-          values = [filter.value];
-        }
-        return onSelect({
-          value: filter.value,
-          filteredValue: values,
-          included: !included,
-          domEvent
-        });
-      };
-      const checked = filteredValue.includes(filter.value);
-      const {
-        text
-      } = filter;
-      const {
-        value
-      } = filter;
-      const key = `${level}_${index}`;
-      const dropdownItem = typeof renderFilterDropdownItem === 'function' ? renderFilterDropdownItem({
-        onChange: changeFn,
-        filterMultiple,
-        value,
-        text,
-        checked,
-        filteredValue,
-        level
-      }) : null;
-      let item = dropdownItem && /*#__PURE__*/React.isValidElement(dropdownItem) ? /*#__PURE__*/React.cloneElement(dropdownItem, {
-        key
-      }) : /*#__PURE__*/React.createElement(Dropdown.Item, {
-        key: key,
-        onClick: changeFn
-      }, filterMultiple ? /*#__PURE__*/React.createElement(Checkbox, {
-        checked: checked
-      }, text) : /*#__PURE__*/React.createElement(Radio, {
-        checked: checked
-      }, text));
-      if (Array.isArray(filter.children) && filter.children.length) {
-        const childrenDropdownProps = Object.assign(Object.assign({}, props), {
-          filters: filter.children,
-          trigger: 'hover',
-          position: 'right'
-        });
-        delete childrenDropdownProps.filterDropdownVisible;
-        item = renderDropdown(childrenDropdownProps, item, level + 1);
-      }
-      return item;
-    }))
+    render
   });
   if (filterDropdownVisible != null) {
     dropdownProps.visible = filterDropdownVisible;
@@ -105,12 +109,68 @@ export default function ColumnFilter() {
     prefixCls = cssClasses.PREFIX,
     filteredValue,
     filterIcon = 'filter',
+    filterDropdownProps,
+    onSelect,
+    filterDropdownVisible,
     renderFilterDropdown,
-    filterDropdownProps
+    onFilterDropdownVisibleChange
   } = props;
   let {
     filterDropdown = null
   } = props;
+  // custom filter related status
+  const isFilterDropdownVisibleControlled = typeof filterDropdownVisible !== 'undefined';
+  const isCustomFilterDropdown = typeof renderFilterDropdown === 'function';
+  const isCustomDropdownVisible = !isFilterDropdownVisibleControlled && isCustomFilterDropdown;
+  const [tempFilteredValue, setTempFilteredValue] = useState(filteredValue);
+  const dropdownVisibleInitValue = isCustomDropdownVisible ? false : filterDropdownVisible;
+  const [dropdownVisible, setDropdownVisible] = useState(dropdownVisibleInitValue);
+  useEffect(() => {
+    if (typeof filterDropdownVisible !== 'undefined') {
+      setDropdownVisible(filterDropdownVisible);
+    }
+  }, [filterDropdownVisible]);
+  useEffect(() => {
+    setTempFilteredValue(filteredValue);
+  }, [filteredValue]);
+  const confirm = function () {
+    let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    const newFilteredValue = (props === null || props === void 0 ? void 0 : props.filteredValue) || tempFilteredValue;
+    if (!_isEqual(newFilteredValue, filteredValue)) {
+      onSelect({
+        filteredValue: newFilteredValue
+      });
+    }
+    if (props.closeDropdown) {
+      setDropdownVisible(false);
+    }
+  };
+  const clear = function () {
+    let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    setTempFilteredValue([]);
+    onSelect({
+      filteredValue: []
+    });
+    if (props.closeDropdown) {
+      setDropdownVisible(false);
+    }
+  };
+  const close = () => {
+    setDropdownVisible(false);
+  };
+  const handleFilterDropdownVisibleChange = visible => {
+    if (isCustomDropdownVisible) {
+      setDropdownVisible(visible);
+    }
+    onFilterDropdownVisibleChange(visible);
+  };
+  const renderFilterDropdownProps = {
+    tempFilteredValue,
+    setTempFilteredValue,
+    confirm,
+    clear,
+    close
+  };
   const finalCls = cls(`${prefixCls}-column-filter`, {
     on: Array.isArray(filteredValue) && filteredValue.length
   });
@@ -130,9 +190,10 @@ export default function ColumnFilter() {
       size: "default"
     }));
   }
-  const renderProps = Object.assign(Object.assign({}, props), filterDropdownProps);
-  filterDropdown = /*#__PURE__*/React.isValidElement(filterDropdown) ? filterDropdown : typeof renderFilterDropdown === 'function' ? renderFilterDropdown(renderProps, {
-    iconElem
-  }) : renderDropdown(renderProps, iconElem);
+  const renderProps = Object.assign(Object.assign(Object.assign(Object.assign({}, props), filterDropdownProps), renderFilterDropdownProps), {
+    filterDropdownVisible: isFilterDropdownVisibleControlled ? filterDropdownVisible : dropdownVisible,
+    onFilterDropdownVisibleChange: handleFilterDropdownVisibleChange
+  });
+  filterDropdown = /*#__PURE__*/React.isValidElement(filterDropdown) ? filterDropdown : renderDropdown(renderProps, iconElem);
   return filterDropdown;
 }

package/lib/es/table/ResizableTable.js

@@ -57,7 +57,7 @@ const ResizableTable = function () {
       width: numbers.DEFAULT_WIDTH_COLUMN_EXPAND
     });
   }
-  if (props.rowSelection && !_get(props.rowSelection, 'hidden') && !_find(rawColumns, item => item.key === strings.DEFAULT_KEY_COLUMN_SELECTION)) {
+  if (props.rowSelection && !_find(rawColumns, item => item.key === strings.DEFAULT_KEY_COLUMN_SELECTION)) {
     newColumns.unshift({
       width: _get(props, 'rowSelection.width', numbers.DEFAULT_WIDTH_COLUMN_SELECTION),
       key: strings.DEFAULT_KEY_COLUMN_SELECTION

package/lib/es/table/Table.d.ts

@@ -1,7 +1,7 @@
 import React, { ReactNode } from 'react';
 import PropTypes from 'prop-types';
 import Store from '@douyinfe/semi-foundation/lib/es/utils/Store';
-import TableFoundation, { TableAdapter, BaseRowKeyType, BaseHeadWidth } from '@douyinfe/semi-foundation/lib/es/table/foundation';
+import TableFoundation, { TableAdapter, BasePageData, BaseRowKeyType, BaseHeadWidth } from '@douyinfe/semi-foundation/lib/es/table/foundation';
 import { TableSelectionCellEvent } from '@douyinfe/semi-foundation/lib/es/table/tableSelectionCellFoundation';
 import { strings } from '@douyinfe/semi-foundation/lib/es/table/constants';
 import '@douyinfe/semi-foundation/lib/es/table/table.css';
@@ -185,7 +185,7 @@ declare class Table<RecordType extends Record<string, any>> extends BaseComponen
     _invokeRowSelection: (funcName: string, ...args: any[]) => void;
     _invokeColumnFn: (key: string, funcName: string, ...args: any[]) => void;
     _cacheHeaderRef: (node: HTMLDivElement) => void;
-    getCurrentPageData: () => any;
+    getCurrentPageData: () => Pick<BasePageData<RecordType>, "dataSource" | "groups">;
     getColumns: (columns: ColumnProps<RecordType>[], children: ReactNode) => ColumnProps<RecordType>[];
     getCellWidths: (...args: any[]) => number[];
     setHeadWidths: (...args: any[]) => void;
@@ -200,8 +200,8 @@ declare class Table<RecordType extends Record<string, any>> extends BaseComponen
     setScrollPosition: (position: BodyScrollPosition) => void;
     setScrollPositionClassName: () => void;
     syncTableWidth: () => void;
-    renderSelection: (record?: any, inHeader?: boolean) => React.ReactNode;
-    renderRowSelectionCallback: (text: string, record?: RecordType) => React.ReactNode;
+    renderSelection: (record?: any, inHeader?: boolean, index?: number) => React.ReactNode;
+    renderRowSelectionCallback: (text: string, record: RecordType, index: number) => React.ReactNode;
     renderTitleSelectionCallback: () => React.ReactNode;
     normalizeSelectionColumn: (props?: {
         rowSelection?: TableStateRowSelection<RecordType>;
@@ -283,7 +283,7 @@ declare class Table<RecordType extends Record<string, any>> extends BaseComponen
      * @param {ReactNode} children
      * @returns {Array}
      */
-    normalizeColumns: (columns: ColumnProps<RecordType>[], children: ReactNode) => any;
+    normalizeColumns: (columns: ColumnProps<RecordType>[], children: ReactNode) => ColumnProps<RecordType>[];
     /**
      * Combine pagination and table paging processing functions
      */