@zat-design/sisyphus-react 3.6.7-beta.6 → 3.6.7-beta.8

package/es/ProTable/index.js

@@ -1,8 +1,3 @@
-import _typeof from "@babel/runtime/helpers/esm/typeof";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
-import "antd/es/table/style";
-import _Table from "antd/es/table";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
@@ -12,21 +7,20 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "originalDataSource"],
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
-import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState, createContext } from 'react';
 import { get, keyBy, assign, isObject } from 'lodash';
 import { useDebounceEffect, useDeepCompareEffect, useSetState } from 'ahooks';
-import { ReactSVG } from 'react-svg';
 import classnames from 'classnames';
-import { tools } from '@zat-design/utils';
-import { useProConfig, ProTreeModal } from '../index';
-import { valueTypeRender } from '../ProUtils/utils';
-import { TableResizable, ResizableLine, DndWrapper, Row } from './components';
-import useAntdTable from './useAntdTable';
+import { useProConfig } from '../index';
+import { RenderTableHeader, RenderFooter } from './components';
+import useAntdTable from './hooks/useAntdTable';
+import { BaseTable, DraggableTable } from './components/RcTable';
+import { formatColumn } from './components/FormatColumn';
 import empty from '../assets/empty.png';
 import resetSvg from '../assets/reset.svg';
 import customColumnSvg from '../assets/customColumn.svg';
-import { formatColumn, getColumnDataIndex, getRowKey } from './utils';
+import { getColumnDataIndex, getRowKey } from './utils';
 import locale from '../locale';
 var defaultCacheTime = 1; // columns 配置保存时间为一天
 // 全局上下文
