@zat-design/sisyphus-react 3.6.1 → 3.6.2-beta.10

package/dist/index.esm.css

@@ -2141,12 +2141,6 @@
 .pro-edit-table-drag table tr th.ant-table-selection-column.ant-table-cell-fix-left {
   text-align: right;
 }
-.ant-table-cell-fix-right {
-  z-index: 999 !important;
-}
-.ant-table-cell-fix-left {
-  z-index: 999 !important;
-}
 .pro-tooltip {
   cursor: pointer;
 }

package/dist/less.esm.css

@@ -2141,12 +2141,6 @@
 .pro-edit-table-drag table tr th.ant-table-selection-column.ant-table-cell-fix-left {
   text-align: right;
 }
-.ant-table-cell-fix-right {
-  z-index: 999 !important;
-}
-.ant-table-cell-fix-left {
-  z-index: 999 !important;
-}
 .pro-tooltip {
   cursor: pointer;
 }

package/es/ProConfigProvider/index.d.ts

@@ -29,5 +29,6 @@ interface Actions {
 export declare const ProConfigProvider: FC<{
     value?: ProConfigState;
     locale?: string;
+    onSuccess?: (data: any, params: any) => void;
 }>;
 export default ProConfigProvider;

package/es/ProConfigProvider/index.js

@@ -75,7 +75,7 @@ export var ProConfigProvider = function ProConfigProvider(props) {
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
-  useEnumRequest(_objectSpread(_objectSpread(_objectSpread({}, state.ProEnum), props === null || props === void 0 ? void 0 : (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.ProEnum), props === null || props === void 0 ? void 0 : (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.globalConfig), dispatch);
+  var enumRes = useEnumRequest(_objectSpread(_objectSpread(_objectSpread({}, state.ProEnum), props === null || props === void 0 ? void 0 : (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.ProEnum), props === null || props === void 0 ? void 0 : (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.globalConfig), dispatch);
   useEffect(function () {
     // 本地配置取出
     var localConfigStr = localStorage.getItem('localConfig');
@@ -93,6 +93,11 @@ export var ProConfigProvider = function ProConfigProvider(props) {
     // 设置默认语言
     setLanguage(props === null || props === void 0 ? void 0 : props.locale);
   }
+  useEffect(function () {
+    if (enumRes === null || enumRes === void 0 ? void 0 : enumRes.data) {
+      (props === null || props === void 0 ? void 0 : props.onSuccess) && (props === null || props === void 0 ? void 0 : props.onSuccess(enumRes === null || enumRes === void 0 ? void 0 : enumRes.data, enumRes === null || enumRes === void 0 ? void 0 : enumRes.params));
+    }
+  }, [enumRes === null || enumRes === void 0 ? void 0 : enumRes.loading]);
   return _jsx(ProConfigContext.Provider, {
     value: {
       state: merge(state, props.value),

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

@@ -414,7 +414,7 @@ var RenderField = function RenderField(_ref) {
             }
             _args = formatArgs([].concat(args));
             rowPath = [].concat(_toConsumableArray(namePath), [index]);
-            row = form.getFieldValue(rowPath, true); // if (type === 'InputNumber' && column.name) row[column.name] = args[0];
+            row = form.getFieldValue(rowPath, true);
             orgRow = cloneDeep(row);
             _args[1] = row;
             _context2.t0 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 ? void 0 : (_TargetComponent3$pro = _TargetComponent3.props) === null || _TargetComponent3$pro === void 0 ? void 0 : _TargetComponent3$pro.onBlur;
@@ -443,8 +443,6 @@ var RenderField = function RenderField(_ref) {
               if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
                 debounceValidate(validateFieldKeys);
               }
-            } else {
-              debounceValidate();
             }
             if (!isCell) {
               _context2.next = 20;

package/es/ProEditTable/index.js

@@ -276,7 +276,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     return transformColumns(columns, config);
   }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
   useEffect(function () {
-    var isAllHasKey = value.every(function (item) {
+    var _value$every;
+    var isAllHasKey = value === null || value === void 0 ? void 0 : (_value$every = value.every) === null || _value$every === void 0 ? void 0 : _value$every.call(value, function (item) {
       return item.rowKey;
     });
     // 初始化默认生成row-key

package/es/ProEditTable/utils/tools.js

@@ -7,10 +7,7 @@ export var getRandom = function getRandom() {
 export var difference = function difference(object, base) {
   var changes = function changes(object, base) {
     return transform(object, function (result, value, key) {
-      var _key$indexOf;
-      if ((key === null || key === void 0 ? void 0 : (_key$indexOf = key.indexOf) === null || _key$indexOf === void 0 ? void 0 : _key$indexOf.call(key, '-')) > -1) {
-        result[key] = true;
-      } else if (!isEqual(value, base[key])) {
+      if (!isEqual(value, base[key])) {
         result[key] = isObject(value) && isObject(base[key]) ? changes(value, base[key]) : value;
       }
     });

package/es/ProEnum/hooks/useEnumRequest.d.ts

@@ -1,4 +1,4 @@
 import { ProEnumConfig } from '../propsType';
 import '../utils/eventCenter';
-declare const useEnumRequest: (props: ProEnumConfig, dispatch: any) => void;
+declare const useEnumRequest: (props: ProEnumConfig, dispatch: any) => import("ahooks/lib/useRequest/src/types").Result<any, any>;
 export default useEnumRequest;

package/es/ProEnum/hooks/useEnumRequest.js

@@ -45,120 +45,119 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
       console.info('proEnum：', msg);
     }
   };
-  var _useRequestFunc = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({
-      manual: true,
-      cacheKey: cacheKey,
-      cacheTime: -1,
-      staleTime: 6e4 * 60
-    }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
-      setCache: function () {
-        var _setCache = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
-          var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
-          return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
-              case 0:
-                response = res.data;
-                if (!(transformResponse && typeof transformResponse === 'function')) {
-                  _context.next = 10;
-                  break;
-                }
-                _context.next = 4;
-                return transformResponse(res.data);
-              case 4:
-                response = _context.sent;
-                if (!(_typeof(response) !== 'object' || response == null)) {
-                  _context.next = 9;
-                  break;
-                }
-                throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum2 = locale.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
-              case 9:
-                res.data = response;
-              case 10:
-                if (!(_typeof(response) !== 'object' || response === null)) {
-                  _context.next = 12;
-                  break;
-                }
-                throw Error('response enum data must be object');
-              case 12:
-                if (!(Object.keys(response).length === 0)) {
-                  _context.next = 14;
-                  break;
-                }
-                throw Error('Please return valid enumeration data');
-              case 14:
-                // 只返回fieldNames对象的key
-                if (clear) {
-                  // 忽略清洗的 codes
-                  ignoreCodes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.ignoreCodes) || [];
-                  Object.keys(response).forEach(function (key) {
-                    var options = _toConsumableArray(response[key]) || [];
-                    if (ignoreCodes.includes(key)) {
-                      response[key] = options;
-                    } else {
-                      response[key] = options.map(function (item) {
-                        return cacheFieldNames(fieldNames, item);
-                      });
-                    }
-                  });
-                  res.data = response;
-                }
-                cacheData = getEnumData(storage, cacheKey, baseEnumStorage) || {
-                  data: {}
-                }; // 合并缓存数据
-                res.data = _objectSpread(_objectSpread({}, cacheData === null || cacheData === void 0 ? void 0 : cacheData.data), res.data);
-                setEnumData(storage, cacheKey, res);
-                // 同步数据到全局
-                dispatch({
-                  type: 'setProEnumDic',
-                  payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), res.data)
+  var enumRes = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({
+    manual: true,
+    cacheKey: cacheKey,
+    cacheTime: -1,
+    staleTime: 6e4 * 60
+  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
+    setCache: function () {
+      var _setCache = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
+        var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              response = res.data;
+              if (!(transformResponse && typeof transformResponse === 'function')) {
+                _context.next = 10;
+                break;
+              }
+              _context.next = 4;
+              return transformResponse(res.data);
+            case 4:
+              response = _context.sent;
+              if (!(_typeof(response) !== 'object' || response == null)) {
+                _context.next = 9;
+                break;
+              }
+              throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum2 = locale.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
+            case 9:
+              res.data = response;
+            case 10:
+              if (!(_typeof(response) !== 'object' || response === null)) {
+                _context.next = 12;
+                break;
+              }
+              throw Error('response enum data must be object');
+            case 12:
+              if (!(Object.keys(response).length === 0)) {
+                _context.next = 14;
+                break;
+              }
+              throw Error('Please return valid enumeration data');
+            case 14:
+              // 只返回fieldNames对象的key
+              if (clear) {
+                // 忽略清洗的 codes
+                ignoreCodes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.ignoreCodes) || [];
+                Object.keys(response).forEach(function (key) {
+                  var options = _toConsumableArray(response[key]) || [];
+                  if (ignoreCodes.includes(key)) {
+                    response[key] = options;
+                  } else {
+                    response[key] = options.map(function (item) {
+                      return cacheFieldNames(fieldNames, item);
+                    });
+                  }
                 });
-                if (main) {
-                  setTimeout(function () {
-                    var _locale$ProEnum3;
-                    window.eventCenter.publish('zat-design-pro-component-event', res.data);
-                    logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum3 = locale.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.mainInitByRequest);
-                  }, 10000);
-                }
-                return _context.abrupt("return", res);
-              case 21:
-              case "end":
-                return _context.stop();
-            }
-          }, _callee);
-        }));
-        function setCache(_x) {
-          return _setCache.apply(this, arguments);
-        }
-        return setCache;
-      }(),
-      getCache: function getCache() {
-        var res = getEnumData(storage, cacheKey, baseEnumStorage) || {
-          data: {}
-        };
-        dispatch({
-          type: 'setProEnumDic',
-          payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), res === null || res === void 0 ? void 0 : res.data)
-        });
-        if (main) {
-          setTimeout(function () {
-            var _locale$ProEnum4;
-            window.eventCenter.publish('zat-design-pro-component-event', res.data);
-            logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.mainInitByCache);
-          }, 10000);
-        }
-        return res;
-      },
-      onSuccess: function onSuccess(res) {
-        var _res$status = res.status,
-          status = _res$status === void 0 ? 200 : _res$status,
-          msg = res.message;
-        if (status !== 200) {
-          var _locale$ProEnum5;
-          throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum5 = locale.ProEnum) === null || _locale$ProEnum5 === void 0 ? void 0 : _locale$ProEnum5.requestError);
-        }
+                res.data = response;
+              }
+              cacheData = getEnumData(storage, cacheKey, baseEnumStorage) || {
+                data: {}
+              }; // 合并缓存数据
+              res.data = _objectSpread(_objectSpread({}, cacheData === null || cacheData === void 0 ? void 0 : cacheData.data), res.data);
+              setEnumData(storage, cacheKey, res);
+              // 同步数据到全局
+              dispatch({
+                type: 'setProEnumDic',
+                payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), res.data)
+              });
+              if (main) {
+                setTimeout(function () {
+                  var _locale$ProEnum3;
+                  window.eventCenter.publish('zat-design-pro-component-event', res.data);
+                  logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum3 = locale.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.mainInitByRequest);
+                }, 10000);
+              }
+              return _context.abrupt("return", res);
+            case 21:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function setCache(_x) {
+        return _setCache.apply(this, arguments);
       }
-    })),
-    run = _useRequestFunc.run;
+      return setCache;
+    }(),
+    getCache: function getCache() {
+      var res = getEnumData(storage, cacheKey, baseEnumStorage) || {
+        data: {}
+      };
+      dispatch({
+        type: 'setProEnumDic',
+        payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), res === null || res === void 0 ? void 0 : res.data)
+      });
+      if (main) {
+        setTimeout(function () {
+          var _locale$ProEnum4;
+          window.eventCenter.publish('zat-design-pro-component-event', res.data);
+          logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.mainInitByCache);
+        }, 10000);
+      }
+      return res;
+    },
+    onSuccess: function onSuccess(res) {
+      var _res$status = res.status,
+        status = _res$status === void 0 ? 200 : _res$status,
+        msg = res.message;
+      if (status !== 200) {
+        var _locale$ProEnum5;
+        throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum5 = locale.ProEnum) === null || _locale$ProEnum5 === void 0 ? void 0 : _locale$ProEnum5.requestError);
+      }
+    }
+  }));
   var mergeData = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
