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

package/es/card/components/Card/index.js

@@ -5,11 +5,10 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["className", "style", "bodyStyle", "headStyle", "title", "subTitle", "extra", "wrap", "layout", "loading", "gutter", "tooltip", "split", "headerBordered", "variant", "boxShadow", "children", "size", "actions", "ghost", "hoverable", "direction", "collapsed", "collapsible", "collapsibleIconRender", "colStyle", "defaultCollapsed", "onCollapse", "checked", "onChecked", "tabs", "type"];
 import { RightOutlined } from '@ant-design/icons';
+import { omit, useMergedState } from '@rc-component/util';
 import { ConfigProvider, Tabs } from 'antd';
 import useBreakpoint from 'antd/lib/grid/hooks/useBreakpoint';
 import classNames from 'classnames';
-import { useMergedState } from 'rc-util';
-import omit from 'rc-util/lib/omit';
 import React, { useContext } from 'react';
 import { LabelIconTip } from "../../../utils";
 import Actions from "../Actions";

package/es/card/components/CheckCard/Group.js

@@ -5,9 +5,9 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["prefixCls", "className", "style", "options", "loading", "multiple", "bordered", "onChange"];
 import { RightOutlined } from '@ant-design/icons';
+import { omit } from '@rc-component/util';
 import { ConfigProvider, Skeleton } from 'antd';
 import classNames from 'classnames';
-import omit from 'rc-util/lib/omit';
 import React, { createContext, useCallback, useContext, useMemo, useRef, useState } from 'react';
 import { ProConfigProvider, proTheme } from "../../../provider";
 import { useMountMergeState } from "../../../utils";

package/es/descriptions/index.js

@@ -6,9 +6,8 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["valueEnum", "render", "renderText", "mode", "plain", "dataIndex", "request", "params", "editable"],
   _excluded2 = ["request", "columns", "params", "dataSource", "onDataSourceChange", "formProps", "editable", "loading", "onLoadingChange", "actionRef", "onRequestError", "emptyText", "contentStyle"];
 import { CheckOutlined, CloseOutlined, EditOutlined } from '@ant-design/icons';
+import { get, toArray } from '@rc-component/util';
 import { ConfigProvider, Descriptions, Space } from 'antd';
-import { get } from 'rc-util';
-import toArray from 'rc-util/lib/Children/toArray';
 import React, { useContext, useEffect } from 'react';
 import ValueTypeToComponent from "../field/ValueTypeToComponent";
 import ProForm, { ProFormField } from "../form";

package/es/descriptions/useFetchData.js

@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useMergedState } from 'rc-util';
+import { useMergedState } from '@rc-component/util';
 import { useEffect } from 'react';
 var useFetchData = function useFetchData(getData, options) {
   var _ref = options || {},

package/es/field/components/Cascader/index.d.ts

@@ -11,7 +11,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     options?: (string | number | import("antd").CheckboxOptionType<any>)[] | undefined;
     radioType?: "button" | "radio" | undefined;
     placeholder?: string | undefined;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | undefined;
 } & {
     text: string;
     valueEnum?: import("src/utils/typing").ProFieldValueEnumType | undefined;
@@ -19,7 +19,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | undefined;
     id?: string | undefined;
     children?: React.ReactNode;
     defaultKeyWords?: string | undefined;

package/es/field/components/Checkbox/index.d.ts

@@ -15,7 +15,7 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | undefined;
     id?: string | undefined;
     children?: React.ReactNode;
     defaultKeyWords?: string | undefined;

package/es/field/components/ColorPicker/index.d.ts

@@ -3,5 +3,5 @@ import React from 'react';
 declare const _default: React.ForwardRefExoticComponent<import("src/provider").BaseProFieldFC & import("src/provider").ProRenderFieldPropsType & {
     text: string;
     mode?: "read" | "edit" | "update" | undefined;
-} & Partial<Omit<ColorPickerProps, "mode" | "value">> & React.RefAttributes<any>>;
+} & Partial<Omit<ColorPickerProps, "value" | "mode">> & React.RefAttributes<any>>;
 export default _default;

package/es/field/components/DatePicker/index.d.ts

@@ -4,7 +4,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     text: string | number;
     format?: string | undefined;
     showTime?: boolean | undefined;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
