@zat-design/sisyphus-react 3.6.6-beta.1 → 3.6.6-beta.5

package/es/ProEditTable/components/RcTable/BaseTable.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+declare const _default: import("react").MemoExoticComponent<({ tableProps, ...resetProps }: {
+    [x: string]: any;
+    tableProps: any;
+}) => JSX.Element>;
+export default _default;

package/es/ProEditTable/components/RcTable/BaseTable.js

@@ -0,0 +1,75 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import "antd/es/table/style";
+import _Table from "antd/es/table";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["tableProps"];
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { memo } from 'react';
+var BaseTable = function BaseTable(_ref) {
+  var _value$;
+  var tableProps = _ref.tableProps,
+    resetProps = _objectWithoutProperties(_ref, _excluded);
+  var value = tableProps.value,
+    headerRender = tableProps.headerRender,
+    tableRef = tableProps.tableRef,
+    className = tableProps.className,
+    columns = tableProps.columns,
+    renderRowSelection = tableProps.renderRowSelection,
+    rowClassName = tableProps.rowClassName,
+    disabled = tableProps.disabled,
+    virtualKey = tableProps.virtualKey,
+    editingKeys = tableProps.editingKeys,
+    isHideCheckBox = tableProps.isHideCheckBox,
+    rowDraggable = tableProps.rowDraggable,
+    pagination = tableProps.pagination,
+    scroll = tableProps.scroll,
+    summary = tableProps.summary,
+    page = tableProps.page,
+    formatMessage = tableProps.formatMessage,
+    locale = tableProps.locale,
+    handlePageChange = tableProps.handlePageChange;
+  return _jsxs(_Fragment, {
+    children: [headerRender ? _jsx("div", {
+      className: "pro-edit-table-header",
+      children: typeof headerRender === 'function' ? headerRender() : headerRender
+    }) : null, _jsx(_Table, _objectSpread(_objectSpread({
+      ref: tableRef,
+      className: className,
+      dataSource: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value : undefined,
+      columns: columns,
+      rowSelection: renderRowSelection(),
+      rowClassName: rowClassName,
+      onRow: function onRow() {
+        return {
+          disabled: disabled || virtualKey && !!editingKeys.length,
+          'data-hide': isHideCheckBox,
+          onClick: function onClick() {},
+          rowDraggable: rowDraggable
+        };
+      }
+    }, resetProps), {}, {
+      pagination: pagination ? _objectSpread({
+        current: page.pageNum,
+        pageSize: page.pageSize,
+        showSizeChanger: false,
+        showQuickJumper: true,
+        total: value === null || value === void 0 ? void 0 : value.length,
+        showTotal: function showTotal(total) {
+          var _locale$ProEditTable;
+          if (!total) return;
+          return formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
+            total: total
+          });
+        },
+        onChange: handlePageChange
+      }, pagination) : false,
+      rowKey: "rowKey",
+      scroll: {
+        x: scroll === null || scroll === void 0 ? void 0 : scroll.x,
+        y: (value === null || value === void 0 ? void 0 : value.length) ? scroll === null || scroll === void 0 ? void 0 : scroll.y : undefined
+      },
+      summary: summary
+    }))]
+  });
+};
+export default /*#__PURE__*/memo(BaseTable);

package/es/ProEditTable/components/RcTable/DraggableTable.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+declare const _default: import("react").MemoExoticComponent<({ tableProps, draggableProps, ...resetProps }: {
+    [x: string]: any;
+    tableProps: any;
+    draggableProps: any;
+}) => JSX.Element>;
+export default _default;

package/es/ProEditTable/components/RcTable/DraggableTable.js

