@zat-design/sisyphus-react 3.4.5-beta.27 → 3.4.5-beta.28

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

@@ -11,7 +11,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim"];
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
@@ -22,12 +22,13 @@ import valueTypeMap from '../../../ProForm/utils/valueType';
 import transformMap from '../../utils/transform';
 import { getNamePath, difference, getDisabled } from '../../utils/tools';
 import * as componentMap from '../../../ProForm/components';
+import { useProConfig } from '../../../ProConfigProvider';
 import Container from '../../../ProForm/components/Container';
 import transformNames from '../../../ProForm/utils/transformNames';
 import { FieldProvider } from '../../../ProForm/utils/useFieldProps';
 import { useListChanged } from '../../../ProForm/utils/useListChanged';
 import useRules from '../../../ProForm/utils/useRules';
-import { isSelect } from '../../../ProForm/utils';
+import { isSelect, isTrim } from '../../../ProForm/utils';
 var RenderField = function RenderField(_ref) {
   var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps;
   var value = _ref.text,
@@ -56,6 +57,7 @@ var RenderField = function RenderField(_ref) {
     rules = _column$rules === void 0 ? [] : _column$rules,
     equalWith = column.equalWith,
     className = column.className,
+    trim = column.trim,
     resetProps = _objectWithoutProperties(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -517,7 +519,7 @@ var RenderField = function RenderField(_ref) {
   if (['Select', 'ProSelect', 'ProEnum'].includes(type)) {
     componentProps.scrollFollowParent = false;
   }
-  Object.assign(_formItemProps, _objectSpread(_objectSpread(_objectSpread({}, defaultTransform()), valueTypeTransform()), namesTransform()));
+  Object.assign(_formItemProps, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultTransform()), valueTypeTransform()), namesTransform()), isTrim(type, trim, useProConfig())));
   // 编辑&保存模式，在查看状态下移除表单的rules不做校验
   if (!isEditing) {
     delete _formItemProps.rules;

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

@@ -596,6 +596,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           });
           nextState.selectedRows = value;
         }
+      } else if (value) {
+        nextState.selectedRowKeys = [value];
+        nextState.selectedRows = [_defineProperty({}, valueKey, value[valueKey])];
       }
       setState(nextState);
     }
@@ -799,6 +802,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         form: form,
         columns: formColumns,
         onFinish: handleSearch,