-    picker?: "date" | "time" | "week" | "month" | "quarter" | "year" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | undefined;
+    picker?: "date" | "time" | "month" | "week" | "quarter" | "year" | undefined;
 } & ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

package/es/field/components/Digit/index.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { omit } from '@rc-component/util';
 import { InputNumber } from 'antd';
-import omit from 'rc-util/lib/omit';
 import React, { useCallback } from 'react';
 import { useIntl } from "../../../provider";
 import { isNil } from "../../../utils";

package/es/field/components/DigitRange/index.js

@@ -1,8 +1,8 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { useMergedState } from '@rc-component/util';
 import { Input, InputNumber, Space } from 'antd';
-import { useMergedState } from 'rc-util';
 import React, { useRef } from 'react';
 import { proTheme, useIntl } from "../../../provider";
 import { jsxs as _jsxs } from "react/jsx-runtime";

package/es/field/components/Money/index.js

@@ -3,9 +3,8 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["contentRender", "numberFormatOptions", "numberPopoverRender", "open"],
   _excluded2 = ["text", "mode", "render", "formItemRender", "fieldProps", "proFieldKey", "plain", "valueEnum", "placeholder", "locale", "customSymbol", "numberFormatOptions", "numberPopoverRender"];
+import { omit, useMergedState } from '@rc-component/util';
 import { InputNumber, Popover } from 'antd';
-import { useMergedState } from 'rc-util';
-import omit from 'rc-util/lib/omit';
 import React, { useCallback, useMemo } from 'react';
 import { intlMap as allIntlMap, useIntl } from "../../../provider";
 import { jsx as _jsx } from "react/jsx-runtime";

package/es/field/components/Password/index.js

@@ -3,8 +3,8 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["text", "mode", "render", "formItemRender", "fieldProps", "proFieldKey"];
 import { EyeInvisibleOutlined, EyeOutlined } from '@ant-design/icons';
+import { useMergedState } from '@rc-component/util';
 import { Input, Space } from 'antd';
-import { useMergedState } from 'rc-util';
 import React from 'react';
 import { useIntl } from "../../../provider";
 import { Fragment as _Fragment } from "react/jsx-runtime";

package/es/field/components/Radio/index.d.ts

@@ -15,7 +15,7 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | undefined;
     id?: string | undefined;
     children?: React.ReactNode;
     defaultKeyWords?: string | undefined;

package/es/field/components/RangePicker/index.d.ts

@@ -3,8 +3,8 @@ import type { ProFieldLightProps } from '../../PureProField';
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     text: string[];
     format?: string | undefined;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | undefined;
     showTime?: boolean | undefined;
-    picker?: "date" | "time" | "week" | "month" | "quarter" | "year" | undefined;
+    picker?: "date" | "time" | "month" | "week" | "quarter" | "year" | undefined;
 } & ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

package/es/field/components/Segmented/index.d.ts

@@ -9,7 +9,7 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | undefined;
     id?: string | undefined;
     children?: React.ReactNode;
     defaultKeyWords?: string | undefined;

package/es/field/components/Segmented/index.js

@@ -3,8 +3,8 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["mode", "render", "formItemRender", "fieldProps", "emptyText"];
+import { omit } from '@rc-component/util';
 import { Segmented, Spin } from 'antd';
-import omit from 'rc-util/lib/omit';
 import React, { useImperativeHandle, useRef } from 'react';
 import { objectToMap, proFieldParsingText } from "../../../utils";
 import { useFieldFetchData } from "../Select";

package/es/field/components/Select/LightSelect/index.d.ts

@@ -30,6 +30,6 @@ declare const _default: React.ForwardRefExoticComponent<SelectProps<any, import(
      */
     fetchDataOnSearch?: boolean | undefined;
     /** 变体类型 */
-    variant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | "underlined" | undefined;
 } & ProFieldLightProps & SelectProps<any, import("antd/es/select").DefaultOptionType> & React.RefAttributes<any>>;
 export default _default;

package/es/field/components/Select/LightSelect/index.js

@@ -5,9 +5,9 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 var _excluded = ["label", "prefixCls", "onChange", "value", "mode", "children", "defaultValue", "size", "showSearch", "disabled", "style", "className", "options", "onSearch", "allowClear", "labelInValue", "fieldNames", "lightLabel", "labelTrigger", "optionFilterProp", "optionLabelProp", "valueMaxLength", "fetchDataOnSearch", "fetchData", "variant"];
 import { SearchOutlined } from '@ant-design/icons';
