@zat-design/sisyphus-react 3.11.5 → 3.11.6-beta.1

package/es/ProDrawerForm/components/ProDrawer/index.js

@@ -9,7 +9,7 @@ import _Modal from "antd/es/modal";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import React, { useCallback, useState, useRef } from 'react';
+import React, { useCallback, useState, useRef, useEffect } from 'react';
 import { useScroll } from 'ahooks';
 import { isArray } from 'lodash';
 import { ReactSVG } from 'react-svg';
@@ -46,13 +46,38 @@ var ProDrawer = function ProDrawer(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     toggleLoading = _useState2[1];
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    initialSnapshot = _useState4[0],
+    setInitialSnapshot = _useState4[1];
   var noRenderFooter = isView || footer === false || footer === null;
+  // 使用 useEffect 在 visible 变更时延迟捕获 初始DOM 快照
+  useEffect(function () {
+    if (visible) {
+      // 延迟到下一个事件循环，确保 Drawer 已经渲染
+      var timeoutId = setTimeout(function () {
+        if (ref.current) {
+          setInitialSnapshot(ref.current.innerHTML); // 捕获 DOM 快照
+        }
+      }, 100); // 使用 setTimeout 让 DOM 渲染完成后再执行
+      return function () {
+        return clearTimeout(timeoutId);
+      }; // 清理定时器
+    }
+    setInitialSnapshot('');
+  }, [visible]); // 当 visible 变化时执行
+  // 快照对比
+  var compareSnapshots = function compareSnapshots() {
+    if (!ref.current) return false;
+    return ref.current.innerHTML === initialSnapshot;
+  };
   var onConfirm = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3, _locale$ProDrawerForm4;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (isView || !isConfirmClose) {
+          // 如果当前是查看状态，或者不需要确认关闭，或者快照对比一致，则直接关闭
+          if (isView || !isConfirmClose || compareSnapshots()) {
             onCancel && onCancel();
           } else if (!modalRef.current) {
             modalRef.current = _Modal.confirm(_objectSpread({
@@ -74,7 +99,7 @@ var ProDrawer = function ProDrawer(_ref) {
           return _context.stop();
       }
     }, _callee);
-  })), [onCancel, modalRef.current]);
+  })), [onCancel, modalRef.current, ref.current]);
   var handleFinish = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
     var values, _error$errorFields, _error$errorFields$;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {

package/es/ProEditTable/index.js

@@ -439,7 +439,9 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             columns: columns,
             page: page,
             pagination: pagination,
-            setState: setState
+            setState: setState,
+            isView: isView,
+            disabled: disabled
           });
         }
       }) : null]

package/es/ProEditTable/utils/tools.d.ts

@@ -35,7 +35,10 @@ export declare const handleScrollToError: () => void;
  * @returns 深拷贝后的对象，其中的React节点会被保留
  */
 export declare function cloneDeepFilterNode(value: any): any;