@@ -36,7 +30,7 @@ export var defaultPage = {
   pageSize: 10
 };
 function ProTable(props) {
-  var _locale$ProTable, _curTableConfig$pathK, _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5;
+  var _locale$ProTable, _curTableConfig$pathK;
   var _ref = useProConfig('globalConfig') || {},
     configStorage = _ref.storage; // 获取全局缓存位置配置
   var _ref2 = useProConfig('ProTable') || {},
@@ -61,7 +55,6 @@ function ProTable(props) {
     originalDataSource = props.originalDataSource,
     restProps = _objectWithoutProperties(props, _excluded);
   var quickTableConfig = quickConfig ? _objectSpread({
-    // resizeColumn: true,
     columnConfig: true,
     cacheTime: true
   }, restProps) : (restProps === null || restProps === void 0 ? void 0 : restProps.columnConfig) ? _objectSpread({
@@ -268,53 +261,6 @@ function ProTable(props) {
       return item === null || item === void 0 ? void 0 : item.dataIndex;
     });
   }, [curColumns]);
-  var renderSummary = function renderSummary() {
-    var _ref6 = summary || {},
-      columns = _ref6.columns,
-      _ref6$total = _ref6.total,
-      total = _ref6$total === void 0 ? true : _ref6$total,
-      _ref6$fixed = _ref6.fixed,
-      fixed = _ref6$fixed === void 0 ? true : _ref6$fixed;
-    var _ref7 = tableProps || {},
-      dataSource = _ref7.dataSource;
-    // 没有数据时，不展示合计栏
-    if (!(_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.length)) {
-      return null;
-    }
-    return _jsx(_Table.Summary, {
-      fixed: fixed,
-      children: _jsx(_Table.Summary.Row, {
-        children: columns === null || columns === void 0 ? void 0 : columns.map(function (_ref8) {
-          var key = _ref8.key,
-            index = _ref8.index,
-            colSpan = _ref8.colSpan,
-            prefix = _ref8.prefix,
-            suffix = _ref8.suffix,
-            title = _ref8.title,
-            precision = _ref8.precision,
-            valueType = _ref8.valueType;
-          var text = null;
-          if (title) {
-            text = title;
-          } else if (total && key) {
-            var _dataSource$reduce;
-            var format = valueTypeRender === null || valueTypeRender === void 0 ? void 0 : valueTypeRender[valueType];
-            var sum = _dataSource === null || _dataSource === void 0 ? void 0 : (_dataSource$reduce = _dataSource.reduce) === null || _dataSource$reduce === void 0 ? void 0 : _dataSource$reduce.call(_dataSource, function (pre, cur) {
-              var _get;
-              return tools.calc(pre, '+', (_get = get(cur, key)) !== null && _get !== void 0 ? _get : 0);
-            }, 0);
-            text = format ? format(sum, precision !== null && precision !== void 0 ? precision : 2) : sum;
-          }
-          var _key = key;
-          return _jsxs(_Table.Summary.Cell, {
-            index: index,
-            colSpan: colSpan,
-            children: [prefix, text, suffix]
-          }, _key);
-        })
-      })
-    });
-  };
   var cls = classnames(_defineProperty({
     'pro-table': true,
     'pro-table-no-stripe': !stripe,
@@ -354,7 +300,7 @@ function ProTable(props) {
     return _rowSelection;
   };
   var onDataSourceChange = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(nextDataSource) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(nextDataSource) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -370,111 +316,76 @@ function ProTable(props) {
       }, _callee2);
     }));
     return function onDataSourceChange(_x2) {
-      return _ref9.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
-  var renderComponents = function renderComponents() {
-    if (draggable) {
-      return {
-        body: {
-          row: Row
-        }
-      };
-    }
-    if (resizeColumn) {
-      return TableResizable.components;
+  var _rowClassName = function _rowClassName(record, index) {
+    if (originalDataSource && !originalObj.hasOwnProperty(get(record, 'rowKey'))) {
+      return 'new-cell';
     }
-    return null;
   };
+  var TableComponent = draggable ? DraggableTable : BaseTable;
   return _jsx(TableContext.Provider, {
     value: {
       pathKey: pathKey,
       tableConfig: tableConfig,
       Storage: Storage
     },
-    children: _jsx("div", {
+    children: _jsxs("div", {
       className: cls,
-      children: _jsxs(DndWrapper, {
-        value: _dataSource !== null && _dataSource !== void 0 ? _dataSource : [],
-        onChange: onDataSourceChange,
-        disabled: false,
-        draggable: draggable,
-        rowKey: rowKey,
-        children: [(headerRender || columnConfig || resizeColumn) && _jsxs("div", {
-          className: "column-config",
-          children: [_jsx("div", {
-            className: "left-contain",
-            children: headerRender ? typeof headerRender === 'function' ? headerRender() : headerRender : null
-          }), _jsxs("div", {
-            className: "right-actions",
-            children: [resizeColumn && _jsx(_Button, {
-              icon: _jsx(ReactSVG, {
-                className: "anticon",
-                wrapper: "span",
-                src: resetSvg
-              }),
-              onClick: resetColumnWidth,
-              children: locale === null || locale === void 0 ? void 0 : (_locale$ProTable2 = locale.ProTable) === null || _locale$ProTable2 === void 0 ? void 0 : _locale$ProTable2.resetColumnWidth
-            }), columnConfig && _jsx(ProTreeModal, {
-              title: locale === null || locale === void 0 ? void 0 : (_locale$ProTable3 = locale.ProTable) === null || _locale$ProTable3 === void 0 ? void 0 : _locale$ProTable3.customColumns,
-              span: 8,
-              mode: "list",
-              draggable: true,
-              dataSource: customColumns,
-              value: checkColumns,
-              allValue: "all",
-              onChange: handleColumnConfig,
-              trigger: _jsx(_Button, {
-                className: "custom-column-btn",
-                icon: _jsx(ReactSVG, {
-                  className: "anticon",
-                  wrapper: "span",
-                  src: customColumnSvg
-                }),
-                children: locale === null || locale === void 0 ? void 0 : (_locale$ProTable4 = locale.ProTable) === null || _locale$ProTable4 === void 0 ? void 0 : _locale$ProTable4.customColumns
-              })
-            })]
-          })]
-        }), _jsxs("div", {
-          className: "pro-table-container",
-          children: [_jsx(_Table, _objectSpread(_objectSpread({
-            className: draggable ? 'pro-edit-table-drag' : '',
-            // components={resizeColumn ? TableResizable.components : undefined}
-            components: renderComponents(),
-            // @ts-ignore
+      children: [_jsx(RenderTableHeader, {
+        dataSource: {
+          headerRender: headerRender,
+          columnConfig: columnConfig,
+          resizeColumn: resizeColumn,
+          resetSvg: resetSvg,
+          resetColumnWidth: resetColumnWidth,
+          locale: locale,
+          customColumns: customColumns,
+          checkColumns: checkColumns,
+          handleColumnConfig: handleColumnConfig,
+          customColumnSvg: customColumnSvg
+        }
+      }), _jsxs("div", {
+        className: "pro-table-container",
+        children: [_jsx(TableComponent, _objectSpread(_objectSpread({}, restProps), {}, {
+          draggableProps: {
+            onChange: onDataSourceChange,
+            draggable: draggable,
+            rowKey: rowKey
+          },
+          tableProps: {
+            value: _dataSource,
+            headerRender: headerRender,
             columns: columns,
-            locale: {
-              emptyText: _jsxs("div", {
-                className: "pro-table-empty",
-                children: [_jsx("div", {
-                  className: "empty-image",
-                  children: _jsx("img", {
-                    src: empty,
-                    alt: locale === null || locale === void 0 ? void 0 : (_locale$ProTable5 = locale.ProTable) === null || _locale$ProTable5 === void 0 ? void 0 : _locale$ProTable5.noData
-                  })
-                }), _jsx("div", {
-                  className: "empty-description",
-                  children: typeof emptyText === 'function' ? emptyText() : emptyText
-                })]
-              })
-            },
-            summary: _typeof(summary) === 'object' ? function () {
-              return renderSummary();
-            } : summary,
-            rowClassName: function rowClassName(record, index) {
-              if (originalDataSource && !originalObj.hasOwnProperty(get(record, 'rowKey'))) {
-                return 'new-cell';
-              }
-            }
-          }, tableProps), {}, {
-            dataSource: _dataSource,
-            rowSelection: renderRowSelection()
-          })), _jsx(ResizableLine, {})]
-        }), footerRender ? _jsx("div", {
-          className: "pro-table-footer ".concat(pagination && !!(_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.length) ? 'has-page' : 'no-page'),
-          children: typeof footerRender === 'function' ? footerRender() : footerRender
-        }) : null]
-      })
+            renderRowSelection: renderRowSelection,
+            rowClassName: _rowClassName,
+            disabled: disabled,
+            resizeColumn: resizeColumn
+          },
+          emptyTextProps: {
+            empty: empty,
+            locale: locale,
+            emptyText: emptyText
+          },
+          summaryProps: {
+            summary: summary,
+            dataSource: _dataSource
+          },
+          dataSource: _dataSource
+        })), _jsx("span", {
+          className: "pro-table-resizable-line",
+          style: {
+            display: 'none'
+          }
+        })]
+      }), _jsx(RenderFooter, {
+        dataSource: {
+          footerRender: footerRender,
+          pagination: pagination,
+          _dataSource: _dataSource
+        }
+      })]
     })
   });
 }

package/es/ProTable/utils/index.d.ts

@@ -0,0 +1,26 @@
+/**
+ * 获取小数点后的位数
+ * @param num 数字
+ * @returns 位数
+ */
+export declare const getDecimalDigits: (num?: number) => number;
+/**
+ * @description: 获取初始值
+ * @author: xiangchengli
+ * @param {any} rowKey
+ * @param any value
+ * @param any originalObj
+ * @param {any} dataIndex
+ * @return {any}
+ */
+export declare const getOriginalValue: (value: any, record: any, originalObj: any, rowKey: any, dataIndex: any) => any;
+export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;
+/**
+ * 判断数据是否为Response<List<any>>结构
+ * @param data { [key: string]: any } 需要判断数据
+ * @returns boolean 是否
+ */
+export declare const isListResult: (data: {
+    [key: string]: any;
+}) => boolean;
+export declare const getRowKey: (rowKey: any, record: any) => any;

package/es/ProTable/utils/index.js

@@ -0,0 +1,51 @@
+import { get, isEqual } from 'lodash';
+/**
+ * 获取小数点后的位数
+ * @param num 数字
+ * @returns 位数
+ */
+export var getDecimalDigits = function getDecimalDigits() {
+  var num = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  var match = Number(num).toString().match(/\.(\d+)/);
+  return match ? match[1].length : 0;
+};
+/**
+ * @description: 获取初始值
+ * @author: xiangchengli
+ * @param {any} rowKey
+ * @param any value
+ * @param any originalObj
+ * @param {any} dataIndex
+ * @return {any}
+ */
+export var getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
+  if (!originalObj) {
+    return undefined;
+  }
+  var originalRecord = get(originalObj, get(record, rowKey));
+  var originalValue = get(originalRecord, dataIndex);
+  if (!isEqual(originalValue, value)) {
+    return originalValue;
+  }
+  return undefined;
+};
+export var getColumnDataIndex = function getColumnDataIndex(dataIndex) {
+  return typeof dataIndex === 'string' ? dataIndex : dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.join('-');
+};
+/**
+ * 判断数据是否为Response<List<any>>结构
+ * @param data { [key: string]: any } 需要判断数据
+ * @returns boolean 是否
+ */
+export var isListResult = function isListResult(data) {
+  return data.hasOwnProperty('total') && data.hasOwnProperty('list');
+};
+export var getRowKey = function getRowKey(rowKey, record) {
+  // 默认取id
+  var key = record.rowKey || 'id';
+  if (rowKey) {
+    var _ref;
+    key = (_ref = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref !== void 0 ? _ref : key;
+  }
+  return key;
+};

package/lib/ProEditTable/components/ActionButton/index.js

@@ -86,24 +86,24 @@ var ActionButton = function ActionButton(_ref) {
         disabled: isDisabled,
         okText: _locale.default.ProEditTable.confirm,
         cancelText: _locale.default.ProEditTable.cancel,
-        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled
-        }))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        }))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           disabled: isDisabled,
           type: "link",
           children: btnConfig.label
         }))
       }) : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled,
           onClick: function onClick() {
             btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
           }