+import { toArray } from '@rc-component/util';
 import { ConfigProvider, Input, Select } from 'antd';
 import classNames from 'classnames';
-import toArray from 'rc-util/lib/Children/toArray';
 import React, { useContext, useMemo, useState } from 'react';
 import { FieldLabel, useStyle } from "../../../../utils";
 import { jsx as _jsx } from "react/jsx-runtime";

package/es/field/components/Select/index.d.ts

@@ -45,7 +45,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     params?: any;
     /** 组件的全局设置 */
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | undefined;
     id?: string | undefined;
     children?: ReactNode;
     /** 默认搜素条件 */

package/es/field/components/Switch/index.d.ts

@@ -3,6 +3,6 @@ import React from 'react';
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     text: boolean;
     fieldProps?: SwitchProps | undefined;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | undefined;
 } & React.RefAttributes<any>>;
 export default _default;

package/es/field/components/Switch/index.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { omit } from '@rc-component/util';
 import { Switch } from 'antd';
-import omit from 'rc-util/lib/omit';
 import React, { useMemo } from 'react';
 import { useIntl } from "../../../provider";
 import { FieldLabel } from "../../../utils";

package/es/field/components/TextArea/index.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { omit } from '@rc-component/util';
 import { Input } from 'antd';
-import omit from 'rc-util/lib/omit';
 import React from 'react';
 import { useIntl } from "../../../provider";
 import FieldTextAreaReadonly from "./readonly";

package/es/field/components/TextArea/readonly.js

@@ -1,8 +1,8 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import { omit } from '@rc-component/util';
 import { ConfigProvider } from 'antd';
 import classNames from 'classnames';
-import omit from 'rc-util/lib/omit';
 import React, { useContext } from 'react';
 import { useStyle } from "../../../utils";
 import { jsx as _jsx } from "react/jsx-runtime";

package/es/field/components/TreeSelect/index.d.ts