-export declare const onPageCheck: ({ form, name, value, columns, page, pagination, setState }: {
+/**
+ * 分页校验
+ */
+export declare const onPageCheck: ({ form, name, value, columns, page, pagination, setState, isView, disabled }: {
     form: any;
     name: any;
     value: any;
@@ -43,4 +46,6 @@ export declare const onPageCheck: ({ form, name, value, columns, page, paginatio
     page: any;
     pagination: any;
     setState: any;
+    isView: any;
+    disabled: any;
 }) => Promise<void>;

package/es/ProEditTable/utils/tools.js

@@ -334,14 +334,17 @@ var handleCheckCellValue = /*#__PURE__*/function () {
     return _ref6.apply(this, arguments);
   };
 }();
+/**
+ * 分页校验
+ */
 export var onPageCheck = /*#__PURE__*/function () {
   var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref7) {
-    var form, name, value, columns, page, pagination, setState, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState;
+    var form, name, value, columns, page, pagination, setState, isView, disabled, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          form = _ref7.form, name = _ref7.name, value = _ref7.value, columns = _ref7.columns, page = _ref7.page, pagination = _ref7.pagination, setState = _ref7.setState;
-          if (!pagination) {
+          form = _ref7.form, name = _ref7.name, value = _ref7.value, columns = _ref7.columns, page = _ref7.page, pagination = _ref7.pagination, setState = _ref7.setState, isView = _ref7.isView, disabled = _ref7.disabled;
+          if (!(pagination && !isView && !disabled)) {
             _context2.next = 75;
             break;
           }

package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -104,11 +104,8 @@ export function useRequestList(service, options, useRequestOptions) {
   var dataSource = useMemo(function () {
     if (data) {
       var _data$data;
-      if (transformResponse) {
-        return (data === null || data === void 0 ? void 0 : data.data) ? transformResponse(data === null || data === void 0 ? void 0 : data.data) : transformResponse(data);
-      }
       var list = withPagination ? data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.list : data === null || data === void 0 ? void 0 : data.data;
-      return list !== null && list !== void 0 ? list : [];
+      return transformResponse ? transformResponse(list) : list !== null && list !== void 0 ? list : [];
     }
     return [];
   }, [data, transformResponse, withPagination]);

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

@@ -34,7 +34,7 @@ import viewSvg from '../../../../assets/view.svg';
 import useRequestList from './hooks/useRequestList';
 import locale from '../../../../locale';
 var ProModalSelect = function ProModalSelect(props, ref) {
-  var _useRequest$options9, _formColumns$;
+  var _useRequest$options, _useRequest$options10, _formColumns$;
   var value = props.value,
     onChange = props.onChange,
     disabled = props.disabled,
@@ -74,6 +74,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     withPagination = _configOption$withPag === void 0 ? true : _configOption$withPag,
     modalProps = configOption.modalProps,
     tableProps = configOption.tableProps;
+  // const  useRequest?.options?.defaultParams;
   var _ref = modalProps || {},
     onOk = _ref.onOk,
     restModalProps = _objectWithoutProperties(_ref, _excluded2);
@@ -107,6 +108,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     rowSelection = _ref4.rowSelection,
     restTableProps = _objectWithoutProperties(_ref4, _excluded3);
   var preValue = useRef(value);
+  var defaultParamsRef = useRef(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.defaultParams); // 缓存 defaultParams 的引用
   var _useSetState = useSetState({
       _value: value,
       isInit: true,
@@ -316,7 +318,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     };
   }();
   var handleClose = function handleClose() {
-    var _useRequest$options;
+    var _useRequest$options2;
     form.resetFields();
     setState({
       onOff: false,
@@ -324,7 +326,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       isInit: false
     });
     // 当设置manual为true时，清空当前弹框内已搜索出来的值
-    if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.manual) {
+    if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.manual) {
       mutate(function () {
         return [];
       });
@@ -471,7 +473,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
+      var _useRequest$options3, _useRequest$options4, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -479,11 +481,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               _context4.next = 9;
               break;
             }
-            queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), initParams || {});
+            queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.defaultParams), initParams || {});
             page = _objectSpread({
               pageNum: 1,
               pageSize: 10
-            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.page);
+            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.page);
             params = withPagination ? _objectSpread(_objectSpread({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
@@ -532,16 +534,16 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-      var _useRequest$options4, _useRequest$options5;
+      var _useRequest$options5, _useRequest$options6;
       var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            queryBean = _objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.defaultParams);
+            queryBean = _objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.defaultParams);
             page = _objectSpread({
               pageNum: 1,
               pageSize: 10
-            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.page);
+            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.page);
             params = withPagination ? _objectSpread(_objectSpread({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
@@ -616,8 +618,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   });
   useEffect(function () {
     if (onOff && !visible) {
-      var _useRequest$options6;
-      if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.manual) !== true) {
+      var _useRequest$options7;
+      if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.manual) !== true) {
         onReset();
       }
       var nextState = {
@@ -650,13 +652,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       setState(nextState);
     }
   }, [onOff, visible, JSON.stringify(value)]);
-  useDeepCompareEffect(function () {
+  useEffect(function () {
     if (value && !visible && isInit && !readOnly) {
       getInitValues();
     }
   }, [JSON.stringify(value), visible, isInit]);
   useDebounceEffect(function () {
-    if (value && !visible && readOnly && !isEqual(value, preValue.current)) {
+    if (value && !visible && readOnly && (!isEqual(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
       var _options$some;
       preValue.current = value;
       var isHasValue = options === null || options === void 0 ? void 0 : (_options$some = options.some) === null || _options$some === void 0 ? void 0 : _options$some.call(options, function (item) {
@@ -668,18 +670,51 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       if (useRequest) {
         // 加定时器 修复依赖数据同步更新未取到问题
         setTimeout(function () {
-          var _useRequest$options7, _useRequest$options8;
+          var _useRequest$options8, _useRequest$options9;
           var params = withPagination ? {
             pageNum: 1,
             pageSize: 50,
-            queryBean: _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.defaultParams), initParams)
-          } : _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams);
+            queryBean: _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams)
+          } : _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams), initParams);
           var nextParams = transformParams ? transformParams(params) : params;
           run(nextParams);
         }, 300);
       }
     }
-  }, [JSON.stringify(value), visible, JSON.stringify(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams), JSON.stringify(initParams)]);
+  }, [JSON.stringify(value), visible, JSON.stringify(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
+  var handleSelectFocus = function handleSelectFocus() {
+    if (useRequest) {
+      var _useRequest$options11;
+      var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options11 = useRequest.options) === null || _useRequest$options11 === void 0 ? void 0 : _useRequest$options11.defaultParams) || {};
+      var params = withPagination ? {
+        pageNum: 1,
+        pageSize: 50,
+        queryBean: queryBean
+      } : queryBean;
+      var nextParams = transformParams ? transformParams(params) : params;
+      // 减少请求条件一致时，且请求过时，focus的重复请求
+      if (!isEqual(queryBean, defaultParamsRef.current) || !(options === null || options === void 0 ? void 0 : options.length)) {
+        run(nextParams); // 触发 run 请求
+        defaultParamsRef.current = queryBean; // 更新缓存
+      }
+      setState({
+        isInit: false
+      });
+    }
+  };
+  var handleSelectSearch = debounce(function (val) {
+    if (useRequest) {
+      var _useRequest$options12;
+      var queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options12 = useRequest.options) === null || _useRequest$options12 === void 0 ? void 0 : _useRequest$options12.defaultParams), {}, _defineProperty({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
+      var params = withPagination ? {
+        pageNum: 1,
+        pageSize: 50,
+        queryBean: queryBean
+      } : queryBean;
+      var nextParams = transformParams ? transformParams(params) : params;
+      run(nextParams);
+    }
+  }, 1000);
   useDebounceEffect(function () {
     if (!value) {
       if (defaultOne) {
@@ -729,35 +764,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       notFoundContent: selectLoading ? _jsx(_Spin, {
         size: "small"
       }) : null,
-      onFocus: function onFocus() {
-        if (useRequest) {
-          var _useRequest$options10;
-          var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams) || {};
-          var params = withPagination ? {
-            pageNum: 1,
-            pageSize: 50,
-            queryBean: queryBean
-          } : queryBean;
-          var nextParams = transformParams ? transformParams(params) : params;
-          run(nextParams);
-          setState({
-            isInit: false
-          });
-        }
-      },
-      onSearch: debounce(function (val) {
-        if (useRequest) {
-          var _useRequest$options11;
-          var queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options11 = useRequest.options) === null || _useRequest$options11 === void 0 ? void 0 : _useRequest$options11.defaultParams), {}, _defineProperty({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
-          var params = withPagination ? {
-            pageNum: 1,
-            pageSize: 50,
-            queryBean: queryBean
-          } : queryBean;
-          var nextParams = transformParams ? transformParams(params) : params;
-          run(nextParams);
-        }
-      }, 2000),
+      onFocus: handleSelectFocus,
+      onSearch: handleSelectSearch,
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }

package/es/ProStep/components/Item/index.js

@@ -8,7 +8,7 @@ import { isBoolean } from 'lodash';
 import { useStep } from '../../index';
 import ProCollapse from '../../../ProLayout/components/ProCollapse';
 var defaultLazyLoadConfig = {
-  height: 300,
+  height: 200,
   offset: 100,
   once: true // Load only once upon first entry into the viewport
 };
@@ -24,7 +24,7 @@ var ProStepItem = function ProStepItem(_ref) {
     register = _useStep.register,
     collapse = _useStep.collapse,
     globalLazyLoad = _useStep.lazyLoad;
-  var lazyLoad = stepLazyLoad || globalLazyLoad;
+  var lazyLoad = stepLazyLoad !== null && stepLazyLoad !== void 0 ? stepLazyLoad : globalLazyLoad;
   useEffect(function () {
     // Schedule registration to avoid re-render issues
     var timeoutId = setTimeout(function () {
@@ -60,7 +60,10 @@ var ProStepItem = function ProStepItem(_ref) {
         onChange: function onChange(e) {
           var _restProps$onChange;
           if (lazyLoad) {
-            forceCheck();
+            // 延时执行, 避免在折叠时, 懒加载的元素没有高度
+            setTimeout(function () {
+              forceCheck();
+            }, 100);
           }
           // 默认执行
           restProps === null || restProps === void 0 ? void 0 : (_restProps$onChange = restProps.onChange) === null || _restProps$onChange === void 0 ? void 0 : _restProps$onChange.call(restProps, e);

package/es/ProTable/index.js

@@ -250,9 +250,6 @@ var ProTable = function ProTable(props) {
   if (isExistPercentWidth) {
     _scroll = props === null || props === void 0 ? void 0 : props.scroll;
   }
-  if (props.expandable) {
-    _scroll = {};
-  }
   var handleColumnConfig = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(checkList) {
       var newColumns, _columnConfig$onColum, catchColumns;

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

@@ -30,8 +30,8 @@ export declare const isListResult: (data: {
 }) => boolean;
 export declare const getRowKey: (rowKey: any, record: any) => any;
 /** 移除对象中的 null , undefined, '' 的key */
-export declare const removeEmptyKeys: (obj: any) => {
-    [k: string]: unknown;
+export declare const removeEmptyKeys: (obj?: Record<string, any>) => {
+    [k: string]: any;
 };
 export declare const getPadding: (el: HTMLElement) => {
     pLeft: number;

package/es/ProTable/utils/index.js

@@ -75,6 +75,7 @@ export var getRowKey = function getRowKey(rowKey, record) {
 };
 /** 移除对象中的 null , undefined, '' 的key */
 export var removeEmptyKeys = function removeEmptyKeys(obj) {
+  if (!obj) return {};
   // 使用 Object.entries() 将对象转换为键值对数组
   var entries = Object.entries(obj);
   // 过滤掉值为 null, undefined, 或 '' 的键值对

package/es/ProUpload/components/ButtonRender.d.ts

@@ -14,6 +14,7 @@ interface DragRenderProps extends Pick<ProUploadProps, 'buttonProps' | 'disabled
     afterRender: string | ReactNode;
     extExt: any[];
     isConfirmDelete?: boolean;
+    onRemove?: (file: UploadFile) => any | Promise<any>;
 }
 declare const ButtonRender: FC<DragRenderProps>;
 export default ButtonRender;

package/es/ProUpload/components/ButtonRender.js

@@ -2,6 +2,8 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import "antd/es/upload/style";
 import _Upload from "antd/es/upload";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DndContext } from '@dnd-kit/core';
@@ -26,7 +28,8 @@ var ButtonRender = function ButtonRender(props) {
     afterRender = props.afterRender,
     _props$buttonText = props.buttonText,
     buttonText = _props$buttonText === void 0 ? locale === null || locale === void 0 ? void 0 : (_locale$ProUpload = locale.ProUpload) === null || _locale$ProUpload === void 0 ? void 0 : _locale$ProUpload.buttonText : _props$buttonText,
-    isConfirmDelete = props.isConfirmDelete;
+    isConfirmDelete = props.isConfirmDelete,
+    _onRemove = props.onRemove;
   // 按钮类型的props
   var buttonUploadProps = _objectSpread(_objectSpread({}, baseUploadProps), {}, {
     fileList: fileList,
@@ -38,7 +41,34 @@ var ButtonRender = function ButtonRender(props) {
           file: file,
           isConfirmDelete: isConfirmDelete,
           onPreview: onPreview,
-          onRemove: actions.remove,
+          onRemove: function () {
+            var _onRemove2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
+              var res;
+              return _regeneratorRuntime().wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    _context.next = 2;
+                    return _onRemove === null || _onRemove === void 0 ? void 0 : _onRemove(file);
+                  case 2:
+                    res = _context.sent;
+                    if (!(res === false)) {
+                      _context.next = 5;
+                      break;
+                    }
+                    return _context.abrupt("return");
+                  case 5:
+                    actions.remove(file);
+                  case 6:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
+            }));
+            function onRemove(_x) {
+              return _onRemove2.apply(this, arguments);
+            }
+            return onRemove;
+          }(),
           onDownload: onDownload
         })
       });

package/es/ProUpload/components/ImageRender.d.ts

@@ -13,7 +13,7 @@ interface DragRenderProps extends Pick<ProUploadProps, 'buttonProps' | 'disabled
     onPreview: any;
     onDownload: any;
     extExt: any[];
-    onRemove: (file: UploadFile) => void | Promise<boolean>;
+    onRemove: (file: UploadFile) => any | Promise<any>;
 }
 declare const ImageRender: FC<DragRenderProps>;
 export default ImageRender;

package/es/ProUpload/index.js

@@ -265,7 +265,7 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onDragEnd: onDragEnd,
     onPreview: onPreview,
     onDownload: onDownload,
-    onRemove: handleRemove,
+    onRemove: onRemove,
     onChange: onChange,
     setFileList: setFileList,
     extExt: extExt,

package/lib/ProDrawerForm/components/ProDrawer/index.js

@@ -49,13 +49,38 @@ var ProDrawer = function ProDrawer(_ref) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     loading = _useState2[0],
     toggleLoading = _useState2[1];
+  var _useState3 = (0, _react.useState)(''),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    initialSnapshot = _useState4[0],
+    setInitialSnapshot = _useState4[1];
   var noRenderFooter = isView || footer === false || footer === null;
+  // 使用 useEffect 在 visible 变更时延迟捕获 初始DOM 快照
+  (0, _react.useEffect)(function () {
+    if (visible) {
+      // 延迟到下一个事件循环，确保 Drawer 已经渲染
+      var timeoutId = setTimeout(function () {
+        if (ref.current) {
+          setInitialSnapshot(ref.current.innerHTML); // 捕获 DOM 快照
+        }
+      }, 100); // 使用 setTimeout 让 DOM 渲染完成后再执行
+      return function () {
+        return clearTimeout(timeoutId);
+      }; // 清理定时器
+    }
+    setInitialSnapshot('');
+  }, [visible]); // 当 visible 变化时执行
+  // 快照对比
+  var compareSnapshots = function compareSnapshots() {
+    if (!ref.current) return false;
+    return ref.current.innerHTML === initialSnapshot;
+  };
   var onConfirm = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3, _locale$ProDrawerForm4;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (isView || !isConfirmClose) {
+          // 如果当前是查看状态，或者不需要确认关闭，或者快照对比一致，则直接关闭
+          if (isView || !isConfirmClose || compareSnapshots()) {
             onCancel && onCancel();
           } else if (!modalRef.current) {
             modalRef.current = _antd.Modal.confirm((0, _objectSpread2.default)({
@@ -77,7 +102,7 @@ var ProDrawer = function ProDrawer(_ref) {
           return _context.stop();
       }
     }, _callee);
-  })), [onCancel, modalRef.current]);
+  })), [onCancel, modalRef.current, ref.current]);
   var handleFinish = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
     var values, _error$errorFields, _error$errorFields$;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {

package/lib/ProEditTable/index.js

@@ -442,7 +442,9 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             columns: columns,
             page: page,
             pagination: pagination,
-            setState: setState
+            setState: setState,
+            isView: isView,
+            disabled: disabled
           });
         }
       }) : null]

