@ant-design/pro-components 3.0.0-beta.2 → 3.0.1-0

package/lib/form/layouts/DrawerForm/index.js

@@ -12,10 +12,9 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _util = require("@rc-component/util");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _rcUtil = require("rc-util");
-var _set = require("rc-util/lib/utils/set");
 var _react = _interopRequireWildcard(require("react"));
 var _reactDom = require("react-dom");
 var _utils = require("../../../utils");
@@ -23,7 +22,7 @@ var _BaseForm = require("../../BaseForm");
 var _style = require("./style");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["children", "trigger", "drawerProps", "onFinish", "submitTimeout", "title", "width", "resize", "onOpenChange", "open"];
-var noteOnce = _rcUtil.warning.noteOnce;
+var noteOnce = _util.warning.noteOnce;
 function DrawerForm(_ref) {
   var _context$locale3, _context$locale4;
   var children = _ref.children,
@@ -83,7 +82,7 @@ function DrawerForm(_ref) {
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
     drawerWidth = _useState8[0],
     setDrawerWidth = _useState8[1];
-  var _useMergedState = (0, _rcUtil.useMergedState)(!!propsOpen, {
+  var _useMergedState = (0, _util.useMergedState)(!!propsOpen, {
       value: propsOpen,
       onChange: onOpenChange
     }),
@@ -153,7 +152,7 @@ function DrawerForm(_ref) {
     if (rest.submitter === false) {
       return false;
     }
-    return (0, _set.merge)({
+    return (0, _util.merge)({
       searchConfig: {
         submitText: (_context$locale$Modal = (_context$locale = context.locale) === null || _context$locale === void 0 || (_context$locale = _context$locale.Modal) === null || _context$locale === void 0 ? void 0 : _context$locale.okText) !== null && _context$locale$Modal !== void 0 ? _context$locale$Modal : '确认',
         resetText: (_context$locale$Modal2 = (_context$locale2 = context.locale) === null || _context$locale2 === void 0 || (_context$locale2 = _context$locale2.Modal) === null || _context$locale2 === void 0 ? void 0 : _context$locale2.cancelText) !== null && _context$locale$Modal2 !== void 0 ? _context$locale$Modal2 : '取消'

package/lib/form/layouts/LightFilter/index.js

@@ -11,9 +11,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _icons = require("@ant-design/icons");
+var _util = require("@rc-component/util");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _omit = _interopRequireDefault(require("rc-util/lib/omit"));
 var _react = _interopRequireWildcard(require("react"));
 var _provider = require("../../../provider");
 var _utils = require("../../../utils");
@@ -242,7 +242,7 @@ function LightFilter(props) {
         width: undefined
       }
     }
-  }, (0, _omit.default)(reset, ['labelWidth'])), {}, {
+  }, (0, _util.omit)(reset, ['labelWidth'])), {}, {
     onValuesChange: function onValuesChange(_, allValues) {
       var _formRef$current3;
       setValues(allValues);

package/lib/form/layouts/ModalForm/index.js

@@ -11,15 +11,15 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _util = require("@rc-component/util");
 var _antd = require("antd");
 var _lodashEs = require("lodash-es");
-var _rcUtil = require("rc-util");
 var _react = _interopRequireWildcard(require("react"));
 var _reactDom = require("react-dom");
 var _BaseForm = require("../../BaseForm");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["children", "trigger", "onOpenChange", "modalProps", "onFinish", "submitTimeout", "title", "width", "open"];
-var noteOnce = _rcUtil.warning.noteOnce;
+var noteOnce = _util.warning.noteOnce;
 function ModalForm(_ref) {
   var _context$locale3, _context$locale4;
   var children = _ref.children,
@@ -43,7 +43,7 @@ function ModalForm(_ref) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
-  var _useMergedState = (0, _rcUtil.useMergedState)(false, {
+  var _useMergedState = (0, _util.useMergedState)(false, {
       value: propsOpen,
       onChange: onOpenChange
     }),

package/lib/form/layouts/ProForm/index.d.ts

@@ -14,7 +14,7 @@ declare namespace ProForm {
     var Provider: React.FC<import("antd/es/form/context").FormProviderProps>;
     var useFormInstance: typeof import("antd/es/form/hooks/useFormInstance").default;
     var EditOrReadOnlyContext: React.Context<{
-        mode: "update" | "edit" | "read";
+        mode: "edit" | "read" | "update";
     }>;
 }
 export { ProForm };

package/lib/form/layouts/QueryFilter/index.js

@@ -9,10 +9,10 @@ exports.QueryFilter = QueryFilter;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _util = require("@rc-component/util");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _rcResizeObserver = _interopRequireDefault(require("rc-resize-observer"));
-var _rcUtil = require("rc-util");
 var _react = _interopRequireWildcard(require("react"));
 var _provider = require("../../../provider");
 var _utils = require("../../../utils");
@@ -94,7 +94,7 @@ var QueryFilterContent = function QueryFilterContent(props) {
     hashId = _useContext.hashId;
   var resetText = props.resetText || intl.getMessage('tableForm.reset', '重置');
   var searchText = props.searchText || intl.getMessage('tableForm.search', '搜索');
-  var _useMergedState = (0, _rcUtil.useMergedState)(function () {
+  var _useMergedState = (0, _util.useMergedState)(function () {
       return props.defaultCollapsed && !!props.submitter;
     }, {
       value: props.collapsed,

package/lib/form/layouts/StepsForm/StepForm.js

@@ -9,14 +9,13 @@ var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helper
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _rcUtil = require("rc-util");
-var _omit = _interopRequireDefault(require("rc-util/lib/omit"));
+var _util = require("@rc-component/util");
 var _react = require("react");
 var _BaseForm = require("../../BaseForm");
 var _index = require("./index");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["onFinish", "step", "formRef", "title", "stepProps"];
-var noteOnce = _rcUtil.warning.noteOnce;
+var noteOnce = _util.warning.noteOnce;
 function StepForm(stepNativeProps) {
   var formRef = (0, _react.useRef)();
   var context = (0, _react.useContext)(_index.StepsFormProvide);
@@ -99,6 +98,6 @@ function StepForm(stepNativeProps) {
       restProps === null || restProps === void 0 || (_restProps$onInit = restProps.onInit) === null || _restProps$onInit === void 0 || _restProps$onInit.call(restProps, _, form);
     },
     layout: "vertical"
-  }, (0, _omit.default)(restProps, ['layoutType', 'columns'])));
+  }, (0, _util.omit)(restProps, ['layoutType', 'columns'])));
 }
 var _default = exports.default = StepForm;

package/lib/form/layouts/StepsForm/index.js

@@ -15,10 +15,9 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _util = require("@rc-component/util");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _rcUtil = require("rc-util");
-var _toArray = _interopRequireDefault(require("rc-util/lib/Children/toArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _provider = require("../../../provider");
 var _utils = require("../../../utils");
@@ -134,7 +133,7 @@ function StepsForm(props) {
   /**
    * 受控的方式来操作表单
    */
-  var _useMergedState = (0, _rcUtil.useMergedState)(0, {
+  var _useMergedState = (0, _util.useMergedState)(0, {
       value: props.current,
       onChange: props.onCurrentChange
     }),
@@ -337,7 +336,7 @@ function StepsForm(props) {
     return buttons;
   }, [formArray.length, next, onSubmit, pre, prePage, step, submit, submitter]);
   var formDom = (0, _react.useMemo)(function () {
-    return (0, _toArray.default)(props.children).map(function (item, index) {
+    return (0, _util.toArray)(props.children).map(function (item, index) {
       var itemProps = item.props;
       var name = itemProps.name || "".concat(index);
       /** 是否是当前的表单 */

package/lib/form/typing.d.ts

@@ -67,7 +67,7 @@ export type ExtendsProps = {
      */
     formItemProps?: FormItemProps;
     /** 给自定义组件行为开的口子 */
-    filedConfig?: ProFormItemCreateConfig;
+    fieldConfig?: ProFormItemCreateConfig;
     fieldRef?: React.Ref<CaptFieldRef | null | undefined>;
 };
 export type ProFormGroupProps = ProFormBaseGroupProps & ProFormGridConfig;

package/lib/layout/ProLayout.js

@@ -12,11 +12,10 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _util = require("@rc-component/util");
 var _routeUtils = require("@umijs/route-utils");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _rcUtil = require("rc-util");
-var _omit = _interopRequireDefault(require("rc-util/lib/omit"));
 var _react = _interopRequireWildcard(require("react"));
 var _swr = _interopRequireWildcard(require("swr"));
 var _provider = require("../provider");
@@ -131,7 +130,10 @@ var defaultPageTitleRender = function defaultPageTitleRender(pageProps, props) {
         title: title
       }));
     }
-    (0, _rcUtil.warning)(typeof title === 'string', 'pro-layout: renderPageTitle return value should be a string');
+    (0, _util.warning)(typeof title === 'string', 'pro-layout: renderPageTitle return value should be a string');
+    // 当 pageTitleRender 返回非字符串值时，返回默认的 pageTitleInfo
+    // 而不是使用可能包含非字符串值的 title
+    return pageTitleInfo;
   }
   return pageTitleInfo;
 };
@@ -295,7 +297,7 @@ var BaseProLayout = function BaseProLayout(props) {
   // don't need padding in phone mode
   /* Checking if the menu is loading and if it is, it will return a skeleton loading screen. */
   var hasLeftPadding = propsLayout !== 'top' && !isMobile;
-  var _useMergedState = (0, _rcUtil.useMergedState)(function () {
+  var _useMergedState = (0, _util.useMergedState)(function () {
       if (defaultCollapsed !== undefined) return defaultCollapsed;
       if (process.env.NODE_ENV === 'TEST') return false;
       if (isMobile) return true;
@@ -310,7 +312,7 @@ var BaseProLayout = function BaseProLayout(props) {
     onCollapse = _useMergedState2[1];
 
   // Splicing parameters, adding menuData and formatMessage in props
-  var defaultProps = (0, _omit.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+  var defaultProps = (0, _util.omit)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     prefixCls: prefixCls
   }, props), {}, {
     siderWidth: siderWidth
@@ -463,8 +465,8 @@ var BaseProLayout = function BaseProLayout(props) {
             },
             components: {
               Menu: {
-                colorItemBg: ((_token$layout3 = token.layout) === null || _token$layout3 === void 0 || (_token$layout3 = _token$layout3.sider) === null || _token$layout3 === void 0 ? void 0 : _token$layout3.colorMenuBackground) || 'transparent',
-                colorSubItemBg: ((_token$layout4 = token.layout) === null || _token$layout4 === void 0 || (_token$layout4 = _token$layout4.sider) === null || _token$layout4 === void 0 ? void 0 : _token$layout4.colorMenuBackground) || 'transparent',
+                itemBg: ((_token$layout3 = token.layout) === null || _token$layout3 === void 0 || (_token$layout3 = _token$layout3.sider) === null || _token$layout3 === void 0 ? void 0 : _token$layout3.colorMenuBackground) || 'transparent',
+                subMenuItemBg: ((_token$layout4 = token.layout) === null || _token$layout4 === void 0 || (_token$layout4 = _token$layout4.sider) === null || _token$layout4 === void 0 ? void 0 : _token$layout4.colorMenuBackground) || 'transparent',
                 itemBorderRadius: token.borderRadius,
                 itemSelectedBg: ((_token$layout5 = token.layout) === null || _token$layout5 === void 0 || (_token$layout5 = _token$layout5.sider) === null || _token$layout5 === void 0 ? void 0 : _token$layout5.colorBgMenuItemSelected) || (token === null || token === void 0 ? void 0 : token.colorBgTextHover),
                 itemHoverBg: ((_token$layout6 = token.layout) === null || _token$layout6 === void 0 || (_token$layout6 = _token$layout6.sider) === null || _token$layout6 === void 0 ? void 0 : _token$layout6.colorBgMenuItemHover) || (token === null || token === void 0 ? void 0 : token.colorBgTextHover),
@@ -478,7 +480,6 @@ var BaseProLayout = function BaseProLayout(props) {
                 // 悬浮态
                 itemSelectedColor: ((_token$layout11 = token.layout) === null || _token$layout11 === void 0 || (_token$layout11 = _token$layout11.sider) === null || _token$layout11 === void 0 ? void 0 : _token$layout11.colorTextMenuSelected) || 'rgba(0, 0, 0, 1)',
                 popupBg: token === null || token === void 0 ? void 0 : token.colorBgElevated,
-                subMenuItemBg: token === null || token === void 0 ? void 0 : token.colorBgElevated,
                 darkSubMenuItemBg: 'transparent',
                 darkPopupBg: token === null || token === void 0 ? void 0 : token.colorBgElevated
               }

package/lib/layout/components/FooterToolbar/index.js

@@ -9,9 +9,9 @@ exports.FooterToolbar = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _util = require("@rc-component/util");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _omit = _interopRequireDefault(require("rc-util/lib/omit"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactDom = require("react-dom");
 var _utils = require("../../../utils");
@@ -88,7 +88,7 @@ var FooterToolbar = exports.FooterToolbar = function FooterToolbar(props) {
     style: (0, _objectSpread2.default)({
       width: width
     }, style)
-  }, (0, _omit.default)(restProps, ['prefixCls'])), {}, {
+  }, (0, _util.omit)(restProps, ['prefixCls'])), {}, {
     children: renderContent ? renderContent((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), value), {}, {
       leftWidth: width
     }), dom) : dom

package/lib/layout/components/Help/ProHelpDrawer.js

@@ -8,8 +8,8 @@ exports.ProHelpDrawer = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _util = require("@rc-component/util");
 var _antd = require("antd");
-var _rcUtil = require("rc-util");
 var _ProHelpPanel = require("./ProHelpPanel");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["drawerProps"];
@@ -21,7 +21,7 @@ var _excluded = ["drawerProps"];
 var ProHelpDrawer = exports.ProHelpDrawer = function ProHelpDrawer(_ref) {
   var drawerProps = _ref.drawerProps,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var _useMergedState = (0, _rcUtil.useMergedState)(false, {
+  var _useMergedState = (0, _util.useMergedState)(false, {
       value: drawerProps.open,
       onChange: drawerProps.afterOpenChange
     }),

package/lib/layout/components/Help/ProHelpModal.js

@@ -8,8 +8,8 @@ exports.ProHelpModal = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _util = require("@rc-component/util");
 var _antd = require("antd");
-var _rcUtil = require("rc-util");
 var _ProHelpPanel = require("./ProHelpPanel");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["modalProps"];
@@ -21,7 +21,7 @@ var _excluded = ["modalProps"];
 var ProHelpModal = exports.ProHelpModal = function ProHelpModal(_ref) {
   var modalProps = _ref.modalProps,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var _useMergedState = (0, _rcUtil.useMergedState)(false, {
+  var _useMergedState = (0, _util.useMergedState)(false, {
       value: modalProps === null || modalProps === void 0 ? void 0 : modalProps.open,
       onChange: modalProps === null || modalProps === void 0 ? void 0 : modalProps.afterClose
     }),

package/lib/layout/components/Help/ProHelpPanel.js

@@ -10,8 +10,8 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _icons = require("@ant-design/icons");
+var _util = require("@rc-component/util");
 var _antd = require("antd");
-var _rcUtil = require("rc-util");
 var _react = _interopRequireWildcard(require("react"));
 var _provider = require("../../../provider");
 var _HelpProvide = require("./HelpProvide");
@@ -50,7 +50,7 @@ var ProHelpPanel = exports.ProHelpPanel = function ProHelpPanel(_ref) {
     hashId = _useStyle.hashId;
   var _useContext2 = (0, _react.useContext)(_HelpProvide.ProHelpProvide),
     dataSource = _useContext2.dataSource;
-  var _useMergedState = (0, _rcUtil.useMergedState)(undefined, {
+  var _useMergedState = (0, _util.useMergedState)(undefined, {
       defaultValue: props.defaultSelectedKey,
       value: props.selectedKey,
       onChange: props.onSelectedKeyChange
@@ -64,7 +64,7 @@ var ProHelpPanel = exports.ProHelpPanel = function ProHelpPanel(_ref) {
     setOpenKey = _useState2[1];
   var _useContext3 = (0, _react.useContext)(_provider.ProProvider),
     token = _useContext3.token;
-  var _useMergedState3 = (0, _rcUtil.useMergedState)(true, {
+  var _useMergedState3 = (0, _util.useMergedState)(true, {
       value: props.showLeftPanel,
       onChange: props.onShowLeftPanelChange
     }),

package/lib/layout/components/SettingDrawer/index.js

@@ -11,10 +11,9 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _icons = require("@ant-design/icons");
+var _util = require("@rc-component/util");
 var _useParams = require("@umijs/use-params");
 var _antd = require("antd");
-var _rcUtil = require("rc-util");
-var _omit = _interopRequireDefault(require("rc-util/lib/omit"));
 var _react = _interopRequireWildcard(require("react"));
 var _utils = require("../../../utils");
 var _defaultSettings = require("../../defaultSettings");
@@ -97,7 +96,7 @@ var getParamsFromUrl = function getParamsFromUrl(urlParams, settings) {
   return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _defaultSettings.defaultSettings), settings || {}), urlParams);
 };
 var genCopySettingJson = function genCopySettingJson(settingState) {
-  return JSON.stringify((0, _omit.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, settingState), {}, {
+  return JSON.stringify((0, _util.omit)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, settingState), {}, {
     colorPrimary: settingState.colorPrimary
   }), ['colorWeak']), null, 2);
 };
@@ -155,7 +154,7 @@ var SettingDrawer = exports.SettingDrawer = function SettingDrawer(props) {
     themeOnly = props.themeOnly,
     drawerProps = props.drawerProps;
   var firstRender = (0, _react.useRef)(true);
-  var _useMergedState = (0, _rcUtil.useMergedState)(false, {
+  var _useMergedState = (0, _util.useMergedState)(false, {
       value: props.collapse,
       onChange: props.onCollapseChange
     }),
@@ -172,7 +171,7 @@ var SettingDrawer = exports.SettingDrawer = function SettingDrawer(props) {
     _useUrlSearchParams2 = (0, _slicedToArray2.default)(_useUrlSearchParams, 2),
     urlParams = _useUrlSearchParams2[0],
     setUrlParams = _useUrlSearchParams2[1];
-  var _useMergedState3 = (0, _rcUtil.useMergedState)(function () {
+  var _useMergedState3 = (0, _util.useMergedState)(function () {
       return getParamsFromUrl(urlParams, propsSettings || propsDefaultSettings);
     }, {
       value: propsSettings,

package/lib/layout/components/SiderMenu/index.js

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SiderMenu = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _util = require("@rc-component/util");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _omit = _interopRequireDefault(require("rc-util/lib/omit"));
 var _react = _interopRequireWildcard(require("react"));
 var _provider = require("../../../provider");
 var _SiderMenu = require("./SiderMenu");
@@ -34,7 +34,7 @@ var SiderMenuWrapper = exports.SiderMenu = function SiderMenuWrapper(props) {
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isMobile]);
-  var omitProps = (0, _omit.default)(props, ['className', 'style']);
+  var omitProps = (0, _util.omit)(props, ['className', 'style']);
   var _React$useContext = _react.default.useContext(_antd.ConfigProvider.ConfigContext),
     direction = _React$useContext.direction;
   var _useStyle = (0, _index.useStyle)("".concat(prefixCls, "-sider"), {

package/lib/layout/index.d.ts

@@ -20,7 +20,6 @@ import { getPageTitle } from './getPageTitle';
 import type { ProLayoutProps } from './ProLayout';
 import { ProLayout } from './ProLayout';
 import { getMenuData } from './utils/getMenuData';
-export { Watermark as WaterMark } from 'antd';
 export * from './components/Help';
 export type { ProSettings, ProSettings as Settings } from './defaultSettings';
 export type { MenuDataItem } from './typing';

package/lib/layout/index.js

@@ -18,8 +18,7 @@ var _exportNames = {
   RouteContext: true,
   getPageTitle: true,
   ProLayout: true,
-  getMenuData: true,
-  WaterMark: true
+  getMenuData: true
 };
 Object.defineProperty(exports, "DefaultFooter", {
   enumerable: true,
@@ -99,12 +98,6 @@ Object.defineProperty(exports, "TopNavHeader", {
     return _TopNavHeader.TopNavHeader;
   }
 });
-Object.defineProperty(exports, "WaterMark", {
-  enumerable: true,
-  get: function get() {
-    return _antd.Watermark;
-  }
-});
 exports.default = void 0;
 Object.defineProperty(exports, "getMenuData", {
   enumerable: true,
@@ -131,7 +124,6 @@ var _RouteContext = require("./context/RouteContext");
 var _getPageTitle = require("./getPageTitle");
 var _ProLayout = require("./ProLayout");
 var _getMenuData = require("./utils/getMenuData");
-var _antd = require("antd");
 var _Help = require("./components/Help");
 Object.keys(_Help).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -144,4 +136,5 @@ Object.keys(_Help).forEach(function (key) {
     }
   });
 });
+// WaterMark component has been removed, please use antd Watermark directly
 var _default = exports.default = _ProLayout.ProLayout;

package/lib/list/Item.js

@@ -12,9 +12,9 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _icons = require("@ant-design/icons");
+var _util = require("@rc-component/util");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _rcUtil = require("rc-util");
 var _react = _interopRequireWildcard(require("react"));
 var _card = require("../card");
 var _provider = require("../provider");
@@ -96,7 +96,7 @@ function ProListItem(props) {
     _ref2$indentSize = _ref2.indentSize,
     indentSize = _ref2$indentSize === void 0 ? 8 : _ref2$indentSize,
     expandedRowClassName = _ref2.expandedRowClassName;
-  var _useMergedState = (0, _rcUtil.useMergedState)(!!propsExpand, {
+  var _useMergedState = (0, _util.useMergedState)(!!propsExpand, {
       value: propsExpand,
       onChange: propsOnExpand
     }),

package/lib/list/ListView.js

@@ -10,12 +10,12 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _util = require("@rc-component/util");
 var _antd = require("antd");
 var _useLazyKVMap3 = _interopRequireDefault(require("antd/lib/table/hooks/useLazyKVMap"));
 var _usePagination3 = _interopRequireDefault(require("antd/lib/table/hooks/usePagination"));
 var _useSelection3 = _interopRequireDefault(require("antd/lib/table/hooks/useSelection"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _rcUtil = require("rc-util");
 var _react = _interopRequireWildcard(require("react"));
 var _provider = require("../provider");
 var _constants = require("./constants");
@@ -159,7 +159,7 @@ function ListView(props) {
           return;
         }
         var dataIndex = column.dataIndex || listKey || column.key;
-        var rawData = Array.isArray(dataIndex) ? (0, _rcUtil.get)(item, dataIndex) : item[dataIndex];
+        var rawData = Array.isArray(dataIndex) ? (0, _util.get)(item, dataIndex) : item[dataIndex];
 
         /** 如果cardActionProps 需要直接使用源数组，因为 action 必须要源数组 */
         if (cardActionProps === 'actions' && listKey === 'actions') {

package/lib/provider/intl.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.zhTWIntl = exports.zhCNIntl = exports.viVNIntl = exports.uzUZIntl = exports.ukUAIntl = exports.trTRIntl = exports.thTHIntl = exports.svSEIntl = exports.srRSIntl = exports.skSKIntl = exports.ruRUIntl = exports.roROIntl = exports.ptBRIntl = exports.plPLIntl = exports.nlNLIntl = exports.msMYIntl = exports.mnMNIntl = exports.koKRIntl = exports.jaJPIntl = exports.itITIntl = exports.intlMapKeys = exports.intlMap = exports.idIDIntl = exports.hrHRIntl = exports.heILIntl = exports.frFRIntl = exports.findIntlKeyByAntdLocaleKey = exports.faIRIntl = exports.esESIntl = exports.enUSIntl = exports.enGBIntl = exports.deDEIntl = exports.csCZIntl = exports.createIntl = exports.caESIntl = exports.arEGIntl = void 0;
-var _rcUtil = require("rc-util");
+var _util = require("@rc-component/util");
 var _ar_EG = _interopRequireDefault(require("./locale/ar_EG"));
 var _ca_ES = _interopRequireDefault(require("./locale/ca_ES"));
 var _cs_CZ = _interopRequireDefault(require("./locale/cs_CZ"));
@@ -48,7 +48,7 @@ var _zh_TW = _interopRequireDefault(require("./locale/zh_TW"));
 var createIntl = exports.createIntl = function createIntl(locale, localeMap) {
   return {
     getMessage: function getMessage(id, defaultMessage) {
-      var msg = (0, _rcUtil.get)(localeMap, id.replace(/\[(\d+)\]/g, '.$1').split('.')) || '';
+      var msg = (0, _util.get)(localeMap, id.replace(/\[(\d+)\]/g, '.$1').split('.')) || '';
       if (msg) return msg;
       var localKey = locale.replace('_', '-');
       if (localKey === 'zh-CN') {

package/lib/table/Store/Provide.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.TableContext = exports.Container = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _util = require("@rc-component/util");
 var _merge = _interopRequireDefault(require("lodash-es/merge"));
-var _rcUtil = require("rc-util");
 var _react = require("react");
 var _utils = require("../utils");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -29,7 +29,7 @@ function useContainer() {
     _setKeyWords = _useState2[1];
   // 用于排序的数组
   var sortKeyColumns = (0, _react.useRef)([]);
-  var _useMergedState = (0, _rcUtil.useMergedState)(function () {
+  var _useMergedState = (0, _util.useMergedState)(function () {
       return props.size || props.defaultSize || 'middle';
     }, {
       value: props.size,
@@ -60,7 +60,7 @@ function useContainer() {
     });
     return columnKeyMap;
   }, [props.columns]);
-  var _useMergedState3 = (0, _rcUtil.useMergedState)(function () {
+  var _useMergedState3 = (0, _util.useMergedState)(function () {
       var _props$columnsState4, _props$columnsState5;
       var _ref2 = props.columnsState || {},
         persistenceType = _ref2.persistenceType,

package/lib/table/components/ColumnSetting/index.js

@@ -11,9 +11,9 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _icons = require("@ant-design/icons");
+var _util = require("@rc-component/util");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _omit = _interopRequireDefault(require("rc-util/lib/omit"));
 var _react = _interopRequireWildcard(require("react"));
 var _provider = require("../../../provider");
 var _utils = require("../../../utils");
@@ -131,7 +131,7 @@ var CheckboxList = function CheckboxList(_ref3) {
         }
         var item = (0, _objectSpread3.default)((0, _objectSpread3.default)({
           key: columnKey
-        }, (0, _omit.default)(rest, ['className'])), {}, {
+        }, (0, _util.omit)(rest, ['className'])), {}, {
           selectable: false,
           disabled: config.disable === true,
           disableCheckbox: typeof config.disable === 'boolean' ? config.disable : (_config$disable = config.disable) === null || _config$disable === void 0 ? void 0 : _config$disable.checkbox,
@@ -247,7 +247,7 @@ var CheckboxList = function CheckboxList(_ref3) {
       });
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(CheckboxListItem, (0, _objectSpread3.default)((0, _objectSpread3.default)({
         className: className
-      }, (0, _omit.default)(node, ['key'])), {}, {
+      }, (0, _util.omit)(node, ['key'])), {}, {
         showListItemOption: showListItemOption,
         title: wrappedTitle,
         columnKey: node.key

package/lib/table/components/DragSortTable/index.js

@@ -12,8 +12,8 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _icons = require("@ant-design/icons");
+var _util = require("@rc-component/util");
 var _antd = require("antd");
-var _rcUtil = require("rc-util");
 var _react = _interopRequireWildcard(require("react"));
 var _Table = _interopRequireDefault(require("../../Table"));
 var _useDragSort2 = require("../../utils/useDragSort");
@@ -34,7 +34,7 @@ function DragSortTable(props) {
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
-  var _useMergedState = (0, _rcUtil.useMergedState)(function () {
+  var _useMergedState = (0, _util.useMergedState)(function () {
       return defaultData || [];
     }, {
       value: originDataSource,