+        confirmLoading: loading,
         footer: (formColumns === null || formColumns === void 0 ? void 0 : formColumns.length) > 1
       }), _jsx(ProTable, _objectSpread({
         onRow: function onRow(record) {

package/es/ProTree/components/ProTree.js

@@ -161,10 +161,7 @@ var ProTree = function ProTree(props) {
     }
   }, [dataSource, enumCode]);
   useDeepCompareEffect(function () {
-    if (enumCode) {
-      return undefined;
-    }
-    if (dataSource) {
+    if (enumCode || dataSource) {
       return undefined;
     }
     var _ref = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
@@ -176,56 +173,60 @@ var ProTree = function ProTree(props) {
     // 执行用户配置的枚举服务，拉取枚举数据进行更新
     fetchFunction.run(defaultParams);
   }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
+  var handleSignalSelect = function handleSignalSelect(value) {
+    var checkedValues = [];
+    var innerVal = value;
+    if (labelInValue) {
+      checkedValues = innerVal[fieldNameValue];
+    } else {
+      // 单选值场景为string走到这里
+      checkedValues = innerVal;
+    }
+    setState({
+      checkedValues: checkedValues
+    });
+  };
+  var handleCheckSelect = function handleCheckSelect(allKeys) {
+    var checkedValues = [];
+    if (allValue && typeof value === 'string') {
+      // 如果value等于allValue那么全选中，否则选中value得值
+      if (value === allValue) {
+        checkedValues = allKeys;
+      } else {
+        checkedValues = [value];
+      }
+    } else {
+      var innerVal = value;
+      // 开启 labelInValue [{ label:xx, value: ""}] 形式、需要取出来 value
+      if (labelInValue) {
+        var isObjectArray = innerVal && innerVal.every(function (element) {
+          return _typeof(element) === 'object' && element !== null;
+        });
+        if (!isObjectArray) {
+          console.error('Please enter an array object');
+        }
+        checkedValues = innerVal && innerVal.map(function (item) {
+          return item[fieldNameValue];
+        });
+      } else {
+        // 复选，单纯value数组场景
+        checkedValues = innerVal;
+      }
+    }
+    setState({
+      checkedValues: checkedValues,
+      checkAll: checkedValues.length === allKeys.length
+    });
+  };
   useEffect(function () {
     if (value) {
-      var checkedValues = [];
       var allKeys = state.allKeys;
       if (!(other === null || other === void 0 ? void 0 : other.checkable)) {
         // 单选
-        var innerVal = value;
-        if (labelInValue) {
-          checkedValues = innerVal[fieldNameValue];
-        } else {
-          // 单选值场景为string走到这里
-          checkedValues = innerVal;
-        }
-        setState({
-          checkedValues: checkedValues
-        });
+        handleSignalSelect(value);
       } else {
         // 复选
-        if (allValue && typeof value === 'string') {
-          // 如果value等于allValue那么全选中，否则选中value得值
-          if (value === allValue) {
-            checkedValues = allKeys;
-          } else {
-            checkedValues = [value];
-          }
-        } else {
-          var _innerVal = value;
-          // 开启 labelInValue [{ label:xx, value: ""}] 形式、需要取出来 value
-          if (labelInValue) {
-            var isObjectArray = _innerVal && _innerVal.every(function (element) {
-              return _typeof(element) === 'object' && element !== null;
-            });
-            if (!isObjectArray) {
-              console.error('Please enter an array object');
-              checkedValues = [];
-            }
-            checkedValues = _innerVal && _innerVal.map(function (item) {
-              return item[fieldNameValue];
-            });
-          } else {
-            // 复选，单纯value数组场景
-            checkedValues = _innerVal;
-          }
-        }
-        // treeViewData = filterCheckedNodes(originalTreeData, checkedValues, '', fieldNames);
-        setState({
-          checkedValues: checkedValues,
-          checkAll: checkedValues.length === allKeys.length
-          // treeViewData,
-        });
+        handleCheckSelect(allKeys);
       }
     } else if (!(other === null || other === void 0 ? void 0 : other.checkable)) {
       // 单选--场景-->如果表单的value没有值，那么配置的selectedKey就起作用了，选中树节点
@@ -390,7 +391,6 @@ var ProTree = function ProTree(props) {
   }, className, className));
   var toggleExpand = function toggleExpand() {
     var _state$innerExpandKey;
-    // expandedKeys
     if (state === null || state === void 0 ? void 0 : (_state$innerExpandKey = state.innerExpandKeys) === null || _state$innerExpandKey === void 0 ? void 0 : _state$innerExpandKey.length) {
       setState({
         innerExpandKeys: []

package/es/ProTree/components/ProTreeSelect/index.js

@@ -193,12 +193,8 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     }
   }, [enumCode, dataSource]);
   useDeepCompareEffect(function () {
-    // code存在，不执行接口请求
-    if (enumCode) {
-      return undefined;
-    }
-    // dataSource存在不执行接口请求
-    if (dataSource) {
+    // code存在huo dataSource存在，不执行接口请求
+    if (enumCode || dataSource) {
       return undefined;
     }
     // disabled 状态时，不查询接口
@@ -411,7 +407,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     }
     return result;
   }
-  var handleChange = function handleChange(newVal, option) {
+  var handleChange = function handleChange(newVal) {
     // newVal回来得一定是label、value
     var result = newVal;
     if (props === null || props === void 0 ? void 0 : props.labelInValue) {

package/es/ProTree/components/Tree.js

@@ -59,13 +59,15 @@ function List(props) {
   var _useSetState = useSetState({
       expandedKeys: [],
       autoExpandParent: true,
-      currentClickTreeNode: null
+      currentClickTreeNode: null,
+      handing: false
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     _useSetState2$ = _useSetState2[0],
     expandedKeys = _useSetState2$.expandedKeys,
     autoExpandParent = _useSetState2$.autoExpandParent,
     currentClickTreeNode = _useSetState2$.currentClickTreeNode,
+    handing = _useSetState2$.handing,
     setState = _useSetState2[1];
   useEffect(function () {
     if (searchStr) {
@@ -112,21 +114,28 @@ function List(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            // if (window.handing) {
-            //   return null;
-            // }
-            // window.handing = true;
+            if (!handing) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return", null);
+          case 2:
             val = value;
             if (!isRadioSelect && value === currentClickTreeNode) {
               // 如果当前点击了已经选中节点，那么取消选择
               val = '';
             }
             setState({
-              currentClickTreeNode: val
+              currentClickTreeNode: val,
+              handing: true
             });
-            _context.next = 5;
+            _context.next = 7;
             return props === null || props === void 0 ? void 0 : (_props$onSelect = props.onSelect) === null || _props$onSelect === void 0 ? void 0 : _props$onSelect.call(props, val, item);
-          case 5:
+          case 7:
+            setState({
+              handing: false
+            });
+          case 8:
           case "end":
             return _context.stop();
         }
@@ -285,7 +294,6 @@ function List(props) {
       })]
     }, onlyKey);
   };
-  // const _treeData = useMemo(() => {
   function fn() {
     var loop = function loop(data, index) {
       index++;
@@ -317,7 +325,7 @@ function List(props) {
           key: (item === null || item === void 0 ? void 0 : item.key) || item[fieldNameValue]
         });
       });
-      return treeRow; // .filter((item) => item);
+      return treeRow;
     };
     if ((other === null || other === void 0 ? void 0 : other.mode) === 'view') {
       return;
@@ -328,8 +336,6 @@ function List(props) {
     }
     return loop(newTreeData, -1);
   }
-  // return fn();
-  // }, [searchStr, expandedKeys, showCodeName, originalTreeData, currentClickTreeNode]);
   var _treeData = fn();
   var onExpand = function onExpand(newExpandedKeys) {
     setState({

package/es/ProUpload/index.js

@@ -175,10 +175,6 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
    * @return {*}
    */
   var handleBeforeUpload = function handleBeforeUpload(file, fileList) {
-    if (!isFunction(beforeUpload)) {
-      return false;
-    }
-    // TODO
     if (!validateFileExt(extExt, file)) {
       var _locale$ProUpload2;
       _message.error("".concat(locale === null || locale === void 0 ? void 0 : (_locale$ProUpload2 = locale.ProUpload) === null || _locale$ProUpload2 === void 0 ? void 0 : _locale$ProUpload2.errorInfoExt, "\u3010").concat(extExt.join('、'), "\u3011"));
@@ -189,7 +185,9 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
       _message.error("".concat(locale === null || locale === void 0 ? void 0 : (_locale$ProUpload3 = locale.ProUpload) === null || _locale$ProUpload3 === void 0 ? void 0 : _locale$ProUpload3.errorInfoSize).concat(size, "M"));
       return false;
     }
-    return beforeUpload(file, fileList);
+    if (beforeUpload) {
+      return beforeUpload(file, fileList);
+    }
   };
   var handleRemove = function handleRemove(file) {
     var nextList = _fileList.slice();

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

@@ -22,13 +22,14 @@ var _valueType = _interopRequireDefault(require("../../../ProForm/utils/valueTyp
 var _transform = _interopRequireDefault(require("../../utils/transform"));
 var _tools = require("../../utils/tools");
 var componentMap = _interopRequireWildcard(require("../../../ProForm/components"));
+var _ProConfigProvider = require("../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
 var _transformNames = _interopRequireDefault(require("../../../ProForm/utils/transformNames"));
 var _useFieldProps = require("../../../ProForm/utils/useFieldProps");
 var _useListChanged3 = require("../../../ProForm/utils/useListChanged");
 var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
 var _utils = require("../../../ProForm/utils");
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
@@ -59,6 +60,7 @@ var RenderField = function RenderField(_ref) {
     rules = _column$rules === void 0 ? [] : _column$rules,
     equalWith = column.equalWith,
     className = column.className,
+    trim = column.trim,
     resetProps = (0, _objectWithoutProperties2.default)(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -520,7 +522,7 @@ var RenderField = function RenderField(_ref) {
   if (['Select', 'ProSelect', 'ProEnum'].includes(type)) {
     componentProps.scrollFollowParent = false;
   }
-  Object.assign(_formItemProps, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultTransform()), valueTypeTransform()), namesTransform()));
+  Object.assign(_formItemProps, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultTransform()), valueTypeTransform()), namesTransform()), (0, _utils.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())));
   // 编辑&保存模式，在查看状态下移除表单的rules不做校验
   if (!isEditing) {
     delete _formItemProps.rules;

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

@@ -593,6 +593,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           });
           nextState.selectedRows = value;
         }
+      } else if (value) {
+        nextState.selectedRowKeys = [value];
+        nextState.selectedRows = [(0, _defineProperty2.default)({}, valueKey, value[valueKey])];
       }
       setState(nextState);
     }
@@ -796,6 +799,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         form: form,
         columns: formColumns,
         onFinish: handleSearch,
+        confirmLoading: loading,
         footer: (formColumns === null || formColumns === void 0 ? void 0 : formColumns.length) > 1
       }), (0, _jsxRuntime.jsx)(_index.ProTable, (0, _objectSpread3.default)({
         onRow: function onRow(record) {

package/lib/ProTree/components/ProTree.js

@@ -161,10 +161,7 @@ var ProTree = function ProTree(props) {
     }
   }, [dataSource, enumCode]);
   (0, _ahooks.useDeepCompareEffect)(function () {
-    if (enumCode) {
-      return undefined;
-    }
-    if (dataSource) {
+    if (enumCode || dataSource) {
       return undefined;
     }
     var _ref = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
@@ -176,56 +173,60 @@ var ProTree = function ProTree(props) {
     // 执行用户配置的枚举服务，拉取枚举数据进行更新
     fetchFunction.run(defaultParams);
   }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
+  var handleSignalSelect = function handleSignalSelect(value) {
+    var checkedValues = [];
+    var innerVal = value;
+    if (labelInValue) {
+      checkedValues = innerVal[fieldNameValue];
+    } else {
+      // 单选值场景为string走到这里
+      checkedValues = innerVal;
+    }
+    setState({
+      checkedValues: checkedValues
+    });
+  };
+  var handleCheckSelect = function handleCheckSelect(allKeys) {
+    var checkedValues = [];
+    if (allValue && typeof value === 'string') {
+      // 如果value等于allValue那么全选中，否则选中value得值
+      if (value === allValue) {
+        checkedValues = allKeys;
+      } else {
+        checkedValues = [value];
+      }
+    } else {
+      var innerVal = value;
+      // 开启 labelInValue [{ label:xx, value: ""}] 形式、需要取出来 value
+      if (labelInValue) {
+        var isObjectArray = innerVal && innerVal.every(function (element) {
+          return (0, _typeof2.default)(element) === 'object' && element !== null;
+        });
+        if (!isObjectArray) {
+          console.error('Please enter an array object');
+        }
+        checkedValues = innerVal && innerVal.map(function (item) {
+          return item[fieldNameValue];
+        });
+      } else {
+        // 复选，单纯value数组场景
+        checkedValues = innerVal;
+      }
+    }
+    setState({
+      checkedValues: checkedValues,
+      checkAll: checkedValues.length === allKeys.length
+    });
+  };
   (0, _react.useEffect)(function () {
     if (value) {
-      var checkedValues = [];
       var allKeys = state.allKeys;
       if (!(other === null || other === void 0 ? void 0 : other.checkable)) {
         // 单选
-        var innerVal = value;
-        if (labelInValue) {
-          checkedValues = innerVal[fieldNameValue];
-        } else {
-          // 单选值场景为string走到这里
-          checkedValues = innerVal;
-        }
-        setState({
-          checkedValues: checkedValues
-        });
+        handleSignalSelect(value);
       } else {
         // 复选
-        if (allValue && typeof value === 'string') {
-          // 如果value等于allValue那么全选中，否则选中value得值
-          if (value === allValue) {
-            checkedValues = allKeys;
-          } else {
-            checkedValues = [value];
-          }
-        } else {
-          var _innerVal = value;
-          // 开启 labelInValue [{ label:xx, value: ""}] 形式、需要取出来 value
-          if (labelInValue) {
-            var isObjectArray = _innerVal && _innerVal.every(function (element) {
-              return (0, _typeof2.default)(element) === 'object' && element !== null;
-            });
-            if (!isObjectArray) {
-              console.error('Please enter an array object');
-              checkedValues = [];
-            }
-            checkedValues = _innerVal && _innerVal.map(function (item) {
-              return item[fieldNameValue];
-            });
-          } else {
-            // 复选，单纯value数组场景
-            checkedValues = _innerVal;
-          }
-        }
-        // treeViewData = filterCheckedNodes(originalTreeData, checkedValues, '', fieldNames);
-        setState({
-          checkedValues: checkedValues,
-          checkAll: checkedValues.length === allKeys.length
-          // treeViewData,
-        });
+        handleCheckSelect(allKeys);
       }
     } else if (!(other === null || other === void 0 ? void 0 : other.checkable)) {
       // 单选--场景-->如果表单的value没有值，那么配置的selectedKey就起作用了，选中树节点
@@ -390,7 +391,6 @@ var ProTree = function ProTree(props) {
   }, className, className));
   var toggleExpand = function toggleExpand() {
     var _state$innerExpandKey;
-    // expandedKeys
     if (state === null || state === void 0 ? void 0 : (_state$innerExpandKey = state.innerExpandKeys) === null || _state$innerExpandKey === void 0 ? void 0 : _state$innerExpandKey.length) {
       setState({
         innerExpandKeys: []

package/lib/ProTree/components/ProTreeSelect/index.js

@@ -195,12 +195,8 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     }
   }, [enumCode, dataSource]);
   (0, _ahooks.useDeepCompareEffect)(function () {
-    // code存在，不执行接口请求
-    if (enumCode) {
-      return undefined;
-    }
-    // dataSource存在不执行接口请求
-    if (dataSource) {
+    // code存在huo dataSource存在，不执行接口请求
+    if (enumCode || dataSource) {
       return undefined;
     }
     // disabled 状态时，不查询接口
@@ -413,7 +409,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     }
     return result;
   }
-  var handleChange = function handleChange(newVal, option) {
+  var handleChange = function handleChange(newVal) {
     // newVal回来得一定是label、value
     var result = newVal;
     if (props === null || props === void 0 ? void 0 : props.labelInValue) {

package/lib/ProTree/components/Tree.js

@@ -64,13 +64,15 @@ function List(props) {
   var _useSetState = (0, _ahooks.useSetState)({
       expandedKeys: [],
       autoExpandParent: true,
-      currentClickTreeNode: null
+      currentClickTreeNode: null,
+      handing: false
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     _useSetState2$ = _useSetState2[0],
     expandedKeys = _useSetState2$.expandedKeys,
     autoExpandParent = _useSetState2$.autoExpandParent,
     currentClickTreeNode = _useSetState2$.currentClickTreeNode,
+    handing = _useSetState2$.handing,
     setState = _useSetState2[1];
   (0, _react.useEffect)(function () {
     if (searchStr) {
@@ -117,21 +119,28 @@ function List(props) {
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            // if (window.handing) {
-            //   return null;
-            // }
-            // window.handing = true;
+            if (!handing) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return", null);
+          case 2:
             val = value;
             if (!isRadioSelect && value === currentClickTreeNode) {
               // 如果当前点击了已经选中节点，那么取消选择
               val = '';
             }
             setState({
-              currentClickTreeNode: val
+              currentClickTreeNode: val,
+              handing: true
             });
-            _context.next = 5;
+            _context.next = 7;
             return props === null || props === void 0 ? void 0 : (_props$onSelect = props.onSelect) === null || _props$onSelect === void 0 ? void 0 : _props$onSelect.call(props, val, item);
-          case 5:
+          case 7:
+            setState({
+              handing: false
+            });
+          case 8:
           case "end":
             return _context.stop();
         }
@@ -290,7 +299,6 @@ function List(props) {
       })]
     }, onlyKey);
   };
-  // const _treeData = useMemo(() => {
   function fn() {
     var loop = function loop(data, index) {
       index++;
@@ -322,7 +330,7 @@ function List(props) {
           key: (item === null || item === void 0 ? void 0 : item.key) || item[fieldNameValue]
         });
       });
-      return treeRow; // .filter((item) => item);
+      return treeRow;
     };
     if ((other === null || other === void 0 ? void 0 : other.mode) === 'view') {
       return;
@@ -333,8 +341,6 @@ function List(props) {
     }
     return loop(newTreeData, -1);
   }
-  // return fn();
-  // }, [searchStr, expandedKeys, showCodeName, originalTreeData, currentClickTreeNode]);
   var _treeData = fn();
   var onExpand = function onExpand(newExpandedKeys) {
     setState({

package/lib/ProUpload/index.js

@@ -182,10 +182,6 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
    * @return {*}
    */
   var handleBeforeUpload = function handleBeforeUpload(file, fileList) {
-    if (!(0, _lodash.isFunction)(beforeUpload)) {
-      return false;
-    }
-    // TODO
     if (!(0, _uitls.validateFileExt)(extExt, file)) {
       var _locale$ProUpload2;
       _antd.message.error("".concat(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProUpload2 = _locale.default.ProUpload) === null || _locale$ProUpload2 === void 0 ? void 0 : _locale$ProUpload2.errorInfoExt, "\u3010").concat(extExt.join('、'), "\u3011"));
@@ -196,7 +192,9 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       _antd.message.error("".concat(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProUpload3 = _locale.default.ProUpload) === null || _locale$ProUpload3 === void 0 ? void 0 : _locale$ProUpload3.errorInfoSize).concat(size, "M"));
       return false;
     }
-    return beforeUpload(file, fileList);
+    if (beforeUpload) {
+      return beforeUpload(file, fileList);
+    }
   };
   var handleRemove = function handleRemove(file) {
     var nextList = _fileList.slice();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.5-beta.27",
+  "version": "3.4.5-beta.28",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -58,7 +58,7 @@
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
     "@pansy/react-watermark": "^3.1.13",
-    "@zat-design/utils": "^1.1.18",
+    "@zat-design/utils": "^1.1.19",
     "ahooks": "3.7.4",
     "antd": "4.24.8",
     "big.js": "^6.2.1",