@@ -0,0 +1,90 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import "antd/es/table/style";
+import _Table from "antd/es/table";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["tableProps", "draggableProps"];
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { memo } from 'react';
+import { DndWrapper, Row } from '../index';
+var DraggableTable = function DraggableTable(_ref) {
+  var _value$;
+  var tableProps = _ref.tableProps,
+    draggableProps = _ref.draggableProps,
+    resetProps = _objectWithoutProperties(_ref, _excluded);
+  var value = tableProps.value,
+    headerRender = tableProps.headerRender,
+    tableRef = tableProps.tableRef,
+    className = tableProps.className,
+    columns = tableProps.columns,
+    renderRowSelection = tableProps.renderRowSelection,
+    rowClassName = tableProps.rowClassName,
+    disabled = tableProps.disabled,
+    virtualKey = tableProps.virtualKey,
+    editingKeys = tableProps.editingKeys,
+    isHideCheckBox = tableProps.isHideCheckBox,
+    rowDraggable = tableProps.rowDraggable,
+    pagination = tableProps.pagination,
+    scroll = tableProps.scroll,
+    summary = tableProps.summary,
+    page = tableProps.page,
+    formatMessage = tableProps.formatMessage,
+    locale = tableProps.locale,
+    handlePageChange = tableProps.handlePageChange;
+  var onChange = draggableProps.onChange,
+    onDrag = draggableProps.onDrag,
+    draggable = draggableProps.draggable;
+  return _jsxs(DndWrapper, {
+    value: value,
+    onChange: onChange,
+    onDrag: onDrag,
+    disabled: disabled,
+    draggable: draggable,
+    children: [headerRender ? _jsx("div", {
+      className: "pro-edit-table-header",
+      children: typeof headerRender === 'function' ? headerRender() : headerRender
+    }) : null, _jsx(_Table, _objectSpread(_objectSpread({
+      ref: tableRef,
+      className: className,
+      dataSource: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value : undefined,
+      columns: columns,
+      rowSelection: renderRowSelection(),
+      rowClassName: rowClassName,
+      components: {
+        body: {
+          row: Row
+        }
+      },
+      onRow: function onRow() {
+        return {
+          disabled: disabled || virtualKey && !!editingKeys.length,
+          'data-hide': isHideCheckBox,
+          onClick: function onClick() {},
+          rowDraggable: rowDraggable
+        };
+      }
+    }, resetProps), {}, {
+      pagination: pagination ? _objectSpread({
+        current: page.pageNum,
+        pageSize: page.pageSize,
+        showSizeChanger: false,
+        showQuickJumper: true,
+        total: value === null || value === void 0 ? void 0 : value.length,
+        showTotal: function showTotal(total) {
+          var _locale$ProEditTable;
+          if (!total) return;
+          return formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
+            total: total
+          });
+        },
+        onChange: handlePageChange
+      }, pagination) : false,
+      rowKey: "rowKey",
+      scroll: {
+        x: scroll === null || scroll === void 0 ? void 0 : scroll.x,
+        y: (value === null || value === void 0 ? void 0 : value.length) ? scroll === null || scroll === void 0 ? void 0 : scroll.y : undefined
+      },
+      summary: summary
+    }))]
+  });
+};
+export default /*#__PURE__*/memo(DraggableTable);

package/es/ProEditTable/components/RcTable/VirtualTable.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+declare const _default: React.MemoExoticComponent<({ tableProps, ...resetProps }: {
+    [x: string]: any;
+    tableProps: any;
+}) => JSX.Element>;
+export default _default;

package/es/ProEditTable/components/RcTable/VirtualTable.js

