@zat-design/sisyphus-react 3.6.2 → 3.6.3-beta.2

package/es/ProStep/index.js

@@ -1,13 +1,13 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { createContext, useContext, useEffect, useMemo, useRef, useState } from 'react';
-import { useEventEmitter, useSetState, useLocalStorageState, useDeepCompareEffect } from 'ahooks';
+import { createContext, useContext, useMemo, useRef, useState } from 'react';
+import { useSetState, useLocalStorageState, useDeepCompareEffect } from 'ahooks';
 import { handleScroll } from './utils';
 import Step from './components/Step';
 import Item from './components/Item';
@@ -20,21 +20,16 @@ export var useStep = function useStep() {
 var ProStep = function ProStep(_ref) {
   var children = _ref.children,
     resetProps = _objectWithoutProperties(_ref, _excluded);
-  var emitter = useEventEmitter();
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    ids = _useState2[0],
+    setIds = _useState2[1];
   var _useSetState = useSetState({}),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     errorCollection = _useSetState2[0],
     setErrorCollection = _useSetState2[1];
   // 注册子节点id与title映射的集合
   var registerMap = useRef({});
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    anchorIds = _useState2[0],
-    setAnchorIds = _useState2[1];
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    loading = _useState4[0],
-    setLoading = _useState4[1];
   var _useLocalStorageState = useLocalStorageState('cache-pro-step'),
     _useLocalStorageState2 = _slicedToArray(_useLocalStorageState, 2),
     setLocalData = _useLocalStorageState2[1];
@@ -43,7 +38,6 @@ var ProStep = function ProStep(_ref) {
     collapse = _resetProps$collapse === void 0 ? false : _resetProps$collapse,
     _resetProps$scrollToE = resetProps.scrollToError,
     scrollToError = _resetProps$scrollToE === void 0 ? true : _resetProps$scrollToE;
-  var values = {};
   var dataSource = useMemo(function () {
     var _Object$entries, _Object$entries$map;
     if (resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource) {
@@ -61,14 +55,14 @@ var ProStep = function ProStep(_ref) {
         order: order
       };
     }).filter(function (item) {
-      return anchorIds.includes(item.code);
+      var _ids$includes;
+      return ids === null || ids === void 0 ? void 0 : (_ids$includes = ids.includes) === null || _ids$includes === void 0 ? void 0 : _ids$includes.call(ids, item.code);
     }).sort(function (pre, next) {
       return pre.order - next.order;
     });
-  }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap.current, anchorIds]);
+  }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap.current, ids]);
   // 用来注册form匹配到对应的模块id
   var register = function register(_ref4) {
-    var _registerMap$current;
     var id = _ref4.id,
       form = _ref4.form,
       title = _ref4.title,
@@ -78,18 +72,23 @@ var ProStep = function ProStep(_ref) {
     var record = {};
     record.title = title;
     record.order = order;
+    if (!ids.includes(id)) {
+      setIds(function (preState) {
+        return [].concat(_toConsumableArray(preState), [id]);
+      });
+    }
     if (disabled) {
       registerMap.current[id] = record;
       return null;
     }
     var subEvent = /*#__PURE__*/function () {
       var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var num, _form$validateFields, _errors$errorFields;
+        var value, _form$validateFields, _error$errorFields;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              num = 0;
-              _context.prev = 1;
+              _context.prev = 0;
+              value = null;
               if (!validator) {
                 _context.next = 8;
                 break;
@@ -97,58 +96,60 @@ var ProStep = function ProStep(_ref) {
               _context.next = 5;
               return validator === null || validator === void 0 ? void 0 : validator();
             case 5:
-              values[id] = _context.sent;
+              value = _context.sent;
               _context.next = 11;
               break;
             case 8:
               _context.next = 10;
               return form === null || form === void 0 ? void 0 : (_form$validateFields = form.validateFields) === null || _form$validateFields === void 0 ? void 0 : _form$validateFields.call(form);
             case 10:
-              values[id] = _context.sent;
+              value = _context.sent;
             case 11:
-              setErrorCollection(_defineProperty({}, id, 0));
-              _context.next = 21;
-              break;
+              return _context.abrupt("return", value);
             case 14:
               _context.prev = 14;
-              _context.t0 = _context["catch"](1);
-              num = _context.t0 === null || _context.t0 === void 0 ? void 0 : (_errors$errorFields = _context.t0.errorFields) === null || _errors$errorFields === void 0 ? void 0 : _errors$errorFields.length;
-              if (num) {
-                setLocalData(false);
+              _context.t0 = _context["catch"](0);
+              if (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length) {
                 console.error(_context.t0);
+                setLocalData(false);
               }
-              setErrorCollection(_defineProperty({}, id, num));
-              setLoading(false);
               return _context.abrupt("return", _context.t0);
-            case 21:
-              return _context.abrupt("return", values[id]);
-            case 22:
+            case 18:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[1, 14]]);
+        }, _callee, null, [[0, 14]]);
       }));
       return function subEvent() {
         return _ref5.apply(this, arguments);
       };
     }();
     record.subEvent = subEvent;
-    if (title && !(registerMap === null || registerMap === void 0 ? void 0 : (_registerMap$current = registerMap.current) === null || _registerMap$current === void 0 ? void 0 : _registerMap$current[id])) {
-      registerMap.current[id] = record;
-    }
-    emitter.useSubscription(subEvent);
+    registerMap.current[id] = record;
   };
   var notify = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var events, res, nextErrorCollection;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            setLoading(true);
+            events = Object.values(registerMap.current).map(function (item) {
+              var _item$subEvent;
+              return item === null || item === void 0 ? void 0 : (_item$subEvent = item.subEvent) === null || _item$subEvent === void 0 ? void 0 : _item$subEvent.call(item);
+            });
             _context2.next = 3;
-            return emitter.emit();
+            return Promise.all(events);
           case 3:
-            return _context2.abrupt("return", values);
-          case 4:
+            res = _context2.sent;
+            nextErrorCollection = {};
+            Object.keys(registerMap.current).forEach(function (id, index) {
+              var _ref7 = (res === null || res === void 0 ? void 0 : res[index]) || {},
+                errorFields = _ref7.errorFields;
+              nextErrorCollection[id] = (errorFields === null || errorFields === void 0 ? void 0 : errorFields.length) || 0;
+            });
+            setErrorCollection(nextErrorCollection);
+            return _context2.abrupt("return", res);
+          case 8:
           case "end":
             return _context2.stop();
         }
@@ -158,37 +159,16 @@ var ProStep = function ProStep(_ref) {
       return _ref6.apply(this, arguments);
     };
   }();
-  var handleListenerDom = function handleListenerDom() {
-    var targetElement = document.getElementById('pro-step');
-    var observer = new MutationObserver(function (mutations) {
-      mutations.forEach(function (mutation) {
-        // 处理 DOM 树变化的逻辑
-        var Anchors = document.getElementsByClassName('pro-step-item') || [];
-        // 当前页面所存在的所有折叠项
-        var nextAnchorIds = [];
-        Array.prototype.slice.call(Anchors).forEach(function (dom) {
-          var id = dom.getAttribute('id');
-          nextAnchorIds.push(id);
-        });
-        setAnchorIds(nextAnchorIds);
-      });
-    });
-    var config = {
-      subtree: true,
-      childList: true // 是否观察子元素的添加或删除
-    };
-    observer.observe(targetElement, config);
-  };
   var triggerTo = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(keys) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(keys) {
       var events, result, nextErrorCollection;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             events = [];
             keys === null || keys === void 0 ? void 0 : keys.forEach(function (key) {
-              var _registerMap$current2, _registerMap$current3, _registerMap$current4;
-              events.push(registerMap === null || registerMap === void 0 ? void 0 : (_registerMap$current2 = registerMap.current) === null || _registerMap$current2 === void 0 ? void 0 : (_registerMap$current3 = _registerMap$current2[key]) === null || _registerMap$current3 === void 0 ? void 0 : (_registerMap$current4 = _registerMap$current3.subEvent) === null || _registerMap$current4 === void 0 ? void 0 : _registerMap$current4.call(_registerMap$current3));
+              var _registerMap$current, _registerMap$current$, _registerMap$current$2;
+              events.push(registerMap === null || registerMap === void 0 ? void 0 : (_registerMap$current = registerMap.current) === null || _registerMap$current === void 0 ? void 0 : (_registerMap$current$ = _registerMap$current[key]) === null || _registerMap$current$ === void 0 ? void 0 : (_registerMap$current$2 = _registerMap$current$.subEvent) === null || _registerMap$current$2 === void 0 ? void 0 : _registerMap$current$2.call(_registerMap$current$));
             });
             _context3.next = 4;
             return Promise.all(events);
@@ -211,7 +191,7 @@ var ProStep = function ProStep(_ref) {
       }, _callee3);
     }));
     return function triggerTo(_x) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   useDeepCompareEffect(function () {
@@ -230,18 +210,13 @@ var ProStep = function ProStep(_ref) {
       });
     }
   }, [errorCollection, dataSource]);
-  useEffect(function () {
-    handleListenerDom();
-  }, []);
   return _jsx(ProStepContext.Provider, {
     value: {
       collapse: collapse,
       register: register,
       notify: notify,
       triggerTo: triggerTo,
-      handleScroll: handleScroll,
-      loading: loading,
-      setLoading: setLoading
+      handleScroll: handleScroll
     },
     children: _jsxs("div", {
       className: "pro-step-wrapper",

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

@@ -64,7 +64,7 @@ var ActionButton = function ActionButton(_ref) {
   // 其他操作按钮Props
   var actionBtnProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, btnConfig.buttonProps), {}, {
     onClick: function onClick() {
-      btnConfig.onEvent(record, index);
+      btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
     },
     disabled: getDisabled((_btnConfig$buttonProp3 = btnConfig.buttonProps) === null || _btnConfig$buttonProp3 === void 0 ? void 0 : _btnConfig$buttonProp3.disabled)
   });
@@ -81,7 +81,7 @@ var ActionButton = function ActionButton(_ref) {
         placement: "topRight",
         title: deleteMsgMap[btnConfig.type],
         onConfirm: function onConfirm() {
-          btnConfig.onEvent(record, index);
+          btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
         },
         disabled: isDisabled,
         okText: _locale.default.ProEditTable.confirm,
@@ -101,13 +101,13 @@ var ActionButton = function ActionButton(_ref) {
           index: index,
           disabled: isDisabled,
           onClick: function onClick() {
-            btnConfig.onEvent(record, index);
+            btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
           }
         }))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           disabled: isDisabled,
           type: "link",
           onClick: function onClick() {
-            btnConfig.onEvent(record, index);
+            btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
           },
           children: btnConfig.label
         }))

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

@@ -79,37 +79,27 @@ var RenderToolbar = function RenderToolbar(config) {
     toolbar.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     toolbar.onEvent = /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
-        var _yield$onEvent;
         var onEvent, result;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               onEvent = onClick || onHandle;
-              _context.next = 3;
+              if (onEvent) {
+                _context.next = 5;
+                break;
+              }
+              result = true;
+              _context.next = 8;
+              break;
+            case 5:
+              _context.next = 7;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(selectedRows, dataSource, {
                 form: form,
                 namePath: virtualName
               });
-            case 3:
-              _context.t1 = _yield$onEvent = _context.sent;
-              _context.t0 = _context.t1 !== null;
-              if (!_context.t0) {
-                _context.next = 7;
-                break;
-              }
-              _context.t0 = _yield$onEvent !== void 0;
             case 7:
-              if (!_context.t0) {
-                _context.next = 11;
-                break;
-              }
-              _context.t2 = _yield$onEvent;
-              _context.next = 12;
-              break;
-            case 11:
-              _context.t2 = true;
-            case 12:
-              result = _context.t2;
+              result = _context.sent;
+            case 8:
               if (result && type !== 'custom') {
                 _config.actions[type]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
                   index: index,
@@ -119,7 +109,7 @@ var RenderToolbar = function RenderToolbar(config) {
                   virtualName: virtualName
                 }));
               }
-            case 14:
+            case 9:
             case "end":
               return _context.stop();
           }

package/lib/ProEditTable/utils/index.js

@@ -83,7 +83,7 @@ var getActionColumn = function getActionColumn(config) {
     action.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     action.onEvent = /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
-        var _form$getFieldValue, _yield$onEvent;
+        var _form$getFieldValue;
         var rowName, _record, onEvent, result;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -109,31 +109,22 @@ var getActionColumn = function getActionColumn(config) {
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
               _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
-              _context.next = 16;
+              if (onEvent) {
+                _context.next = 18;
+                break;
+              }
+              result = true;
+              _context.next = 21;
+              break;
+            case 18:
+              _context.next = 20;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, index, {
                 form: form,
                 namePath: virtualRowName
               });
-            case 16:
-              _context.t2 = _yield$onEvent = _context.sent;
-              _context.t1 = _context.t2 !== null;
-              if (!_context.t1) {
-                _context.next = 20;
-                break;
-              }
-              _context.t1 = _yield$onEvent !== void 0;
             case 20:
-              if (!_context.t1) {
-                _context.next = 24;
-                break;
-              }
-              _context.t3 = _yield$onEvent;
-              _context.next = 25;
-              break;
-            case 24:
-              _context.t3 = true;
-            case 25:
-              result = _context.t3;
+              result = _context.sent;
+            case 21:
               if (result && type !== 'custom') {
                 _config.actions[type]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
                   rowName: [].concat((0, _toConsumableArray2.default)(name), [index]),
@@ -143,7 +134,7 @@ var getActionColumn = function getActionColumn(config) {
                   validateKeys: validateKeys
                 }));
               }
-            case 27:
+            case 22:
             case "end":
               return _context.stop();
           }

package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -21,10 +21,8 @@ var _excluded = ["label", "onClick", "onHandle", "type"],
 var actions = {
   add: {
     onClick: function onClick(value, _ref) {
-      var operation = _ref.operation,
-        form = _ref.form,
-        namePath = _ref.namePath;
-      operation.add();
+      var operation = _ref.operation;
+      operation.add({});
     },
     label: "".concat(_locale.default.ProForm.formListActions[5]),
     icon: (0, _jsxRuntime.jsx)(_icons.PlusOutlined, {})

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

@@ -11,6 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _antd = require("antd");
 var _core = require("@dnd-kit/core");
+var _lodash = require("lodash");
 var _sortable = require("@dnd-kit/sortable");
 var _utils = require("../../../utils");
 var _utils2 = require("./utils");
@@ -61,6 +62,10 @@ var FormList = function FormList(props, ref) {
         listName: [].concat((0, _toConsumableArray2.default)(namePath), [item.name]),
         label: mode === 'less' ? undefined : item.label
       });
+      // 可编辑表格的columns需要消除引用关系，防止串数据
+      if (column.type === 'ProEditTable' && !(0, _lodash.isFunction)(column.fieldProps)) {
+        column.fieldProps.columns = (0, _lodash.cloneDeep)(column.fieldProps.columns);
+      }
       return column;
     });
   }, [columns]);

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

@@ -181,20 +181,6 @@ var ProCascader = function ProCascader(props) {
       return option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1;
     });
   };
-  var handleAddressChange = function handleAddressChange(e) {
-    var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
-    if (onChange) {
-      if (!e.target.value && (cascaderValue === null || cascaderValue === void 0 ? void 0 : cascaderValue.every(function (item) {
-        return !item;
-      }))) {
-        onChange(undefined);
-      } else {
-        var realValue = value ? (0, _toConsumableArray2.default)(value) : [];
-        realValue[realLevel] = e.target.value;
-        onChange(realValue);
-      }
-    }
-  };
   var displayRender = function displayRender(label) {
     return label === null || label === void 0 ? void 0 : label.filter(function (item) {
       return !!item;
@@ -208,6 +194,48 @@ var ProCascader = function ProCascader(props) {
   })) === null || _ref7$filter === void 0 ? void 0 : _ref7$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
     return !!item;
   })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
