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

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

@@ -82,24 +82,24 @@ var ActionButton = function ActionButton(_ref) {
         disabled: isDisabled,
         okText: locale.ProEditTable.confirm,
         cancelText: locale.ProEditTable.cancel,
-        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled
-        }))) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        }))) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           disabled: isDisabled,
           type: "link",
           children: btnConfig.label
         }))
       }) : _jsx(_Fragment, {
-        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, 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);
           }
-        }))) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        }))) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           disabled: isDisabled,
           type: "link",
           onClick: function onClick() {
@@ -109,12 +109,12 @@ var ActionButton = function ActionButton(_ref) {
         }))
       })
     }) : _jsx(_Fragment, {
-      children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
+      children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         record: record,
         index: index
       }))) : _jsx(_Button, _objectSpread(_objectSpread({
         className: "action-button"
-      }, omit(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
+      }, 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 : iconMap[btnConfig.type],
         children: btnConfig.label

package/es/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/es/ProEditTable/components/DndWrapper/index.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["disabled", "rowDraggable", "children"];
+var _excluded = ["disabled", "children"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { DndContext } from '@dnd-kit/core';
@@ -9,7 +9,6 @@ import { CSS } from '@dnd-kit/utilities';
 import ProIcon from '../../../ProIcon';
 export var Row = function Row(props) {
   var disabled = props.disabled,
-    rowDraggable = props.rowDraggable,
     children = props.children,
     restProps = _objectWithoutProperties(props, _excluded);
   var data = useSortable({
@@ -37,11 +36,12 @@ export var Row = function Row(props) {
   }, attributes), {}, {
     children: React.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.cloneElement(child, {
           children: _jsxs("span", {
             className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),

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

@@ -43,8 +43,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/es/ProEditTable/components/RcTable/DraggableTable.js

@@ -58,8 +58,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/es/ProEditTable/components/RcTable/VirtualTable.js

@@ -148,8 +148,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/es/ProEditTable/components/RenderField/index.js

@@ -61,7 +61,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 = _objectWithoutProperties(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -555,7 +555,7 @@ var RenderField = function RenderField(_ref) {
   var FormItem = null;
   FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
     validateFirst: true
-  }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+  }, 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) ? _jsx(ConfirmWrapper, _objectSpread(_objectSpread({}, componentProps), {}, {

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

@@ -4,6 +4,8 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
+import "antd/es/spin/style";
+import _Spin from "antd/es/spin";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
@@ -141,7 +143,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       }
     })),
-    run = _useRequestList.run;
+    run = _useRequestList.run,
+    selectLoading = _useRequestList.loading;
   var _useRequestList2 = useRequestList(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, {
       withPagination: withPagination,
       transformParams: transformParams,
@@ -684,6 +687,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       optionRender: optionRender,
       scrollFollowParent: false,
       mode: isMultiple ? 'multiple' : undefined,
+      notFoundContent: selectLoading ? _jsx(_Spin, {
+        size: "small"
+      }) : null,
       onFocus: function onFocus() {
         if (useRequest) {
           var _useRequest$options9;

package/es/ProSelect/index.js

@@ -9,10 +9,10 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
-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"];
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useDeepCompareEffect, useInViewport, useRequest as useRequestFunc } from 'ahooks';
-import React, { useImperativeHandle, useState, forwardRef, useRef, useEffect } from 'react';
+import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
+import React, { useImperativeHandle, useState, forwardRef, useRef } from 'react';
 import { isFunction, isObject, isString, omit, cloneDeep, isNumber } from 'lodash';
 import { useProConfig } from '../ProConfigProvider';
 import Container from '../ProForm/components/Container';
@@ -27,8 +27,7 @@ export var ProSelect = function ProSelect(props, ref) {
   var _ref = 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) {
@@ -55,18 +54,8 @@ export var ProSelect = function ProSelect(props, ref) {
     updateDataSource = props.updateDataSource,
     transformResponse = props.transformResponse,
     isViewPro = props.isView,
-    __viewportReady = props.viewportReady,
     selectProps = _objectWithoutProperties(props, _excluded);
-  var viewportReady = __viewportReady || gViewportReady;
-  /** 是否在可视区域出现过 */
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    viewFlag = _useState2[0],
-    setViewFlag = _useState2[1];
   var refSelect1 = useRef();
-  var _useInViewport = useInViewport(refSelect1),
-    _useInViewport2 = _slicedToArray(_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() || {},
@@ -77,15 +66,15 @@ export var ProSelect = function ProSelect(props, ref) {
     code = fieldNames.value;
     label = fieldNames.label;
   }
-  var _useState3 = useState(dataSource || []),
-    _useState4 = _slicedToArray(_useState3, 2),
-    selectList = _useState4[0],
-    setSelectList = _useState4[1];
+  var _useState = useState(dataSource || []),
+    _useState2 = _slicedToArray(_useState, 2),
+    selectList = _useState2[0],
+    setSelectList = _useState2[1];
   // 用来控制只有第一次才会设置 defaultOne 属性、🔒
-  var _useState5 = useState(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    isDefaultOne = _useState6[0],
-    setIsDefaultOne = _useState6[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isDefaultOne = _useState4[0],
+    setIsDefaultOne = _useState4[1];
   var OptionRender = optionRender;
   var defaultOnSuccessFun = function defaultOnSuccessFun(res) {
     var _res$status = res.status,
@@ -146,16 +135,8 @@ export var 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]);
-  useEffect(function () {
-    if (inViewport && !viewFlag && viewportReady) {
-      setViewFlag(true);
-    }
-  }, [inViewport]);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue]);
   // disable默认值
   if (defaultDisableValue) {
     return _jsx("span", {
@@ -301,11 +282,9 @@ export var ProSelect = function ProSelect(props, ref) {
     });
   }
   return _jsx("div", {
-    ref: refSelect1,
     style: props.style,
     className: "ant-select-compact-item-div",
     children: _jsx(_Select, _objectSpread(_objectSpread({
-      // id={refSelect1.current}
       placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProSelect = locale.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
       allowClear: true,
       showArrow: true,

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.6.7-beta.6",
+  "version": "3.6.7-beta.7",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",