@@ -258,7 +257,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         window.localStorage.removeItem(cacheKey);
         window.sessionStorage.removeItem(cacheKey);
       }
-      run(defaultParams);
+      enumRes.run(defaultParams);
       // TODO 这段代码目前看起来是没啥用的、没起到作用
       mergeData();
     } else if (Object.keys(dataSource)) {
@@ -304,5 +303,6 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
       window.eventCenter.unsubscribe('zat-design-pro-component-event', shareProEnumDic);
     };
   }, []);
+  return enumRes;
 };
 export default useEnumRequest;

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

@@ -5,6 +5,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { forwardRef, useCallback, useImperativeHandle } from 'react';
 import { DndContext } from '@dnd-kit/core';
+import { cloneDeep, isFunction } from 'lodash';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { toArray } from '../../../utils';
 import { namesPathTransform } from './utils';
@@ -55,6 +56,10 @@ var FormList = function FormList(props, ref) {
         listName: [].concat(_toConsumableArray(namePath), [item.name]),
         label: mode === 'less' ? undefined : item.label
       });
+      // 可编辑表格的columns需要消除引用关系，防止串数据
+      if (column.type === 'ProEditTable' && !isFunction(column.fieldProps)) {
+        column.fieldProps.columns = cloneDeep(column.fieldProps.columns);
+      }
       return column;
     });
   }, [columns]);

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