+  var findSelectedOptions = function findSelectedOptions(options, value) {
+    var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+    var _value = value !== null && value !== void 0 ? value : [];
+    // 基准情况：如果 value 数组为空，且 path 不为空，说明找到了完整的路径
+    if ((_value === null || _value === void 0 ? void 0 : _value.length) === 0 && (path === null || path === void 0 ? void 0 : path.length) > 0) {
+      return path;
+    }
+    // 如果没有更多的 _value 需要匹配，或者当前选项没有 children，返回 null
+    if ((_value === null || _value === void 0 ? void 0 : _value.length) === 0 || !options || options.length === 0) {
+      return null;
+    }
+    // 尝试在当前层级的选项中查找匹配的 _value
+    var currentValue = _value[0];
+    var foundOption = (0, _lodash.find)(options, {
+      value: currentValue
+    });
+    if (foundOption) {
+      // 如果找到了匹配的选项，并且还有更多的 value 需要匹配，递归地在子选项中查找
+      if (_value.length > 1 && foundOption.children) {
+        return findSelectedOptions(foundOption.children, _value.slice(1), [].concat((0, _toConsumableArray2.default)(path), [foundOption]));
+      }
+      // 如果没有更多的 value 需要匹配，返回当前选项（以及之前的路径）
+      return [].concat((0, _toConsumableArray2.default)(path), [foundOption]);
+    }
+    // 如果没有在当前层级的选项中找到匹配的 value，返回 null
+    return null;
+  };
+  var _selectedOptions = findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+  var handleAddressChange = function handleAddressChange(e) {
+    var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
+    if (onChange) {
+      if (!e.target.value && (cascaderValue === null || cascaderValue === void 0 ? void 0 : cascaderValue.every(function (item) {
+        return !item;
+      }))) {
+        onChange(undefined);
+      } else {
+        var realValue = value ? (0, _toConsumableArray2.default)(value) : [];
+        realValue[realLevel] = e.target.value;
+        onChange(realValue, _selectedOptions);
+      }
+    }
+  };
   return realIsView ? tooltip ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
     className: className,
     title: tooltip === true ? viewValue : tooltip,

package/lib/ProForm/components/combination/ProCascader/style/index.less

@@ -6,7 +6,7 @@
   width: 100%;
 
   .@{ant-prefix}-cascader {
-    width: 50% !important;
+    width: 45% !important;
 
     &.no-detail {
       width: 100% !important;
@@ -14,7 +14,7 @@
   }
 
   .pro-address-detail {
-    width: 50%;
+    width: 55%;
     margin-left: 2px;
 
     .@{ant-prefix}-input-affix-wrapper {
@@ -23,7 +23,7 @@
   }
 
   .@{ant-prefix}-input-affix-wrapper {
-    width: 50%;
+    width: 55%;
     margin-left: 2px;
   }
 }

package/lib/ProForm/components/render/Render.js

@@ -414,7 +414,7 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl'];
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl', 'listName'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';

package/lib/ProForm/utils/useShouldUpdate.js

@@ -181,7 +181,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
       }
       if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !(0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun) || !(0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun) ||
       // 值变更，需要同步更新函数式的fieldProps