@@ -17,7 +17,7 @@ export type TreeSelectFieldProps = TreeSelectProps<any> & {
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     options?: (string | number | import("antd").CheckboxOptionType<any>)[] | undefined;
     radioType?: "button" | "radio" | undefined;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | undefined;
 } & {
     text: string;
     valueEnum?: import("src/utils/typing").ProFieldValueEnumType | undefined;
@@ -25,7 +25,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | undefined;
     id?: string | undefined;
     children?: React.ReactNode;
     defaultKeyWords?: string | undefined;

package/es/field/components/TreeSelect/index.js

@@ -3,9 +3,9 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["radioType", "formItemRender", "mode", "light", "label", "render", "variant"],
   _excluded2 = ["onSearch", "onClear", "onChange", "onBlur", "showSearch", "autoClearSearchValue", "treeData", "fetchDataOnSearch", "searchValue"];
+import { useMergedState } from '@rc-component/util';
 import { ConfigProvider, Spin, TreeSelect } from 'antd';
 import classNames from 'classnames';
-import { useMergedState } from 'rc-util';
 import React, { useContext, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { useIntl } from "../../../provider";
 import { FieldLabel, objectToMap, proFieldParsingText } from "../../../utils";

package/es/form/BaseForm/BaseForm.js

@@ -8,11 +8,10 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children", "contentRender", "submitter", "fieldProps", "formItemProps", "groupProps", "transformKey", "formRef", "onInit", "form", "loading", "formComponentType", "extraUrlParams", "syncToUrl", "onUrlSearchChange", "onReset", "omitNil", "isKeyPressSubmit", "autoFocusFirstInput", "grid", "rowProps", "colProps"],
   _excluded2 = ["extraUrlParams", "syncToUrl", "isKeyPressSubmit", "syncToUrlAsImportant", "syncToInitialValues", "children", "contentRender", "submitter", "fieldProps", "proFieldProps", "formItemProps", "groupProps", "dateFormatter", "formRef", "onInit", "form", "formComponentType", "onReset", "grid", "rowProps", "colProps", "omitNil", "request", "params", "initialValues", "formKey", "readonly", "onLoadingChange", "loading"];
-/* eslint-disable react-hooks/exhaustive-deps */import { useUrlSearchParams } from '@umijs/use-params';
+/* eslint-disable react-hooks/exhaustive-deps */import { get, set as namePathSet, omit, set, warning } from '@rc-component/util';
+import { useUrlSearchParams } from '@umijs/use-params';
 import { ConfigProvider, Form, Spin } from 'antd';
 import classNames from 'classnames';
-import { get, set as namePathSet, set, warning } from 'rc-util';
-import omit from 'rc-util/lib/omit';
 import React, { useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { ProConfigProvider } from "../../provider";
 import { ProFormContext, conversionMomentValue, isDeepEqualReact, nanoid, runFunction, transformKeySubmitValue, useFetchData, useMountMergeState, usePrevious, useRefFunction, useStyle } from "../../utils";

package/es/form/BaseForm/Submitter/index.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { omit } from '@rc-component/util';
 import { Button, Form } from 'antd';
-import omit from 'rc-util/lib/omit';
 import React from 'react';
 import { proTheme, useIntl } from "../../../provider";
 

package/es/form/components/Dependency/index.js

@@ -1,9 +1,9 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["name", "originDependencies", "children", "ignoreFormListField"];
+import { get, set } from '@rc-component/util';
 import { Form } from 'antd';
 import { merge } from 'lodash-es';
-import { get, set } from 'rc-util';
 import React, { useContext, useMemo } from 'react';
 import { isDeepEqualReact, ProFormContext } from "../../../utils";
 import { FormListContext } from "../List";

package/es/form/components/Digit/DigitRange.d.ts

@@ -13,7 +13,7 @@ export type ProFormDigitRangeProps = ProFormFieldItemProps<RangeInputNumberProps
     separatorWidth?: number;
 };
 declare const ForwardRefProFormDigit: React.ForwardRefExoticComponent<{
-    fieldProps?: Partial<import("../../typing").FieldProps<any> & Omit<InputNumberProps<number>, "defaultValue" | "onChange" | "value" | "placeholder"> & {
+    fieldProps?: Partial<import("../../typing").FieldProps<any> & Omit<InputNumberProps<number>, "value" | "onChange" | "placeholder" | "defaultValue"> & {
         value?: ValuePair | undefined;
         defaultValue?: ValuePair | undefined;
         onChange?: ((value?: ValuePair) => void) | undefined;

package/es/form/components/FieldSet/index.js

@@ -4,8 +4,8 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _ref3;
 var _excluded = ["children", "value", "valuePropName", "onChange", "fieldProps", "space", "type", "transform", "convertValue", "lightProps"],
   _excluded2 = ["children", "space", "valuePropName"];
+import { toArray } from '@rc-component/util';
 import { Space } from 'antd';
-import toArray from 'rc-util/lib/Children/toArray';
 import React, { useCallback, useImperativeHandle } from 'react';
 import { runFunction, useRefFunction } from "../../../utils";
 import { useGridHelpers } from "../../helpers";

package/es/form/components/FormItem/index.js

@@ -4,8 +4,8 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["children", "onChange", "onBlur", "ignoreFormItem", "valuePropName"],
   _excluded2 = ["children", "addonAfter", "addonBefore", "valuePropName", "addonWarpStyle", "convertValue", "help"],
   _excluded3 = ["valueType", "transform", "dataFormat", "ignoreFormItem", "lightProps", "children"];
+import { omit } from '@rc-component/util';
 import { ConfigProvider, Form } from 'antd';
-import omit from 'rc-util/lib/omit';
 import React, { useContext, useEffect, useMemo } from 'react';
 import { isDropdownValueType, omitUndefined, useDeepCompareMemo, useRefFunction } from "../../../utils";
 import { LightWrapper } from "../../BaseForm";

package/es/form/components/List/ListContainer.js

@@ -3,8 +3,8 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { PlusOutlined } from '@ant-design/icons';
+import { omit } from '@rc-component/util';
 import { Button } from 'antd';
-import omit from 'rc-util/lib/omit';
 import { useContext, useMemo, useRef, useState } from 'react';
 import { ProProvider, useIntl } from "../../../provider";
 import { nanoid, runFunction } from "../../../utils";

package/es/form/components/List/ListItem.js

@@ -6,10 +6,9 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["creatorButtonProps", "deleteIconProps", "copyIconProps", "arrowSort", "upIconProps", "downIconProps", "itemContainerRender", "itemRender", "alwaysShowItemLabel", "prefixCls", "creatorRecord", "action", "actionGuard", "children", "actionRender", "fields", "meta", "field", "index", "formInstance", "originName", "containerClassName", "containerStyle", "min", "max", "count"];
 import { ArrowDownOutlined, ArrowUpOutlined, CopyOutlined, DeleteOutlined, LoadingOutlined } from '@ant-design/icons';
+import { set, toArray } from '@rc-component/util';
 import { ConfigProvider, Tooltip } from 'antd';
 import classNames from 'classnames';
-import { set } from 'rc-util';
-import toArray from 'rc-util/lib/Children/toArray';
 import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { FormListContext } from '.';
 import { ProProvider } from "../../../provider";

package/es/form/components/List/index.d.ts

@@ -6,9 +6,9 @@ import type { ReactNode } from 'react';
 import React from 'react';
 import type { ProFormGridConfig } from '../../typing';
 import type { ChildrenItemFunction, FormListActionGuard, ProFromListCommonProps } from './ListItem';
-declare const FormListContext: React.Context<(FormListFieldData & {
+declare const FormListContext: React.Context<Record<string, any> | (FormListFieldData & {
     listName: NamePath;
-}) | Record<string, any>>;
+})>;
 export type FormListActionType<T = any> = FormListOperation & {
     get: (index: number) => T | undefined;
     getList: () => T[] | undefined;

package/es/form/components/List/index.js

@@ -3,9 +3,9 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["transform", "actionRender", "creatorButtonProps", "label", "alwaysShowItemLabel", "tooltip", "creatorRecord", "itemRender", "rules", "itemContainerRender", "fieldExtraRender", "copyIconProps", "children", "deleteIconProps", "arrowSort", "upIconProps", "downIconProps", "actionRef", "style", "prefixCls", "actionGuard", "min", "max", "colProps", "wrapperCol", "rowProps", "onAfterAdd", "onAfterRemove", "isValidateList", "emptyListMessage", "className", "containerClassName", "containerStyle", "readonly"];
 import { ArrowDownOutlined, ArrowUpOutlined, CopyOutlined, DeleteOutlined } from '@ant-design/icons';
+import { warning } from '@rc-component/util';
 import { ConfigProvider, Form } from 'antd';
 import classNames from 'classnames';
-import { warning } from 'rc-util';
 import React, { useContext, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { useIntl } from "../../../provider";
 import { ProFormContext } from "../../../utils";

package/es/form/components/SchemaForm/valueType/dependency.js

@@ -1,5 +1,5 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { warning } from 'rc-util';
+import { warning } from '@rc-component/util';
 import ProFormDependency from "../../Dependency";
 import { createElement as _createElement } from "react";
 var noteOnce = warning.noteOnce;

package/es/form/components/SchemaForm/valueType/field.js

@@ -1,7 +1,7 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["key"];
-import omit from 'rc-util/lib/omit';
+import { omit } from '@rc-component/util';
 import React from 'react';
 import { omitUndefined } from "../../../../utils";
 import ProFormDependency from "../../Dependency";

package/es/form/components/Text/index.js

@@ -3,8 +3,8 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["fieldProps", "proFieldProps"],
   _excluded2 = ["fieldProps", "proFieldProps"];
+import { omit } from '@rc-component/util';
 import { Form, Popover } from 'antd';
-import omit from 'rc-util/lib/omit';
 import React, { useState } from 'react';
 import { FieldPassword } from "../../../field";
 import { ProConfigProvider } from "../../../provider";

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

@@ -5,10 +5,9 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children", "trigger", "drawerProps", "onFinish", "submitTimeout", "title", "width", "resize", "onOpenChange", "open"];
+import { merge, useMergedState, warning } from '@rc-component/util';
 import { ConfigProvider, Drawer } from 'antd';
 import classNames from 'classnames';
-import { useMergedState, warning } from 'rc-util';
-import { merge } from 'rc-util/lib/utils/set';
 import React, { useCallback, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 import { isBrowser, omitUndefined, useRefFunction } from "../../../utils";

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

@@ -4,9 +4,9 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["size", "collapse", "collapseLabel", "initialValues", "onValuesChange", "form", "placement", "formRef", "variant", "ignoreRules", "footerRender"];
 import { FilterOutlined } from '@ant-design/icons';
+import { omit } from '@rc-component/util';
 import { ConfigProvider } from 'antd';
 import classNames from 'classnames';
-import omit from 'rc-util/lib/omit';
 import React, { useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { useIntl } from "../../../provider";
 import { FieldLabel, FilterDropdown } from "../../../utils";

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

@@ -4,9 +4,9 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children", "trigger", "onOpenChange", "modalProps", "onFinish", "submitTimeout", "title", "width", "open"];
+import { useMergedState, warning } from '@rc-component/util';
 import { ConfigProvider, Modal } from 'antd';
 import { merge } from 'lodash-es';
-import { useMergedState, warning } from 'rc-util';
 import React, { useCallback, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 import { BaseForm } from "../../BaseForm";

package/es/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: "read" | "edit" | "update";
     }>;
 }
 export { ProForm };

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

@@ -3,12 +3,10 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["collapsed", "layout", "defaultCollapsed", "defaultColsNumber", "defaultFormItemsNumber", "span", "searchGutter", "searchText", "resetText", "optionRender", "collapseRender", "onReset", "onCollapse", "labelWidth", "style", "split", "preserve", "ignoreRules", "showHiddenNum", "submitterColSpanProps"];
 var _document;
-/* eslint-disable no-param-reassign */
-
+/* eslint-disable no-param-reassign */import { useMergedState } from '@rc-component/util';
 import { Col, ConfigProvider, Form, Row } from 'antd';
 import classNames from 'classnames';
 import RcResizeObserver from 'rc-resize-observer';
-import { useMergedState } from 'rc-util';
 import React, { useContext, useMemo } from 'react';
 import { ProProvider, useIntl } from "../../../provider";
 import { isBrowser, useMountMergeState } from "../../../utils";

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

@@ -3,8 +3,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["onFinish", "step", "formRef", "title", "stepProps"];
-import { warning } from 'rc-util';
-import omit from 'rc-util/lib/omit';
+import { omit, warning } from '@rc-component/util';
 import { useContext, useEffect, useImperativeHandle, useRef } from 'react';
 import { BaseForm } from "../../BaseForm";
 import { StepFormProvide, StepsFormProvide } from "./index";

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

@@ -6,10 +6,9 @@ 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 = ["current", "onCurrentChange", "submitter", "stepsFormRender", "stepsRender", "stepFormRender", "stepsProps", "onFinish", "formProps", "containerStyle", "formRef", "formMapRef", "layoutRender"];
+import { toArray, useMergedState } from '@rc-component/util';
 import { Button, Col, ConfigProvider, Form, Row, Space, Steps } from 'antd';
 import classNames from 'classnames';
-import { useMergedState } from 'rc-util';
-import toArray from 'rc-util/lib/Children/toArray';
 import React, { useCallback, useContext, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { ProConfigProvider, useIntl } from "../../../provider";
 import { merge, useRefFunction } from "../../../utils";

package/es/layout/ProLayout.js

@@ -6,11 +6,10 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["id", "defaultMessage"],
   _excluded2 = ["fixSiderbar", "navTheme", "layout"];
+import { omit, useMergedState, warning } from '@rc-component/util';
 import { getMatchMenu } from '@umijs/route-utils';
 import { ConfigProvider, Layout } from 'antd';
 import classNames from 'classnames';
-import { useMergedState, warning } from 'rc-util';
-import omit from 'rc-util/lib/omit';
 import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import useSWR, { useSWRConfig } from 'swr';
 import { ProConfigProvider, ProProvider, isNeedOpenHash } from "../provider";
@@ -457,8 +456,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),
@@ -472,7 +471,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/es/layout/components/FooterToolbar/index.js

@@ -2,9 +2,9 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children", "className", "extra", "portalDom", "style", "renderContent"];
-/* eslint-disable react-hooks/exhaustive-deps */import { ConfigProvider } from 'antd';
+/* eslint-disable react-hooks/exhaustive-deps */import { omit } from '@rc-component/util';
+import { ConfigProvider } from 'antd';
 import classNames from 'classnames';
-import omit from 'rc-util/lib/omit';
 import React, { useContext, useEffect, useMemo } from 'react';
 import { createPortal } from 'react-dom';
 import { isBrowser } from "../../../utils";

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

@@ -2,8 +2,8 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["drawerProps"];
+import { useMergedState } from '@rc-component/util';
 import { Drawer } from 'antd';
-import { useMergedState } from 'rc-util';
 import { ProHelpPanel } from "./ProHelpPanel";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**