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

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/ProEditTable/components/RcTable/DraggableTable.js

@@ -67,7 +67,7 @@ var Row = function Row(props) {
   }));
 };
 var DndWrapper = function DndWrapper(_ref2) {
-  var _value$;
+  var _value$, _value$map;
   var draggable = _ref2.draggable,
     value = _ref2.value,
     onChange = _ref2.onChange,
@@ -78,15 +78,16 @@ var DndWrapper = function DndWrapper(_ref2) {
     var active = event.active,
       over = event.over;
     if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
+      var _value$findIndex, _value$findIndex2;
       if (onDrag) {
         var nextList = onDrag(event, value);
         onChange(nextList);
         return;
       }
-      var activeIndex = value.findIndex(function (i) {
+      var activeIndex = value === null || value === void 0 ? void 0 : (_value$findIndex = value.findIndex) === null || _value$findIndex === void 0 ? void 0 : _value$findIndex.call(value, function (i) {
         return i.rowKey === active.id;
       });
-      var overIndex = value.findIndex(function (i) {
+      var overIndex = value === null || value === void 0 ? void 0 : (_value$findIndex2 = value.findIndex) === null || _value$findIndex2 === void 0 ? void 0 : _value$findIndex2.call(value, function (i) {
         return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
       });
       var nextValue = arrayMove(value, activeIndex, overIndex);
@@ -96,8 +97,8 @@ var DndWrapper = function DndWrapper(_ref2) {
   return draggable && !disabled ? _jsx(DndContext, {
     onDragEnd: onDragEnd,
     children: _jsx(SortableContext, {
-      items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value.map(function (i) {
-        return i.rowKey;
+      items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value === null || value === void 0 ? void 0 : (_value$map = value.map) === null || _value$map === void 0 ? void 0 : _value$map.call(value, function (i) {
+        return i === null || i === void 0 ? void 0 : i.rowKey;
       }) : [],
       strategy: verticalListSortingStrategy,
       children: children

package/es/ProEditTable/index.js

@@ -122,10 +122,10 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     className: className
   });
   var getRowKey = function getRowKey(record) {
-    var key = record.rowKey || getRandom();
+    var key = (record === null || record === void 0 ? void 0 : record.rowKey) || getRandom();
     if (rowKey) {
       var _ref3;
-      key = (_ref3 = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref3 !== void 0 ? _ref3 : key;
+      key = (_ref3 = typeof rowKey === 'function' ? rowKey(record) : record === null || record === void 0 ? void 0 : record[rowKey]) !== null && _ref3 !== void 0 ? _ref3 : key;
     }
     return key;
   };
@@ -240,7 +240,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   }, resetProps);
   // 编辑行设置下样式
   var _rowClassName = function _rowClassName(record) {
-    var isEdit = !virtualKey || editingKeys.includes(record.rowKey);
+    var isEdit = !virtualKey || editingKeys.includes(record === null || record === void 0 ? void 0 : record.rowKey);
     var className = isEdit ? 'is-editing' : '';
     if (getIsNew(record)) {
       return "is-new-row ".concat(className);
@@ -342,7 +342,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     });
     // 初始化默认生成row-key
     if ((value === null || value === void 0 ? void 0 : value.length) && (!isAllHasKey || isNeedCover)) {
-      var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
+      var _value$map;
+      var nextValues = value === null || value === void 0 ? void 0 : (_value$map = value.map) === null || _value$map === void 0 ? void 0 : _value$map.call(value, function (item) {
         return _objectSpread(_objectSpread({}, item), {}, {
           rowKey: getRowKey(item)
         });

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/config.js

@@ -50,7 +50,7 @@ export var actions = {
     }
     var nextEditingKeys = _toConsumableArray(editingKeys);
     // 开启编辑状态
-    nextEditingKeys.push(record.rowKey);
+    nextEditingKeys.push(record === null || record === void 0 ? void 0 : record.rowKey);
     // 编辑时赋值编辑状态，供validator做保存校验
     if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
       record.isEditing = true;
@@ -65,6 +65,7 @@ export var actions = {
   },
   save: function () {
     var _save = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
+      var _editingKeys$filter;
       var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -75,8 +76,9 @@ export var actions = {
             record = _objectSpread(_objectSpread(_objectSpread({}, record), form.getFieldValue(virtualRowName)), updateData);
             delete record.addFlag; // 删除第一次新增的标记
             // 关闭当前保存行的编辑状态
-            nextEditingKeys = editingKeys.filter(function (key) {
-              return key !== record.rowKey;
+            nextEditingKeys = editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$filter = editingKeys.filter) === null || _editingKeys$filter === void 0 ? void 0 : _editingKeys$filter.call(editingKeys, function (key) {
+              var _record;
+              return key !== ((_record = record) === null || _record === void 0 ? void 0 : _record.rowKey);
             }); // 保存后取消编辑状态，供validator做保存校验
             if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
               record.isEditing = true;
@@ -102,6 +104,7 @@ export var actions = {
     return save;
   }(),
   cancel: function cancel(_ref3) {
+    var _editingKeys$filter2;
     var name = _ref3.name,
       record = _ref3.record,
       editingKeys = _ref3.editingKeys,
@@ -109,8 +112,8 @@ export var actions = {
       form = _ref3.form,
       virtualRowName = _ref3.virtualRowName,
       virtualKey = _ref3.virtualKey;
-    var nextEditingKeys = editingKeys.filter(function (key) {
-      return key !== record.rowKey;
+    var nextEditingKeys = editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$filter2 = editingKeys.filter) === null || _editingKeys$filter2 === void 0 ? void 0 : _editingKeys$filter2.call(editingKeys, function (key) {
+      return key !== (record === null || record === void 0 ? void 0 : record.rowKey);
     });
     // 保存后取消编辑状态，供validator做保存校验
     if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
@@ -127,7 +130,7 @@ export var actions = {
         name: name,
         form: form,
         virtualKey: virtualKey,
-        selectedRowKeys: [record.rowKey]
+        selectedRowKeys: [record === null || record === void 0 ? void 0 : record.rowKey]
       });
     } else {
       // 防止value引用不变, 值不更新 - (自定义组件)
@@ -154,12 +157,13 @@ export var actions = {
       name: name,
       form: form,
       virtualKey: virtualKey,
-      selectedRowKeys: [record.rowKey]
+      selectedRowKeys: [record === null || record === void 0 ? void 0 : record.rowKey]
     });
     if (virtualKey) {
+      var _editingKeys$filter3;
       // 关闭编辑状态
-      var nextEditingKeys = editingKeys.filter(function (key) {
-        return key === record.rowKey;
+      var nextEditingKeys = editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$filter3 = editingKeys.filter) === null || _editingKeys$filter3 === void 0 ? void 0 : _editingKeys$filter3.call(editingKeys, function (key) {
+        return key === (record === null || record === void 0 ? void 0 : record.rowKey);
       });
       setState({
         editingKeys: nextEditingKeys

package/es/ProEditTable/utils/index.js

@@ -174,7 +174,7 @@ var getActionColumn = function getActionColumn(config) {
               config: config,
               btnConfig: btnConfig
             }))
-          }, "".concat(record.rowKey, "-").concat(btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type));
+          }, "".concat(record === null || record === void 0 ? void 0 : record.rowKey, "-").concat(btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type));
         })
       });
     }
@@ -277,9 +277,9 @@ export var transformColumns = function transformColumns() {
       item.className = _toConsumableArray(new Set(item.className.split(' '))).join(' ');
     }
     var _render = function _render(text, record, index) {
-      var isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record.addFlag;
+      var isEditing = !virtualKey || editingKeys.includes(record === null || record === void 0 ? void 0 : record.rowKey) || record.addFlag;
       var namePath = isArray(name) ? name : [name];
-      if (virtualKey && editingKeys.includes(record.rowKey)) {
+      if (virtualKey && editingKeys.includes(record === null || record === void 0 ? void 0 : record.rowKey)) {
         namePath = getNamePath(name, virtualKey);
       }
       var columnNamePath = isArray(columnName) ? columnName : [columnName];

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,7 @@ 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 }: {
     form: any;
     name: any;
     value: any;

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;
@@ -65,7 +65,7 @@ export var onDelete = function onDelete(_ref) {
   // 正常的form数据流处理
   var dataSource = form.getFieldValue(name);
   dataSource = dataSource.filter(function (row) {
-    return !selectedRowKeys.includes(row.rowKey);
+    return !selectedRowKeys.includes(row === null || row === void 0 ? void 0 : row.rowKey);
   });
   form.setFieldValue(name, dataSource);
   // 单行模式数据流处理 重置中间正在编辑状态单行数据
@@ -75,7 +75,7 @@ export var onDelete = function onDelete(_ref) {
     var virtualList = form.getFieldValue(namePath);
     if ((_virtualList = virtualList) === null || _virtualList === void 0 ? void 0 : _virtualList.length) {
       virtualList = virtualList.filter(function (row) {
-        return !selectedRowKeys.includes(row.rowKey);
+        return !selectedRowKeys.includes(row === null || row === void 0 ? void 0 : row.rowKey);
       });
       form.setFieldValue(namePath, virtualList);
     }

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: 300,
   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;
+    globalLazyLoad = _useStep.lazyLoad;
   var lazyLoad = stepLazyLoad || globalLazyLoad;
-  var loadedMap = getLoadedMap(registerMap);
   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,14 @@ var ProStepItem = function ProStepItem(_ref) {
         title: title,
         icon: true
       }, restProps), {}, {
+        onChange: function onChange(e) {
+          var _restProps$onChange;
+          if (lazyLoad) {
+            forceCheck();
+          }
+          // 默认执行
+          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/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/lib/ProEditTable/components/RcTable/DraggableTable.js

@@ -74,7 +74,7 @@ var Row = function Row(props) {
   }));
 };
 var DndWrapper = function DndWrapper(_ref2) {
-  var _value$;
+  var _value$, _value$map;
   var draggable = _ref2.draggable,
     value = _ref2.value,
     onChange = _ref2.onChange,
@@ -85,15 +85,16 @@ var DndWrapper = function DndWrapper(_ref2) {
     var active = event.active,
       over = event.over;
     if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
+      var _value$findIndex, _value$findIndex2;
       if (onDrag) {
         var nextList = onDrag(event, value);
         onChange(nextList);
         return;
       }
-      var activeIndex = value.findIndex(function (i) {
+      var activeIndex = value === null || value === void 0 ? void 0 : (_value$findIndex = value.findIndex) === null || _value$findIndex === void 0 ? void 0 : _value$findIndex.call(value, function (i) {
         return i.rowKey === active.id;
       });
-      var overIndex = value.findIndex(function (i) {
+      var overIndex = value === null || value === void 0 ? void 0 : (_value$findIndex2 = value.findIndex) === null || _value$findIndex2 === void 0 ? void 0 : _value$findIndex2.call(value, function (i) {
         return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
       });
       var nextValue = (0, _sortable.arrayMove)(value, activeIndex, overIndex);
@@ -103,8 +104,8 @@ var DndWrapper = function DndWrapper(_ref2) {
   return draggable && !disabled ? (0, _jsxRuntime.jsx)(_core.DndContext, {
     onDragEnd: onDragEnd,
     children: (0, _jsxRuntime.jsx)(_sortable.SortableContext, {
-      items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value.map(function (i) {
-        return i.rowKey;
+      items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value === null || value === void 0 ? void 0 : (_value$map = value.map) === null || _value$map === void 0 ? void 0 : _value$map.call(value, function (i) {
+        return i === null || i === void 0 ? void 0 : i.rowKey;
       }) : [],
       strategy: _sortable.verticalListSortingStrategy,
       children: children

package/lib/ProEditTable/index.js

@@ -125,10 +125,10 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     className: className
   });
   var getRowKey = function getRowKey(record) {
-    var key = record.rowKey || (0, _tools.getRandom)();
+    var key = (record === null || record === void 0 ? void 0 : record.rowKey) || (0, _tools.getRandom)();
     if (rowKey) {
       var _ref3;
-      key = (_ref3 = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref3 !== void 0 ? _ref3 : key;
+      key = (_ref3 = typeof rowKey === 'function' ? rowKey(record) : record === null || record === void 0 ? void 0 : record[rowKey]) !== null && _ref3 !== void 0 ? _ref3 : key;
     }
     return key;
   };
@@ -243,7 +243,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   }, resetProps);
   // 编辑行设置下样式
   var _rowClassName = function _rowClassName(record) {
-    var isEdit = !virtualKey || editingKeys.includes(record.rowKey);
+    var isEdit = !virtualKey || editingKeys.includes(record === null || record === void 0 ? void 0 : record.rowKey);
     var className = isEdit ? 'is-editing' : '';
     if (getIsNew(record)) {
       return "is-new-row ".concat(className);
@@ -345,7 +345,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     });
     // 初始化默认生成row-key
     if ((value === null || value === void 0 ? void 0 : value.length) && (!isAllHasKey || isNeedCover)) {
-      var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
+      var _value$map;
+      var nextValues = value === null || value === void 0 ? void 0 : (_value$map = value.map) === null || _value$map === void 0 ? void 0 : _value$map.call(value, function (item) {
         return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
           rowKey: getRowKey(item)
         });

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/config.js

@@ -56,7 +56,7 @@ var actions = exports.actions = {
     }
     var nextEditingKeys = (0, _toConsumableArray2.default)(editingKeys);
     // 开启编辑状态
-    nextEditingKeys.push(record.rowKey);
+    nextEditingKeys.push(record === null || record === void 0 ? void 0 : record.rowKey);
     // 编辑时赋值编辑状态，供validator做保存校验
     if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
       record.isEditing = true;
@@ -71,6 +71,7 @@ var actions = exports.actions = {
   },
   save: function () {
     var _save = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref2) {
+      var _editingKeys$filter;
       var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -81,8 +82,9 @@ var actions = exports.actions = {
             record = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, record), form.getFieldValue(virtualRowName)), updateData);
             delete record.addFlag; // 删除第一次新增的标记
             // 关闭当前保存行的编辑状态
-            nextEditingKeys = editingKeys.filter(function (key) {
-              return key !== record.rowKey;
+            nextEditingKeys = editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$filter = editingKeys.filter) === null || _editingKeys$filter === void 0 ? void 0 : _editingKeys$filter.call(editingKeys, function (key) {
+              var _record;
+              return key !== ((_record = record) === null || _record === void 0 ? void 0 : _record.rowKey);
             }); // 保存后取消编辑状态，供validator做保存校验
             if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
               record.isEditing = true;
@@ -108,6 +110,7 @@ var actions = exports.actions = {
     return save;
   }(),
   cancel: function cancel(_ref3) {
+    var _editingKeys$filter2;
     var name = _ref3.name,
       record = _ref3.record,
       editingKeys = _ref3.editingKeys,
@@ -115,8 +118,8 @@ var actions = exports.actions = {
       form = _ref3.form,
       virtualRowName = _ref3.virtualRowName,
       virtualKey = _ref3.virtualKey;
-    var nextEditingKeys = editingKeys.filter(function (key) {
-      return key !== record.rowKey;
+    var nextEditingKeys = editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$filter2 = editingKeys.filter) === null || _editingKeys$filter2 === void 0 ? void 0 : _editingKeys$filter2.call(editingKeys, function (key) {
+      return key !== (record === null || record === void 0 ? void 0 : record.rowKey);
     });
     // 保存后取消编辑状态，供validator做保存校验
     if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
@@ -133,7 +136,7 @@ var actions = exports.actions = {
         name: name,
         form: form,
         virtualKey: virtualKey,
-        selectedRowKeys: [record.rowKey]
+        selectedRowKeys: [record === null || record === void 0 ? void 0 : record.rowKey]
       });
     } else {
       // 防止value引用不变, 值不更新 - (自定义组件)
@@ -160,12 +163,13 @@ var actions = exports.actions = {
       name: name,
       form: form,
       virtualKey: virtualKey,
-      selectedRowKeys: [record.rowKey]
+      selectedRowKeys: [record === null || record === void 0 ? void 0 : record.rowKey]
     });
     if (virtualKey) {
+      var _editingKeys$filter3;
       // 关闭编辑状态
-      var nextEditingKeys = editingKeys.filter(function (key) {
-        return key === record.rowKey;
+      var nextEditingKeys = editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$filter3 = editingKeys.filter) === null || _editingKeys$filter3 === void 0 ? void 0 : _editingKeys$filter3.call(editingKeys, function (key) {
+        return key === (record === null || record === void 0 ? void 0 : record.rowKey);
       });
       setState({
         editingKeys: nextEditingKeys

package/lib/ProEditTable/utils/index.js

@@ -178,7 +178,7 @@ var getActionColumn = function getActionColumn(config) {
               config: config,
               btnConfig: btnConfig
             }))
-          }, "".concat(record.rowKey, "-").concat(btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type));
+          }, "".concat(record === null || record === void 0 ? void 0 : record.rowKey, "-").concat(btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type));
         })
       });
     }
@@ -281,9 +281,9 @@ var transformColumns = exports.transformColumns = function transformColumns() {
       item.className = (0, _toConsumableArray2.default)(new Set(item.className.split(' '))).join(' ');
     }
     var _render = function _render(text, record, index) {
-      var isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record.addFlag;
+      var isEditing = !virtualKey || editingKeys.includes(record === null || record === void 0 ? void 0 : record.rowKey) || record.addFlag;
       var namePath = (0, _lodash.isArray)(name) ? name : [name];
-      if (virtualKey && editingKeys.includes(record.rowKey)) {
+      if (virtualKey && editingKeys.includes(record === null || record === void 0 ? void 0 : record.rowKey)) {
         namePath = (0, _tools.getNamePath)(name, virtualKey);
       }
       var columnNamePath = (0, _lodash.isArray)(columnName) ? columnName : [columnName];

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,7 @@ 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 }: {
     form: any;
     name: any;
     value: any;

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;
@@ -74,7 +74,7 @@ var onDelete = exports.onDelete = function onDelete(_ref) {
   // 正常的form数据流处理
   var dataSource = form.getFieldValue(name);
   dataSource = dataSource.filter(function (row) {
-    return !selectedRowKeys.includes(row.rowKey);
+    return !selectedRowKeys.includes(row === null || row === void 0 ? void 0 : row.rowKey);
   });
   form.setFieldValue(name, dataSource);
   // 单行模式数据流处理 重置中间正在编辑状态单行数据
@@ -84,7 +84,7 @@ var onDelete = exports.onDelete = function onDelete(_ref) {
     var virtualList = form.getFieldValue(namePath);
     if ((_virtualList = virtualList) === null || _virtualList === void 0 ? void 0 : _virtualList.length) {
       virtualList = virtualList.filter(function (row) {
-        return !selectedRowKeys.includes(row.rowKey);
+        return !selectedRowKeys.includes(row === null || row === void 0 ? void 0 : row.rowKey);
       });
       form.setFieldValue(namePath, virtualList);
     }

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: 300,
   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;
+    globalLazyLoad = _useStep.lazyLoad;
   var lazyLoad = stepLazyLoad || globalLazyLoad;
-  var loadedMap = (0, _utils.getLoadedMap)(registerMap);
   (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,14 @@ var ProStepItem = function ProStepItem(_ref) {
         title: title,
         icon: true
       }, restProps), {}, {
+        onChange: function onChange(e) {
+          var _restProps$onChange;
+          if (lazyLoad) {
+            (0, _reactLazyload.forceCheck)();
+          }
+          // 默认执行
+          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/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/package.json

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

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "kisstkondoros.vscode-codemetrics"
-    ]
-}