-      (0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun) && !(0, _lodash.isEqual)(prevValues, currentValues) ||
+      // (isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) && !isEqual(prevValues, currentValues)) ||
       // !isEqualWith(originComponentRef.current, _component, customEqualForFun) ||
       (0, _index.equalDependencies)(dependencies, prevValues, _currentValues)) {
         showRef.current = _show;

package/lib/ProLayout/index.js

@@ -20,6 +20,7 @@ var _utils = require("./utils");
 // 全局上下文
 var LayoutContext = exports.LayoutContext = /*#__PURE__*/(0, _react.createContext)(undefined);
 var ProLayout = function ProLayout(props) {
+  var _Object$keys;
   var children = props.children,
     _props$className = props.className,
     className = _props$className === void 0 ? '' : _props$className,
@@ -31,6 +32,8 @@ var ProLayout = function ProLayout(props) {
     headerNotice = props.headerNotice,
     noticeIn = props.notice,
     dataSource = props.dataSource,
+    _props$pathPrefix = props.pathPrefix,
+    pathPrefix = _props$pathPrefix === void 0 ? '' : _props$pathPrefix,
     theme = props.theme,
     onCollapsedChange = props.onCollapsedChange;
   var _useSetState = (0, _ahooks.useSetState)({
@@ -57,7 +60,7 @@ var ProLayout = function ProLayout(props) {
     if (Array.isArray(dataSource) && !dataSource.length) {
       return _antd.message.warning('Warning: Missing menu data source, or menu data source is not an array');
     }
-    var userData = (0, _utils.transformMenus)(dataSource);
+    var userData = (0, _utils.transformMenus)(dataSource, pathPrefix);
     setState({
       menus: userData
     });
@@ -113,7 +116,7 @@ var ProLayout = function ProLayout(props) {
       selectedPath: selectedPath,
       onSelected: setState
     },
-    children: !waterMarkProps ? layoutDom : (0, _jsxRuntime.jsx)(_index.ProWaterMark, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, waterMarkProps), {}, {
+    children: !((_Object$keys = Object.keys(waterMarkProps)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) ? layoutDom : (0, _jsxRuntime.jsx)(_index.ProWaterMark, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, waterMarkProps), {}, {
       children: layoutDom
     }))
   });

package/lib/ProLayout/propTypes.d.ts

@@ -44,6 +44,10 @@ export interface ProLayoutProps {
     dataSource?: DataSourceProps | Partial<MenusProps>;
     collapsed?: boolean;
     /**
+  *  菜单拼接前缀
+  */
+    pathPrefix?: string;
+    /**
     *  是否带有菜单界面，true不带，只显示content内容
     */
     pure?: pureKey;

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

@@ -11,13 +11,13 @@ export declare const getIdsByPathName: (menus: any[], activeMenu?: string) => nu
  * @param menuData 菜单数据源
  * @returns []
  */
-export declare const transformMenu: (menuData: any[]) => any[];
+export declare const transformMenu: (menuData: any[], pathPrefix: string) => any[];
 /**
  * 转换菜单数据源评价keyUrlPath与keyIdPath
  * @param data 菜单数据源
  * @returns []
  */
-export declare const transformMenus: (data: MenusProps) => any[] | MenusProps;
+export declare const transformMenus: (data: MenusProps, pathPrefix: string) => any[] | MenusProps;
 /**
  * 获取URL中的search参数
  * @param name 参数key

package/lib/ProLayout/utils/index.js

@@ -50,7 +50,7 @@ var getIdsByPathName = exports.getIdsByPathName = function getIdsByPathName(menu
  * @param menuData 菜单数据源
  * @returns []
  */
-var transformMenu = exports.transformMenu = function transformMenu(menuData) {
+var transformMenu = exports.transformMenu = function transformMenu(menuData, pathPrefix) {
   var data = (0, _toConsumableArray2.default)(menuData);
   var menuDeep = function menuDeep(menuDeepItem) {
     if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
@@ -59,6 +59,8 @@ var transformMenu = exports.transformMenu = function transformMenu(menuData) {
     menuDeepItem.forEach(function (item, index) {
       var _item$keyUrlPath, _item$keyIdPath, _item$children;
       item.code = item.code || item.id;
+      item.url = "".concat(pathPrefix).concat(item.url);
+      item.redirectUrl = (item === null || item === void 0 ? void 0 : item.redirectUrl) ? "".concat(pathPrefix).concat(item.redirectUrl) : '';
       // 拼接父级url与id数据
       if (item === null || item === void 0 ? void 0 : (_item$keyUrlPath = item.keyUrlPath) === null || _item$keyUrlPath === void 0 ? void 0 : _item$keyUrlPath.length) {
         item.keyUrlPath.push(item.redirectUrl || item.url);
@@ -95,18 +97,18 @@ var transformMenu = exports.transformMenu = function transformMenu(menuData) {
  * @param data 菜单数据源
  * @returns []
  */
-var transformMenus = exports.transformMenus = function transformMenus(data) {
+var transformMenus = exports.transformMenus = function transformMenus(data, pathPrefix) {
   if ((0, _lodash.isPlainObject)(data)) {
     // @ts-ignore
     if (!Array.isArray(data === null || data === void 0 ? void 0 : data.menus)) {
       return [];
     }
     // @ts-ignore
-    data.menus = transformMenu(data.menus);
+    data.menus = transformMenu(data.menus, pathPrefix);
     return data;
   }
   if (Array.isArray(data)) {
-    return transformMenu(data);
+    return transformMenu(data, pathPrefix);
   }
   return data;
 };