@@ -0,0 +1,166 @@
+import "antd/es/table/style";
+import _Table from "antd/es/table";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["tableProps"];
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useRef, useState, memo } from 'react';
+import classNames from 'classnames';
+import ResizeObserver from 'rc-resize-observer';
+import { VariableSizeGrid } from 'react-window';
+var VirtualTable = function VirtualTable(_ref) {
+  var _value$;
+  var tableProps = _ref.tableProps,
+    resetProps = _objectWithoutProperties(_ref, _excluded);
+  var value = tableProps.value,
+    headerRender = tableProps.headerRender,
+    tableRef = tableProps.tableRef,
+    className = tableProps.className,
+    columns = tableProps.columns,
+    renderRowSelection = tableProps.renderRowSelection,
+    rowClassName = tableProps.rowClassName,
+    disabled = tableProps.disabled,
+    virtualKey = tableProps.virtualKey,
+    editingKeys = tableProps.editingKeys,
+    isHideCheckBox = tableProps.isHideCheckBox,
+    rowDraggable = tableProps.rowDraggable,
+    scroll = tableProps.scroll,
+    summary = tableProps.summary;
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    tableWidth = _useState2[0],
+    setTableWidth = _useState2[1];
+  var widthColumnCount = columns.filter(function (_ref2) {
+    var width = _ref2.width;
+    return !width;
+  }).length;
+  var mergedColumns = columns.map(function (column) {
+    if (column.width) {
+      return column;
+    }
+    return _objectSpread(_objectSpread({}, column), {}, {
+      width: Math.floor(tableWidth / widthColumnCount)
+    });
+  });
+  var gridRef = useRef();
+  var _useState3 = useState(function () {
+      var obj = {};
+      Object.defineProperty(obj, 'scrollLeft', {
+        get: function get() {
+          if (gridRef.current) {
+            var _gridRef$current, _gridRef$current$stat;
+            return (_gridRef$current = gridRef.current) === null || _gridRef$current === void 0 ? void 0 : (_gridRef$current$stat = _gridRef$current.state) === null || _gridRef$current$stat === void 0 ? void 0 : _gridRef$current$stat.scrollLeft;
+          }
+          return null;
+        },
+        set: function set(scrollLeft) {
+          if (gridRef.current) {
+            gridRef.current.scrollTo({
+              scrollLeft: scrollLeft
+            });
+          }
+        }
+      });
+      return obj;
+    }),
+    _useState4 = _slicedToArray(_useState3, 1),
+    connectObject = _useState4[0];
+  var resetVirtualGrid = function resetVirtualGrid() {
+    var _gridRef$current2;
+    (_gridRef$current2 = gridRef.current) === null || _gridRef$current2 === void 0 ? void 0 : _gridRef$current2.resetAfterIndices({
+      columnIndex: 0,
+      shouldForceUpdate: true
+    });
+  };
+  useEffect(function () {
+    return resetVirtualGrid;
+  }, [tableWidth]);
+  var renderVirtualList = function renderVirtualList(rawData, _ref3) {
+    var scrollbarSize = _ref3.scrollbarSize,
+      ref = _ref3.ref,
+      _onScroll = _ref3.onScroll;
+    ref.current = connectObject;
+    var totalHeight = rawData.length * 54;
+    return _jsx(VariableSizeGrid, {
+      ref: gridRef,
+      className: "virtual-grid",
+      columnCount: mergedColumns.length,
+      columnWidth: function columnWidth(index) {
+        var _width2;
+        var width = mergedColumns[index].width;
+        var _width = width;
+        if (typeof _width === 'string' && ((_width2 = _width) === null || _width2 === void 0 ? void 0 : _width2.includes('px'))) {
+          _width = parseInt(width, 10);
+        }
+        return totalHeight > scroll.y && index === mergedColumns.length - 1 ? _width - scrollbarSize - 1 : _width;
+      },
+      height: scroll.y,
+      rowCount: rawData.length,
+      rowHeight: function rowHeight() {
+        return 54;
+      },
+      width: tableWidth,
+      onScroll: function onScroll(_ref4) {
+        var scrollLeft = _ref4.scrollLeft;
+        _onScroll({
+          scrollLeft: scrollLeft
+        });
+      },
+      children: function children(_ref5) {
+        var columnIndex = _ref5.columnIndex,
+          rowIndex = _ref5.rowIndex,
+          style = _ref5.style;
+        return _jsx("div", {
+          className: classNames('virtual-table-cell', {
+            'virtual-table-cell-last': columnIndex === mergedColumns.length - 1
+          }),
+          style: style,
+          children: rawData[rowIndex][mergedColumns[columnIndex].dataIndex]
+        });
+      }
+    });
+  };
+  return _jsxs(ResizeObserver, {
+    onResize: function onResize(_ref6) {
+      var _width3;
+      var width = _ref6.width;
+      var _width = width;
+      if (typeof _width === 'string' && ((_width3 = _width) === null || _width3 === void 0 ? void 0 : _width3.includes('px'))) {
+        _width = parseInt(width, 10);
+      }
+      setTableWidth(_width);
+    },
+    children: [headerRender ? _jsx("div", {
+      className: "pro-edit-table-header",
+      children: typeof headerRender === 'function' ? headerRender() : headerRender
+    }) : null, _jsx(_Table, _objectSpread(_objectSpread({
+      ref: tableRef,
+      className: className,
+      dataSource: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value : undefined,
+      columns: mergedColumns,
+      rowSelection: renderRowSelection(),
+      rowClassName: rowClassName,
+      components: {
+        body: renderVirtualList
+      },
+      onRow: function onRow() {
+        return {
+          disabled: disabled || virtualKey && !!editingKeys.length,
+          'data-hide': isHideCheckBox,
+          onClick: function onClick() {},
+          rowDraggable: rowDraggable
+        };
+      }
+    }, resetProps), {}, {
+      pagination: false,
+      rowKey: "rowKey",
+      scroll: {
+        x: scroll === null || scroll === void 0 ? void 0 : scroll.x,
+        y: (value === null || value === void 0 ? void 0 : value.length) ? scroll === null || scroll === void 0 ? void 0 : scroll.y : undefined
+      },
+      summary: summary
+    }))]
+  });
+};
+export default /*#__PURE__*/memo(VirtualTable);