@@ -16,7 +16,7 @@ import _Typography from "antd/es/typography";
 var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState, memo, useMemo } from 'react';
-import { omit } from 'lodash';
+import { omit, find as _find } from 'lodash';
 import { transformDataName } from './utils/index';
 import { useProConfig } from '../../../../ProConfigProvider';
 import useEnum from '../../../../ProEnum/hooks/useEnum';
@@ -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 ? _toConsumableArray(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 = _find(options, {
+      value: currentValue
+    });
+    if (foundOption) {
+      // 如果找到了匹配的选项，并且还有更多的 value 需要匹配，递归地在子选项中查找
+      if (_value.length > 1 && foundOption.children) {
+        return findSelectedOptions(foundOption.children, _value.slice(1), [].concat(_toConsumableArray(path), [foundOption]));
+      }
+      // 如果没有更多的 value 需要匹配，返回当前选项（以及之前的路径）
+      return [].concat(_toConsumableArray(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 ? _toConsumableArray(value) : [];
+        realValue[realLevel] = e.target.value;
+        onChange(realValue, _selectedOptions);
+      }
+    }
+  };
   return realIsView ? tooltip ? _jsx(_Tooltip, {
     className: className,
     title: tooltip === true ? viewValue : tooltip,

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

@@ -353,7 +353,13 @@ var Render = function Render(props) {
       mark: 'pro_table_render',
       render: function render(inputProps, doms) {
         return _jsxs(_Fragment, {
-          children: [_jsxs("div", {
+          children: [_jsx(_Space, {
+            size: 0,
+            style: {
+              marginTop: 8
+            },
+            children: formItemProps.above
+          }), _jsxs("div", {
             style: {
               display: 'flex',
               alignItems: 'center'

package/es/ProForm/components/render/propsType.d.ts

@@ -214,6 +214,8 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     before?: string | React.ReactNode;
     /** 表单后缀信息 */
     after?: string | React.ReactNode;
+    /** 表单上方辅助信息 */
+    above?: string | React.ReactNode;
     /** 表单下方辅助信息 */
     extra?: string | React.ReactNode;
     /** 是否固定字段, 不隐藏 */
@@ -244,6 +246,8 @@ export interface RenderProps<Values = any> {
         before?: string | React.ReactNode;
         /** 表单后缀信息 */
         after?: string | React.ReactNode;
+        /** 表单上方辅助信息 */
+        above?: string | React.ReactNode;
         /** 表单下方辅助信息 */
         extra?: string | React.ReactNode;
         parentNames?: string;

package/es/ProLayout/index.js

@@ -14,6 +14,7 @@ import { transformMenus } from './utils';
 // 全局上下文
 export var LayoutContext = /*#__PURE__*/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,
@@ -25,6 +26,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 = useSetState({
@@ -51,7 +54,7 @@ var ProLayout = function ProLayout(props) {
     if (Array.isArray(dataSource) && !dataSource.length) {
       return _message.warning('Warning: Missing menu data source, or menu data source is not an array');
     }
-    var userData = transformMenus(dataSource);
+    var userData = transformMenus(dataSource, pathPrefix);
     setState({
       menus: userData
     });
@@ -107,7 +110,7 @@ var ProLayout = function ProLayout(props) {
       selectedPath: selectedPath,
       onSelected: setState
     },
-    children: !waterMarkProps ? layoutDom : _jsx(ProWaterMark, _objectSpread(_objectSpread({}, waterMarkProps), {}, {
+    children: !((_Object$keys = Object.keys(waterMarkProps)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) ? layoutDom : _jsx(ProWaterMark, _objectSpread(_objectSpread({}, waterMarkProps), {}, {
       children: layoutDom
     }))
   });

package/es/ProLayout/propTypes.d.ts

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

package/es/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/es/ProLayout/utils/index.js

@@ -40,7 +40,7 @@ export var getIdsByPathName = function getIdsByPathName(menus, activeMenu) {
  * @param menuData 菜单数据源
  * @returns []
  */
-export var transformMenu = function transformMenu(menuData) {
+export var transformMenu = function transformMenu(menuData, pathPrefix) {
   var data = _toConsumableArray(menuData);
   var menuDeep = function menuDeep(menuDeepItem) {
     if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
@@ -49,6 +49,8 @@ export var 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);
@@ -85,18 +87,18 @@ export var transformMenu = function transformMenu(menuData) {
  * @param data 菜单数据源
  * @returns []
  */
-export var transformMenus = function transformMenus(data) {
+export var transformMenus = function transformMenus(data, pathPrefix) {
   if (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;
 };

package/es/ProSelect/utils/index.js

@@ -2,7 +2,8 @@ import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIt
 /* eslint-disable no-restricted-syntax */
 import _ from 'lodash';
 var findSelectNameValues = function findSelectNameValues(_ref) {
-  var list = _ref.list,
+  var _ref$list = _ref.list,
+    list = _ref$list === void 0 ? [] : _ref$list,
     selectName = _ref.selectName,
     value = _ref.value,
     dataSource = _ref.dataSource,
@@ -53,7 +54,7 @@ export var getSelectList = function getSelectList(_ref2) {
   var fatherName = listName.slice(0, firstNumberIndex);
   var selectName = listName.slice(firstNumberIndex + 1);
   return findSelectNameValues({
-    list: form.getFieldValue(fatherName),
+    list: form.getFieldValue(fatherName) || [],
     selectName: selectName,
     value: value,
     dataSource: dataSource,

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

@@ -7,16 +7,12 @@ import { throttle } from 'lodash';
 import React from 'react';
 import { useStep } from '../../index';
 export default (function (_ref) {
-  var _children$props;
   var children = _ref.children,
     delayTime = _ref.delayTime,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useStep = useStep(),
-    notify = _useStep.notify,
-    loading = _useStep.loading,
-    setLoading = _useStep.setLoading;
+    notify = _useStep.notify;
   return /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, props), {}, {
-    loading: loading || (children === null || children === void 0 ? void 0 : (_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.loading),
     onClick: throttle( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -28,11 +24,10 @@ export default (function (_ref) {
           case 3:
             values = _context.sent;
             setTimeout(function () {
-              setLoading(false);
               var localData = localStorage.getItem('cache-pro-step');
               if (localData !== 'false') {
-                var _children$props2, _children$props2$onCl;
-                children === null || children === void 0 ? void 0 : (_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : (_children$props2$onCl = _children$props2.onClick) === null || _children$props2$onCl === void 0 ? void 0 : _children$props2$onCl.call(_children$props2, values);
+                var _children$props, _children$props$onCli;
+                children === null || children === void 0 ? void 0 : (_children$props = children.props) === null || _children$props === void 0 ? void 0 : (_children$props$onCli = _children$props.onClick) === null || _children$props$onCli === void 0 ? void 0 : _children$props$onCli.call(_children$props, values);
               }
             }, delayTime !== null && delayTime !== void 0 ? delayTime : 0);
           case 5: