@zat-design/sisyphus-react 3.11.4 → 3.11.5-beta.10

package/dist/index.esm.css

@@ -4812,8 +4812,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   margin-left: var(--zaui-space-size-xs, 4px);
 }
 .pro-edit-table-drag table tr th.ant-table-selection-column.ant-table-cell-fix-left {
-  text-align: left;
-  padding-left: 52px;
+  text-align: right;
 }
 .pro-edit-label {
   display: inline-block;

package/dist/less.esm.css

@@ -4812,8 +4812,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   margin-left: var(--zaui-space-size-xs, 4px);
 }
 .pro-edit-table-drag table tr th.ant-table-selection-column.ant-table-cell-fix-left {
-  text-align: left;
-  padding-left: 52px;
+  text-align: right;
 }
 .pro-edit-label {
   display: inline-block;

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/style/index.less

@@ -396,7 +396,6 @@
 
 .pro-edit-table-drag {
   table tr th.@{ant-prefix}-table-selection-column.@{ant-prefix}-table-cell-fix-left{
-    text-align: left;
-    padding-left: 52px;
+    text-align: right;
   }
 }

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

@@ -7,7 +7,7 @@ export declare const customValidate: (validateKeys: any, form: any, rowName: any
  * @returns string
  */
 export declare const splitNames: (names: any[]) => any;
-export declare const getNamePath: (name: any, virtualKey: any) => any;
+export declare const getNamePath: (name: any, virtualKey: any) => any[];
 export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys }: {
     name: any;
     form: any;
@@ -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

@@ -51,7 +51,7 @@ export var splitNames = function splitNames(names) {
 };
 // 获取中间formItem的name
 export var getNamePath = function getNamePath(name, virtualKey) {
-  var nextName = cloneDeep(name);
+  var nextName = cloneDeep(Array.isArray(name) ? name : [name]);
   var lastValue = nextName[nextName.length - 1];
   nextName[nextName.length - 1] = "".concat(lastValue).concat(virtualKey ? "-".concat(virtualKey) : '');
   return nextName;
@@ -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/base/DatePicker/index.js

@@ -7,9 +7,9 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["className", "format"];
 import { jsx as _jsx } from "react/jsx-runtime";
 /*
- * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Author: ''
  * @Date: 2024-01-19 18:27:41
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditors: ''
  * @LastEditTime: 2024-06-03 15:33:12
  * @FilePath: /za-material-warehouse/src/ProForm/components/base/DatePicker/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE

package/es/ProForm/components/base/RangePicker/index.js

@@ -6,9 +6,9 @@ import _DatePicker from "antd/es/date-picker";
 var _excluded = ["format", "otherProps", "separator", "range"];
 import { jsx as _jsx } from "react/jsx-runtime";
 /*
- * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Author: ''
  * @Date: 2024-04-10 11:39:17
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditors: ''
  * @LastEditTime: 2024-05-29 11:50:49
  * @FilePath: /za-material-warehouse/src/ProForm/components/base/RangePicker/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE

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

@@ -19,15 +19,15 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "searchForm", "searchKey", "defaultOne"],
+var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "searchForm", "searchKey", "defaultOne", "otherProps"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { SearchOutlined } from '@ant-design/icons';
 import { useDebounceEffect, useDeepCompareEffect, useMount, useSetState } from 'ahooks';
-import { debounce, isArray, isEqual, isFunction, omit } from 'lodash';
+import { debounce, isArray, isEqual, isFunction } from 'lodash';
 import { ReactSVG } from 'react-svg';
-import React, { forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
+import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { ProForm, ProDrawerForm, ProTable, useProConfig, ProSelect } from '../../../../index';
 import Container from '../../Container';
 import viewSvg from '../../../../assets/view.svg';
@@ -58,6 +58,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     searchForm = props.searchForm,
     searchKey = props.searchKey,
     defaultOne = props.defaultOne,
+    otherProps = props.otherProps,
     restProps = _objectWithoutProperties(props, _excluded);
   var contentForm = _Form.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
@@ -105,6 +106,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     columns = _ref4.columns,
     rowSelection = _ref4.rowSelection,
     restTableProps = _objectWithoutProperties(_ref4, _excluded3);
+  var preValue = useRef(value);
   var _useSetState = useSetState({
       _value: value,
       isInit: true,
@@ -250,6 +252,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleChangeValue = function handleChangeValue(e) {
     onChange(e.target.value);
+    preValue.current = e.target.value;
     if (!readOnly) {
       setState({
         _value: e.target.value
@@ -258,6 +261,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleSelectValue = function handleSelectValue(val, option) {
     onChange(val, option);
+    preValue.current = val;
   };
   var handleClick = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -369,6 +373,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           case 14:
             if (flag) {
               onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? record : getNextValues(record), record);
+              preValue.current = labelInValue ? record : getNextValues(record);
               // 更新内部展示值
               setState({
                 _value: record,
@@ -497,6 +502,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                 nextSelectRowKeys = isMultiple ? value : [value];
                 if (labelInValue) {
                   onChange(_data);
+                  preValue.current = _data;
                 }
                 // 更新内部展示值
                 setState({
@@ -553,10 +559,14 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               nextSelectRowKeys = isMultiple ? value : [value];
               if (labelInValue) {
                 onChange(_data2);
+                preValue.current = _data2;
               } else {
                 onChange(isMultiple ? _data2.map(function (item) {
                   return item[valueKey];
                 }) : _data2[valueKey]);
+                preValue.current = isMultiple ? _data2.map(function (item) {
+                  return item[valueKey];
+                }) : _data2[valueKey];
               }
               // 更新内部展示值
               setState({
@@ -640,14 +650,15 @@ 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) {
+    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) {
         return item[valueKey] === value;
       });
@@ -668,7 +679,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         }, 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$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
   useDebounceEffect(function () {
     if (!value) {
       if (defaultOne) {
@@ -746,17 +757,17 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           var nextParams = transformParams ? transformParams(params) : params;
           run(nextParams);
         }
-      }, 1000),
+      }, 2000),
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }
-    }, omit(restProps, ['otherProps']))) : _jsx(_Input, _objectSpread({
+    }, restProps)) : _jsx(_Input, _objectSpread({
       value: viewText,
       onChange: handleChangeValue,
       disabled: disabled,
       autoComplete: "off",
       allowClear: true
-    }, omit(restProps, ['otherProps']))), isView || disabled ? null : _jsx(_Button, {
+    }, restProps)), isView || disabled ? null : _jsx(_Button, {
       icon: _jsx(ReactSVG, {
         className: "viewSvg",
         src: viewSvg,

package/es/ProLayout/components/ProCollapse/index.js

@@ -36,7 +36,8 @@ var ProCollapse = function ProCollapse(props) {
     className = props.className,
     icon = props.icon,
     _props$autoHeight = props.autoHeight,
-    autoHeight = _props$autoHeight === void 0 ? true : _props$autoHeight;
+    autoHeight = _props$autoHeight === void 0 ? true : _props$autoHeight,
+    onChange = props.onChange;
   var cls = classNames(_defineProperty({
     'pro-collapse': true,
     'pro-collapse-level2': level === '2',
@@ -154,7 +155,8 @@ var ProCollapse = function ProCollapse(props) {
         });
       },
       expandIconPosition: "end",
-      defaultActiveKey: folding ? [] : ['1']
+      defaultActiveKey: folding ? [] : ['1'],
+      onChange: onChange
     }, collapseProps), {}, {
       children: renderPanel()
     }))

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

@@ -3,13 +3,12 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["id", "title", "collapse", "children", "lazyLoad"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect } from 'react';
-import LazyLoad from 'react-lazyload';
+import LazyLoad, { forceCheck } from 'react-lazyload';
 import { isBoolean } from 'lodash';
 import { useStep } from '../../index';
-import { getLoadedMap } from '../../utils';
 import ProCollapse from '../../../ProLayout/components/ProCollapse';
 var defaultLazyLoadConfig = {
-  height: 100,
+  height: 200,
   offset: 100,
   once: true // Load only once upon first entry into the viewport
 };
@@ -24,10 +23,8 @@ var ProStepItem = function ProStepItem(_ref) {
   var _useStep = useStep(),
     register = _useStep.register,
     collapse = _useStep.collapse,
-    globalLazyLoad = _useStep.lazyLoad,
-    registerMap = _useStep.registerMap;
-  var lazyLoad = stepLazyLoad || globalLazyLoad;
-  var loadedMap = getLoadedMap(registerMap);
+    globalLazyLoad = _useStep.lazyLoad;
+  var lazyLoad = stepLazyLoad !== null && stepLazyLoad !== void 0 ? stepLazyLoad : globalLazyLoad;
   useEffect(function () {
     // Schedule registration to avoid re-render issues
     var timeoutId = setTimeout(function () {
@@ -38,13 +35,11 @@ var ProStepItem = function ProStepItem(_ref) {
       }, restProps));
     }, 0);
     return function () {
-      return clearTimeout(timeoutId);
+      clearTimeout(timeoutId);
     };
   }, [id, title, lazyLoad, restProps, register]);
   var renderChildren = function renderChildren() {
-    var _loadedMap$;
-    // 第一个step不设置lasyload，防止懒加载不生效
-    if (lazyLoad && (loadedMap === null || loadedMap === void 0 ? void 0 : loadedMap.length) && (loadedMap === null || loadedMap === void 0 ? void 0 : (_loadedMap$ = loadedMap[0]) === null || _loadedMap$ === void 0 ? void 0 : _loadedMap$.id) !== id) {
+    if (lazyLoad) {
       var lazyLoadProps = isBoolean(lazyLoad) ? defaultLazyLoadConfig : lazyLoad;
       return _jsx(LazyLoad, _objectSpread(_objectSpread({}, lazyLoadProps), {}, {
         classNamePrefix: id,
@@ -62,6 +57,17 @@ var ProStepItem = function ProStepItem(_ref) {
         title: title,
         icon: true
       }, restProps), {}, {
+        onChange: function onChange(e) {
+          var _restProps$onChange;
+          if (lazyLoad) {
+            // 延时执行, 避免在折叠时, 懒加载的元素没有高度
+            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);
+        },
         children: renderChildren()
       }))
     });

package/es/ProTable/components/RcTable/components/DraggableTable/index.js

@@ -5,9 +5,9 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
 import { jsx as _jsx } from "react/jsx-runtime";
 /*
- * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Author: ''
  * @Date: 2024-08-09 13:48:59
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditors: ''
  * @LastEditTime: 2024-08-27 15:27:44
  * @FilePath: /za-material-warehouse/src/ProTable/components/RcTable/components/DraggableTable/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE

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/ProTree/components/AdaptiveTooltip.js

@@ -3,9 +3,9 @@ import _Tooltip from "antd/es/tooltip";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 /*
- * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Author: ''
  * @Date: 2024-09-20 10:26:04
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditors: ''
  * @LastEditTime: 2024-09-26 14:12:44
  * @FilePath: /za-material-warehouse/src/ProTree/components/AdaptiveTooltip.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE

package/es/ProTree/components/List.js

@@ -5,9 +5,9 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["checkedValues", "disabled", "treeData", "searchStr", "showCodeName", "mode", "fieldNames", "handleOnChange", "handleFilterClose", "optionRender"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 /*
- * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Author: ''
  * @Date: 2024-07-03 11:02:19
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditors: ''
  * @LastEditTime: 2024-09-26 14:30:26
  * @FilePath: /za-material-warehouse/src/ProTree/components/List.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE

package/es/ProTree/components/SearchTitle.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /*
- * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Author: ''
  * @Date: 2024-09-26 14:37:00
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditors: ''
  * @LastEditTime: 2024-09-26 17:50:59
  * @FilePath: /za-material-warehouse/src/ProTree/components/SearchTitle.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE

package/es/ProTreeModal/index.js

@@ -12,9 +12,9 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /*
- * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Author: ''
  * @Date: 2024-06-04 10:01:18
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditors: ''
  * @LastEditTime: 2024-09-27 11:49:28
  * @FilePath: /za-material-warehouse/src/ProTreeModal/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE

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/style/index.less

@@ -396,7 +396,6 @@
 
 .pro-edit-table-drag {
   table tr th.@{ant-prefix}-table-selection-column.@{ant-prefix}-table-cell-fix-left{
-    text-align: left;
-    padding-left: 52px;
+    text-align: right;
   }
 }

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

@@ -7,7 +7,7 @@ export declare const customValidate: (validateKeys: any, form: any, rowName: any
  * @returns string
  */
 export declare const splitNames: (names: any[]) => any;
-export declare const getNamePath: (name: any, virtualKey: any) => any;
+export declare const getNamePath: (name: any, virtualKey: any) => any[];
 export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys }: {
     name: any;
     form: any;
@@ -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

@@ -60,7 +60,7 @@ var splitNames = exports.splitNames = function splitNames(names) {
 };
 // 获取中间formItem的name
 var getNamePath = exports.getNamePath = function getNamePath(name, virtualKey) {
-  var nextName = (0, _lodash.cloneDeep)(name);
+  var nextName = (0, _lodash.cloneDeep)(Array.isArray(name) ? name : [name]);
   var lastValue = nextName[nextName.length - 1];
   nextName[nextName.length - 1] = "".concat(lastValue).concat(virtualKey ? "-".concat(virtualKey) : '');
   return nextName;
@@ -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/base/DatePicker/index.js

@@ -19,9 +19,9 @@ var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
 var _excluded = ["className", "format"];
 /*
- * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Author: ''
  * @Date: 2024-01-19 18:27:41
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditors: ''
  * @LastEditTime: 2024-06-03 15:33:12
  * @FilePath: /za-material-warehouse/src/ProForm/components/base/DatePicker/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE

package/lib/ProForm/components/base/RangePicker/index.js

@@ -18,9 +18,9 @@ var _Container = _interopRequireDefault(require("../../Container"));
 var _useDateRange = require("./useDateRange");
 var _excluded = ["format", "otherProps", "separator", "range"];
 /*
- * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Author: ''
  * @Date: 2024-04-10 11:39:17
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditors: ''
  * @LastEditTime: 2024-05-29 11:50:49
  * @FilePath: /za-material-warehouse/src/ProForm/components/base/RangePicker/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE

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

@@ -25,7 +25,7 @@ var _Container = _interopRequireDefault(require("../../Container"));
 var _view = _interopRequireDefault(require("../../../../assets/view.svg"));
 var _useRequestList3 = _interopRequireDefault(require("./hooks/useRequestList"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
-var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "searchForm", "searchKey", "defaultOne"],
+var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "searchForm", "searchKey", "defaultOne", "otherProps"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 var ProModalSelect = function ProModalSelect(props, ref) {
@@ -53,6 +53,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     searchForm = props.searchForm,
     searchKey = props.searchKey,
     defaultOne = props.defaultOne,
+    otherProps = props.otherProps,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var contentForm = _antd.Form.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
@@ -100,6 +101,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     columns = _ref4.columns,
     rowSelection = _ref4.rowSelection,
     restTableProps = (0, _objectWithoutProperties2.default)(_ref4, _excluded3);
+  var preValue = (0, _react.useRef)(value);
   var _useSetState = (0, _ahooks.useSetState)({
       _value: value,
       isInit: true,
@@ -245,6 +247,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleChangeValue = function handleChangeValue(e) {
     onChange(e.target.value);
+    preValue.current = e.target.value;
     if (!readOnly) {
       setState({
         _value: e.target.value
@@ -253,6 +256,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleSelectValue = function handleSelectValue(val, option) {
     onChange(val, option);
+    preValue.current = val;
   };
   var handleClick = /*#__PURE__*/function () {
     var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
@@ -364,6 +368,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           case 14:
             if (flag) {
               onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? record : getNextValues(record), record);
+              preValue.current = labelInValue ? record : getNextValues(record);
               // 更新内部展示值
               setState({
                 _value: record,
@@ -492,6 +497,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                 nextSelectRowKeys = isMultiple ? value : [value];
                 if (labelInValue) {
                   onChange(_data);
+                  preValue.current = _data;
                 }
                 // 更新内部展示值
                 setState({
@@ -548,10 +554,14 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               nextSelectRowKeys = isMultiple ? value : [value];
               if (labelInValue) {
                 onChange(_data2);
+                preValue.current = _data2;
               } else {
                 onChange(isMultiple ? _data2.map(function (item) {
                   return item[valueKey];
                 }) : _data2[valueKey]);
+                preValue.current = isMultiple ? _data2.map(function (item) {
+                  return item[valueKey];
+                }) : _data2[valueKey];
               }
               // 更新内部展示值
               setState({
@@ -635,14 +645,15 @@ 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) {
+    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) {
         return item[valueKey] === value;
       });
@@ -663,7 +674,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         }, 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$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
   (0, _ahooks.useDebounceEffect)(function () {
     if (!value) {
       if (defaultOne) {
@@ -741,17 +752,17 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           var nextParams = transformParams ? transformParams(params) : params;
           run(nextParams);
         }
-      }, 1000),
+      }, 2000),
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }
-    }, (0, _lodash.omit)(restProps, ['otherProps']))) : (0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread3.default)({
+    }, restProps)) : (0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread3.default)({
       value: viewText,
       onChange: handleChangeValue,
       disabled: disabled,
       autoComplete: "off",
       allowClear: true
-    }, (0, _lodash.omit)(restProps, ['otherProps']))), isView || disabled ? null : (0, _jsxRuntime.jsx)(_antd.Button, {
+    }, restProps)), isView || disabled ? null : (0, _jsxRuntime.jsx)(_antd.Button, {
       icon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
         className: "viewSvg",
         src: _view.default,

package/lib/ProLayout/components/ProCollapse/index.js

@@ -38,7 +38,8 @@ var ProCollapse = function ProCollapse(props) {
     className = props.className,
     icon = props.icon,
     _props$autoHeight = props.autoHeight,
-    autoHeight = _props$autoHeight === void 0 ? true : _props$autoHeight;
+    autoHeight = _props$autoHeight === void 0 ? true : _props$autoHeight,
+    onChange = props.onChange;
   var cls = (0, _classnames.default)((0, _defineProperty2.default)({
     'pro-collapse': true,
     'pro-collapse-level2': level === '2',
@@ -156,7 +157,8 @@ var ProCollapse = function ProCollapse(props) {
         });
       },
       expandIconPosition: "end",
-      defaultActiveKey: folding ? [] : ['1']
+      defaultActiveKey: folding ? [] : ['1'],
+      onChange: onChange
     }, collapseProps), {}, {
       children: renderPanel()
     }))

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

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,14 +10,13 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
-var _reactLazyload = _interopRequireDefault(require("react-lazyload"));
+var _reactLazyload = _interopRequireWildcard(require("react-lazyload"));
 var _lodash = require("lodash");
 var _index = require("../../index");