package/es/ProEditTable/components/RcTable/index.d.ts

@@ -0,0 +1,6 @@
+/** 基础表格 */
+export { default as BaseTable } from './BaseTable';
+/** 拖拽表格 */
+export { default as DraggableTable } from './DraggableTable';
+/** 虚拟列表表格 */
+export { default as VirtualTable } from './VirtualTable';

package/es/ProEditTable/components/RcTable/index.js

@@ -0,0 +1,6 @@
+/** 基础表格 */
+export { default as BaseTable } from './BaseTable';
+/** 拖拽表格 */
+export { default as DraggableTable } from './DraggableTable';
+/** 虚拟列表表格 */
+export { default as VirtualTable } from './VirtualTable';

package/es/ProEditTable/components/RenderField/index.js

@@ -591,7 +591,7 @@ var RenderField = function RenderField(_ref) {
   }) : null;
   return _jsx(FieldProvider, {
     value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
-    children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {
+    children: !originalTitle || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {
       title: originalTitle,
       placement: "topLeft",
       open: changed ? undefined : false,

package/es/ProEditTable/index.js

@@ -1,7 +1,5 @@
 import "antd/es/affix/style";
 import _Affix from "antd/es/affix";
-import "antd/es/table/style";
-import _Table from "antd/es/table";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
@@ -11,7 +9,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection"];
+var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { get, isArray, isBoolean } from 'lodash';
@@ -19,12 +17,13 @@ import { useDeepCompareEffect, useLocalStorageState, useSetState } from 'ahooks'
 import classnames from 'classnames';
 import { transformColumns } from './utils';
 import { getRandom, getNamePath } from './utils/tools';
-import { DndWrapper, Row, Validator, Summary, RenderToolbar } from './components';
+import { Validator, Summary, RenderToolbar } from './components';
 import ProForm from '../ProForm';
 import Empty from '../assets/empty.png';
 import locale, { formatMessage } from '../locale';
+import { BaseTable, DraggableTable, VirtualTable } from './components/RcTable';
 var ProEditTable = function ProEditTable(_ref, ref) {
-  var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$;
+  var _resetProps$id, _resetProps$id$split, _themeConfig$data2;
   var value = _ref.value,
     onChange = _ref.onChange,
     onDrag = _ref.onDrag,
@@ -34,6 +33,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     mode = _ref.mode,
     stripe = _ref.stripe,
     draggable = _ref.draggable,
+    virtual = _ref.virtual,
     disabled = _ref.disabled,
     insertType = _ref.insertType,
     emptyBtnText = _ref.emptyBtnText,
@@ -326,62 +326,38 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       rowSelection: renderRowSelection()
     });
   } : summary;
+  var TableComponent = draggable ? DraggableTable : virtual ? VirtualTable : BaseTable;
   return _jsxs(_Fragment, {
     children: [_jsxs(_ConfigProvider, {
       renderEmpty: (value === null || value === void 0 ? void 0 : value.length) ? undefined : empty,
-      children: [_jsxs(DndWrapper, {
-        value: value,
-        onChange: onChange,
-        onDrag: onDrag,
-        disabled: disabled,
-        draggable: draggable,
-        children: [headerRender ? _jsx("div", {
-          className: "pro-edit-table-header",
-          children: typeof headerRender === 'function' ? headerRender() : headerRender
-        }) : null, _jsx(_Table, _objectSpread(_objectSpread({
-          ref: tableRef,
+      children: [_jsx(TableComponent, _objectSpread(_objectSpread({}, resetProps), {}, {
+        draggableProps: {
+          onChange: onChange,
+          onDrag: onDrag,
+          draggable: draggable
+        },
+        tableProps: {
+          value: value,
+          headerRender: headerRender,
+          tableRef: tableRef,
           className: _className,
-          dataSource: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value : undefined,
           columns: _columns,
-          rowSelection: renderRowSelection(),
+          renderRowSelection: renderRowSelection,
           rowClassName: _rowClassName,
-          components: draggable ? {
-            body: {
-              row: Row
-            }
-          } : undefined,
-          onRow: function onRow() {
-            return {
-              disabled: disabled || virtualKey && !!editingKeys.length,
-              'data-hide': isHideCheckBox,
-              onClick: function onClick() {},
-              rowDraggable: rowDraggable
-            };
-          }
-        }, resetProps), {}, {
-          pagination: pagination ? _objectSpread({
-            current: page.pageNum,
-            pageSize: page.pageSize,
-            showSizeChanger: false,
-            showQuickJumper: true,
-            total: value === null || value === void 0 ? void 0 : value.length,
-            showTotal: function showTotal(total) {
-              var _locale$ProEditTable;
-              if (!total) return;
-              return formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
-                total: total
-              });
-            },
-            onChange: handlePageChange
-          }, pagination) : false,
-          rowKey: "rowKey",
-          scroll: {
-            x: scroll === null || scroll === void 0 ? void 0 : scroll.x,
-            y: (value === null || value === void 0 ? void 0 : value.length) ? scroll === null || scroll === void 0 ? void 0 : scroll.y : undefined
-          },
-          summary: _summary
-        }))]
-      }), !isView && (value === null || value === void 0 ? void 0 : value.length) ? toolbarSticky ? _jsx(_Affix, _objectSpread(_objectSpread({
+          disabled: disabled,
+          virtualKey: virtualKey,
+          editingKeys: editingKeys,
+          isHideCheckBox: isHideCheckBox,
+          rowDraggable: rowDraggable,
+          pagination: pagination,
+          scroll: scroll,
+          summary: _summary,
+          page: page,
+          formatMessage: formatMessage,
+          locale: locale,
+          handlePageChange: handlePageChange
+        }
+      })), !isView && (value === null || value === void 0 ? void 0 : value.length) ? toolbarSticky ? _jsx(_Affix, _objectSpread(_objectSpread({
         ref: affixRef
       }, _toolbarSticky), {}, {
         children: _jsx("div", {
@@ -414,6 +390,7 @@ ForwardProEditTable.defaultProps = {
   toolbarProps: [],
   disabled: false,
   draggable: false,
+  virtual: false,
   stripe: true,
   emptyBtnText: locale.ProEditTable.clickAdd,
   onlyOneLineMsg: locale.ProEditTable.onlyOneLineMsg,

package/es/ProEditTable/propsType.d.ts

@@ -192,6 +192,11 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @default           -
      */
     draggable?: boolean;
+    /**
+   * @description       是否开启虚拟列表（scroll,x,y必须为固定值）
+   * @default           -
+   */
+    virtual?: boolean;
     /**
      * @description       空列表状态时，自定义添加按钮
      * @default          点击添加

package/es/ProEditTable/utils/index.js

@@ -121,7 +121,7 @@ var getActionColumn = function getActionColumn(config) {
             case 20:
               result = _context.sent;
             case 21:
-              if (result && type !== 'custom') {
+              if (result !== false && type !== 'custom') {
                 actions[type](_objectSpread(_objectSpread({}, config), {}, {
                   rowName: [].concat(_toConsumableArray(name), [index]),
                   virtualRowName: rowName,

package/es/ProForm/components/combination/ProCascader/index.js

@@ -221,7 +221,9 @@ var ProCascader = function ProCascader(props) {
     // 如果没有在当前层级的选项中找到匹配的 value，返回 null
     return null;
   };
-  var _selectedOptions = findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+  var _selectedOptions = useMemo(function () {
+    return findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+  }, [service, serviceData, realDataSource, addressValue]);
   var handleAddressChange = function handleAddressChange(e) {
     var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
     if (onChange) {

package/es/ProSelect/index.js

@@ -338,7 +338,7 @@ export var ProSelect = function ProSelect(props, ref) {
               title: OptionRender(item),
               children: OptionRender(item)
             }) : _jsx("span", {
-              title: "".concat(item[code], "-").concat(item[label]),
+              title: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label],
               children: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label]
             })
           }, item[code])

package/es/ProTable/propsType.d.ts

@@ -72,11 +72,12 @@ export interface PaginationProps {
     pageNum: number;
     pageSize: number;
 }
+type RowSelectionTypeWithPick = Pick<TableProps<any>, 'rowSelection'>['rowSelection'];
 export interface RequestOptions<T, R> {
     form?: FormInstance;
     isResetQuery?: boolean;
     rowKey?: string | GetRowKey<R>;
-    rowSelection?: boolean;
+    rowSelection?: boolean | RowSelectionTypeWithPick;
     rowSelectType?: RowSelectionType;
     rowSelections?: boolean;
     extraParams?: Partial<T>;

package/es/ProTable/useAntdTable.d.ts

@@ -11,7 +11,7 @@ declare function useAntdTable<I, R extends Record<string, any>, S extends Servic
         selectedRowKeys: Key[];
         onChange(rowKeys: Key[], rows: any[]): void;
         onSelectAll: (selected: boolean) => void;
-        getCheckboxProps: () => {
+        getCheckboxProps: (record?: any) => {
             className: string;
         };
         selections: boolean | ({
@@ -57,7 +57,7 @@ declare function useAntdTable<I, R extends Record<string, any>, S extends Servic
             selectedRowKeys: Key[];
             onChange(rowKeys: Key[], rows: any[]): void;
             onSelectAll: (selected: boolean) => void;
-            getCheckboxProps: () => {
+            getCheckboxProps: (record?: any) => {
                 className: string;
             };
             selections: boolean | ({

package/es/ProTable/useAntdTable.js

@@ -9,7 +9,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["page", "filters", "sorter"];
 import { useCallback, useMemo, useState } from 'react';
 import { useRequest, useSetState, useDeepCompareEffect } from 'ahooks';
-import { pickBy } from 'lodash';
+import { pickBy, isObject, merge, set, isEqual } from 'lodash';
 import { defaultPage } from './index';
 import { isListResult } from './utils';
 import locale, { formatMessage } from '../locale';
@@ -313,7 +313,7 @@ function useAntdTable(service, options, useRequestOptions) {
       }));
     }
   }, [extraParams]);
-  var rowSelection = {
+  var _rowSelection = {
     fixed: true,
     type: rowSelectType,
     columnWidth: rowSelections ? 64 : undefined,
@@ -355,7 +355,7 @@ function useAntdTable(service, options, useRequestOptions) {
         });
       }
     },
-    getCheckboxProps: function getCheckboxProps() {
+    getCheckboxProps: function getCheckboxProps(record) {
       return {
         className: allSelected && rowSelections ? 'checkbox-disabled' : ''
       };
@@ -424,6 +424,20 @@ function useAntdTable(service, options, useRequestOptions) {
       }()
     }] : false
   };
+  var rowSelection = isObject(returnRowSelection) ? merge(_rowSelection, returnRowSelection) : _rowSelection;
+  if (isObject(returnRowSelection) && !isEqual(rowSelection, _rowSelection)) {
+    // getCheckboxProps需要特殊兼容原有的逻辑，特殊处理
+    var isHasGetCheckboxProps = Reflect.ownKeys(returnRowSelection).includes('getCheckboxProps');
+    if (isHasGetCheckboxProps) {
+      set(rowSelection, 'getCheckboxProps', function (record) {
+        var _rowSelection$getChec;
+        var passReturnObjects = (_rowSelection$getChec = rowSelection.getCheckboxProps(record)) !== null && _rowSelection$getChec !== void 0 ? _rowSelection$getChec : {};
+        return _objectSpread({
+          className: allSelected && rowSelections ? 'checkbox-disabled' : ''
+        }, passReturnObjects);
+      });
+    }
+  }
   var selectedTip = allSelected || selectedRowKeys.length ? formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTable5 = locale.ProTable) === null || _locale$ProTable5 === void 0 ? void 0 : _locale$ProTable5.selectAll, {
     selectedNum: allSelected ? total : selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length
   }) : null;

package/lib/ProEditTable/components/RcTable/BaseTable.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+declare const _default: import("react").MemoExoticComponent<({ tableProps, ...resetProps }: {
+    [x: string]: any;
+    tableProps: any;
+}) => JSX.Element>;
+export default _default;