-        }))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        }))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           disabled: isDisabled,
           type: "link",
           onClick: function onClick() {
@@ -113,12 +113,12 @@ var ActionButton = function ActionButton(_ref) {
         }))
       })
     }) : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-      children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
+      children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         record: record,
         index: index
       }))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         className: "action-button"
-      }, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
+      }, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         type: "link",
         icon: (_btnConfig$icon = btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.icon) !== null && _btnConfig$icon !== void 0 ? _btnConfig$icon : _config.iconMap[btnConfig.type],
         children: btnConfig.label

package/lib/ProEditTable/components/DndWrapper/index.d.ts

@@ -3,7 +3,7 @@ interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
     'data-row-key': string;
     'data-hide'?: boolean;
     disabled?: boolean;
-    rowDraggable?: any;
+    'data-row-draggable'?: any;
 }
 export declare const Row: FC<RowProps>;
 declare const DndWrapper: ({ draggable, value, onChange, onDrag, disabled, children }: {

package/lib/ProEditTable/components/DndWrapper/index.js

@@ -13,10 +13,9 @@ var _core = require("@dnd-kit/core");
 var _sortable = require("@dnd-kit/sortable");
 var _utilities = require("@dnd-kit/utilities");
 var _ProIcon = _interopRequireDefault(require("../../../ProIcon"));
-var _excluded = ["disabled", "rowDraggable", "children"];
+var _excluded = ["disabled", "children"];
 var Row = exports.Row = function Row(props) {
   var disabled = props.disabled,
-    rowDraggable = props.rowDraggable,
     children = props.children,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var data = (0, _sortable.useSortable)({
@@ -44,11 +43,12 @@ var Row = exports.Row = function Row(props) {
   }, attributes), {}, {
     children: _react.default.Children.map(children, function (child) {
       if (child.key === 'RC_TABLE_KEY' && !disabled) {
+        var _restProps$dataRowD;
         var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
           render = _ref.render,
           record = _ref.record,
           renderIndex = _ref.renderIndex;
-        var isDrag = rowDraggable ? rowDraggable === null || rowDraggable === void 0 ? void 0 : rowDraggable(record) : true;
+        var isDrag = restProps['data-row-draggable'] ? (_restProps$dataRowD = restProps['data-row-draggable']) === null || _restProps$dataRowD === void 0 ? void 0 : _restProps$dataRowD.call(restProps, record) : true;
         return /*#__PURE__*/_react.default.cloneElement(child, {
           children: (0, _jsxRuntime.jsxs)("span", {
             className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),

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

@@ -49,8 +49,8 @@ var BaseTable = function BaseTable(_ref) {
         return {
           disabled: disabled || virtualKey && !!editingKeys.length,
           'data-hide': isHideCheckBox,
-          onClick: function onClick() {},
-          rowDraggable: rowDraggable
+          'data-row-draggable': rowDraggable,
+          onClick: function onClick() {}
         };
       }
     }, resetProps), {}, {

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

@@ -64,8 +64,8 @@ var DraggableTable = function DraggableTable(_ref) {
         return {
           disabled: disabled || virtualKey && !!editingKeys.length,
           'data-hide': isHideCheckBox,
-          onClick: function onClick() {},
-          rowDraggable: rowDraggable
+          'data-row-draggable': rowDraggable,
+          onClick: function onClick() {}
         };
       }
     }, resetProps), {}, {

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

@@ -154,8 +154,8 @@ var VirtualTable = function VirtualTable(_ref) {
         return {
           disabled: disabled || virtualKey && !!editingKeys.length,
           'data-hide': isHideCheckBox,
-          onClick: function onClick() {},
-          rowDraggable: rowDraggable
+          'data-row-draggable': rowDraggable,
+          onClick: function onClick() {}
         };
       }
     }, resetProps), {}, {

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

@@ -64,7 +64,7 @@ var RenderField = function RenderField(_ref) {
     trim = column.trim,
     confirm = column.confirm,
     _column$validateTrigg = column.validateTrigger,
-    validateTrigger = _column$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSumbit'] : _column$validateTrigg,
+    validateTrigger = _column$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _column$validateTrigg,
     resetProps = (0, _objectWithoutProperties2.default)(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -558,7 +558,7 @@ var RenderField = function RenderField(_ref) {
   var FormItem = null;
   FormItem = TargetComponent ? (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     validateFirst: true
-  }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+  }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name', 'onCell'])), {}, {
     className: _className,
     name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
     children: ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) ? (0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {

package/lib/ProForm/components/combination/ProModalSelect/index.js

@@ -138,7 +138,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       }
     })),
-    run = _useRequestList.run;
+    run = _useRequestList.run,
+    selectLoading = _useRequestList.loading;
   var _useRequestList2 = (0, _useRequestList3.default)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, {
       withPagination: withPagination,
       transformParams: transformParams,
@@ -681,6 +682,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       optionRender: optionRender,
       scrollFollowParent: false,
       mode: isMultiple ? 'multiple' : undefined,
+      notFoundContent: selectLoading ? (0, _jsxRuntime.jsx)(_antd.Spin, {
+        size: "small"
+      }) : null,
       onFocus: function onFocus() {
         if (useRequest) {
           var _useRequest$options9;

package/lib/ProSelect/index.js

@@ -21,15 +21,14 @@ var _ = require("..");
 var _locale = _interopRequireDefault(require("../locale"));
 var _utils = require("./utils");
 require("./index.less");
-var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView", "viewportReady"];
+var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
 var Option = _antd.Select.Option;
 var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
   var _selectProps$showCode, _locale$ProSelect;
   var _ref = (0, _ProConfigProvider.useProConfig)('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
     proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
-    showCodeName = _ref.showCodeName,
-    gViewportReady = _ref.viewportReady;
+    showCodeName = _ref.showCodeName;
   var label = 'label';
   var code = 'value';
   if (proSelectFieldNames && Object.keys(proSelectFieldNames).length) {
@@ -56,18 +55,8 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     updateDataSource = props.updateDataSource,
     transformResponse = props.transformResponse,
     isViewPro = props.isView,
-    __viewportReady = props.viewportReady,
     selectProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var viewportReady = __viewportReady || gViewportReady;
-  /** 是否在可视区域出现过 */
-  var _useState = (0, _react.useState)(false),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    viewFlag = _useState2[0],
-    setViewFlag = _useState2[1];
   var refSelect1 = (0, _react.useRef)();
-  var _useInViewport = (0, _ahooks.useInViewport)(refSelect1),
-    _useInViewport2 = (0, _slicedToArray2.default)(_useInViewport, 1),
-    inViewport = _useInViewport2[0];
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
   var value = props.value;
   var _ref2 = _.ProForm.useFieldProps() || {},
@@ -78,15 +67,15 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     code = fieldNames.value;
     label = fieldNames.label;
   }
-  var _useState3 = (0, _react.useState)(dataSource || []),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    selectList = _useState4[0],
-    setSelectList = _useState4[1];
+  var _useState = (0, _react.useState)(dataSource || []),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    selectList = _useState2[0],
+    setSelectList = _useState2[1];
   // 用来控制只有第一次才会设置 defaultOne 属性、🔒
-  var _useState5 = (0, _react.useState)(false),
-    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    isDefaultOne = _useState6[0],
-    setIsDefaultOne = _useState6[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    isDefaultOne = _useState4[0],
+    setIsDefaultOne = _useState4[1];
   var OptionRender = optionRender;
   var defaultOnSuccessFun = function defaultOnSuccessFun(res) {
     var _res$status = res.status,
@@ -147,16 +136,8 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     if (manual) {
       return;
     }
-    if (viewportReady && !viewFlag) {
-      return;
-    }
     fetchFunction.run(defaultParams);
-  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue, viewFlag]);
-  (0, _react.useEffect)(function () {
-    if (inViewport && !viewFlag && viewportReady) {
-      setViewFlag(true);
-    }
-  }, [inViewport]);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue]);
   // disable默认值
   if (defaultDisableValue) {
     return (0, _jsxRuntime.jsx)("span", {
@@ -302,13 +283,9 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     });
   }
   return (0, _jsxRuntime.jsx)("div", {
-    ref: refSelect1,
     style: props.style,
     className: "ant-select-compact-item-div",
-    children: (0, _jsxRuntime.jsx)(_antd.Select
-    // id={refSelect1.current}
-    , (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      // id={refSelect1.current}
+    children: (0, _jsxRuntime.jsx)(_antd.Select, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProSelect = _locale.default.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
       allowClear: true,
       showArrow: true,

package/{es/ProTable/utils.d.ts → lib/ProTable/components/FormatColumn/index.d.ts}

@@ -1,7 +1,6 @@
 import React from 'react';
-import { ProTableColumn } from './propsType';
+import { ProTableColumn } from '../../propsType';
 export declare const formatColumn: (column: ProTableColumn, originalObj: any, dataSourceObj: any, rowKey: any) => void;
-export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;
 /**
  * 查找最近的父级className
  * @param element 当前node节点
@@ -10,12 +9,3 @@ export declare const getColumnDataIndex: (dataIndex: string | string[]) => strin
  * @returns ReactNode 父级element
  */
 export declare const getParentElement: (element: any, name: any, type?: string) => React.ReactNode;
-/**
- * 判断数据是否为Response<List<any>>结构
- * @param data { [key: string]: any } 需要判断数据
- * @returns boolean 是否
- */
-export declare const isListResult: (data: {
-    [key: string]: any;
-}) => boolean;
-export declare const getRowKey: (rowKey: any, record: any) => any;