-var _utils = require("../../utils");
 var _ProCollapse = _interopRequireDefault(require("../../../ProLayout/components/ProCollapse"));
 var _excluded = ["id", "title", "collapse", "children", "lazyLoad"];
 var defaultLazyLoadConfig = {
-  height: 100,
+  height: 200,
   offset: 100,
   once: true // Load only once upon first entry into the viewport
 };
@@ -31,10 +31,8 @@ var ProStepItem = function ProStepItem(_ref) {
   var _useStep = (0, _index.useStep)(),
     register = _useStep.register,
     collapse = _useStep.collapse,
-    globalLazyLoad = _useStep.lazyLoad,
-    registerMap = _useStep.registerMap;
-  var lazyLoad = stepLazyLoad || globalLazyLoad;
-  var loadedMap = (0, _utils.getLoadedMap)(registerMap);
+    globalLazyLoad = _useStep.lazyLoad;
+  var lazyLoad = stepLazyLoad !== null && stepLazyLoad !== void 0 ? stepLazyLoad : globalLazyLoad;
   (0, _react.useEffect)(function () {
     // Schedule registration to avoid re-render issues
     var timeoutId = setTimeout(function () {
@@ -45,13 +43,11 @@ var ProStepItem = function ProStepItem(_ref) {
       }, restProps));
     }, 0);
     return function () {
-      return clearTimeout(timeoutId);
+      clearTimeout(timeoutId);
     };
   }, [id, title, lazyLoad, restProps, register]);
   var renderChildren = function renderChildren() {
-    var _loadedMap$;
-    // 第一个step不设置lasyload，防止懒加载不生效
-    if (lazyLoad && (loadedMap === null || loadedMap === void 0 ? void 0 : loadedMap.length) && (loadedMap === null || loadedMap === void 0 ? void 0 : (_loadedMap$ = loadedMap[0]) === null || _loadedMap$ === void 0 ? void 0 : _loadedMap$.id) !== id) {
+    if (lazyLoad) {
       var lazyLoadProps = (0, _lodash.isBoolean)(lazyLoad) ? defaultLazyLoadConfig : lazyLoad;
       return (0, _jsxRuntime.jsx)(_reactLazyload.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, lazyLoadProps), {}, {
         classNamePrefix: id,
@@ -69,6 +65,17 @@ var ProStepItem = function ProStepItem(_ref) {
         title: title,
         icon: true
       }, restProps), {}, {
+        onChange: function onChange(e) {
+          var _restProps$onChange;
+          if (lazyLoad) {
+            // 延时执行, 避免在折叠时, 懒加载的元素没有高度
+            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);
+        },
         children: renderChildren()
       }))
     });

package/lib/ProTable/components/RcTable/components/DraggableTable/index.js

@@ -16,9 +16,9 @@ var _index = require("../../../index");
 require("../../../../style/index.less");
 var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
 /*
- * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Author: ''
  * @Date: 2024-08-09 13:48:59
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditors: ''
  * @LastEditTime: 2024-08-27 15:27:44
  * @FilePath: /za-material-warehouse/src/ProTable/components/RcTable/components/DraggableTable/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE

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/ProTree/components/AdaptiveTooltip.js

@@ -10,9 +10,9 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _react = require("react");
 /*
- * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Author: ''
  * @Date: 2024-09-20 10:26:04
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditors: ''
  * @LastEditTime: 2024-09-26 14:12:44
  * @FilePath: /za-material-warehouse/src/ProTree/components/AdaptiveTooltip.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE

package/lib/ProTree/components/List.js

@@ -14,9 +14,9 @@ var _SearchTitle = _interopRequireDefault(require("./SearchTitle"));
 var _CloseIcon = _interopRequireDefault(require("./CloseIcon"));
 var _excluded = ["checkedValues", "disabled", "treeData", "searchStr", "showCodeName", "mode", "fieldNames", "handleOnChange", "handleFilterClose", "optionRender"];
 /*
- * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Author: ''
  * @Date: 2024-07-03 11:02:19
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditors: ''
  * @LastEditTime: 2024-09-26 14:30:26
  * @FilePath: /za-material-warehouse/src/ProTree/components/List.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE

package/lib/ProTree/components/SearchTitle.js

@@ -9,9 +9,9 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _AdaptiveTooltip = _interopRequireDefault(require("./AdaptiveTooltip"));
 /*
- * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Author: ''
  * @Date: 2024-09-26 14:37:00
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditors: ''
  * @LastEditTime: 2024-09-26 17:50:59
  * @FilePath: /za-material-warehouse/src/ProTree/components/SearchTitle.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE

package/lib/ProTreeModal/index.js

@@ -25,9 +25,9 @@ var _inputSearch = _interopRequireDefault(require("../assets/input-search.svg"))
 var _locale = _interopRequireWildcard(require("../locale"));
 require("./style/index.less");
 /*
- * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Author: ''
  * @Date: 2024-06-04 10:01:18
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditors: ''
  * @LastEditTime: 2024-09-27 11:49:28
  * @FilePath: /za-material-warehouse/src/ProTreeModal/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE

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.4",
+  "version": "3.11.5-beta.10",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",