package/lib/ProEditTable/utils/tools.d.ts

@@ -35,7 +35,10 @@ export declare const handleScrollToError: () => void;
  * @returns 深拷贝后的对象，其中的React节点会被保留
  */
 export declare function cloneDeepFilterNode(value: any): any;
-export declare const onPageCheck: ({ form, name, value, columns, page, pagination, setState }: {
+/**
+ * 分页校验
+ */
+export declare const onPageCheck: ({ form, name, value, columns, page, pagination, setState, isView, disabled }: {
     form: any;
     name: any;
     value: any;
@@ -43,4 +46,6 @@ export declare const onPageCheck: ({ form, name, value, columns, page, paginatio
     page: any;
     pagination: any;
     setState: any;
+    isView: any;
+    disabled: any;
 }) => Promise<void>;

package/lib/ProEditTable/utils/tools.js

@@ -343,14 +343,17 @@ var handleCheckCellValue = /*#__PURE__*/function () {
     return _ref6.apply(this, arguments);
   };
 }();
+/**
+ * 分页校验
+ */
 var onPageCheck = exports.onPageCheck = /*#__PURE__*/function () {
   var _ref8 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref7) {
-    var form, name, value, columns, page, pagination, setState, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState;
+    var form, name, value, columns, page, pagination, setState, isView, disabled, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          form = _ref7.form, name = _ref7.name, value = _ref7.value, columns = _ref7.columns, page = _ref7.page, pagination = _ref7.pagination, setState = _ref7.setState;
-          if (!pagination) {
+          form = _ref7.form, name = _ref7.name, value = _ref7.value, columns = _ref7.columns, page = _ref7.page, pagination = _ref7.pagination, setState = _ref7.setState, isView = _ref7.isView, disabled = _ref7.disabled;
+          if (!(pagination && !isView && !disabled)) {
             _context2.next = 75;
             break;
           }

package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -113,11 +113,8 @@ function useRequestList(service, options, useRequestOptions) {
   var dataSource = (0, _react.useMemo)(function () {
     if (data) {
       var _data$data;
-      if (transformResponse) {
-        return (data === null || data === void 0 ? void 0 : data.data) ? transformResponse(data === null || data === void 0 ? void 0 : data.data) : transformResponse(data);
-      }
       var list = withPagination ? data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.list : data === null || data === void 0 ? void 0 : data.data;
-      return list !== null && list !== void 0 ? list : [];
+      return transformResponse ? transformResponse(list) : list !== null && list !== void 0 ? list : [];
     }
     return [];
   }, [data, transformResponse, withPagination]);

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

@@ -29,7 +29,7 @@ var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames",
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 var ProModalSelect = function ProModalSelect(props, ref) {
-  var _useRequest$options9, _formColumns$;
+  var _useRequest$options, _useRequest$options10, _formColumns$;
   var value = props.value,
     onChange = props.onChange,
     disabled = props.disabled,
@@ -69,6 +69,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     withPagination = _configOption$withPag === void 0 ? true : _configOption$withPag,
     modalProps = configOption.modalProps,
     tableProps = configOption.tableProps;
+  // const  useRequest?.options?.defaultParams;
   var _ref = modalProps || {},
     onOk = _ref.onOk,
     restModalProps = (0, _objectWithoutProperties2.default)(_ref, _excluded2);
@@ -102,6 +103,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     rowSelection = _ref4.rowSelection,
     restTableProps = (0, _objectWithoutProperties2.default)(_ref4, _excluded3);
   var preValue = (0, _react.useRef)(value);
+  var defaultParamsRef = (0, _react.useRef)(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.defaultParams); // 缓存 defaultParams 的引用
   var _useSetState = (0, _ahooks.useSetState)({
       _value: value,
       isInit: true,
@@ -311,7 +313,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     };
   }();
   var handleClose = function handleClose() {
-    var _useRequest$options;
+    var _useRequest$options2;
     form.resetFields();
     setState({
       onOff: false,
@@ -319,7 +321,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       isInit: false
     });
     // 当设置manual为true时，清空当前弹框内已搜索出来的值
-    if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.manual) {
+    if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.manual) {
       mutate(function () {
         return [];
       });
@@ -466,7 +468,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref10 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
-      var _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
+      var _useRequest$options3, _useRequest$options4, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -474,11 +476,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               _context4.next = 9;
               break;
             }
-            queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), initParams || {});
+            queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.defaultParams), initParams || {});
             page = (0, _objectSpread3.default)({
               pageNum: 1,
               pageSize: 10
-            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.page);
+            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.page);
             params = withPagination ? (0, _objectSpread3.default)((0, _objectSpread3.default)({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
@@ -527,16 +529,16 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref11 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
-      var _useRequest$options4, _useRequest$options5;
+      var _useRequest$options5, _useRequest$options6;
       var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            queryBean = (0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.defaultParams);
+            queryBean = (0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.defaultParams);
             page = (0, _objectSpread3.default)({
               pageNum: 1,
               pageSize: 10
-            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.page);
+            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.page);
             params = withPagination ? (0, _objectSpread3.default)((0, _objectSpread3.default)({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
@@ -611,8 +613,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   });
   (0, _react.useEffect)(function () {
     if (onOff && !visible) {
-      var _useRequest$options6;
-      if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.manual) !== true) {
+      var _useRequest$options7;
+      if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.manual) !== true) {
         onReset();
       }
       var nextState = {
@@ -645,13 +647,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       setState(nextState);
     }
   }, [onOff, visible, JSON.stringify(value)]);
-  (0, _ahooks.useDeepCompareEffect)(function () {
+  (0, _react.useEffect)(function () {
     if (value && !visible && isInit && !readOnly) {
       getInitValues();
     }
   }, [JSON.stringify(value), visible, isInit]);
   (0, _ahooks.useDebounceEffect)(function () {
-    if (value && !visible && readOnly && !(0, _lodash.isEqual)(value, preValue.current)) {
+    if (value && !visible && readOnly && (!(0, _lodash.isEqual)(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
       var _options$some;
       preValue.current = value;
       var isHasValue = options === null || options === void 0 ? void 0 : (_options$some = options.some) === null || _options$some === void 0 ? void 0 : _options$some.call(options, function (item) {
@@ -663,18 +665,51 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       if (useRequest) {
         // 加定时器 修复依赖数据同步更新未取到问题
         setTimeout(function () {
-          var _useRequest$options7, _useRequest$options8;
+          var _useRequest$options8, _useRequest$options9;
           var params = withPagination ? {
             pageNum: 1,
             pageSize: 50,
-            queryBean: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.defaultParams), initParams)
-          } : (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams);
+            queryBean: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams)
+          } : (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams), initParams);
           var nextParams = transformParams ? transformParams(params) : params;
           run(nextParams);
         }, 300);
       }
     }
-  }, [JSON.stringify(value), visible, JSON.stringify(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams), JSON.stringify(initParams)]);
+  }, [JSON.stringify(value), visible, JSON.stringify(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
+  var handleSelectFocus = function handleSelectFocus() {
+    if (useRequest) {
+      var _useRequest$options11;
+      var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options11 = useRequest.options) === null || _useRequest$options11 === void 0 ? void 0 : _useRequest$options11.defaultParams) || {};
+      var params = withPagination ? {
+        pageNum: 1,
+        pageSize: 50,
+        queryBean: queryBean
+      } : queryBean;
+      var nextParams = transformParams ? transformParams(params) : params;
+      // 减少请求条件一致时，且请求过时，focus的重复请求
+      if (!(0, _lodash.isEqual)(queryBean, defaultParamsRef.current) || !(options === null || options === void 0 ? void 0 : options.length)) {
+        run(nextParams); // 触发 run 请求
+        defaultParamsRef.current = queryBean; // 更新缓存
+      }
+      setState({
+        isInit: false
+      });
+    }
+  };
+  var handleSelectSearch = (0, _lodash.debounce)(function (val) {
+    if (useRequest) {
+      var _useRequest$options12;
+      var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options12 = useRequest.options) === null || _useRequest$options12 === void 0 ? void 0 : _useRequest$options12.defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
+      var params = withPagination ? {
+        pageNum: 1,
+        pageSize: 50,
+        queryBean: queryBean
+      } : queryBean;
+      var nextParams = transformParams ? transformParams(params) : params;
+      run(nextParams);
+    }
+  }, 1000);
   (0, _ahooks.useDebounceEffect)(function () {
     if (!value) {
       if (defaultOne) {
@@ -724,35 +759,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       notFoundContent: selectLoading ? (0, _jsxRuntime.jsx)(_antd.Spin, {
         size: "small"
       }) : null,
-      onFocus: function onFocus() {
-        if (useRequest) {
-          var _useRequest$options10;
-          var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams) || {};
-          var params = withPagination ? {
-            pageNum: 1,
-            pageSize: 50,
-            queryBean: queryBean
-          } : queryBean;
-          var nextParams = transformParams ? transformParams(params) : params;
-          run(nextParams);
-          setState({
-            isInit: false
-          });
-        }
-      },
-      onSearch: (0, _lodash.debounce)(function (val) {
-        if (useRequest) {
-          var _useRequest$options11;
-          var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options11 = useRequest.options) === null || _useRequest$options11 === void 0 ? void 0 : _useRequest$options11.defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
-          var params = withPagination ? {
-            pageNum: 1,
-            pageSize: 50,
-            queryBean: queryBean
-          } : queryBean;
-          var nextParams = transformParams ? transformParams(params) : params;
-          run(nextParams);
-        }
-      }, 2000),
+      onFocus: handleSelectFocus,
+      onSearch: handleSelectSearch,
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }

package/lib/ProStep/components/Item/index.js

@@ -16,7 +16,7 @@ var _index = require("../../index");
 var _ProCollapse = _interopRequireDefault(require("../../../ProLayout/components/ProCollapse"));
 var _excluded = ["id", "title", "collapse", "children", "lazyLoad"];
 var defaultLazyLoadConfig = {
-  height: 300,
+  height: 200,
   offset: 100,
   once: true // Load only once upon first entry into the viewport
 };
@@ -32,7 +32,7 @@ var ProStepItem = function ProStepItem(_ref) {
     register = _useStep.register,
     collapse = _useStep.collapse,
     globalLazyLoad = _useStep.lazyLoad;
-  var lazyLoad = stepLazyLoad || globalLazyLoad;
+  var lazyLoad = stepLazyLoad !== null && stepLazyLoad !== void 0 ? stepLazyLoad : globalLazyLoad;
   (0, _react.useEffect)(function () {
     // Schedule registration to avoid re-render issues
     var timeoutId = setTimeout(function () {
@@ -68,7 +68,10 @@ var ProStepItem = function ProStepItem(_ref) {
         onChange: function onChange(e) {
           var _restProps$onChange;
           if (lazyLoad) {
-            (0, _reactLazyload.forceCheck)();
+            // 延时执行, 避免在折叠时, 懒加载的元素没有高度
+            setTimeout(function () {
+              (0, _reactLazyload.forceCheck)();
+            }, 100);
           }
           // 默认执行
           restProps === null || restProps === void 0 ? void 0 : (_restProps$onChange = restProps.onChange) === null || _restProps$onChange === void 0 ? void 0 : _restProps$onChange.call(restProps, e);

package/lib/ProTable/index.js

@@ -257,9 +257,6 @@ var ProTable = function ProTable(props) {
   if (isExistPercentWidth) {
     _scroll = props === null || props === void 0 ? void 0 : props.scroll;
   }
-  if (props.expandable) {
-    _scroll = {};
-  }
   var handleColumnConfig = /*#__PURE__*/function () {
     var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(checkList) {
       var newColumns, _columnConfig$onColum, catchColumns;

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

@@ -30,8 +30,8 @@ export declare const isListResult: (data: {
 }) => boolean;
 export declare const getRowKey: (rowKey: any, record: any) => any;
 /** 移除对象中的 null , undefined, '' 的key */
-export declare const removeEmptyKeys: (obj: any) => {
-    [k: string]: unknown;
+export declare const removeEmptyKeys: (obj?: Record<string, any>) => {
+    [k: string]: any;
 };
 export declare const getPadding: (el: HTMLElement) => {
     pLeft: number;

package/lib/ProTable/utils/index.js

@@ -82,6 +82,7 @@ var getRowKey = exports.getRowKey = function getRowKey(rowKey, record) {
 };
 /** 移除对象中的 null , undefined, '' 的key */
 var removeEmptyKeys = exports.removeEmptyKeys = function removeEmptyKeys(obj) {
+  if (!obj) return {};
   // 使用 Object.entries() 将对象转换为键值对数组
   var entries = Object.entries(obj);
   // 过滤掉值为 null, undefined, 或 '' 的键值对

package/lib/ProUpload/components/ButtonRender.d.ts

@@ -14,6 +14,7 @@ interface DragRenderProps extends Pick<ProUploadProps, 'buttonProps' | 'disabled
     afterRender: string | ReactNode;
     extExt: any[];
     isConfirmDelete?: boolean;
+    onRemove?: (file: UploadFile) => any | Promise<any>;
 }
 declare const ButtonRender: FC<DragRenderProps>;
 export default ButtonRender;

package/lib/ProUpload/components/ButtonRender.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
@@ -30,7 +32,8 @@ var ButtonRender = function ButtonRender(props) {
     afterRender = props.afterRender,
     _props$buttonText = props.buttonText,
     buttonText = _props$buttonText === void 0 ? _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProUpload = _locale.default.ProUpload) === null || _locale$ProUpload === void 0 ? void 0 : _locale$ProUpload.buttonText : _props$buttonText,
-    isConfirmDelete = props.isConfirmDelete;
+    isConfirmDelete = props.isConfirmDelete,
+    _onRemove = props.onRemove;
   // 按钮类型的props
   var buttonUploadProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, baseUploadProps), {}, {
     fileList: fileList,
@@ -42,7 +45,34 @@ var ButtonRender = function ButtonRender(props) {
           file: file,
           isConfirmDelete: isConfirmDelete,
           onPreview: onPreview,
-          onRemove: actions.remove,
+          onRemove: function () {
+            var _onRemove2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(file) {
+              var res;
+              return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    _context.next = 2;
+                    return _onRemove === null || _onRemove === void 0 ? void 0 : _onRemove(file);
+                  case 2:
+                    res = _context.sent;
+                    if (!(res === false)) {
+                      _context.next = 5;
+                      break;
+                    }
+                    return _context.abrupt("return");
+                  case 5:
+                    actions.remove(file);
+                  case 6:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
+            }));
+            function onRemove(_x) {
+              return _onRemove2.apply(this, arguments);
+            }
+            return onRemove;
+          }(),
           onDownload: onDownload
         })
       });

package/lib/ProUpload/components/ImageRender.d.ts

@@ -13,7 +13,7 @@ interface DragRenderProps extends Pick<ProUploadProps, 'buttonProps' | 'disabled
     onPreview: any;
     onDownload: any;
     extExt: any[];
-    onRemove: (file: UploadFile) => void | Promise<boolean>;
+    onRemove: (file: UploadFile) => any | Promise<any>;
 }
 declare const ImageRender: FC<DragRenderProps>;
 export default ImageRender;

package/lib/ProUpload/index.js

@@ -272,7 +272,7 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     onDragEnd: onDragEnd,
     onPreview: onPreview,
     onDownload: onDownload,
-    onRemove: handleRemove,
+    onRemove: onRemove,
     onChange: onChange,
     setFileList: setFileList,
     extExt: extExt,

package/package.json

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