From 9ce02a89751a2a15c893773c96e560f79a7dbc82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= Date: Wed, 21 Feb 2024 14:44:24 +0800 Subject: [PATCH 01/57] =?UTF-8?q?=E5=88=A0=E9=99=A4=20=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/StatisticCard/index.tsx | 3 -- packages/card/src/index.tsx | 2 - packages/descriptions/src/index.tsx | 24 +++------ packages/field/package.json | 1 - .../field/src/components/Cascader/index.tsx | 4 -- .../field/src/components/Checkbox/index.tsx | 7 +-- packages/field/src/components/Code/index.tsx | 3 -- .../src/components/ColorPicker/index.tsx | 50 ++++-------------- .../field/src/components/DatePicker/index.tsx | 4 -- packages/field/src/components/Digit/index.tsx | 6 +-- .../field/src/components/DigitRange/index.tsx | 4 -- .../field/src/components/FromNow/index.tsx | 6 +-- packages/field/src/components/Image/index.tsx | 4 -- packages/field/src/components/Money/index.tsx | 11 +--- .../field/src/components/Options/index.tsx | 6 +-- .../field/src/components/Password/index.tsx | 5 -- .../field/src/components/Percent/index.tsx | 4 -- .../field/src/components/Progress/index.tsx | 5 -- packages/field/src/components/Radio/index.tsx | 4 -- .../src/components/RangePicker/index.tsx | 4 -- packages/field/src/components/Rate/index.tsx | 4 -- .../field/src/components/Second/index.tsx | 3 -- .../field/src/components/Segmented/index.tsx | 16 +++--- .../field/src/components/Select/index.tsx | 4 -- .../field/src/components/Slider/index.tsx | 4 -- .../field/src/components/Status/index.tsx | 4 -- .../field/src/components/Switch/index.tsx | 6 +-- packages/field/src/components/Text/index.tsx | 4 -- .../field/src/components/TextArea/index.tsx | 3 -- .../src/components/TextArea/readonly.tsx | 4 -- .../field/src/components/TimePicker/index.tsx | 4 -- .../field/src/components/TreeSelect/index.tsx | 5 -- .../form/src/components/ColorPicker/index.tsx | 1 - packages/form/src/index.tsx | 12 +---- .../form/src/layouts/DrawerForm/index.tsx | 11 ++-- packages/form/src/layouts/ModalForm/index.tsx | 7 +-- packages/form/src/layouts/StepsForm/index.tsx | 50 +++++------------- .../components/AppsLogoComponents/index.tsx | 10 +--- .../src/components/Help/ProHelpPanel.tsx | 14 ++--- .../src/components/PageContainer/index.tsx | 28 +--------- .../src/components/PageHeader/index.tsx | 1 - .../src/components/SettingDrawer/index.tsx | 32 ++---------- .../layout/src/components/SiderMenu/index.tsx | 10 ++-- packages/layout/src/index.tsx | 20 -------- .../layout/src/utils/getBreadcrumbProps.tsx | 14 ++--- packages/list/src/ListView.tsx | 8 +-- packages/list/src/index.tsx | 3 -- packages/skeleton/src/index.tsx | 1 - packages/table/src/Table.tsx | 5 -- .../table/src/components/Dropdown/index.tsx | 40 +++++++-------- .../src/components/ListToolBar/HeaderMenu.tsx | 44 ++++++---------- .../src/components/ListToolBar/index.tsx | 19 ++----- .../src/components/ToolBar/DensityIcon.tsx | 51 ++++++++++--------- .../src/compareVersions/coverToNewToken.ts | 3 -- .../compareVersions/menuOverlayCompatible.tsx | 20 -------- .../compareVersions/openVisibleCompatible.ts | 25 --------- .../utils/src/compatible/compatibleBorder.ts | 16 +++--- .../src/components/FilterDropdown/index.tsx | 20 ++------ .../components/InlineErrorFormItem/index.tsx | 15 ++---- packages/utils/src/index.tsx | 4 -- tests/field/__snapshots__/demo.test.ts.snap | 2 - tests/form/__snapshots__/demo.test.ts.snap | 6 ++- tests/form/base.test.tsx | 42 --------------- tests/utils/index.test.tsx | 16 ------ 64 files changed, 157 insertions(+), 611 deletions(-) delete mode 100644 packages/utils/src/compareVersions/menuOverlayCompatible.tsx delete mode 100644 packages/utils/src/compareVersions/openVisibleCompatible.ts diff --git a/packages/card/src/components/StatisticCard/index.tsx b/packages/card/src/components/StatisticCard/index.tsx index a3d9dfb65ceb..ae66c0dbc8c4 100644 --- a/packages/card/src/components/StatisticCard/index.tsx +++ b/packages/card/src/components/StatisticCard/index.tsx @@ -9,9 +9,6 @@ import type { StatisticProps } from '../Statistic'; import Statistic from '../Statistic'; import { useStyle } from './style'; -import 'antd/lib/divider/style'; -import 'antd/lib/statistic/style'; - export type StatisticCardProps = { /** 图表配置 */ chart?: React.ReactNode; diff --git a/packages/card/src/index.tsx b/packages/card/src/index.tsx index 0da135a7487f..374c011bc082 100644 --- a/packages/card/src/index.tsx +++ b/packages/card/src/index.tsx @@ -14,8 +14,6 @@ import type { ProCardProps } from './ProCard'; import ProCard from './ProCard'; import type { ProCardTabsProps } from './typing'; -import 'antd/lib/card/style'; - export { CheckCard, ProCard, Statistic, StatisticCard }; export type { CheckCardGroupProps, diff --git a/packages/descriptions/src/index.tsx b/packages/descriptions/src/index.tsx index 04f0d33a193b..fa91224d6340 100644 --- a/packages/descriptions/src/index.tsx +++ b/packages/descriptions/src/index.tsx @@ -13,14 +13,13 @@ import { ErrorBoundary, InlineErrorFormItem, LabelIconTip, - compareVersions, genCopyable, getFieldPropsOrFormItemProps, stringify, useEditableMap, } from '@ant-design/pro-utils'; import type { DescriptionsProps, FormInstance, FormProps } from 'antd'; -import { ConfigProvider, Descriptions, Space, version } from 'antd'; +import { ConfigProvider, Descriptions, Space } from 'antd'; import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel'; import toArray from 'rc-util/lib/Children/toArray'; import get from 'rc-util/lib/utils/get'; @@ -28,12 +27,9 @@ import React, { useContext, useEffect } from 'react'; import type { RequestData } from './useFetchData'; import useFetchData from './useFetchData'; -// 兼容代码----------- import type { ProFieldFCMode } from '@ant-design/pro-provider'; import { proTheme } from '@ant-design/pro-provider'; import type { DescriptionsItemType } from 'antd/es/descriptions'; -import 'antd/lib/descriptions/style'; -//---------------------- // todo remove it export interface DescriptionsItemProps { @@ -328,16 +324,13 @@ const schemaToDescriptionsItem = ( emptyText?: React.ReactNode, ) => { const options: JSX.Element[] = []; - const isBigger58 = compareVersions(version, '5.8.0') >= 0; // 因为 Descriptions 只是个语法糖,children 是不会执行的,所以需要这里处理一下 const children = items ?.map?.((item, index) => { if (React.isValidElement(item)) { - return isBigger58 - ? { - children: item, - } - : item; + return { + children: item, + }; } const { valueEnum, @@ -389,7 +382,7 @@ const schemaToDescriptionsItem = ( fieldMode === 'edit' ? text : genCopyable(text, item, text); const field: DescriptionsItemType | JSX.Element = - isBigger58 && valueType !== 'option' + valueType !== 'option' ? ({ ...restItem, key: restItem.key || restItem.label?.toString() || index, @@ -623,7 +616,6 @@ const ProDescriptions = < } const className = context.getPrefixCls('pro-descriptions'); - const isBigger58 = compareVersions(version, '5.8.0') >= 0; return ( - {isBigger58 ? null : (children as JSX.Element[])} - + items={children as DescriptionsItemType[]} + /> ); diff --git a/packages/field/package.json b/packages/field/package.json index 9a36530fdfa9..01d681feefe6 100644 --- a/packages/field/package.json +++ b/packages/field/package.json @@ -33,7 +33,6 @@ "@ant-design/pro-provider": "2.13.5", "@ant-design/pro-utils": "2.15.4", "@babel/runtime": "^7.18.0", - "@chenshuai2144/sketch-color": "^1.0.8", "classnames": "^2.3.2", "dayjs": "^1.11.10", "lodash.tonumber": "^4.0.3", diff --git a/packages/field/src/components/Cascader/index.tsx b/packages/field/src/components/Cascader/index.tsx index a77fac2abebd..eaa12bbbb2ab 100644 --- a/packages/field/src/components/Cascader/index.tsx +++ b/packages/field/src/components/Cascader/index.tsx @@ -20,10 +20,6 @@ import type { ProFieldFC } from '../../index'; import type { FieldSelectProps } from '../Select'; import { useFieldFetchData } from '../Select'; -// 兼容代码----------- -import 'antd/lib/cascader/style'; -//---------------------- - export type GroupProps = { options?: RadioGroupProps['options']; radioType?: 'button' | 'radio'; diff --git a/packages/field/src/components/Checkbox/index.tsx b/packages/field/src/components/Checkbox/index.tsx index d4640c2793c7..145d8511dfc6 100644 --- a/packages/field/src/components/Checkbox/index.tsx +++ b/packages/field/src/components/Checkbox/index.tsx @@ -1,4 +1,5 @@ -import { +import { useToken } from '@ant-design/pro-provider'; +import { objectToMap, proFieldParsingText, useStyle, @@ -15,10 +16,6 @@ export type GroupProps = { options?: CheckboxGroupProps['options']; } & FieldSelectProps; -// 兼容代码----------- -import { useToken } from '@ant-design/pro-provider'; -import 'antd/lib/checkbox/style'; -//---------------------- /** * 多选组件 * diff --git a/packages/field/src/components/Code/index.tsx b/packages/field/src/components/Code/index.tsx index cf6a96b938ca..ce4e7c03e396 100644 --- a/packages/field/src/components/Code/index.tsx +++ b/packages/field/src/components/Code/index.tsx @@ -2,10 +2,7 @@ import { Input } from 'antd'; import React from 'react'; import type { ProFieldFC } from '../../index'; -// 兼容代码----------- import { proTheme } from '@ant-design/pro-provider'; -import 'antd/lib/input/style'; -//---------------------- const languageFormat = (text: string, language: string) => { if (typeof text !== 'string') { diff --git a/packages/field/src/components/ColorPicker/index.tsx b/packages/field/src/components/ColorPicker/index.tsx index 198e56844915..68a992bfdacd 100644 --- a/packages/field/src/components/ColorPicker/index.tsx +++ b/packages/field/src/components/ColorPicker/index.tsx @@ -1,11 +1,9 @@ -import { compareVersions } from '@ant-design/pro-utils'; -import type { ColorPickerProps } from 'antd'; -import { ColorPicker as ColorPickerV5, ConfigProvider, version } from 'antd'; +import type { ColorPickerProps } from 'antd'; +import { ColorPicker, ConfigProvider } from 'antd'; import classNames from 'classnames'; -import React, { useContext, useMemo } from 'react'; +import React, { useContext } from 'react'; import type { ProFieldFC } from '../../index'; -import { ColorPicker as ColorPickerV4 } from './old'; -// https://ant.design/components/color-picker-cn 示例颜色 + const DEFAULT_PRESETS = { label: 'Recommended', colors: [ @@ -31,25 +29,7 @@ const DEFAULT_PRESETS = { '#EB2F964D', ], }; -/** - * 判断是否是 5.5.0 以上的版本 - * @returns - */ -function IsIt_Render_V5() { - return compareVersions(version, '5.5.0') > -1; -} -/** - * 获取颜色组件 - * @param {boolean} [old=false] 是否使用旧版本 - * @return {*} - */ -function getColorPicker(old: boolean = false) { - if ((typeof old === 'undefined' || old === false) && IsIt_Render_V5()) { - return ColorPickerV5; - } - return ColorPickerV4; -} -// const ColorPicker = getColorPicker(); + /** * 颜色组件 * Antd > 5.5.0 的版本 使用 antd 的 ColorPicker @@ -60,28 +40,16 @@ function getColorPicker(old: boolean = false) { const FieldColorPicker: ProFieldFC< { text: string; - /** 是否使用旧版本 */ - old?: boolean; } & Partial -> = ( - { text, mode: type, render, renderFormItem, fieldProps, old }, - ref: any, -) => { +> = ({ text, mode: type, render, renderFormItem, fieldProps }, ref: any) => { const { getPrefixCls } = useContext(ConfigProvider.ConfigContext); - const ColorPicker = React.useMemo(() => getColorPicker(old), [old]); const prefixCls = getPrefixCls('pro-field-color-picker'); - // 5.5.0 以上版本追加 className - const className = useMemo(() => { - if (old) return ''; - return classNames({ [prefixCls]: IsIt_Render_V5() }); - }, [prefixCls, old]); + if (type === 'read') { const dom = ( @@ -100,7 +68,7 @@ const FieldColorPicker: ProFieldFC< presets={[DEFAULT_PRESETS]} {...fieldProps} style={style} - className={className} + className={classNames({ [prefixCls]: true })} /> ); if (renderFormItem) { diff --git a/packages/field/src/components/DatePicker/index.tsx b/packages/field/src/components/DatePicker/index.tsx index c5e1dab87cdc..1b54962f4912 100644 --- a/packages/field/src/components/DatePicker/index.tsx +++ b/packages/field/src/components/DatePicker/index.tsx @@ -10,10 +10,6 @@ import weekOfYear from 'dayjs/plugin/weekOfYear'; import React, { useState } from 'react'; import type { ProFieldFC, ProFieldLightProps } from '../../index'; -// 兼容代码----------- -import 'antd/lib/date-picker/style'; -//---------------------- - dayjs.extend(weekOfYear); const formatDate = (text: any, format: any) => { diff --git a/packages/field/src/components/Digit/index.tsx b/packages/field/src/components/Digit/index.tsx index 1b907882d416..78ac5be3b24f 100644 --- a/packages/field/src/components/Digit/index.tsx +++ b/packages/field/src/components/Digit/index.tsx @@ -1,14 +1,10 @@ +import { useIntl } from '@ant-design/pro-provider'; import { isNil } from '@ant-design/pro-utils'; import { InputNumber } from 'antd'; import omit from 'omit.js'; import React, { useCallback } from 'react'; import type { ProFieldFC } from '../../index'; -// 兼容代码----------- -import { useIntl } from '@ant-design/pro-provider'; -import 'antd/lib/input-number/style'; -//---------------------- - export type FieldDigitProps = { text: number; placeholder?: string; diff --git a/packages/field/src/components/DigitRange/index.tsx b/packages/field/src/components/DigitRange/index.tsx index c740e33a9932..3e3ecc2f89eb 100644 --- a/packages/field/src/components/DigitRange/index.tsx +++ b/packages/field/src/components/DigitRange/index.tsx @@ -4,10 +4,6 @@ import useMergedState from 'rc-util/lib/hooks/useMergedState'; import React from 'react'; import type { ProFieldFC } from '../../index'; -// 兼容代码----------- -import 'antd/lib/input-number/style'; -//---------------------- - export type Value = string | number | undefined | null; export type ValuePair = Value[]; diff --git a/packages/field/src/components/FromNow/index.tsx b/packages/field/src/components/FromNow/index.tsx index b42759a9f23f..a1fd054fe463 100644 --- a/packages/field/src/components/FromNow/index.tsx +++ b/packages/field/src/components/FromNow/index.tsx @@ -3,12 +3,8 @@ import { parseValueToDay } from '@ant-design/pro-utils'; import { DatePicker, Tooltip } from 'antd'; import dayjs from 'dayjs'; import relativeTime from 'dayjs/plugin/relativeTime'; -import type { ProFieldFC } from '../../index'; - -// 兼容代码----------- -import 'antd/lib/date-picker/style'; import React from 'react'; -//---------------------- +import type { ProFieldFC } from '../../index'; dayjs.extend(relativeTime); /** diff --git a/packages/field/src/components/Image/index.tsx b/packages/field/src/components/Image/index.tsx index 4b045daf3d8c..bfb05cd9e6c8 100644 --- a/packages/field/src/components/Image/index.tsx +++ b/packages/field/src/components/Image/index.tsx @@ -3,10 +3,6 @@ import { Image, Input } from 'antd'; import React from 'react'; import type { ProFieldFC } from '../../index'; -// 兼容代码----------- -import 'antd/lib/image/style'; -//---------------------- - export type FieldImageProps = { text: string; width?: number; diff --git a/packages/field/src/components/Money/index.tsx b/packages/field/src/components/Money/index.tsx index dbba95262530..f0e0bf355445 100644 --- a/packages/field/src/components/Money/index.tsx +++ b/packages/field/src/components/Money/index.tsx @@ -6,13 +6,6 @@ import useMergedState from 'rc-util/lib/hooks/useMergedState'; import React, { useCallback, useMemo } from 'react'; import type { ProFieldFC } from '../../index'; -// 兼容代码----------- -import 'antd/lib/input-number/style'; -import 'antd/lib/popover/style'; -//---------------------- - -import { openVisibleCompatible } from '@ant-design/pro-utils'; - export type FieldMoneyProps = { text: number; moneySymbol?: boolean; @@ -252,12 +245,10 @@ const InputNumberPopover = React.forwardRef< value, }); - const props = openVisibleCompatible(dom ? open : false); - return ( { diff --git a/packages/field/src/components/Options/index.tsx b/packages/field/src/components/Options/index.tsx index 33b269df7946..1cda92eebedf 100644 --- a/packages/field/src/components/Options/index.tsx +++ b/packages/field/src/components/Options/index.tsx @@ -1,12 +1,8 @@ +import { proTheme } from '@ant-design/pro-provider'; import { ConfigProvider } from 'antd'; import React, { useContext, useImperativeHandle } from 'react'; import type { ProFieldFC } from '../../index'; -// 兼容代码----------- -import { proTheme } from '@ant-design/pro-provider'; -import 'antd/lib/space/style'; -//---------------------- - const addArrayKeys = (doms: React.ReactNode[]) => doms.map((dom, index) => { if (!React.isValidElement(dom)) { diff --git a/packages/field/src/components/Password/index.tsx b/packages/field/src/components/Password/index.tsx index 41e32255d490..54ca1c3c7099 100644 --- a/packages/field/src/components/Password/index.tsx +++ b/packages/field/src/components/Password/index.tsx @@ -5,11 +5,6 @@ import useMergedState from 'rc-util/lib/hooks/useMergedState'; import React from 'react'; import type { ProFieldFC } from '../../index'; -// 兼容代码----------- -import 'antd/lib/input/style'; -import 'antd/lib/space/style'; -//---------------------- - /** * 最基本的组件,就是个普通的 Input.Password * diff --git a/packages/field/src/components/Percent/index.tsx b/packages/field/src/components/Percent/index.tsx index c2e045f0b59c..c17b6723f531 100644 --- a/packages/field/src/components/Percent/index.tsx +++ b/packages/field/src/components/Percent/index.tsx @@ -10,10 +10,6 @@ import { getSymbolByRealValue, } from './util'; -// 兼容代码----------- -import 'antd/lib/input-number/style'; -//------------ - export type PercentPropInt = { prefix?: ReactNode; suffix?: ReactNode; diff --git a/packages/field/src/components/Progress/index.tsx b/packages/field/src/components/Progress/index.tsx index 56ec520fd0d3..043d669954c2 100644 --- a/packages/field/src/components/Progress/index.tsx +++ b/packages/field/src/components/Progress/index.tsx @@ -4,11 +4,6 @@ import toNumber from 'lodash.tonumber'; import React, { useMemo } from 'react'; import type { ProFieldFC } from '../../index'; -// 兼容代码----------- -import 'antd/lib/input-number/style'; -import 'antd/lib/progress/style'; -//------------ - export function getProgressStatus( text: number, ): 'success' | 'exception' | 'normal' | 'active' { diff --git a/packages/field/src/components/Radio/index.tsx b/packages/field/src/components/Radio/index.tsx index d2f5723e31ac..e235604aaaf9 100644 --- a/packages/field/src/components/Radio/index.tsx +++ b/packages/field/src/components/Radio/index.tsx @@ -11,10 +11,6 @@ import type { ProFieldFC } from '../../index'; import type { FieldSelectProps } from '../Select'; import { useFieldFetchData } from '../Select'; -// 兼容代码----------- -import 'antd/lib/radio/style'; -//------------ - export type GroupProps = { options?: RadioGroupProps['options']; radioType?: RadioGroupProps['optionType']; diff --git a/packages/field/src/components/RangePicker/index.tsx b/packages/field/src/components/RangePicker/index.tsx index 7c5625712e7b..59f3faa7df8d 100644 --- a/packages/field/src/components/RangePicker/index.tsx +++ b/packages/field/src/components/RangePicker/index.tsx @@ -9,10 +9,6 @@ import dayjs from 'dayjs'; import React, { useCallback } from 'react'; import type { ProFieldFC, ProFieldLightProps } from '../../index'; -// 兼容代码----------- -import 'antd/lib/date-picker/style'; -//------------ - /** * 日期范围选择组件 * diff --git a/packages/field/src/components/Rate/index.tsx b/packages/field/src/components/Rate/index.tsx index 633b97f541ba..dd27c31c25b2 100644 --- a/packages/field/src/components/Rate/index.tsx +++ b/packages/field/src/components/Rate/index.tsx @@ -2,10 +2,6 @@ import { Rate } from 'antd'; import React from 'react'; import type { ProFieldFC } from '../../index'; -// 兼容代码----------- -import 'antd/lib/rate/style'; -//------------ - /** * 评分组件 * diff --git a/packages/field/src/components/Second/index.tsx b/packages/field/src/components/Second/index.tsx index 51572ada806a..8dcdbbc92457 100644 --- a/packages/field/src/components/Second/index.tsx +++ b/packages/field/src/components/Second/index.tsx @@ -2,9 +2,6 @@ import { useIntl } from '@ant-design/pro-provider'; import { InputNumber } from 'antd'; import React from 'react'; import type { ProFieldFC } from '../../index'; -// 兼容代码----------- -import 'antd/lib/input-number/style'; -//------------ export type FieldDigitProps = { text: number; diff --git a/packages/field/src/components/Segmented/index.tsx b/packages/field/src/components/Segmented/index.tsx index 0f793ca59402..03154b13f65e 100644 --- a/packages/field/src/components/Segmented/index.tsx +++ b/packages/field/src/components/Segmented/index.tsx @@ -6,8 +6,6 @@ import type { FieldSelectProps } from '../Select'; import { useFieldFetchData } from '../Select'; import { objectToMap, proFieldParsingText } from '@ant-design/pro-utils'; -import 'antd/lib/segmented/style'; -import 'antd/lib/spin/style'; /** * Segmented https://ant.design/components/segmented-cn/ @@ -19,11 +17,15 @@ const FieldSegmented: ProFieldFC< text: string; emptyText?: React.ReactNode; } & FieldSelectProps -> = ( - props, - ref, -) => { - const { mode, render, renderFormItem, fieldProps, emptyText = '-', ...rest } = props; +> = (props, ref) => { + const { + mode, + render, + renderFormItem, + fieldProps, + emptyText = '-', + ...rest + } = props; const inputRef = useRef(); diff --git a/packages/field/src/components/Select/index.tsx b/packages/field/src/components/Select/index.tsx index 017f975143fd..d75357c70d45 100644 --- a/packages/field/src/components/Select/index.tsx +++ b/packages/field/src/components/Select/index.tsx @@ -31,10 +31,6 @@ import type { ProFieldFC, ProFieldLightProps } from '../../index'; import LightSelect from './LightSelect'; import SearchSelect from './SearchSelect'; -// 兼容代码----------- -import 'antd/lib/select/style'; -//------------ - type SelectOptionType = Partial[]; export type FieldSelectProps = { diff --git a/packages/field/src/components/Slider/index.tsx b/packages/field/src/components/Slider/index.tsx index 449347facce9..b32fdd6eac51 100644 --- a/packages/field/src/components/Slider/index.tsx +++ b/packages/field/src/components/Slider/index.tsx @@ -1,10 +1,6 @@ import { Slider } from 'antd'; import React from 'react'; import type { ProFieldFC } from '../../index'; - -// 兼容代码----------- -import 'antd/lib/slider/style'; -//------------ /** * 评分组件 * diff --git a/packages/field/src/components/Status/index.tsx b/packages/field/src/components/Status/index.tsx index 780960369171..0d9ec1576b96 100644 --- a/packages/field/src/components/Status/index.tsx +++ b/packages/field/src/components/Status/index.tsx @@ -2,10 +2,6 @@ import { Badge } from 'antd'; import type { CSSProperties } from 'react'; import React from 'react'; -// 兼容代码----------- -import 'antd/lib/badge/style'; -//------------ - type StatusProps = { className?: string; style?: CSSProperties; diff --git a/packages/field/src/components/Switch/index.tsx b/packages/field/src/components/Switch/index.tsx index a4947d6a13f8..388f9293f62f 100644 --- a/packages/field/src/components/Switch/index.tsx +++ b/packages/field/src/components/Switch/index.tsx @@ -1,15 +1,11 @@ import { useIntl } from '@ant-design/pro-provider'; +import { FieldLabel } from '@ant-design/pro-utils'; import type { SwitchProps } from 'antd'; import { Switch } from 'antd'; import Omit from 'omit.js'; import React, { useMemo } from 'react'; import type { ProFieldFC } from '../../index'; -// 兼容代码----------- -import { FieldLabel } from '@ant-design/pro-utils'; -import 'antd/lib/switch/style'; -//------------ - /** * 评分组件 * diff --git a/packages/field/src/components/Text/index.tsx b/packages/field/src/components/Text/index.tsx index 9829e6bb3a75..5cc70e00db09 100644 --- a/packages/field/src/components/Text/index.tsx +++ b/packages/field/src/components/Text/index.tsx @@ -3,10 +3,6 @@ import { Input } from 'antd'; import React, { useEffect, useImperativeHandle, useRef } from 'react'; import type { ProFieldFC } from '../../index'; -// 兼容代码----------- -import 'antd/lib/input/style'; -//------------ - /** * 最基本的组件,就是个普通的 Input * diff --git a/packages/field/src/components/TextArea/index.tsx b/packages/field/src/components/TextArea/index.tsx index 911dc231f4f1..58f4b280616d 100644 --- a/packages/field/src/components/TextArea/index.tsx +++ b/packages/field/src/components/TextArea/index.tsx @@ -4,9 +4,6 @@ import React from 'react'; import type { ProFieldFC } from '../../index'; import FieldTextAreaReadonly from './readonly'; -// 兼容代码----------- -import 'antd/lib/input/style'; -//------------ /** * 最基本的组件,就是个普通的 Input.TextArea * diff --git a/packages/field/src/components/TextArea/readonly.tsx b/packages/field/src/components/TextArea/readonly.tsx index 9bd77a9ac724..53e5508a1baa 100644 --- a/packages/field/src/components/TextArea/readonly.tsx +++ b/packages/field/src/components/TextArea/readonly.tsx @@ -4,10 +4,6 @@ import classNames from 'classnames'; import React, { useContext } from 'react'; import type { ProFieldFC } from '../../index'; -// 兼容代码----------- -import 'antd/lib/input/style'; -//------------ - /** * Input.TextArea 只读模式时渲染的组件 * diff --git a/packages/field/src/components/TimePicker/index.tsx b/packages/field/src/components/TimePicker/index.tsx index 4231bb031c9e..8c45ea5e5c8c 100644 --- a/packages/field/src/components/TimePicker/index.tsx +++ b/packages/field/src/components/TimePicker/index.tsx @@ -9,10 +9,6 @@ import dayjs from 'dayjs'; import React, { useState } from 'react'; import type { ProFieldFC, ProFieldLightProps } from '../../index'; -// 兼容代码----------- -import 'antd/lib/date-picker/style'; -//----------------------; - /** * 时间选择组件 * diff --git a/packages/field/src/components/TreeSelect/index.tsx b/packages/field/src/components/TreeSelect/index.tsx index b4ec1f899ec7..50d620e7dccd 100644 --- a/packages/field/src/components/TreeSelect/index.tsx +++ b/packages/field/src/components/TreeSelect/index.tsx @@ -19,11 +19,6 @@ import type { ProFieldFC } from '../../index'; import type { FieldSelectProps } from '../Select'; import { useFieldFetchData } from '../Select'; -// 兼容代码----------- -import 'antd/lib/spin/style'; -import 'antd/lib/tree-select/style'; -//---------------------- - export type GroupProps = { options?: RadioGroupProps['options']; radioType?: 'button' | 'radio'; diff --git a/packages/form/src/components/ColorPicker/index.tsx b/packages/form/src/components/ColorPicker/index.tsx index 455faad32f8c..af63db2f1c18 100644 --- a/packages/form/src/components/ColorPicker/index.tsx +++ b/packages/form/src/components/ColorPicker/index.tsx @@ -13,7 +13,6 @@ export type ProFormColorPickerProps = ProFormFieldItemProps & { popoverProps?: PopoverProps; colors?: string[]; - old?: boolean; }; /** * 数组选择组件 diff --git a/packages/form/src/index.tsx b/packages/form/src/index.tsx index ffaec64188d8..6de0cb1785b8 100644 --- a/packages/form/src/index.tsx +++ b/packages/form/src/index.tsx @@ -1,16 +1,6 @@ -import { ProForm } from './layouts'; -// 兼容代码----------- -import 'antd/lib/drawer/style'; -import 'antd/lib/form/style'; -import 'antd/lib/modal/style'; -import 'antd/lib/rate/style'; -import 'antd/lib/row/style'; -import 'antd/lib/steps/style'; -import 'antd/lib/tabs/style'; -import 'antd/lib/upload/style'; import { GridContext } from './helpers'; +import { ProForm } from './layouts'; import type { ProFormGroupProps } from './typing'; -//---------------------- export { ProFormContext } from '@ant-design/pro-utils'; export type { FormInstance, diff --git a/packages/form/src/layouts/DrawerForm/index.tsx b/packages/form/src/layouts/DrawerForm/index.tsx index 09b02de5365d..13b20e7402e6 100644 --- a/packages/form/src/layouts/DrawerForm/index.tsx +++ b/packages/form/src/layouts/DrawerForm/index.tsx @@ -1,8 +1,4 @@ -import { - omitUndefined, - openVisibleCompatible, - useRefFunction, -} from '@ant-design/pro-utils'; +import { omitUndefined, useRefFunction } from '@ant-design/pro-utils'; import type { DrawerProps, FormProps } from 'antd'; import { ConfigProvider, Drawer } from 'antd'; import classNames from 'classnames'; @@ -274,8 +270,6 @@ function DrawerForm, U = Record>({ return result; }); - const drawerOpenProps = openVisibleCompatible(open, onVisibleChange); - const cbHandleMouseMove = useCallback( (e: MouseEvent) => { const offsetRight: number | string = ((document.body.offsetWidth || @@ -309,10 +303,11 @@ function DrawerForm, U = Record>({ title={title} width={drawerWidth} {...drawerProps} - {...drawerOpenProps} + open={open} afterOpenChange={(e) => { if (!e) resetFields(); drawerProps?.afterOpenChange?.(e); + onVisibleChange?.(e); }} onClose={(e) => { // 提交表单loading时,阻止弹框关闭 diff --git a/packages/form/src/layouts/ModalForm/index.tsx b/packages/form/src/layouts/ModalForm/index.tsx index ad41e5f65462..6a713f38a751 100644 --- a/packages/form/src/layouts/ModalForm/index.tsx +++ b/packages/form/src/layouts/ModalForm/index.tsx @@ -1,5 +1,4 @@ -import { openVisibleCompatible } from '@ant-design/pro-utils'; -import type { FormProps, ModalProps } from 'antd'; +import type { FormProps, ModalProps } from 'antd'; import { ConfigProvider, Modal } from 'antd'; import merge from 'lodash.merge'; import useMergedState from 'rc-util/lib/hooks/useMergedState'; @@ -229,15 +228,13 @@ function ModalForm, U = Record>({ [onFinish, setOpen, submitTimeout], ); - const modalOpenProps = openVisibleCompatible(open); - return ( <> { // 提交表单loading时,阻止弹框关闭 if (submitTimeout && loading) return; diff --git a/packages/form/src/layouts/StepsForm/index.tsx b/packages/form/src/layouts/StepsForm/index.tsx index 48e180fe74ba..02e9606a6984 100644 --- a/packages/form/src/layouts/StepsForm/index.tsx +++ b/packages/form/src/layouts/StepsForm/index.tsx @@ -1,16 +1,7 @@ import { ProConfigProvider, useIntl } from '@ant-design/pro-provider'; -import { compareVersions, merge, useRefFunction } from '@ant-design/pro-utils'; +import { merge, useRefFunction } from '@ant-design/pro-utils'; import type { FormInstance, StepsProps } from 'antd'; -import { - Button, - Col, - ConfigProvider, - Form, - Row, - Space, - Steps, - version, -} from 'antd'; +import { Button, Col, ConfigProvider, Form, Row, Space, Steps } from 'antd'; import type { FormProviderProps } from 'antd/lib/form/context'; import classNames from 'classnames'; @@ -286,19 +277,16 @@ function StepsForm>( ); const stepsDom = useMemo(() => { - const isNewAntd = compareVersions(version, '4.24.0') > -1; - const itemsProps = isNewAntd - ? { - items: formArray.map((item) => { - const itemProps = formMapRef.current.get(item); - return { - key: item, - title: itemProps?.title, - ...itemProps?.stepProps, - }; - }), - } - : {}; + const itemsProps = { + items: formArray.map((item) => { + const itemProps = formMapRef.current.get(item); + return { + key: item, + title: itemProps?.title, + ...itemProps?.stepProps, + }; + }), + }; return (
>( {...itemsProps} current={step} onChange={undefined} - > - {!isNewAntd && - formArray.map((item) => { - const itemProps = formMapRef.current.get(item); - return ( - - ); - })} - + />
); }, [formArray, hashId, prefixCls, step, stepsProps]); diff --git a/packages/layout/src/components/AppsLogoComponents/index.tsx b/packages/layout/src/components/AppsLogoComponents/index.tsx index 687a9d2ef88c..b5bf94f95ec3 100644 --- a/packages/layout/src/components/AppsLogoComponents/index.tsx +++ b/packages/layout/src/components/AppsLogoComponents/index.tsx @@ -1,5 +1,4 @@ -import { openVisibleCompatible } from '@ant-design/pro-utils'; -import { Popover } from 'antd'; +import { Popover } from 'antd'; import classNames from 'classnames'; import React, { useMemo, useState } from 'react'; import { AppsLogo } from './AppsLogo'; @@ -91,11 +90,6 @@ export const AppsLogoComponents: React.FC<{ ? appListRender(props?.appList, defaultDomContent) : defaultDomContent; - const popoverOpenProps = openVisibleCompatible( - undefined, - (openChange: boolean) => setOpen(openChange), - ); - return wrapSSR( <>
setOpen(openChange)} overlayClassName={`${baseClassName}-popover ${hashId}`.trim()} content={popoverContent} getPopupContainer={() => ref.current || document.body} diff --git a/packages/layout/src/components/Help/ProHelpPanel.tsx b/packages/layout/src/components/Help/ProHelpPanel.tsx index ccfe310b8738..240e3fae1006 100644 --- a/packages/layout/src/components/Help/ProHelpPanel.tsx +++ b/packages/layout/src/components/Help/ProHelpPanel.tsx @@ -206,12 +206,14 @@ export const ProHelpPanel: React.FC = ({ - {/* 如果版本低于 4.23.0,不支持 items */} - {compareVersions(version, '4.23.0') < 0 - ? tabList?.map((item, index) => { - return ( - - ); - }) - : null} - + /> ); } return null; diff --git a/packages/layout/src/components/PageHeader/index.tsx b/packages/layout/src/components/PageHeader/index.tsx index 7356eaca05dd..db651ff2a81b 100644 --- a/packages/layout/src/components/PageHeader/index.tsx +++ b/packages/layout/src/components/PageHeader/index.tsx @@ -2,7 +2,6 @@ import ArrowLeftOutlined from '@ant-design/icons/ArrowLeftOutlined'; import ArrowRightOutlined from '@ant-design/icons/ArrowRightOutlined'; import type { AvatarProps, BreadcrumbProps, TagType } from 'antd'; import { Avatar, Breadcrumb, ConfigProvider, Space } from 'antd'; -import 'antd/lib/breadcrumb/style'; import type { DirectionType } from 'antd/lib/config-provider'; import classNames from 'classnames'; import ResizeObserver from 'rc-resize-observer'; diff --git a/packages/layout/src/components/SettingDrawer/index.tsx b/packages/layout/src/components/SettingDrawer/index.tsx index 03c2f3aa614c..d1a16d26df97 100644 --- a/packages/layout/src/components/SettingDrawer/index.tsx +++ b/packages/layout/src/components/SettingDrawer/index.tsx @@ -4,24 +4,9 @@ import { NotificationOutlined, SettingOutlined, } from '@ant-design/icons'; -import { - compareVersions, - isBrowser, - merge, - openVisibleCompatible, -} from '@ant-design/pro-utils'; +import { isBrowser, merge } from '@ant-design/pro-utils'; import { useUrlSearchParams } from '@umijs/use-params'; -import { - Alert, - ConfigProvider as AntConfigProvider, - Button, - Divider, - Drawer, - List, - Switch, - message, - version, -} from 'antd'; +import { Alert, Button, Divider, Drawer, List, Switch, message } from 'antd'; import omit from 'omit.js'; import useMergedState from 'rc-util/lib/hooks/useMergedState'; import React, { useEffect, useRef, useState } from 'react'; @@ -270,15 +255,6 @@ export const SettingDrawer: React.FC = (props) => { // eslint-disable-next-line react-hooks/exhaustive-deps }, []); - useEffect(() => { - if (compareVersions(version, '5.0.0') < 0) { - AntConfigProvider.config({ - theme: { - primaryColor: settingState.colorPrimary, - }, - }); - } - }, [settingState.colorPrimary, settingState.navTheme]); /** * 修改设置 * @@ -348,8 +324,6 @@ export const SettingDrawer: React.FC = (props) => { const baseClassName = `${prefixCls}-setting-drawer`; const { wrapSSR, hashId } = useStyle(baseClassName); - const drawerOpenProps = openVisibleCompatible(open); - return wrapSSR( <>
= (props) => { )}
setOpen(false)} closable={false} diff --git a/packages/layout/src/components/SiderMenu/index.tsx b/packages/layout/src/components/SiderMenu/index.tsx index 10672000072f..cc64eff1b61a 100644 --- a/packages/layout/src/components/SiderMenu/index.tsx +++ b/packages/layout/src/components/SiderMenu/index.tsx @@ -1,5 +1,4 @@ import { ProProvider } from '@ant-design/pro-provider'; -import { openVisibleCompatible } from '@ant-design/pro-utils'; import { ConfigProvider, Drawer } from 'antd'; import classNames from 'classnames'; import Omit from 'omit.js'; @@ -45,16 +44,15 @@ const SiderMenuWrapper: React.FC = ( return null; } - const drawerOpenProps = openVisibleCompatible(!collapsed, () => - onCollapse?.(true), - ); - return wrapSSR( isMobile ? ( { + onCollapse?.(true); + }} style={{ padding: 0, height: '100vh', diff --git a/packages/layout/src/index.tsx b/packages/layout/src/index.tsx index eb77441205f6..14e7700f0e61 100644 --- a/packages/layout/src/index.tsx +++ b/packages/layout/src/index.tsx @@ -1,23 +1,3 @@ -// 兼容代码----------- -import 'antd/lib/anchor/style'; -import 'antd/lib/avatar/style'; -import 'antd/lib/breadcrumb/style'; -import 'antd/lib/divider/style'; -import 'antd/lib/drawer/style'; -import 'antd/lib/layout/style'; -import 'antd/lib/list/style'; -import 'antd/lib/menu/style'; -import 'antd/lib/message/style'; -import 'antd/lib/popover/style'; -import 'antd/lib/select/style'; -import 'antd/lib/space/style'; -import 'antd/lib/spin/style'; -import 'antd/lib/switch/style'; -import 'antd/lib/tabs/style'; -import 'antd/lib/tooltip/style'; -import 'antd/lib/typography/style'; -//---------------------- - import type { AppItemProps, AppListProps, diff --git a/packages/layout/src/utils/getBreadcrumbProps.tsx b/packages/layout/src/utils/getBreadcrumbProps.tsx index 26ddf4c5872b..74e4b68bef96 100644 --- a/packages/layout/src/utils/getBreadcrumbProps.tsx +++ b/packages/layout/src/utils/getBreadcrumbProps.tsx @@ -1,4 +1,3 @@ -import { compareVersions } from '@ant-design/pro-utils'; import type { BreadcrumbProps } from 'antd'; import { version } from 'antd'; import type { @@ -184,13 +183,8 @@ export const getBreadcrumbProps = ( items = undefined; } // 如果当前 ant design 包的版本大于等于5.3.0,则返回一个对象{items,itemRender},否则返回一个对象{routes:item,itemRender} - return compareVersions(getVersion(), '5.3.0') > -1 - ? ({ - items, - itemRender, - } as BreadcrumbListReturn) - : ({ - routes: items, - itemRender, - } as unknown as BreadcrumbListReturn); + return { + items, + itemRender, + } as BreadcrumbListReturn; }; diff --git a/packages/list/src/ListView.tsx b/packages/list/src/ListView.tsx index a3d69f5e0854..3c8dd3a44516 100644 --- a/packages/list/src/ListView.tsx +++ b/packages/list/src/ListView.tsx @@ -7,7 +7,7 @@ import type { TablePaginationConfig, TableProps, } from 'antd'; -import { ConfigProvider, List, version } from 'antd'; +import { ConfigProvider, List } from 'antd'; import useLazyKVMap from 'antd/lib/table/hooks/useLazyKVMap'; import usePagination from 'antd/lib/table/hooks/usePagination'; import useSelection from 'antd/lib/table/hooks/useSelection'; @@ -20,7 +20,6 @@ import ProListItem from './Item'; import { PRO_LIST_KEYS_MAP } from './constants'; import type { GetComponentProps } from './index'; -import { compareVersions } from '@ant-design/pro-utils'; import type { AnyObject } from 'antd/es/_util/type'; import type { PaginationConfig } from 'antd/lib/pagination'; @@ -105,8 +104,7 @@ function ListView( onChange: (current: number, pageSize: number) => void, pagination?: TablePaginationConfig | false, ]; - // 兼容 5.2.0 以下的版本 - if (compareVersions(version, '5.3.0') < 0) usePaginationArgs.reverse(); + // 合并分页的的配置,这里是为了兼容 antd 的分页 const [mergedPagination] = usePagination( dataSource.length, @@ -148,8 +146,6 @@ function ListView( // 这个 API 用的不好,先 any 一下 ] as [any, TableRowSelection]; - // 兼容 5.2.0 以下的版本 - if (compareVersions(version, '5.3.0') < 0) useSelectionArgs.reverse(); const [selectItemRender, selectedKeySet] = useSelection(...useSelectionArgs); // 提供和 Table 一样的 expand 支持 diff --git a/packages/list/src/index.tsx b/packages/list/src/index.tsx index e9a23edbb774..9275eaecb5f4 100644 --- a/packages/list/src/index.tsx +++ b/packages/list/src/index.tsx @@ -15,9 +15,6 @@ import type { ItemProps } from './Item'; import ListView from './ListView'; import { useStyle } from './style/index'; -// 兼容性代码 -import 'antd/lib/list/style'; - export type AntdListProps = Omit, 'rowKey'>; export type ProListMeta = Pick< diff --git a/packages/skeleton/src/index.tsx b/packages/skeleton/src/index.tsx index c61da7a45480..8819718b6e39 100644 --- a/packages/skeleton/src/index.tsx +++ b/packages/skeleton/src/index.tsx @@ -1,4 +1,3 @@ -import 'antd/lib/skeleton/style'; import React from 'react'; import type { DescriptionsPageSkeletonProps } from './components/Descriptions'; import DescriptionsPageSkeleton, { diff --git a/packages/table/src/Table.tsx b/packages/table/src/Table.tsx index b7c7500eb71e..4e85eac9832f 100644 --- a/packages/table/src/Table.tsx +++ b/packages/table/src/Table.tsx @@ -1,8 +1,3 @@ -// 兼容代码----------- -import 'antd/lib/table/style'; -import 'antd/lib/typography/style'; -//---------------------- - import ProCard from '@ant-design/pro-card'; import ProForm, { GridContext } from '@ant-design/pro-form'; import type { ParamsType } from '@ant-design/pro-provider'; diff --git a/packages/table/src/components/Dropdown/index.tsx b/packages/table/src/components/Dropdown/index.tsx index ee94983a4ec0..a68227f9fb15 100644 --- a/packages/table/src/components/Dropdown/index.tsx +++ b/packages/table/src/components/Dropdown/index.tsx @@ -1,5 +1,4 @@ import { DownOutlined, EllipsisOutlined } from '@ant-design/icons'; -import { menuOverlayCompatible } from '@ant-design/pro-utils'; import type { MenuItemProps } from 'antd'; import { Button, ConfigProvider, Dropdown } from 'antd'; import classnames from 'classnames'; @@ -35,17 +34,15 @@ const DropdownButton: React.FC = ({ const tempClassName = getPrefixCls('pro-table-dropdown'); - const dropdownProps = menuOverlayCompatible({ - onClick: (params) => onSelect && onSelect(params.key as string), - items: menus?.map((item) => ({ - label: item.name, - key: item.key, - })), - }); - return ( onSelect && onSelect(params.key as string), + items: menus?.map((item) => ({ + label: item.name, + key: item.key, + })), + }} className={classnames(tempClassName, className)} > - -
  • - - 1 - -
  • -
  • - -
  • - -
    - - - - - -
    -
    - - -`; - -exports[`layout demos > 📸 renders ./packages/layout/src/components/WaterMark/demos/image.tsx correctly 1`] = ` - -
    -
    - test -
    -
    -
    -

    - Lorem ipsum dolor sit, amet consectetur adipisicing elit. Quisquam aliquid perferendis, adipisci dolorum officia odio natus facere cumque iusto libero repellendus praesentium ipsa cupiditate iure autem eos repudiandae delectus totam? -

    -

    - Lorem ipsum dolor sit amet consectetur adipisicing elit. Illo praesentium, aperiam numquam voluptatibus asperiores odio? Doloribus saepe, eligendi facere inventore culpa, exercitationem explicabo earum laborum deleniti reiciendis deserunt accusantium ullam. -

    -

    - Lorem ipsum dolor sit amet consectetur adipisicing elit. Officia voluptas numquam impedit architecto facilis aliquam at assumenda, nostrum explicabo accusantium ipsam error provident voluptate molestias magnam quisquam excepturi illum sit! -

    -

    - Lorem ipsum dolor sit amet consectetur adipisicing elit. Aperiam, accusantium quo corporis fugit possimus quaerat ad consequatur veniam voluptatum ut cumque illo beatae. Magni assumenda eligendi itaque eum voluptate non! -

    -
    -
    -
    -
    - -`; - -exports[`layout demos > 📸 renders ./packages/layout/src/components/WaterMark/demos/text.tsx correctly 1`] = ` - -
    -
    - test -
    -
    -
    -
    -
    -
    - -`; - -exports[`layout demos > 📸 renders ./packages/layout/src/components/WaterMark/demos/textRows.tsx correctly 1`] = ` - -
    -
    - test -
    -
    -
    -
    -
    -
    - -`; - exports[`layout demos > 📸 renders ./packages/layout/src/demos/AlwaysDefaultOpenAllMenu.tsx correctly 1`] = `
    📸 renders ./packages/layout/src/demos/dynamic-setting class="ant-pro-grid-content-children" >
    📸 renders ./packages/layout/src/demos/dynamic-setting
    @@ -17793,7 +15232,7 @@ exports[`layout demos > 📸 renders ./packages/layout/src/demos/menu-group.tsx class="ant-pro-grid-content-children" >
    📸 renders ./packages/layout/src/demos/menu-group.tsx
    diff --git a/tests/layout/__snapshots__/waterMark.test.tsx.snap b/tests/layout/__snapshots__/waterMark.test.tsx.snap deleted file mode 100644 index 8e0d7609bd3e..000000000000 --- a/tests/layout/__snapshots__/waterMark.test.tsx.snap +++ /dev/null @@ -1,37 +0,0 @@ -// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html - -exports[`WaterMark > test image watermark 1`] = ` -
    -
    -
    - 123 -
    -
    -
    -
    -`; - -exports[`WaterMark > test text watermark 1`] = ` - -
    -
    -
    -
    - -`; diff --git a/tests/layout/waterMark.test.tsx b/tests/layout/waterMark.test.tsx deleted file mode 100644 index 4d8c03b9b16a..000000000000 --- a/tests/layout/waterMark.test.tsx +++ /dev/null @@ -1,80 +0,0 @@ -/* eslint-disable @typescript-eslint/ban-types */ -import { WaterMark } from '@ant-design/pro-components'; -import { act, cleanup, render } from '@testing-library/react'; - -afterEach(() => { - cleanup(); -}); - -describe('WaterMark', () => { - it('test image watermark', async () => { - let onloadRef: Function | undefined; - - Object.defineProperty(Image.prototype, 'onload', { - get() { - // eslint-disable-next-line no-underscore-dangle - return this._onload; - }, - set(onload: Function) { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - onloadRef = onload; - // eslint-disable-next-line no-underscore-dangle - this._onload = onload; - }, - }); - const { container, unmount } = render( - -
    123
    -
    , - ); - - act(() => { - onloadRef?.(); - }); - expect(container).toMatchSnapshot(); - unmount(); - }); - - it('test text watermark', () => { - const wrapper = render( - -
    - , - ); - - expect(wrapper.asFragment()).toMatchSnapshot(); - wrapper.unmount(); - }); - - it('test image watermark', async () => { - const spy = vi.spyOn(global.console, 'error'); - const createElement = document.createElement.bind(document); - // @ts-ignore - document.createElement = (tagName: string) => { - if (tagName === 'canvas') { - return { - setAttribute: () => null, - getContext: () => null, - measureText: () => ({}), - }; - } - return createElement(tagName); - }; - - const { unmount } = render( - -
    123
    -
    , - ); - - expect(spy.mock.calls).toEqual([['当前环境不支持Canvas']]); - unmount(); - spy.mockRestore(); - }); -}); From 8e20d269e6eba9b6b9efbeac2c09305d337760be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= Date: Wed, 21 Feb 2024 18:19:42 +0800 Subject: [PATCH 06/57] fix test --- pnpm-lock.yaml | 410 +++++++++++++------------- tests/card/checkcard.test.tsx | 2 +- tests/card/index.test.tsx | 6 +- tests/demo.tsx | 4 +- tests/descriptions/editor.test.tsx | 18 +- tests/descriptions/index.test.tsx | 12 +- tests/field/datePick.test.tsx | 12 +- tests/field/field.test.tsx | 30 +- tests/form/base.test.tsx | 83 +++--- tests/form/dependency.test.tsx | 2 +- tests/form/drawerForm.test.tsx | 30 +- tests/form/drawerFormTimeout.test.tsx | 6 +- tests/form/fieldSet.test.tsx | 28 +- tests/form/formList.test.tsx | 52 ++-- tests/form/formitem.test.tsx | 12 +- tests/form/lightFilter.test.tsx | 10 +- tests/form/modalForm.test.tsx | 26 +- tests/form/queryFilter.test.tsx | 2 +- tests/form/schemaForm.test.tsx | 66 ++--- tests/form/stepFormTest.test.tsx | 36 ++- tests/form/upload.test.tsx | 8 +- tests/layout/help.test.tsx | 10 +- tests/layout/index.test.tsx | 30 +- tests/layout/pageContainer.test.tsx | 2 +- tests/layout/settingDrawer.test.tsx | 36 +-- tests/list/index.test.tsx | 10 +- tests/table/column.test.tsx | 12 +- tests/table/columnSetting.test.tsx | 18 +- tests/table/dragSort.test.tsx | 12 +- tests/table/editor-table-two.test.tsx | 76 ++--- tests/table/editor-table.test.tsx | 44 +-- tests/table/filter.test.tsx | 2 +- tests/table/form.test.tsx | 10 +- tests/table/index.test.tsx | 64 ++-- tests/table/listtoolbar.test.tsx | 2 +- tests/table/pagination.test.tsx | 26 +- tests/table/polling.test.tsx | 34 +-- tests/table/protableSpin.test.tsx | 2 +- tests/table/search.test.tsx | 34 ++- tests/table/selectKeys.test.tsx | 4 +- tests/utils/index.test.tsx | 14 +- 41 files changed, 661 insertions(+), 636 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ef8c6edfc5eb..6aa7d3546d3f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -78,7 +78,7 @@ importers: version: 13.4.0(react-dom@18.2.0)(react@18.2.0) '@testing-library/react-hooks': specifier: ^8.0.1 - version: 8.0.1(@types/react@18.2.56)(react-dom@18.2.0)(react@18.2.0) + version: 8.0.1(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0) '@testing-library/user-event': specifier: ^14.5.2 version: 14.5.2(@testing-library/dom@8.20.1) @@ -105,7 +105,7 @@ importers: version: 14.18.63 '@types/react': specifier: ^18.0.38 - version: 18.2.56 + version: 18.2.57 '@types/react-dom': specifier: ^18.0.11 version: 18.2.19 @@ -153,7 +153,7 @@ importers: version: 5.14.1(moment@2.30.1)(react-dom@18.2.0)(react@18.2.0) antd-style: specifier: ^3.6.1 - version: 3.6.1(@types/react@18.2.56)(antd@5.14.1)(react-dom@18.2.0)(react@18.2.0) + version: 3.6.1(@types/react@18.2.57)(antd@5.14.1)(react-dom@18.2.0)(react@18.2.0) babel-loader: specifier: ^9.1.3 version: 9.1.3(@babel/core@7.23.9) @@ -177,10 +177,10 @@ importers: version: 1.11.10 dumi: specifier: ^2.2.17 - version: 2.2.17(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.56)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(stylelint@13.13.1)(typescript@5.3.3) + version: 2.2.17(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(stylelint@13.13.1)(typescript@5.3.3) dumi-theme-antd-style: specifier: 0.25.1 - version: 0.25.1(@ant-design/icons@5.3.0)(@types/react@18.2.56)(antd@5.14.1)(dumi@2.2.17)(react-dom@18.2.0)(react@18.2.0) + version: 0.25.1(@ant-design/icons@5.3.0)(@types/react@18.2.57)(antd@5.14.1)(dumi@2.2.17)(react-dom@18.2.0)(react@18.2.0) esbuild: specifier: ^0.15.18 version: 0.15.18 @@ -291,10 +291,10 @@ importers: version: 6.0.1(react-dom@18.2.0)(react@18.2.0) rc-table: specifier: ^7.40.0 - version: 7.40.0(react-dom@18.2.0)(react@18.2.0) + version: 7.41.0(react-dom@18.2.0)(react@18.2.0) rc-util: specifier: ^5.38.1 - version: 5.38.1(react-dom@18.2.0)(react@18.2.0) + version: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: specifier: ^18.2.0 version: 18.2.0 @@ -312,7 +312,7 @@ importers: version: 4.0.1(react-dom@18.2.0)(react@18.2.0) react-markdown: specifier: ^8.0.7 - version: 8.0.7(@types/react@18.2.56)(react@18.2.0) + version: 8.0.7(@types/react@18.2.57)(react@18.2.0) react-syntax-highlighter: specifier: ^15.5.0 version: 15.5.0(react@18.2.0) @@ -348,7 +348,7 @@ importers: version: 5.3.3 umi: specifier: ^4.1.1 - version: 4.1.1(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.56)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.0)(stylelint@13.13.1)(typescript@5.3.3) + version: 4.1.1(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)(stylelint@13.13.1)(typescript@5.3.3) umi-request: specifier: ^1.4.0 version: 1.4.0 @@ -372,7 +372,7 @@ importers: version: 2.0.0 zustand: specifier: ^4.5.0 - version: 4.5.1(@types/react@18.2.56)(react@18.2.0) + version: 4.5.1(@types/react@18.2.57)(react@18.2.0) packages/card: dependencies: @@ -399,7 +399,7 @@ importers: version: 1.4.0(react-dom@18.2.0)(react@18.2.0) rc-util: specifier: ^5.4.0 - version: 5.38.1(react-dom@18.2.0)(react@18.2.0) + version: 5.38.2(react-dom@18.2.0)(react@18.2.0) devDependencies: typescript: specifier: ^5.0.4 @@ -463,7 +463,7 @@ importers: version: 0.2.6(react-dom@18.2.0)(react@18.2.0) rc-util: specifier: ^5.0.6 - version: 5.38.1(react-dom@18.2.0)(react@18.2.0) + version: 5.38.2(react-dom@18.2.0)(react@18.2.0) devDependencies: typescript: specifier: ^5.0.4 @@ -497,7 +497,7 @@ importers: version: 2.0.2 rc-util: specifier: ^5.4.0 - version: 5.38.1(react-dom@18.2.0)(react@18.2.0) + version: 5.38.2(react-dom@18.2.0)(react@18.2.0) swr: specifier: ^2.0.0 version: 2.2.5(react@18.2.0) @@ -555,7 +555,7 @@ importers: version: 1.4.0(react-dom@18.2.0)(react@18.2.0) rc-util: specifier: ^5.0.6 - version: 5.38.1(react-dom@18.2.0)(react@18.2.0) + version: 5.38.2(react-dom@18.2.0)(react@18.2.0) devDependencies: '@types/lodash.merge': specifier: ^4.6.7 @@ -601,7 +601,7 @@ importers: version: 1.4.0(react-dom@18.2.0)(react@18.2.0) rc-util: specifier: ^5.0.6 - version: 5.38.1(react-dom@18.2.0)(react@18.2.0) + version: 5.38.2(react-dom@18.2.0)(react@18.2.0) swr: specifier: ^2.0.0 version: 2.2.5(react@18.2.0) @@ -663,7 +663,7 @@ importers: version: 3.6.1 rc-util: specifier: ^5.0.1 - version: 5.38.1(react-dom@18.2.0)(react@18.2.0) + version: 5.38.2(react-dom@18.2.0)(react@18.2.0) swr: specifier: ^2.0.0 version: 2.2.5(react@18.2.0) @@ -734,7 +734,7 @@ importers: version: 1.4.0(react-dom@18.2.0)(react@18.2.0) rc-util: specifier: ^5.0.1 - version: 5.38.1(react-dom@18.2.0)(react@18.2.0) + version: 5.38.2(react-dom@18.2.0)(react@18.2.0) devDependencies: '@types/lodash.merge': specifier: ^4.6.7 @@ -765,7 +765,7 @@ importers: version: 4.6.2 rc-util: specifier: ^5.0.6 - version: 5.38.1(react-dom@18.2.0)(react@18.2.0) + version: 5.38.2(react-dom@18.2.0)(react@18.2.0) safe-stable-stringify: specifier: ^2.4.3 version: 2.4.3 @@ -816,7 +816,7 @@ packages: '@emotion/unitless': 0.7.5 classnames: 2.5.1 csstype: 3.1.3 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) stylis: 4.3.1 @@ -835,7 +835,7 @@ packages: '@ant-design/icons-svg': 4.4.2 '@babel/runtime': 7.23.9 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -2487,8 +2487,8 @@ packages: '@jridgewell/trace-mapping': 0.3.9 dev: true - /@csstools/css-parser-algorithms@2.5.0(@csstools/css-tokenizer@2.2.3): - resolution: {integrity: sha512-abypo6m9re3clXA00eu5syw+oaPHbJTPapu9C4pzNsJ4hdZDzushT50Zhu+iIYXgEe1CxnRMn7ngsbV+MLrlpQ==} + /@csstools/css-parser-algorithms@2.6.0(@csstools/css-tokenizer@2.2.3): + resolution: {integrity: sha512-YfEHq0eRH98ffb5/EsrrDspVWAuph6gDggAE74ZtjecsmyyWpW768hOyiONa8zwWGbIWYfa2Xp4tRTrpQQ00CQ==} engines: {node: ^14 || ^16 || >=18} peerDependencies: '@csstools/css-tokenizer': ^2.2.3 @@ -2501,14 +2501,14 @@ packages: engines: {node: ^14 || ^16 || >=18} dev: true - /@csstools/media-query-list-parser@2.1.7(@csstools/css-parser-algorithms@2.5.0)(@csstools/css-tokenizer@2.2.3): - resolution: {integrity: sha512-lHPKJDkPUECsyAvD60joYfDmp8UERYxHGkFfyLJFTVK/ERJe0sVlIFLXU5XFxdjNDTerp5L4KeaKG+Z5S94qxQ==} + /@csstools/media-query-list-parser@2.1.8(@csstools/css-parser-algorithms@2.6.0)(@csstools/css-tokenizer@2.2.3): + resolution: {integrity: sha512-DiD3vG5ciNzeuTEoh74S+JMjQDs50R3zlxHnBnfd04YYfA/kh2KiBCGhzqLxlJcNq+7yNQ3stuZZYLX6wK/U2g==} engines: {node: ^14 || ^16 || >=18} peerDependencies: - '@csstools/css-parser-algorithms': ^2.5.0 + '@csstools/css-parser-algorithms': ^2.6.0 '@csstools/css-tokenizer': ^2.2.3 dependencies: - '@csstools/css-parser-algorithms': 2.5.0(@csstools/css-tokenizer@2.2.3) + '@csstools/css-parser-algorithms': 2.6.0(@csstools/css-tokenizer@2.2.3) '@csstools/css-tokenizer': 2.2.3 dev: true @@ -2624,8 +2624,8 @@ packages: postcss-selector-parser: 6.0.15 dev: true - /@csstools/selector-specificity@3.0.1(postcss-selector-parser@6.0.15): - resolution: {integrity: sha512-NPljRHkq4a14YzZ3YD406uaxh7s0g6eAq3L9aLOWywoqe8PkYamAvtsh7KNX6c++ihDrJ0RiU+/z7rGnhlZ5ww==} + /@csstools/selector-specificity@3.0.2(postcss-selector-parser@6.0.15): + resolution: {integrity: sha512-RpHaZ1h9LE7aALeQXmXrJkRG84ZxIsctEN2biEUmFyKpzFM3zZ35eUMcIzZFsw/2olQE6v69+esEqU2f1MKycg==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss-selector-parser: ^6.0.13 @@ -2745,7 +2745,7 @@ packages: resolution: {integrity: sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==} dev: true - /@emotion/react@11.11.3(@types/react@18.2.56)(react@18.2.0): + /@emotion/react@11.11.3(@types/react@18.2.57)(react@18.2.0): resolution: {integrity: sha512-Cnn0kuq4DoONOMcnoVsTOR8E+AdnKFf//6kUWc4LCdnxj31pZWn7rIULd6Y7/Js1PiPHzn7SKCM9vB/jBni8eA==} peerDependencies: '@types/react': '*' @@ -2761,7 +2761,7 @@ packages: '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0) '@emotion/utils': 1.2.1 '@emotion/weak-memoize': 0.3.1 - '@types/react': 18.2.56 + '@types/react': 18.2.57 hoist-non-react-statics: 3.3.2 react: 18.2.0 dev: true @@ -2795,7 +2795,7 @@ packages: resolution: {integrity: sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==} dev: true - /@emotion/styled@11.11.0(@types/react@18.2.56)(react@18.2.0): + /@emotion/styled@11.11.0(@types/react@18.2.57)(react@18.2.0): resolution: {integrity: sha512-hM5Nnvu9P3midq5aaXj4I+lnSfNi7Pmd4EWk1fOZ3pxookaQTNew6bp4JaCBYM4HVFZF9g7UjJmsUmC2JlxOng==} peerDependencies: '@emotion/react': ^11.0.0-rc.0 @@ -2811,7 +2811,7 @@ packages: '@emotion/serialize': 1.1.3 '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0) '@emotion/utils': 1.2.1 - '@types/react': 18.2.56 + '@types/react': 18.2.57 react: 18.2.0 dev: true @@ -3601,21 +3601,21 @@ packages: '@floating-ui/utils': 0.2.1 dev: true - /@floating-ui/react-dom-interactions@0.3.1(@types/react@18.2.56)(react-dom@18.1.0)(react@18.1.0): + /@floating-ui/react-dom-interactions@0.3.1(@types/react@18.2.57)(react-dom@18.1.0)(react@18.1.0): resolution: {integrity: sha512-tP2KEh7EHJr5hokSBHcPGojb+AorDNUf0NYfZGg/M+FsMvCOOsSEeEF0O1NDfETIzDnpbHnCs0DuvCFhSMSStg==} deprecated: Package renamed to @floating-ui/react dependencies: - '@floating-ui/react-dom': 0.6.3(@types/react@18.2.56)(react-dom@18.1.0)(react@18.1.0) + '@floating-ui/react-dom': 0.6.3(@types/react@18.2.57)(react-dom@18.1.0)(react@18.1.0) aria-hidden: 1.2.3 point-in-polygon: 1.1.0 - use-isomorphic-layout-effect: 1.1.2(@types/react@18.2.56)(react@18.1.0) + use-isomorphic-layout-effect: 1.1.2(@types/react@18.2.57)(react@18.1.0) transitivePeerDependencies: - '@types/react' - react - react-dom dev: true - /@floating-ui/react-dom@0.6.3(@types/react@18.2.56)(react-dom@18.1.0)(react@18.1.0): + /@floating-ui/react-dom@0.6.3(@types/react@18.2.57)(react-dom@18.1.0)(react@18.1.0): resolution: {integrity: sha512-hC+pS5D6AgS2wWjbmSQ6UR6Kpy+drvWGJIri6e1EDGADTPsCaa4KzCgmCczHrQeInx9tqs81EyDmbKJYY2swKg==} peerDependencies: react: '>=16.8.0' @@ -3624,7 +3624,7 @@ packages: '@floating-ui/dom': 0.4.5 react: 18.1.0 react-dom: 18.1.0(react@18.1.0) - use-isomorphic-layout-effect: 1.1.2(@types/react@18.2.56)(react@18.1.0) + use-isomorphic-layout-effect: 1.1.2(@types/react@18.2.57)(react@18.1.0) transitivePeerDependencies: - '@types/react' dev: true @@ -3899,7 +3899,7 @@ packages: istanbul-lib-instrument: 4.0.3 istanbul-lib-report: 3.0.1 istanbul-lib-source-maps: 4.0.1 - istanbul-reports: 3.1.6 + istanbul-reports: 3.1.7 jest-haste-map: 26.6.2 jest-resolve: 26.6.2 jest-util: 26.6.2 @@ -5346,7 +5346,7 @@ packages: '@babel/runtime': 7.23.9 '@ctrl/tinycolor': 3.6.1 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -5358,7 +5358,7 @@ packages: react-dom: '>=16.9.0' dependencies: '@babel/runtime': 7.23.9 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -5379,7 +5379,7 @@ packages: dependencies: '@babel/runtime': 7.23.9 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -5393,7 +5393,7 @@ packages: dependencies: '@babel/runtime': 7.23.9 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -5409,7 +5409,7 @@ packages: '@rc-component/portal': 1.1.2(react-dom@18.2.0)(react@18.2.0) '@rc-component/trigger': 1.18.3(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -5426,7 +5426,7 @@ packages: classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -5963,7 +5963,7 @@ packages: redent: 3.0.0 dev: true - /@testing-library/react-hooks@8.0.1(@types/react@18.2.56)(react-dom@18.2.0)(react@18.2.0): + /@testing-library/react-hooks@8.0.1(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-Aqhl2IVmLt8IovEVarNDFuJDVWVvhnr9/GCU6UUnrYXwgDFF9h2L2o2P9KBni1AST5sT6riAyoukFLyjQUgD/g==} engines: {node: '>=12'} peerDependencies: @@ -5980,7 +5980,7 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.9 - '@types/react': 18.2.56 + '@types/react': 18.2.57 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) react-error-boundary: 3.1.4(react@18.2.0) @@ -6175,7 +6175,7 @@ packages: /@types/hoist-non-react-statics@3.3.5: resolution: {integrity: sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==} dependencies: - '@types/react': 18.2.56 + '@types/react': 18.2.57 hoist-non-react-statics: 3.3.2 dev: true @@ -6315,36 +6315,36 @@ packages: /@types/ramda@0.29.3: resolution: {integrity: sha512-Yh/RHkjN0ru6LVhSQtTkCRo6HXkfL9trot/2elzM/yXLJmbLm2v6kJc8yftTnwv1zvUob6TEtqI2cYjdqG3U0Q==} dependencies: - types-ramda: 0.29.7 + types-ramda: 0.29.8 dev: true /@types/react-color@3.0.11: resolution: {integrity: sha512-20m5GpzmdqwmSdnPeMs4UPPUuvkS4ESwakL6u2YN1hbo+ajWiiTwGYIMGhdcJFGeoLyAsr7TVonbZrMhU3+pdw==} dependencies: - '@types/react': 18.2.56 + '@types/react': 18.2.57 '@types/reactcss': 1.2.11 dev: true /@types/react-dom@18.2.19: resolution: {integrity: sha512-aZvQL6uUbIJpjZk4U8JZGbau9KDeAwMfmhyWorxgBkqDIEf6ROjRozcmPIicqsUwPUjbkDfHKgGee1Lq65APcA==} dependencies: - '@types/react': 18.2.56 + '@types/react': 18.2.57 dev: true /@types/react-helmet@6.1.11: resolution: {integrity: sha512-0QcdGLddTERotCXo3VFlUSWO3ztraw8nZ6e3zJSgG7apwV5xt+pJUS8ewPBqT4NYB1optGLprNQzFleIY84u/g==} dependencies: - '@types/react': 18.2.56 + '@types/react': 18.2.57 dev: true /@types/react-responsive@8.0.8: resolution: {integrity: sha512-HDUZtoeFRHrShCGaND23HmXAB9evOOTjkghd2wAasLkuorYYitm5A1XLeKkhXKZppcMBxqB/8V4Snl6hRUTA8g==} dependencies: - '@types/react': 18.2.56 + '@types/react': 18.2.57 dev: true - /@types/react@18.2.56: - resolution: {integrity: sha512-NpwHDMkS/EFZF2dONFQHgkPRwhvgq/OAvIaGQzxGSBmaeR++kTg6njr15Vatz0/2VcCEwJQFi6Jf4Q0qBu0rLA==} + /@types/react@18.2.57: + resolution: {integrity: sha512-ZvQsktJgSYrQiMirAN60y4O/LRevIV8hUzSOSNB6gfR3/o3wCBFQx3sPwIYtuDMeiVgsSS3UzCV26tEzgnfvQw==} dependencies: '@types/prop-types': 15.7.11 '@types/scheduler': 0.16.8 @@ -6354,7 +6354,7 @@ packages: /@types/reactcss@1.2.11: resolution: {integrity: sha512-0fFy0ubuPlhksId8r9V8nsLcxBAPQnn15g/ERAElgE9L6rOquMj2CapsxqfyBuHlkp0/ndEUVnkYI7MkTtkGpw==} dependencies: - '@types/react': 18.2.56 + '@types/react': 18.2.57 dev: true /@types/responselike@1.0.3: @@ -6638,7 +6638,7 @@ packages: - supports-color dev: true - /@umijs/bundler-vite@4.1.1(@types/node@14.18.63)(postcss@8.4.35)(sass@1.71.0): + /@umijs/bundler-vite@4.1.1(@types/node@14.18.63)(postcss@8.4.35)(sass@1.71.1): resolution: {integrity: sha512-gTu/9TpsBYEHcaQY/ybW1ZDLAQA75lH2kI6FVx/Tg8HutwSB9mIaD4DHZOMDM/9C1W/+DwxXemKZXVkR3iRtVw==} hasBin: true dependencies: @@ -6651,7 +6651,7 @@ packages: postcss-preset-env: 7.5.0(postcss@8.4.35) rollup-plugin-visualizer: 5.9.0 systemjs: 6.14.3 - vite: 4.3.1(@types/node@14.18.63)(less@4.1.3)(sass@1.71.0) + vite: 4.3.1(@types/node@14.18.63)(less@4.1.3)(sass@1.71.1) transitivePeerDependencies: - '@types/node' - postcss @@ -6967,7 +6967,7 @@ packages: peerDependencies: umi: 3.x dependencies: - umi: 4.1.1(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.56)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.0)(stylelint@13.13.1)(typescript@5.3.3) + umi: 4.1.1(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)(stylelint@13.13.1)(typescript@5.3.3) dev: true /@umijs/plugin-run@4.1.1: @@ -6976,7 +6976,7 @@ packages: tsx: 3.14.0 dev: true - /@umijs/preset-umi@4.1.1(@types/node@14.18.63)(@types/react@18.2.56)(sass@1.71.0)(typescript@5.3.3): + /@umijs/preset-umi@4.1.1(@types/node@14.18.63)(@types/react@18.2.57)(sass@1.71.1)(typescript@5.3.3): resolution: {integrity: sha512-mpm2aqyRttfAQRstCoA98oya5r0eZL6dWe3oddTsScjyO/T9rT9vOb2xyqlsE95DTNFEBeyCjr8dcvs2HifJ1w==} dependencies: '@iconify/utils': 2.1.1 @@ -6985,7 +6985,7 @@ packages: '@umijs/babel-preset-umi': 4.1.1 '@umijs/bundler-esbuild': 4.1.1 '@umijs/bundler-utils': 4.1.1 - '@umijs/bundler-vite': 4.1.1(@types/node@14.18.63)(postcss@8.4.35)(sass@1.71.0) + '@umijs/bundler-vite': 4.1.1(@types/node@14.18.63)(postcss@8.4.35)(sass@1.71.1) '@umijs/bundler-webpack': 4.1.1(typescript@5.3.3) '@umijs/core': 4.1.1 '@umijs/did-you-know': 1.0.3 @@ -6999,7 +6999,7 @@ packages: '@umijs/utils': 4.1.1 '@umijs/zod2ts': 4.1.1 babel-plugin-dynamic-import-node: 2.3.3 - click-to-react-component: 1.1.0(@types/react@18.2.56)(react-dom@18.1.0)(react@18.1.0) + click-to-react-component: 1.1.0(@types/react@18.2.57)(react-dom@18.1.0)(react@18.1.0) core-js: 3.34.0 current-script-polyfill: 1.0.0 enhanced-resolve: 5.9.3 @@ -7124,7 +7124,7 @@ packages: umi: ^3.0.0 dependencies: '@testing-library/react': 13.4.0(react-dom@18.2.0)(react@18.2.0) - umi: 4.1.1(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.56)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.0)(stylelint@13.13.1)(typescript@5.3.3) + umi: 4.1.1(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)(stylelint@13.13.1)(typescript@5.3.3) dev: true /@umijs/test@3.5.41(ts-node@10.9.2): @@ -7214,7 +7214,7 @@ packages: '@babel/plugin-transform-react-jsx-self': 7.23.3(@babel/core@7.23.9) '@babel/plugin-transform-react-jsx-source': 7.23.3(@babel/core@7.23.9) react-refresh: 0.14.0 - vite: 4.3.1(@types/node@14.18.63)(less@4.1.3)(sass@1.71.0) + vite: 4.3.1(@types/node@14.18.63)(less@4.1.3)(sass@1.71.1) transitivePeerDependencies: - supports-color dev: true @@ -7225,10 +7225,10 @@ packages: vitest: '>=0.32.0 <1' dependencies: istanbul-lib-coverage: 3.2.2 - istanbul-lib-instrument: 6.0.1 + istanbul-lib-instrument: 6.0.2 istanbul-lib-report: 3.0.1 istanbul-lib-source-maps: 4.0.1 - istanbul-reports: 3.1.6 + istanbul-reports: 3.1.7 picocolors: 1.0.0 test-exclude: 6.0.0 vitest: 0.34.6(jsdom@19.0.0) @@ -7530,7 +7530,7 @@ packages: engines: {node: '>=10'} dev: true - /antd-style@3.6.1(@types/react@18.2.56)(antd@5.14.1)(react-dom@18.2.0)(react@18.2.0): + /antd-style@3.6.1(@types/react@18.2.57)(antd@5.14.1)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-KpKXiAIV3CAe6TfSh/m6ET2vGuhAof7qfqeaouh5WZ0JDl5jDXXSFPeEfqvZuHAckTl+A0NzArvIHKgKt/NZ9g==} peerDependencies: antd: '>=5.8.1' @@ -7540,7 +7540,7 @@ packages: '@babel/runtime': 7.23.9 '@emotion/cache': 11.11.0 '@emotion/css': 11.11.2 - '@emotion/react': 11.11.3(@types/react@18.2.56)(react@18.2.0) + '@emotion/react': 11.11.3(@types/react@18.2.57)(react@18.2.0) '@emotion/serialize': 1.1.3 '@emotion/server': 11.11.0(@emotion/css@11.11.2) '@emotion/utils': 1.2.1 @@ -7586,7 +7586,7 @@ packages: rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-notification: 5.3.0(react-dom@18.2.0)(react@18.2.0) rc-pagination: 4.0.4(react-dom@18.2.0)(react@18.2.0) - rc-picker: 4.1.1(dayjs@1.11.10)(moment@2.30.1)(react-dom@18.2.0)(react@18.2.0) + rc-picker: 4.1.3(dayjs@1.11.10)(moment@2.30.1)(react-dom@18.2.0)(react@18.2.0) rc-progress: 3.5.1(react-dom@18.2.0)(react@18.2.0) rc-rate: 2.12.0(react-dom@18.2.0)(react@18.2.0) rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) @@ -7602,7 +7602,7 @@ packages: rc-tree: 5.8.5(react-dom@18.2.0)(react@18.2.0) rc-tree-select: 5.17.0(react-dom@18.2.0)(react@18.2.0) rc-upload: 4.5.2(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) scroll-into-view-if-needed: 3.1.0 @@ -7850,7 +7850,7 @@ packages: es-errors: 1.3.0 get-intrinsic: 1.2.4 is-array-buffer: 3.0.4 - is-shared-array-buffer: 1.0.2 + is-shared-array-buffer: 1.0.3 dev: true /arrify@1.0.1: @@ -7977,9 +7977,11 @@ packages: postcss-value-parser: 4.2.0 dev: true - /available-typed-arrays@1.0.6: - resolution: {integrity: sha512-j1QzY8iPNPG4o4xmO3ptzpRxTciqD3MgEHtifP/YnJpIo58Xu+ne4BejlbkuaLfXn/nz6HFiw29bLpj2PNMdGg==} + /available-typed-arrays@1.0.7: + resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==} engines: {node: '>= 0.4'} + dependencies: + possible-typed-array-names: 1.0.0 dev: true /aws-lambda@1.0.7: @@ -7987,15 +7989,15 @@ packages: hasBin: true requiresBuild: true dependencies: - aws-sdk: 2.1560.0 + aws-sdk: 2.1562.0 commander: 3.0.2 js-yaml: 3.14.1 watchpack: 2.4.0 dev: true optional: true - /aws-sdk@2.1560.0: - resolution: {integrity: sha512-nakTZHytnhKWZpwu9d1crqjoegBRG+j1/rflsVnckXxoIwlKM0D/v/NIe+BJmRnCA2aCdwuMx3dtkgLz/AB6VA==} + /aws-sdk@2.1562.0: + resolution: {integrity: sha512-HsdlDRfVamH4tv+M+d0lnEYdtx+yEpqWA4T2XuJCjtV5JjjHDUQTKm+9C+EoTxLWtuw+SYSVWyuclwETv6CmHQ==} engines: {node: '>= 10.0.0'} requiresBuild: true dependencies: @@ -8563,7 +8565,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001588 - electron-to-chromium: 1.4.673 + electron-to-chromium: 1.4.677 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.23.0) dev: true @@ -9159,12 +9161,12 @@ packages: engines: {node: '>= 10'} dev: true - /click-to-react-component@1.1.0(@types/react@18.2.56)(react-dom@18.1.0)(react@18.1.0): + /click-to-react-component@1.1.0(@types/react@18.2.57)(react-dom@18.1.0)(react@18.1.0): resolution: {integrity: sha512-/DjZemufS1BkxyRgZL3r7HXVVOFRWVQi5Xd4EBnjxZMwrHEh0OlUVA2N9CjXkZ0x8zMf8dL1cKnnx+xUWUg4VA==} peerDependencies: react: '>=16.8.0' dependencies: - '@floating-ui/react-dom-interactions': 0.3.1(@types/react@18.2.56)(react-dom@18.1.0)(react@18.1.0) + '@floating-ui/react-dom-interactions': 0.3.1(@types/react@18.2.57)(react-dom@18.1.0)(react@18.1.0) htm: 3.1.1 react: 18.1.0 react-merge-refs: 1.1.0 @@ -10225,7 +10227,7 @@ packages: is-array-buffer: 3.0.4 is-date-object: 1.0.5 is-regex: 1.1.4 - is-shared-array-buffer: 1.0.2 + is-shared-array-buffer: 1.0.3 isarray: 2.0.5 object-is: 1.1.5 object-keys: 1.1.1 @@ -10627,7 +10629,7 @@ packages: resolution: {integrity: sha512-a/Y5lf0G6gwsEQ9hop/n03CcjmHsGBk384Cz/AEX6mRYrfSpUx/lQvP9HLoXkCzScl9PL1sSmLPnMkgaXDCZLA==} dev: true - /dumi-theme-antd-style@0.25.1(@ant-design/icons@5.3.0)(@types/react@18.2.56)(antd@5.14.1)(dumi@2.2.17)(react-dom@18.2.0)(react@18.2.0): + /dumi-theme-antd-style@0.25.1(@ant-design/icons@5.3.0)(@types/react@18.2.57)(antd@5.14.1)(dumi@2.2.17)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-L9QFflPNkwm8Fm13UapGlViRUutukEANOSkZme75rjzkfqroFNs7Yaur0dXanARkC0VYLfSfhAmh94xdd02vCw==} peerDependencies: '@ant-design/icons': '>=4' @@ -10640,17 +10642,17 @@ packages: '@babel/runtime': 7.23.9 '@emotion/css': 11.11.2 '@emotion/server': 11.11.0(@emotion/css@11.11.2) - '@emotion/styled': 11.11.0(@types/react@18.2.56)(react@18.2.0) + '@emotion/styled': 11.11.0(@types/react@18.2.57)(react@18.2.0) '@emotion/utils': 1.2.1 '@floating-ui/react': 0.17.0(react-dom@18.2.0)(react@18.2.0) ahooks: 3.7.10(react@18.2.0) animated-scroll-to: 2.3.0 antd: 5.14.1(moment@2.30.1)(react-dom@18.2.0)(react@18.2.0) - antd-style: 3.6.1(@types/react@18.2.56)(antd@5.14.1)(react-dom@18.2.0)(react@18.2.0) + antd-style: 3.6.1(@types/react@18.2.57)(antd@5.14.1)(react-dom@18.2.0)(react@18.2.0) chalk: 4.1.2 chroma-js: 2.4.2 copy-to-clipboard: 3.3.3 - dumi: 2.2.17(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.56)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(stylelint@13.13.1)(typescript@5.3.3) + dumi: 2.2.17(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(stylelint@13.13.1)(typescript@5.3.3) fast-deep-equal: 3.1.3 lodash: 4.17.21 polished: 4.3.1 @@ -10662,14 +10664,14 @@ packages: react-syntax-highlighter: 15.5.0(react@18.2.0) shiki-es: 0.2.0 use-merge-value: 1.2.0(react@18.2.0) - zustand: 4.5.1(@types/react@18.2.56)(react@18.2.0) + zustand: 4.5.1(@types/react@18.2.57)(react@18.2.0) transitivePeerDependencies: - '@emotion/react' - '@types/react' - immer dev: true - /dumi@2.2.17(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.56)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(stylelint@13.13.1)(typescript@5.3.3): + /dumi@2.2.17(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(stylelint@13.13.1)(typescript@5.3.3): resolution: {integrity: sha512-oI2OVlkkVORy0ud64YlhrBF+rsAda9rGFxMLrOLepTjC96mLOrgUz/geKkckWA5LemEuFVsaTYE/5HDpAPTkvQ==} hasBin: true peerDependencies: @@ -10731,9 +10733,9 @@ packages: remark-gfm: 3.0.1 remark-parse: 10.0.2 remark-rehype: 10.1.0 - sass: 1.71.0 + sass: 1.71.1 sitemap: 7.1.1 - umi: 4.1.1(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.56)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.0)(stylelint@13.13.1)(typescript@5.3.3) + umi: 4.1.1(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)(stylelint@13.13.1)(typescript@5.3.3) unified: 10.1.2 unist-util-visit: 4.1.2 unist-util-visit-parents: 5.1.3 @@ -10828,8 +10830,8 @@ packages: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} dev: true - /electron-to-chromium@1.4.673: - resolution: {integrity: sha512-zjqzx4N7xGdl5468G+vcgzDhaHkaYgVcf9MqgexcTqsl2UHSCmOj/Bi3HAprg4BZCpC7HyD8a6nZl6QAZf72gw==} + /electron-to-chromium@1.4.677: + resolution: {integrity: sha512-erDa3CaDzwJOpyvfKhOiJjBVNnMM0qxHq47RheVVwsSQrgBA9ZSGV9kdaOfZDPXcHzhG7lBxhj6A7KvfLJBd6Q==} dev: true /elegant-spinner@1.0.1: @@ -10972,11 +10974,11 @@ packages: dependencies: array-buffer-byte-length: 1.0.1 arraybuffer.prototype.slice: 1.0.3 - available-typed-arrays: 1.0.6 + available-typed-arrays: 1.0.7 call-bind: 1.0.7 es-define-property: 1.0.0 es-errors: 1.3.0 - es-set-tostringtag: 2.0.2 + es-set-tostringtag: 2.0.3 es-to-primitive: 1.2.1 function.prototype.name: 1.1.6 get-intrinsic: 1.2.4 @@ -10984,15 +10986,15 @@ packages: globalthis: 1.0.3 gopd: 1.0.1 has-property-descriptors: 1.0.2 - has-proto: 1.0.1 + has-proto: 1.0.3 has-symbols: 1.0.3 hasown: 2.0.1 internal-slot: 1.0.7 is-array-buffer: 3.0.4 is-callable: 1.2.7 - is-negative-zero: 2.0.2 + is-negative-zero: 2.0.3 is-regex: 1.1.4 - is-shared-array-buffer: 1.0.2 + is-shared-array-buffer: 1.0.3 is-string: 1.0.7 is-typed-array: 1.1.13 is-weakref: 1.0.2 @@ -11005,10 +11007,10 @@ packages: string.prototype.trim: 1.2.8 string.prototype.trimend: 1.0.7 string.prototype.trimstart: 1.0.7 - typed-array-buffer: 1.0.1 - typed-array-byte-length: 1.0.0 - typed-array-byte-offset: 1.0.1 - typed-array-length: 1.0.4 + typed-array-buffer: 1.0.2 + typed-array-byte-length: 1.0.1 + typed-array-byte-offset: 1.0.2 + typed-array-length: 1.0.5 unbox-primitive: 1.0.2 which-typed-array: 1.1.14 dev: true @@ -11052,20 +11054,20 @@ packages: define-properties: 1.2.1 es-abstract: 1.22.4 es-errors: 1.3.0 - es-set-tostringtag: 2.0.2 + es-set-tostringtag: 2.0.3 function-bind: 1.1.2 get-intrinsic: 1.2.4 globalthis: 1.0.3 has-property-descriptors: 1.0.2 - has-proto: 1.0.1 + has-proto: 1.0.3 has-symbols: 1.0.3 internal-slot: 1.0.7 iterator.prototype: 1.1.2 safe-array-concat: 1.1.0 dev: true - /es-set-tostringtag@2.0.2: - resolution: {integrity: sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==} + /es-set-tostringtag@2.0.3: + resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==} engines: {node: '>= 0.4'} dependencies: get-intrinsic: 1.2.4 @@ -12341,13 +12343,13 @@ packages: resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==} engines: {node: ^10.12.0 || >=12.0.0} dependencies: - flatted: 3.2.9 + flatted: 3.3.0 keyv: 4.5.4 rimraf: 3.0.2 dev: true - /flatted@3.2.9: - resolution: {integrity: sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==} + /flatted@3.3.0: + resolution: {integrity: sha512-noqGuLw158+DuD9UPRKHpJ2hGxpFyDlYYrfM0mWt4XhT4n0lwzTLh70Tkdyy4kyTmyTT9Bv7bWAJqw7cgkEXDg==} dev: true /flush-write-stream@1.1.1: @@ -12617,7 +12619,7 @@ packages: dependencies: es-errors: 1.3.0 function-bind: 1.1.2 - has-proto: 1.0.1 + has-proto: 1.0.3 has-symbols: 1.0.3 hasown: 2.0.1 dev: true @@ -13154,8 +13156,8 @@ packages: es-define-property: 1.0.0 dev: true - /has-proto@1.0.1: - resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==} + /has-proto@1.0.3: + resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==} engines: {node: '>= 0.4'} dev: true @@ -13508,7 +13510,7 @@ packages: he: 1.2.0 param-case: 3.0.4 relateurl: 0.2.7 - terser: 5.27.1 + terser: 5.27.2 dev: true /html-tags@3.3.1: @@ -13565,7 +13567,7 @@ packages: svg-pathdata: 5.0.5 svgo-browser: 1.3.8 svgson: 4.1.0 - transformation-matrix: 2.15.0 + transformation-matrix: 2.16.0 uuid: 8.3.2 dev: true @@ -14348,8 +14350,8 @@ packages: resolution: {integrity: sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==} dev: true - /is-negative-zero@2.0.2: - resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==} + /is-negative-zero@2.0.3: + resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==} engines: {node: '>= 0.4'} dev: true @@ -14504,8 +14506,9 @@ packages: resolution: {integrity: sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==} dev: true - /is-shared-array-buffer@1.0.2: - resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==} + /is-shared-array-buffer@1.0.3: + resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==} + engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.7 dev: true @@ -14705,8 +14708,8 @@ packages: - supports-color dev: true - /istanbul-lib-instrument@6.0.1: - resolution: {integrity: sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==} + /istanbul-lib-instrument@6.0.2: + resolution: {integrity: sha512-1WUsZ9R1lA0HtBSohTkm39WTPlNKSJ5iFk7UwqXkBLoHQT+hfqPsfsTDVuZdKGaBwn7din9bS7SsnoAr943hvw==} engines: {node: '>=10'} dependencies: '@babel/core': 7.23.9 @@ -14738,8 +14741,8 @@ packages: - supports-color dev: true - /istanbul-reports@3.1.6: - resolution: {integrity: sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==} + /istanbul-reports@3.1.7: + resolution: {integrity: sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==} engines: {node: '>=8'} dependencies: html-escaper: 2.0.2 @@ -14762,7 +14765,7 @@ packages: get-intrinsic: 1.2.4 has-symbols: 1.0.3 reflect.getprototypeof: 1.0.5 - set-function-name: 2.0.1 + set-function-name: 2.0.2 dev: true /jest-canvas-mock@2.5.2: @@ -19139,6 +19142,11 @@ packages: engines: {node: '>=0.10.0'} dev: true + /possible-typed-array-names@1.0.0: + resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==} + engines: {node: '>= 0.4'} + dev: true + /postcss-attribute-case-insensitive@5.0.2(postcss@8.4.35): resolution: {integrity: sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==} engines: {node: ^12 || ^14 || >=16} @@ -20154,7 +20162,7 @@ packages: classnames: 2.5.1 rc-select: 14.11.0(react-dom@18.2.0)(react@18.2.0) rc-tree: 5.8.5(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20167,7 +20175,7 @@ packages: dependencies: '@babel/runtime': 7.23.9 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20181,7 +20189,7 @@ packages: '@babel/runtime': 7.23.9 classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20196,7 +20204,7 @@ packages: '@rc-component/portal': 1.1.2(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20211,7 +20219,7 @@ packages: '@rc-component/portal': 1.1.2(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20225,7 +20233,7 @@ packages: '@babel/runtime': 7.23.9 '@rc-component/trigger': 1.18.3(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20239,7 +20247,7 @@ packages: dependencies: '@babel/runtime': 7.23.9 async-validator: 4.2.5 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20267,7 +20275,7 @@ packages: classnames: 2.5.1 rc-dialog: 9.3.4(react-dom@18.2.0)(react@18.2.0) rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20282,7 +20290,7 @@ packages: '@rc-component/mini-decimal': 1.1.0 classnames: 2.5.1 rc-input: 1.4.3(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20295,7 +20303,7 @@ packages: dependencies: '@babel/runtime': 7.23.9 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20312,7 +20320,7 @@ packages: rc-input: 1.4.3(react-dom@18.2.0)(react@18.2.0) rc-menu: 9.12.4(react-dom@18.2.0)(react@18.2.0) rc-textarea: 1.6.3(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20328,7 +20336,7 @@ packages: classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-overflow: 1.3.2(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20341,7 +20349,7 @@ packages: dependencies: '@babel/runtime': 7.23.9 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20356,7 +20364,7 @@ packages: '@babel/runtime': 7.23.9 classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20370,7 +20378,7 @@ packages: '@babel/runtime': 7.23.9 classnames: 2.5.1 rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20383,13 +20391,13 @@ packages: dependencies: '@babel/runtime': 7.23.9 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true - /rc-picker@4.1.1(dayjs@1.11.10)(moment@2.30.1)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-H99qaHUepHjHnAqMLiftJEATXRuHJZcUyFoRkyIqUvTHVGnx/uHxFFNm7QIu1valCpfwdsGWQxiWgn9CAxvlvA==} + /rc-picker@4.1.3(dayjs@1.11.10)(moment@2.30.1)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-zmS64uYgiuWNmaWAxbVoAvSMuyNzGL9iO0Z8SIZzzm8U03taHHP0/jncWuM9v+O/F7Ghm7+IrFL0dDyk7aAqIw==} engines: {node: '>=8.x'} peerDependencies: date-fns: '>= 2.x' @@ -20415,7 +20423,7 @@ packages: moment: 2.30.1 rc-overflow: 1.3.2(react-dom@18.2.0)(react@18.2.0) rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20428,7 +20436,7 @@ packages: dependencies: '@babel/runtime': 7.23.9 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20442,7 +20450,7 @@ packages: dependencies: '@babel/runtime': 7.23.9 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20455,7 +20463,7 @@ packages: dependencies: '@babel/runtime': 7.23.9 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) resize-observer-polyfill: 1.5.1 @@ -20468,7 +20476,7 @@ packages: dependencies: '@babel/runtime': 7.23.9 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) resize-observer-polyfill: 1.5.1 @@ -20482,7 +20490,7 @@ packages: '@babel/runtime': 7.23.9 classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20499,7 +20507,7 @@ packages: classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-overflow: 1.3.2(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) rc-virtual-list: 3.11.4(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -20514,7 +20522,7 @@ packages: dependencies: '@babel/runtime': 7.23.9 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20528,7 +20536,7 @@ packages: dependencies: '@babel/runtime': 7.23.9 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20541,7 +20549,7 @@ packages: dependencies: '@babel/runtime': 7.23.9 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20557,14 +20565,14 @@ packages: '@rc-component/context': 1.4.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) rc-virtual-list: 3.11.4(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true - /rc-table@7.40.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-3O/AMZQt6MXr1rMRBkn+L6v80ym07Yp+ESG3yv7SiTZOyTRcpkSlDAcK+zu8rdCEuKUbQx/s3XHB9kHSfxTtEg==} + /rc-table@7.41.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-366Ru8eZwDokhTaEaYL28D3HI3CebkdKAbjihFTs3quYal+y4odrcADWV4sD0jFvNIU467faynwF9+pZPpHJFg==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' @@ -20574,7 +20582,7 @@ packages: '@rc-component/context': 1.4.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) rc-virtual-list: 3.11.4(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -20593,7 +20601,7 @@ packages: rc-menu: 9.12.4(react-dom@18.2.0)(react@18.2.0) rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20611,7 +20619,7 @@ packages: rc-menu: 9.12.4(react-dom@18.2.0)(react@18.2.0) rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20626,7 +20634,7 @@ packages: classnames: 2.5.1 rc-input: 1.4.3(react-dom@18.2.0)(react@18.2.0) rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20654,7 +20662,7 @@ packages: classnames: 2.5.1 rc-select: 14.11.0(react-dom@18.2.0)(react@18.2.0) rc-tree: 5.8.5(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20669,7 +20677,7 @@ packages: '@babel/runtime': 7.23.9 classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) rc-virtual-list: 3.11.4(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -20683,7 +20691,7 @@ packages: dependencies: '@babel/runtime': 7.23.9 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20698,8 +20706,8 @@ packages: shallowequal: 1.1.0 dev: false - /rc-util@5.38.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-e4ZMs7q9XqwTuhIK7zBIVFltUtMSjphuPPQXHoHlzRzNdOwUxDejo0Zls5HYaJfRKNURcsS/ceKVULlhjBrxng==} + /rc-util@5.38.2(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-yRGRPKyi84H7NkRSP6FzEIYBdUt4ufdsmXUZ7qM2H5qoByPax70NnGPkfo36N+UKUnUBj2f2Q2eUbwYMuAsIOQ==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' @@ -20719,7 +20727,7 @@ packages: '@babel/runtime': 7.23.9 classnames: 2.5.1 rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -20847,7 +20855,7 @@ packages: '@formatjs/intl-displaynames': 6.6.6 '@formatjs/intl-listformat': 7.5.5 '@types/hoist-non-react-statics': 3.3.5 - '@types/react': 18.2.56 + '@types/react': 18.2.57 hoist-non-react-statics: 3.3.2 intl-messageformat: 10.5.11 react: 18.2.0 @@ -20889,7 +20897,7 @@ packages: resolution: {integrity: sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==} dev: false - /react-markdown@8.0.7(@types/react@18.2.56)(react@18.2.0): + /react-markdown@8.0.7(@types/react@18.2.57)(react@18.2.0): resolution: {integrity: sha512-bvWbzG4MtOU62XqBx3Xx+zB2raaFFsq4mYiAzfjXJMEz2sixgeAfraA3tvzULF02ZdOMUOKTBFFaZJDDrq+BJQ==} peerDependencies: '@types/react': ^18.0.38 @@ -20897,7 +20905,7 @@ packages: dependencies: '@types/hast': 2.3.10 '@types/prop-types': 15.7.11 - '@types/react': 18.2.56 + '@types/react': 18.2.57 '@types/unist': 2.0.10 comma-separated-tokens: 2.0.3 hast-util-whitespace: 2.0.1 @@ -21272,7 +21280,7 @@ packages: call-bind: 1.0.7 define-properties: 1.2.1 es-errors: 1.3.0 - set-function-name: 2.0.1 + set-function-name: 2.0.2 dev: true /regexpu-core@5.3.2: @@ -21882,8 +21890,8 @@ packages: - supports-color dev: true - /sass@1.71.0: - resolution: {integrity: sha512-HKKIKf49Vkxlrav3F/w6qRuPcmImGVbIXJ2I3Kg0VMA+3Bav+8yE9G5XmP5lMj6nl4OlqbPftGAscNaNu28b8w==} + /sass@1.71.1: + resolution: {integrity: sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==} engines: {node: '>=14.0.0'} hasBin: true dependencies: @@ -22062,11 +22070,12 @@ packages: has-property-descriptors: 1.0.2 dev: true - /set-function-name@2.0.1: - resolution: {integrity: sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==} + /set-function-name@2.0.2: + resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==} engines: {node: '>= 0.4'} dependencies: define-data-property: 1.1.4 + es-errors: 1.3.0 functions-have-names: 1.2.3 has-property-descriptors: 1.0.2 dev: true @@ -22685,7 +22694,7 @@ packages: has-symbols: 1.0.3 internal-slot: 1.0.7 regexp.prototype.flags: 1.5.2 - set-function-name: 2.0.1 + set-function-name: 2.0.2 side-channel: 1.0.5 dev: true @@ -23029,10 +23038,10 @@ packages: engines: {node: ^14.13.1 || >=16.0.0} hasBin: true dependencies: - '@csstools/css-parser-algorithms': 2.5.0(@csstools/css-tokenizer@2.2.3) + '@csstools/css-parser-algorithms': 2.6.0(@csstools/css-tokenizer@2.2.3) '@csstools/css-tokenizer': 2.2.3 - '@csstools/media-query-list-parser': 2.1.7(@csstools/css-parser-algorithms@2.5.0)(@csstools/css-tokenizer@2.2.3) - '@csstools/selector-specificity': 3.0.1(postcss-selector-parser@6.0.15) + '@csstools/media-query-list-parser': 2.1.8(@csstools/css-parser-algorithms@2.6.0)(@csstools/css-tokenizer@2.2.3) + '@csstools/selector-specificity': 3.0.2(postcss-selector-parser@6.0.15) balanced-match: 2.0.0 colord: 2.9.3 cosmiconfig: 8.3.6(typescript@5.3.3) @@ -23326,8 +23335,8 @@ packages: supports-hyperlinks: 2.3.0 dev: true - /terser@5.27.1: - resolution: {integrity: sha512-29wAr6UU/oQpnTw5HoadwjUZnFQXGdOfj0LjZ4sVxzqwHh/QVkvr7m8y9WoR4iN3FRitVduTc6KdjcW38Npsug==} + /terser@5.27.2: + resolution: {integrity: sha512-sHXmLSkImesJ4p5apTeT63DsV4Obe1s37qT8qvwHRmVxKTBH7Rv9Wr26VcAMmLbmk9UliiwK8z+657NyJHHy/w==} engines: {node: '>=10'} hasBin: true dependencies: @@ -23580,8 +23589,8 @@ packages: punycode: 2.3.1 dev: true - /transformation-matrix@2.15.0: - resolution: {integrity: sha512-HN3kCvvH4ug3Xm/ycOfCFQOOktg5htxlC4Ih1Z7Wb6BMtQho+q+irOdGo10ARRKpqkRBXgBzQFw/AVmR0oIf0g==} + /transformation-matrix@2.16.0: + resolution: {integrity: sha512-4XwWHnwmQwhxFfEdDpBhMBYs8ZCly55hrAuggQZJCtJN1CDx+jDZrbCJ0BYgpqVivOMMq7pOzktfm8mZk2nF3A==} dev: true /traverse@0.6.6: @@ -23782,8 +23791,8 @@ packages: mime-types: 2.1.35 dev: true - /typed-array-buffer@1.0.1: - resolution: {integrity: sha512-RSqu1UEuSlrBhHTWC8O9FnPjOduNs4M7rJ4pRKoEjtx1zUNOPN2sSXHLDX+Y2WPbHIxbvg4JFo2DNAEfPIKWoQ==} + /typed-array-buffer@1.0.2: + resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.7 @@ -23791,34 +23800,39 @@ packages: is-typed-array: 1.1.13 dev: true - /typed-array-byte-length@1.0.0: - resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==} + /typed-array-byte-length@1.0.1: + resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.7 for-each: 0.3.3 - has-proto: 1.0.1 + gopd: 1.0.1 + has-proto: 1.0.3 is-typed-array: 1.1.13 dev: true - /typed-array-byte-offset@1.0.1: - resolution: {integrity: sha512-tcqKMrTRXjqvHN9S3553NPCaGL0VPgFI92lXszmrE8DMhiDPLBYLlvo8Uu4WZAAX/aGqp/T1sbA4ph8EWjDF9Q==} + /typed-array-byte-offset@1.0.2: + resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==} engines: {node: '>= 0.4'} dependencies: - available-typed-arrays: 1.0.6 + available-typed-arrays: 1.0.7 call-bind: 1.0.7 for-each: 0.3.3 gopd: 1.0.1 - has-proto: 1.0.1 + has-proto: 1.0.3 is-typed-array: 1.1.13 dev: true - /typed-array-length@1.0.4: - resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==} + /typed-array-length@1.0.5: + resolution: {integrity: sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==} + engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.7 for-each: 0.3.3 + gopd: 1.0.1 + has-proto: 1.0.3 is-typed-array: 1.1.13 + possible-typed-array-names: 1.0.0 dev: true /typedarray-to-buffer@3.1.5: @@ -23831,8 +23845,8 @@ packages: resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==} dev: true - /types-ramda@0.29.7: - resolution: {integrity: sha512-8KBxZGJwUF3MpRkkJauSpvfHXk8Ssq15QXGuCBTDGeKd9PfheokkC3wAKRV3djej9O31Qa5M7Owsg8hF0GjtAw==} + /types-ramda@0.29.8: + resolution: {integrity: sha512-+RTOlcwl1hEdNV1xfug3ofG6rny0hqQsFuBmS88vD4Lrh8Iys14IPlUH9QaGjCY46iCZgEDuCTLMLH/pOOsGKg==} dependencies: ts-toolbelt: 9.6.0 dev: true @@ -23879,7 +23893,7 @@ packages: qs: 6.11.2 dev: true - /umi@4.1.1(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.56)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.0)(stylelint@13.13.1)(typescript@5.3.3): + /umi@4.1.1(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)(stylelint@13.13.1)(typescript@5.3.3): resolution: {integrity: sha512-FGSyS4V2kyXnrOudT3JBavhNjSIzgC1FJjOCmhjElmGIZV/FY9gpqOKk9WExdO96xSOvff0+16SK2WtQj/xQgQ==} engines: {node: '>=14'} hasBin: true @@ -23889,7 +23903,7 @@ packages: '@umijs/bundler-webpack': 4.1.1(typescript@5.3.3) '@umijs/core': 4.1.1 '@umijs/lint': 4.1.1(eslint@8.56.0)(stylelint@13.13.1)(typescript@5.3.3) - '@umijs/preset-umi': 4.1.1(@types/node@14.18.63)(@types/react@18.2.56)(sass@1.71.0)(typescript@5.3.3) + '@umijs/preset-umi': 4.1.1(@types/node@14.18.63)(@types/react@18.2.57)(sass@1.71.1)(typescript@5.3.3) '@umijs/renderer-react': 4.1.1(react-dom@18.2.0)(react@18.2.0) '@umijs/server': 4.1.1 '@umijs/test': 4.1.1(@babel/core@7.23.9) @@ -24291,7 +24305,7 @@ packages: qs: 6.11.2 dev: true - /use-isomorphic-layout-effect@1.1.2(@types/react@18.2.56)(react@18.1.0): + /use-isomorphic-layout-effect@1.1.2(@types/react@18.2.57)(react@18.1.0): resolution: {integrity: sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==} peerDependencies: '@types/react': '*' @@ -24300,7 +24314,7 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.2.56 + '@types/react': 18.2.57 react: 18.1.0 dev: true @@ -24534,7 +24548,7 @@ packages: - terser dev: true - /vite@4.3.1(@types/node@14.18.63)(less@4.1.3)(sass@1.71.0): + /vite@4.3.1(@types/node@14.18.63)(less@4.1.3)(sass@1.71.1): resolution: {integrity: sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -24564,7 +24578,7 @@ packages: less: 4.1.3 postcss: 8.4.35 rollup: 3.29.4 - sass: 1.71.0 + sass: 1.71.1 optionalDependencies: fsevents: 2.3.3 dev: true @@ -24873,7 +24887,7 @@ packages: resolution: {integrity: sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==} engines: {node: '>= 0.4'} dependencies: - available-typed-arrays: 1.0.6 + available-typed-arrays: 1.0.7 call-bind: 1.0.7 for-each: 0.3.3 gopd: 1.0.1 @@ -25285,7 +25299,7 @@ packages: commander: 9.5.0 dev: true - /zustand@4.5.1(@types/react@18.2.56)(react@18.2.0): + /zustand@4.5.1(@types/react@18.2.57)(react@18.2.0): resolution: {integrity: sha512-XlauQmH64xXSC1qGYNv00ODaQ3B+tNPoy22jv2diYiP4eoDKr9LA+Bh5Bc3gplTrFdb6JVI+N4kc1DZ/tbtfPg==} engines: {node: '>=12.7.0'} peerDependencies: @@ -25300,7 +25314,7 @@ packages: react: optional: true dependencies: - '@types/react': 18.2.56 + '@types/react': 18.2.57 react: 18.2.0 use-sync-external-store: 1.2.0(react@18.2.0) dev: true diff --git a/tests/card/checkcard.test.tsx b/tests/card/checkcard.test.tsx index 859b9c1aeac4..a6eebcb1a074 100644 --- a/tests/card/checkcard.test.tsx +++ b/tests/card/checkcard.test.tsx @@ -33,7 +33,7 @@ describe('CheckCard', () => { */ await waitFor(() => { // 断言 onChange 回调函数已被调用,并且传入参数为 true。 - expect(onChange).toBeCalledWith(true); + expect(onChange).toHaveBeenCalledWith(true); // 断言 onClick 回调函数已被调用。 expect(onClick).toHaveBeenCalled(); }); diff --git a/tests/card/index.test.tsx b/tests/card/index.test.tsx index 383f11dc64e4..2b589cbe3da0 100644 --- a/tests/card/index.test.tsx +++ b/tests/card/index.test.tsx @@ -1,5 +1,5 @@ import { ProCard } from '@ant-design/pro-components'; -import { act, cleanup, render } from '@testing-library/react'; +import { act, cleanup, render, waitFor } from '@testing-library/react'; vi.mock('antd/lib/grid/hooks/useBreakpoint'); @@ -37,7 +37,9 @@ describe('Card', () => { ?.click(); }); - expect(fn).toBeCalled(); + await waitFor(() => { + expect(fn).toHaveBeenCalled(); + }); }); it('🥩 collapsible defaultCollapsed', async () => { diff --git a/tests/demo.tsx b/tests/demo.tsx index e8af162df740..357b8129b16a 100644 --- a/tests/demo.tsx +++ b/tests/demo.tsx @@ -125,12 +125,12 @@ function demoTest(component: string, options?: Options) { }); await waitFor(() => { - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); }); + await waitFor(() => { expect(wrapper.asFragment()).toMatchSnapshot(); }); - wrapper.unmount(); vi.useRealTimers(); cleanup(); diff --git a/tests/descriptions/editor.test.tsx b/tests/descriptions/editor.test.tsx index 4d4769ef0dc1..3a209d206329 100644 --- a/tests/descriptions/editor.test.tsx +++ b/tests/descriptions/editor.test.tsx @@ -198,7 +198,7 @@ describe('Descriptions', () => { }); await waitFor(() => { - expect(fn).toBeCalledWith(['title']); + expect(fn).toHaveBeenCalledWith(['title']); }); }); @@ -437,7 +437,7 @@ describe('Descriptions', () => { }); await waitFor(() => { - expect(fn).not.toBeCalled(); + expect(fn).not.toHaveBeenCalled(); }); }); @@ -459,7 +459,7 @@ describe('Descriptions', () => { ?.click(); }); await waitFor(() => { - expect(fn).toBeCalledWith(['state', 'title']); + expect(fn).toHaveBeenCalledWith(['state', 'title']); }); }); @@ -492,7 +492,7 @@ describe('Descriptions', () => { ?.click(); }); await waitFor(() => { - expect(fn).toBeCalledWith('state'); + expect(fn).toHaveBeenCalledWith('state'); }); }); @@ -545,7 +545,7 @@ describe('Descriptions', () => { }); await waitFor(() => { - expect(fn).toBeCalledWith('state'); + expect(fn).toHaveBeenCalledWith('state'); }); }); @@ -580,7 +580,7 @@ describe('Descriptions', () => { }); await waitFor(() => { - expect(fn).toBeCalledWith('state'); + expect(fn).toHaveBeenCalledWith('state'); }); }); @@ -633,7 +633,7 @@ describe('Descriptions', () => { await waitFor(() => { // 没有通过验证,不触发 onSave - expect(fn).not.toBeCalled(); + expect(fn).not.toHaveBeenCalled(); }); act(() => { @@ -663,7 +663,7 @@ describe('Descriptions', () => { }); await waitFor(() => { - expect(fn).toBeCalledWith('qixian'); + expect(fn).toHaveBeenCalledWith('qixian'); }); }); @@ -705,7 +705,7 @@ describe('Descriptions', () => { }); await waitFor(() => { - expect(fn).toBeCalledWith('2021-05-26 09:42:56'); + expect(fn).toHaveBeenCalledWith('2021-05-26 09:42:56'); }); }); }); diff --git a/tests/descriptions/index.test.tsx b/tests/descriptions/index.test.tsx index 10ad2b409858..153bf26fde52 100644 --- a/tests/descriptions/index.test.tsx +++ b/tests/descriptions/index.test.tsx @@ -63,7 +63,7 @@ describe('descriptions', () => { ); await waitFor(() => { - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); }); }); @@ -190,7 +190,7 @@ describe('descriptions', () => { await html.findAllByText('这是一段文本'); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); act(() => { html.queryByText('刷新')?.click(); @@ -204,7 +204,7 @@ describe('descriptions', () => { await waitFor(() => { // 因为有 loading 的控制,所有只会触发两次 - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); }); vi.useRealTimers(); @@ -246,7 +246,7 @@ describe('descriptions', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); act(() => { @@ -289,7 +289,7 @@ describe('descriptions', () => { await html.findAllByText('这是一段文本'); await waitFor(() => { - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); }); vi.useRealTimers(); @@ -322,7 +322,7 @@ describe('descriptions', () => { ); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); }); diff --git a/tests/field/datePick.test.tsx b/tests/field/datePick.test.tsx index c37281e1e5ab..82448d59cf93 100644 --- a/tests/field/datePick.test.tsx +++ b/tests/field/datePick.test.tsx @@ -62,7 +62,7 @@ describe('DateField', () => { }); await waitFor(() => { - expect(openChangeFn).toBeCalledWith(true); + expect(openChangeFn).toHaveBeenCalledWith(true); }); act(() => { @@ -70,7 +70,7 @@ describe('DateField', () => { }); await waitFor(() => { - expect(openChangeFn).toBeCalledWith(false); + expect(openChangeFn).toHaveBeenCalledWith(false); }); await act(async () => { await fireEvent.click(container.querySelector('.ant-picker-clear')!); @@ -80,7 +80,7 @@ describe('DateField', () => { await waitFor( () => { - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); }, { timeout: 1000, @@ -124,7 +124,7 @@ describe('DateField', () => { }); await waitFor(() => { - expect(openChangeFn).toBeCalledWith(true); + expect(openChangeFn).toHaveBeenCalledWith(true); }); act(() => { @@ -141,12 +141,12 @@ describe('DateField', () => { }); await waitFor(() => { - expect(openChangeFn).toBeCalledWith(false); + expect(openChangeFn).toHaveBeenCalledWith(false); }); await waitFor( () => { - expect(onChangeFn).toBeCalled(); + expect(onChangeFn).toHaveBeenCalled(); }, { timeout: 1000, diff --git a/tests/field/field.test.tsx b/tests/field/field.test.tsx index a8a338f8bb8e..2c65ef57df9d 100644 --- a/tests/field/field.test.tsx +++ b/tests/field/field.test.tsx @@ -202,7 +202,7 @@ describe('Field', () => { }); }); - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); act(() => { fireEvent.blur(html.baseElement.querySelector('input')!, { @@ -210,7 +210,7 @@ describe('Field', () => { }); }); - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); html.unmount(); }); @@ -350,7 +350,7 @@ describe('Field', () => { await html.findAllByText('default'); - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); act(() => { ref.current?.fetchData?.('test'); @@ -360,7 +360,7 @@ describe('Field', () => { vi.runOnlyPendingTimers(); }); - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); html.unmount(); vi.useRealTimers(); }); @@ -627,7 +627,7 @@ describe('Field', () => { }); await waitFor(() => { - expect(fn).toBeCalledWith(true); + expect(fn).toHaveBeenCalledWith(true); }); act(() => { @@ -637,7 +637,7 @@ describe('Field', () => { }); await waitFor(() => { - expect(fn).toBeCalledWith(false); + expect(fn).toHaveBeenCalledWith(false); }); }); }); @@ -907,7 +907,7 @@ describe('Field', () => { }); await waitFor(() => { - expect(requestFn).toBeCalledTimes(1); + expect(requestFn).toHaveBeenCalledTimes(1); }); await html.findAllByText('Node2'); @@ -955,7 +955,7 @@ describe('Field', () => { }); await waitFor(() => { - expect(onSearchFn).toBeCalled(); + expect(onSearchFn).toHaveBeenCalled(); }); act(() => { @@ -1011,7 +1011,7 @@ describe('Field', () => { }); await waitFor(() => { - expect(onClearFn).toBeCalled(); + expect(onClearFn).toHaveBeenCalled(); expect(html.baseElement.textContent).toContain(''); }); @@ -1024,7 +1024,7 @@ describe('Field', () => { ); }); - expect(onBlurFn).toBeCalledTimes(1); + expect(onBlurFn).toHaveBeenCalledTimes(1); html.unmount(); vi.useRealTimers(); }); @@ -1505,7 +1505,7 @@ describe('Field', () => { expect( !!html.baseElement.querySelector('span.anticon-eye-invisible'), ).toBeFalsy(); - expect(fn).toBeCalledWith(false); + expect(fn).toHaveBeenCalledWith(false); }); html.unmount(); @@ -1532,7 +1532,7 @@ describe('Field', () => { expect( !!html.baseElement.querySelector('span.anticon-eye-invisible'), ).toBeFalsy(); - expect(fn).toBeCalledWith(false); + expect(fn).toHaveBeenCalledWith(false); }); html.unmount(); }); @@ -1710,7 +1710,7 @@ describe('Field', () => { }); await waitFor(() => { - expect(change).toBeCalledWith('1.00000000000007'); + expect(change).toHaveBeenCalledWith('1.00000000000007'); }); }); @@ -1919,7 +1919,7 @@ describe('Field', () => { />, ); await waitFor(() => { - expect(requestFn).toBeCalledTimes(1); + expect(requestFn).toHaveBeenCalledTimes(1); }); act(() => { @@ -1929,7 +1929,7 @@ describe('Field', () => { }); await waitFor(() => { - expect(requestFn).toBeCalledTimes(2); + expect(requestFn).toHaveBeenCalledTimes(2); }); }); diff --git a/tests/form/base.test.tsx b/tests/form/base.test.tsx index e4925f3c4a90..106b5ebb8c37 100644 --- a/tests/form/base.test.tsx +++ b/tests/form/base.test.tsx @@ -254,7 +254,7 @@ describe('ProForm', () => { }); const dom = await (await wrapper.findByText('提 交')).parentElement; expect(dom?.className.includes('ant-btn-loading')).toBe(true); - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); wrapper.unmount(); vi.useRealTimers(); }); @@ -284,7 +284,7 @@ describe('ProForm', () => { dom = await (await wrapper.findByText('提 交')).parentElement; }); expect(dom?.className.includes('ant-btn-loading')).toBe(true); - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); act(() => { vi.runOnlyPendingTimers(); @@ -451,7 +451,7 @@ describe('ProForm', () => { await (await wrapper.findByText('提 交')).click(); }); - expect(fn).toBeCalledWith({ + expect(fn).toHaveBeenCalledWith({ name: { test: 'test', }, @@ -479,7 +479,7 @@ describe('ProForm', () => { await (await wrapper.findByText('提 交')).click(); }); - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); wrapper.unmount(); }); @@ -551,7 +551,7 @@ describe('ProForm', () => { .click(); }); - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); wrapper.unmount(); }); @@ -580,7 +580,7 @@ describe('ProForm', () => { .querySelectorAll('button.test_button')[0] .click(); }); - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); wrapper.unmount(); }); @@ -612,7 +612,10 @@ describe('ProForm', () => { (await wrapper.findByText('提交并发布')).click(); }); - expect(onFinish).toBeCalled(); + await waitFor(() => { + expect(onFinish).toHaveBeenCalled(); + }); + wrapper.unmount(); }); @@ -702,7 +705,7 @@ describe('ProForm', () => { await (await wrapper.findByText('提 交')).click(); }); - expect(onFinish).toBeCalledWith('test'); + expect(onFinish).toHaveBeenCalledWith('test'); wrapper.unmount(); }); @@ -814,7 +817,7 @@ describe('ProForm', () => { (await wrapper.findByText('获取验证码'))?.click(); }); - expect(fn).not.toBeCalled(); + expect(fn).not.toHaveBeenCalled(); act(() => { fireEvent.change( @@ -831,7 +834,7 @@ describe('ProForm', () => { captcha.click(); }); - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); wrapper.unmount(); }); @@ -934,7 +937,7 @@ describe('ProForm', () => { .click(); }); - expect(fn).toBeCalledWith(true); + expect(fn).toHaveBeenCalledWith(true); act(() => { wrapper.baseElement @@ -942,7 +945,7 @@ describe('ProForm', () => { .click(); }); - expect(fn).toBeCalledWith(false); + expect(fn).toHaveBeenCalledWith(false); wrapper.unmount(); }); @@ -968,7 +971,7 @@ describe('ProForm', () => { .click(); }); - expect(fn).toBeCalledWith(false); + expect(fn).toHaveBeenCalledWith(false); act(() => { wrapper.baseElement @@ -976,7 +979,7 @@ describe('ProForm', () => { .click(); }); - expect(fn).toBeCalledWith(true); + expect(fn).toHaveBeenCalledWith(true); wrapper.unmount(); }); @@ -1000,7 +1003,7 @@ describe('ProForm', () => { wrapper.baseElement.querySelectorAll('#click')[0].click(); }); - expect(fn).not.toBeCalled(); + expect(fn).not.toHaveBeenCalled(); wrapper.unmount(); }); @@ -1048,7 +1051,7 @@ describe('ProForm', () => { }, ); }); - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); wrapper.unmount(); }); @@ -1080,7 +1083,7 @@ describe('ProForm', () => { }, ); }); - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); wrapper.unmount(); }); @@ -1158,7 +1161,7 @@ describe('ProForm', () => { ); }); - expect(onSearch).toBeCalledWith('全'); + expect(onSearch).toHaveBeenCalledWith('全'); act(() => { fireEvent.mouseDown( @@ -1218,7 +1221,7 @@ describe('ProForm', () => { ); }); - expect(onSearch).toBeCalledWith('全'); + expect(onSearch).toHaveBeenCalledWith('全'); act(() => { fireEvent.mouseDown( @@ -1284,7 +1287,7 @@ describe('ProForm', () => { ); }); - expect(onSearch).toBeCalledWith('全'); + expect(onSearch).toHaveBeenCalledWith('全'); act(() => { fireEvent.mouseDown( @@ -1304,7 +1307,7 @@ describe('ProForm', () => { .click(); }); - expect(onValuesChange).toBeCalledWith('全部'); + expect(onValuesChange).toHaveBeenCalledWith('全部'); wrapper.unmount(); }); @@ -1353,7 +1356,7 @@ describe('ProForm', () => { ); }); - expect(onSearch).toBeCalledWith('全'); + expect(onSearch).toHaveBeenCalledWith('全'); act(() => { fireEvent.mouseDown( @@ -1440,7 +1443,7 @@ describe('ProForm', () => { ); }); - expect(onSearch).toBeCalledWith('全'); + expect(onSearch).toHaveBeenCalledWith('全'); act(() => { fireEvent.mouseDown( @@ -1542,7 +1545,7 @@ describe('ProForm', () => { ); }); - expect(onSearch).toBeCalledWith('全'); + expect(onSearch).toHaveBeenCalledWith('全'); act(() => { fireEvent.mouseDown( @@ -1628,7 +1631,7 @@ describe('ProForm', () => { ); }); - expect(onSearch).toBeCalledWith('全'); + expect(onSearch).toHaveBeenCalledWith('全'); act(() => { fireEvent.mouseDown( @@ -1844,7 +1847,7 @@ describe('ProForm', () => { await (await wrapper.findByText('提 交')).click(); }); - expect(onFinish).toBeCalledWith(2); + expect(onFinish).toHaveBeenCalledWith(2); wrapper.unmount(); }); @@ -1926,7 +1929,7 @@ describe('ProForm', () => { .click(); }); - expect(onValuesChange).toBeCalledWith('门店小程序'); + expect(onValuesChange).toHaveBeenCalledWith('门店小程序'); act(() => { fireEvent.mouseDown( @@ -2039,7 +2042,7 @@ describe('ProForm', () => { .click(); }); - expect(onValuesChange).toBeCalledWith('门店小程序'); + expect(onValuesChange).toHaveBeenCalledWith('门店小程序'); wrapper.unmount(); }); @@ -2188,7 +2191,7 @@ describe('ProForm', () => { await (await wrapper.findByText('提 交')).click(); }); - expect(onFinish).toBeCalledWith(2); + expect(onFinish).toHaveBeenCalledWith(2); wrapper.unmount(); }); @@ -2254,7 +2257,7 @@ describe('ProForm', () => { await (await wrapper.findByText('提 交')).click(); }); - expect(onFinish).toBeCalledWith('open'); + expect(onFinish).toHaveBeenCalledWith('open'); }); it('📦 ProFormSelect support filterOption', async () => { @@ -2437,7 +2440,7 @@ describe('ProForm', () => { await (await wrapper.findByText('提 交')).click(); }); - expect(onFinish).toBeCalledWith('open'); + expect(onFinish).toHaveBeenCalledWith('open'); }); it('📦 Select support multiple unnamed async options', async () => { const wrapper = render( @@ -2635,7 +2638,7 @@ describe('ProForm', () => { await (await wrapper.findByText('提 交')).click(); }); - expect(onFinish).toBeCalledWith(2); + expect(onFinish).toHaveBeenCalledWith(2); }); it('📦 Select support multiple and autoClearSearchValue: true', async () => { @@ -2784,7 +2787,7 @@ describe('ProForm', () => { await (await wrapper.findByText('提 交')).click(); }); - expect(onFinish).toBeCalledWith(1); + expect(onFinish).toHaveBeenCalledWith(1); }); it('📦 ColorPicker support rgba new', async () => { @@ -2811,7 +2814,7 @@ describe('ProForm', () => { .querySelectorAll('.ant-color-picker-presets-color')[0] .click(); }); - expect(onFinish).toBeCalledWith('#f5222d'); + expect(onFinish).toHaveBeenCalledWith('#f5222d'); }); it('📦 validateFieldsReturnFormatValue', async () => { @@ -2906,7 +2909,7 @@ describe('ProForm', () => { await act(async () => { await (await wrapper.findByText('提 交')).click(); }); - expect(onFinish).toBeCalledWith([1, 2]); + expect(onFinish).toHaveBeenCalledWith([1, 2]); // 测试清空两个值 act(() => { @@ -2943,7 +2946,7 @@ describe('ProForm', () => { await (await wrapper.findByText('提 交')).click(); }); - expect(onFinish).toBeCalledWith(undefined); + expect(onFinish).toHaveBeenCalledWith(undefined); }); it('📦 when dateFormatter is a Function', async () => { @@ -2974,7 +2977,7 @@ describe('ProForm', () => { const wrapper = render(); - expect(fn1).toBeCalledWith('2021/08/09 12:12:12', 'dateTime'); + expect(fn1).toHaveBeenCalledWith('2021/08/09 12:12:12', 'dateTime'); await act(async () => { await (await wrapper.findByText('提 交')).click(); @@ -3096,7 +3099,7 @@ describe('ProForm', () => { ); }); - expect(onChange).toBeCalledWith(undefined); + expect(onChange).toHaveBeenCalledWith(undefined); wrapper.unmount(); }); @@ -3139,7 +3142,7 @@ describe('ProForm', () => { await (await html.findByText('提 交')).click(); }); - expect(fn).toBeCalledWith(22); + expect(fn).toHaveBeenCalledWith(22); expect(html.asFragment()).toMatchSnapshot(); }); @@ -3172,7 +3175,7 @@ describe('ProForm', () => { await waitForWaitTime(300); expect(dom.value).toBe('22'); - expect(fn).toBeCalledWith(22); + expect(fn).toHaveBeenCalledWith(22); expect(html.asFragment()).toMatchSnapshot(); }); diff --git a/tests/form/dependency.test.tsx b/tests/form/dependency.test.tsx index d4c9b5ed23c7..ed805020f321 100644 --- a/tests/form/dependency.test.tsx +++ b/tests/form/dependency.test.tsx @@ -165,6 +165,6 @@ describe('ProForm Dependency component', () => { }); await waitForWaitTime(100); - expect(dependencyFn).toBeCalledWith('second chen'); + expect(dependencyFn).toHaveBeenCalledWith('second chen'); }); }); diff --git a/tests/form/drawerForm.test.tsx b/tests/form/drawerForm.test.tsx index 0ee789bcbc63..dbe6641c74f1 100644 --- a/tests/form/drawerForm.test.tsx +++ b/tests/form/drawerForm.test.tsx @@ -32,7 +32,7 @@ describe('DrawerForm', () => { (await wrapper.findByText('新 建')).click(); }); - expect(fn).toBeCalledWith(true); + expect(fn).toHaveBeenCalledWith(true); }); it('📦 DrawerForm first no render items', async () => { @@ -181,7 +181,7 @@ describe('DrawerForm', () => { ).click(); }); await waitForWaitTime(100); - expect(fn).toBeCalledWith(false); + expect(fn).toHaveBeenCalledWith(false); }); it('📦 drawer close button will simulate onOpenChange', async () => { @@ -206,7 +206,7 @@ describe('DrawerForm', () => { ).click(); }); await waitForWaitTime(100); - expect(fn).toBeCalledWith(false); + expect(fn).toHaveBeenCalledWith(false); }); it('📦 reset button will simulate onOpenChange', async () => { @@ -227,7 +227,7 @@ describe('DrawerForm', () => { }); await waitForWaitTime(300); - expect(fn).toBeCalledWith(false); + expect(fn).toHaveBeenCalledWith(false); }); it('📦 drawer close button will simulate drawerProps.onClose', async () => { @@ -254,7 +254,7 @@ describe('DrawerForm', () => { ).click(); }); await waitForWaitTime(100); - expect(fn).toBeCalledWith(false); + expect(fn).toHaveBeenCalledWith(false); }); it('📦 drawer reset button will simulate drawerProps.onClose', async () => { @@ -277,7 +277,7 @@ describe('DrawerForm', () => { (await wrapper.findByText('取 消')).click(); }); - expect(fn).toBeCalledWith(false); + expect(fn).toHaveBeenCalledWith(false); }); it('📦 drawer reset button will simulate drawerProps.onCancel', async () => { @@ -301,12 +301,12 @@ describe('DrawerForm', () => { (await wrapper.findByText('取 消')).click(); }); await waitForWaitTime(100); - expect(fn).toBeCalledWith(false); - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledWith(false); + expect(fn).toHaveBeenCalledTimes(2); // 点击关闭按钮的时候会手动触发一下 onClose - expect(onCloseFn).toBeCalledWith(false); - expect(fn).toBeCalledTimes(2); + expect(onCloseFn).toHaveBeenCalledWith(false); + expect(fn).toHaveBeenCalledTimes(2); }); it('📦 form onFinish return true should close drawer', async () => { @@ -329,7 +329,7 @@ describe('DrawerForm', () => { await waitForWaitTime(100); - expect(fn).toBeCalledWith(false); + expect(fn).toHaveBeenCalledWith(false); }); it('📦 form onFinish is null, no close drawer', async () => { @@ -350,7 +350,7 @@ describe('DrawerForm', () => { }); await waitForWaitTime(100); - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); it('📦 submitter config no reset default config', async () => { @@ -382,7 +382,7 @@ describe('DrawerForm', () => { (await wrapper.findByText('新 建')).click(); }); await waitForWaitTime(200); - expect(fn).toBeCalledWith(true); + expect(fn).toHaveBeenCalledWith(true); act(() => { wrapper.baseElement @@ -390,7 +390,7 @@ describe('DrawerForm', () => { ?.click?.(); }); await waitForWaitTime(100); - expect(fn).toBeCalledWith(false); + expect(fn).toHaveBeenCalledWith(false); }); it('📦 DrawerForm close no rerender from', async () => { @@ -817,7 +817,7 @@ describe('DrawerForm', () => { ).toBeFalsy(); // 通过检查fn被调用的次数确定在 onOpenChange 时表单是否已被重置 - expect(fn).toBeCalledTimes(3); + expect(fn).toHaveBeenCalledTimes(3); html.unmount(); }); diff --git a/tests/form/drawerFormTimeout.test.tsx b/tests/form/drawerFormTimeout.test.tsx index e0b0a58b26a9..1f436fdce364 100644 --- a/tests/form/drawerFormTimeout.test.tsx +++ b/tests/form/drawerFormTimeout.test.tsx @@ -45,7 +45,7 @@ describe('DrawerForm', () => { vi.advanceTimersByTime(3000); }); - expect(fn).not.toBeCalled(); + expect(fn).not.toHaveBeenCalled(); expect( (html.queryAllByText('取 消').at(0)?.parentElement as HTMLButtonElement) @@ -56,7 +56,7 @@ describe('DrawerForm', () => { (await html.queryByText('取 消'))?.click(); }); - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); html.unmount(); vi.useRealTimers(); }); @@ -98,6 +98,6 @@ describe('DrawerForm', () => { (await wrapper.queryByText('取 消'))?.click(); }); - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); }); }); diff --git a/tests/form/fieldSet.test.tsx b/tests/form/fieldSet.test.tsx index 3b6d41bd6f1b..bfef4ce7aa15 100644 --- a/tests/form/fieldSet.test.tsx +++ b/tests/form/fieldSet.test.tsx @@ -47,8 +47,8 @@ describe('ProFormFieldSet', () => { }, }); - expect(valueFn).toBeCalledWith(['111']); - expect(valueFn).toBeCalledTimes(1); + expect(valueFn).toHaveBeenCalledWith(['111']); + expect(valueFn).toHaveBeenCalledTimes(1); fireEvent.change(container.querySelector('#filedSet3')!, { target: { @@ -56,15 +56,15 @@ describe('ProFormFieldSet', () => { }, }); - expect(valueFn).toBeCalledWith(['111', undefined, '333']); + expect(valueFn).toHaveBeenCalledWith(['111', undefined, '333']); await userEvent.click(container.querySelectorAll('li > div')[1]); - expect(valueFn).toBeCalledWith(['111', 2, '333']); + expect(valueFn).toHaveBeenCalledWith(['111', 2, '333']); await userEvent.click(await screen.findByText('提 交')); - expect(fn).toBeCalledWith(['111', 2, '333']); + expect(fn).toHaveBeenCalledWith(['111', 2, '333']); unmount(); }); @@ -95,8 +95,8 @@ describe('ProFormFieldSet', () => { }, }); - expect(valueFn).toBeCalledWith(['111']); - expect(valueFn).toBeCalledTimes(1); + expect(valueFn).toHaveBeenCalledWith(['111']); + expect(valueFn).toHaveBeenCalledTimes(1); fireEvent.change(container.querySelector('#filedSet3')!, { target: { @@ -104,15 +104,15 @@ describe('ProFormFieldSet', () => { }, }); - expect(valueFn).toBeCalledWith(['111', undefined, '333']); + expect(valueFn).toHaveBeenCalledWith(['111', undefined, '333']); await userEvent.click(container.querySelectorAll('li > div')[1]); - expect(valueFn).toBeCalledWith(['111', 2, '333']); + expect(valueFn).toHaveBeenCalledWith(['111', 2, '333']); await userEvent.click(await screen.findByText('提 交')); - expect(fn).toBeCalledWith(['111', 2, '333']); + expect(fn).toHaveBeenCalledWith(['111', 2, '333']); unmount(); }); @@ -159,7 +159,7 @@ describe('ProFormFieldSet', () => { }, }); - expect(valueFn).toBeCalledWith(['111']); + expect(valueFn).toHaveBeenCalledWith(['111']); fireEvent.change(container.querySelector('#filedSet2')!, { target: { @@ -167,11 +167,11 @@ describe('ProFormFieldSet', () => { }, }); - expect(valueFn).toBeCalledWith(['111', '222']); + expect(valueFn).toHaveBeenCalledWith(['111', '222']); await userEvent.click(await screen.findByText('提 交')); - expect(fn).toBeCalledWith('111'); + expect(fn).toHaveBeenCalledWith('111'); unmount(); }); @@ -227,7 +227,7 @@ describe('ProFormFieldSet', () => { await userEvent.click(await screen.findByText('提 交')); - expect(fn).toBeCalledWith('2'); + expect(fn).toHaveBeenCalledWith('2'); unmount(); }); }); diff --git a/tests/form/formList.test.tsx b/tests/form/formList.test.tsx index 256341c0974c..8b2fa04ad2ff 100644 --- a/tests/form/formList.test.tsx +++ b/tests/form/formList.test.tsx @@ -58,7 +58,7 @@ describe('ProForm List', () => { fireEvent.click(await screen.findByText('提 交')); await waitFor(() => { - expect(fn).toBeCalledWith(['name', 'nickName']); + expect(fn).toHaveBeenCalledWith(['name', 'nickName']); }); }); @@ -244,7 +244,7 @@ describe('ProForm List', () => { fireEvent.click(await screen.findByText('提 交')); await waitFor(() => { - expect(fn).toBeCalledWith([]); + expect(fn).toHaveBeenCalledWith([]); }); }); @@ -282,7 +282,7 @@ describe('ProForm List', () => { fireEvent.click(await screen.findByText('提 交')); await waitFor(() => { - expect(fn).toBeCalledWith({ + expect(fn).toHaveBeenCalledWith({ name: '1111', nickName: '1111', }); @@ -355,7 +355,7 @@ describe('ProForm List', () => { await waitForWaitTime(100); - expect(fn).toBeCalledWith({ + expect(fn).toHaveBeenCalledWith({ name: '1111', nickName: '1111', }); @@ -374,7 +374,7 @@ describe('ProForm List', () => { await waitForWaitTime(100); - expect(fn).toBeCalledWith({ + expect(fn).toHaveBeenCalledWith({ name: 'New Name0', nickName: 'New Remark0', }); @@ -391,7 +391,7 @@ describe('ProForm List', () => { await waitForWaitTime(100); - expect(fn).toBeCalledWith({ + expect(fn).toHaveBeenCalledWith({ name: undefined, nickName: undefined, }); @@ -452,7 +452,7 @@ describe('ProForm List', () => { fireEvent.click(await screen.findByText('提 交')); await waitFor(() => { - expect(fn).toBeCalledWith({ + expect(fn).toHaveBeenCalledWith({ name: '2222', nickName: '2222', }); @@ -505,7 +505,7 @@ describe('ProForm List', () => { fireEvent.click(await screen.findByText('提 交')); await waitFor(() => { - expect(fn).toBeCalledWith([]); + expect(fn).toHaveBeenCalledWith([]); }); }); @@ -542,7 +542,7 @@ describe('ProForm List', () => { fireEvent.click(await screen.findByText('提 交')); await waitFor(() => { - expect(fn).toBeCalledWith({ + expect(fn).toHaveBeenCalledWith({ name: '1111', nickName: '1111', }); @@ -586,7 +586,7 @@ describe('ProForm List', () => { fireEvent.click(await screen.findByText('提 交')); await waitFor(() => { - expect(fn).toBeCalledWith({ + expect(fn).toHaveBeenCalledWith({ name: '2222', nickName: '2222', }); @@ -697,7 +697,7 @@ describe('ProForm List', () => { fireEvent.click(await screen.findByText('提 交')); await waitFor(() => { - expect(fn).toBeCalledWith([ + expect(fn).toHaveBeenCalledWith([ { name: '1212', }, @@ -747,7 +747,7 @@ describe('ProForm List', () => { }); expect(container.querySelectorAll('input.ant-input')).toHaveLength(4); - expect(fn).toBeCalledWith('222'); + expect(fn).toHaveBeenCalledWith('222'); }); it('⛲ ProForm.List support ProFormDependency2', async () => { @@ -1024,7 +1024,7 @@ describe('ProForm List', () => { ?.click?.(); }); - expect(fnRemove).toBeCalledWith(2); + expect(fnRemove).toHaveBeenCalledWith(2); expect(html.baseElement.querySelectorAll('input.ant-input').length).toBe(3); await waitForWaitTime(1200); @@ -1038,7 +1038,7 @@ describe('ProForm List', () => { }); await waitForWaitTime(1200); - expect(fnRemove).toBeCalledWith(0); + expect(fnRemove).toHaveBeenCalledWith(0); expect(html.baseElement.querySelectorAll('input.ant-input').length).toBe(2); }); @@ -1086,7 +1086,7 @@ describe('ProForm List', () => { (await html.findByText('添加一行数据')).parentElement?.click(); }); - expect(fnAdd).not.toBeCalled(); + expect(fnAdd).not.toHaveBeenCalled(); }); it('⛲ ProForm.List warning after remove', async () => { @@ -1121,7 +1121,7 @@ describe('ProForm List', () => { }); await waitForWaitTime(100); - expect(fnRemove).toBeCalledWith(0); + expect(fnRemove).toHaveBeenCalledWith(0); expect(html.baseElement.querySelectorAll('input.ant-input').length).toBe(0); await waitForWaitTime(100); @@ -1231,7 +1231,7 @@ describe('ProForm List', () => { html.queryByText('提 交')?.click(); }); await waitForWaitTime(100); - expect(onFinish).toBeCalledWith({ + expect(onFinish).toHaveBeenCalledWith({ list: [ { date: '2020', @@ -1290,7 +1290,7 @@ describe('ProForm List', () => { fireEvent.click(await screen.findByText('提 交')!); await waitFor(() => { - expect(fn).toBeCalledWith({ + expect(fn).toHaveBeenCalledWith({ name: '2222', nickName: '2222', }); @@ -1514,7 +1514,7 @@ describe('ProForm List', () => { .querySelectorAll('.action-remove')[0] ?.click?.(); }); - expect(handleRemove).toBeCalledWith(0); + expect(handleRemove).toHaveBeenCalledWith(0); // 新增按钮 await act(async () => { @@ -1525,7 +1525,7 @@ describe('ProForm List', () => { fireEvent.click(createBtn); } }); - expect(handleAdd).toBeCalledWith(1); + expect(handleAdd).toHaveBeenCalledWith(1); }); it(`⛲ ProForm.List display * when required`, () => { @@ -1572,7 +1572,7 @@ describe('ProForm List', () => { it(`⛲ ProForm.List support validate formList empty`, async () => { const onFinish = vi.fn(); const html = render( - + { fireEvent.click(await html.findByText('提 交')); }); await waitForWaitTime(300); - expect(onFinish).toBeCalledTimes(0); + expect((await html.findAllByText('列表不能为空')).length).toBe(1); await act(async () => { fireEvent.click(await html.findByText('添加一行数据')); @@ -1723,9 +1723,9 @@ describe('ProForm List', () => { }); await waitForWaitTime(2000); - expect(handleFinish1).toBeCalledWith(1665568800); - expect(handleFinish2).toBeCalledWith(1665568800); - expect(handleFinish3).toBeCalledWith(1665568800); - expect(handleFinish4).toBeCalledWith(1665568800); + expect(handleFinish1).toHaveBeenCalledWith(1665568800); + expect(handleFinish2).toHaveBeenCalledWith(1665568800); + expect(handleFinish3).toHaveBeenCalledWith(1665568800); + expect(handleFinish4).toHaveBeenCalledWith(1665568800); }); }); diff --git a/tests/form/formitem.test.tsx b/tests/form/formitem.test.tsx index a8b8097acade..9e3acc875f40 100644 --- a/tests/form/formitem.test.tsx +++ b/tests/form/formitem.test.tsx @@ -28,8 +28,8 @@ describe('ProForm.Item', () => { fireEvent.focus(container.querySelector('input#navTheme')!); fireEvent.blur(container.querySelector('input#navTheme')!); - expect(onBlur).toBeCalledWith('dark'); - expect(onBlur).toBeCalledTimes(1); + expect(onBlur).toHaveBeenCalledWith('dark'); + expect(onBlur).toHaveBeenCalledTimes(1); }); it('📦 ProForm.Item supports onChange', async () => { @@ -54,9 +54,9 @@ describe('ProForm.Item', () => { }, }); - expect(onChange).toBeCalledWith('1212'); - expect(onChange).toBeCalledTimes(1); - expect(onValuesChange).toBeCalledWith('1212'); - expect(onValuesChange).toBeCalledTimes(1); + expect(onChange).toHaveBeenCalledWith('1212'); + expect(onChange).toHaveBeenCalledTimes(1); + expect(onValuesChange).toHaveBeenCalledWith('1212'); + expect(onValuesChange).toHaveBeenCalledTimes(1); }); }); diff --git a/tests/form/lightFilter.test.tsx b/tests/form/lightFilter.test.tsx index 18f48c0423d7..844f5bb8dfc8 100644 --- a/tests/form/lightFilter.test.tsx +++ b/tests/form/lightFilter.test.tsx @@ -669,7 +669,7 @@ describe('LightFilter', () => { await waitFor( () => { - expect(onOpenChange).toBeCalledWith(true); + expect(onOpenChange).toHaveBeenCalledWith(true); }, { timeout: 2000, @@ -719,7 +719,7 @@ describe('LightFilter', () => { await waitFor( () => { - expect(onLoadingChange).toBeCalledWith(true); + expect(onLoadingChange).toHaveBeenCalledWith(true); }, { timeout: 1000, @@ -739,7 +739,7 @@ describe('LightFilter', () => { await waitFor( () => { - expect(onLoadingChange).toBeCalledWith(false); + expect(onLoadingChange).toHaveBeenCalledWith(false); }, { timeout: 2000 }, ); @@ -767,7 +767,7 @@ describe('LightFilter', () => { await waitFor( () => { - expect(onLoadingChange).toBeCalledWith(true); + expect(onLoadingChange).toHaveBeenCalledWith(true); }, { timeout: 1000, @@ -776,7 +776,7 @@ describe('LightFilter', () => { await waitFor( () => { - expect(onLoadingChange).toBeCalledWith(false); + expect(onLoadingChange).toHaveBeenCalledWith(false); }, { timeout: 2000, diff --git a/tests/form/modalForm.test.tsx b/tests/form/modalForm.test.tsx index 4ede9a298d8e..a37eb19370b9 100644 --- a/tests/form/modalForm.test.tsx +++ b/tests/form/modalForm.test.tsx @@ -37,7 +37,7 @@ describe('ModalForm', () => { await waitFor(async () => { await waitForWaitTime(100); }); - expect(fn).toBeCalledWith(true); + expect(fn).toHaveBeenCalledWith(true); }); it('📦 ModelForm get formRef when use request', async () => { @@ -94,7 +94,7 @@ describe('ModalForm', () => { (await wrapper.findByText('新 建'))?.click(); }); await waitForWaitTime(200); - expect(fn).toBeCalledWith(true); + expect(fn).toHaveBeenCalledWith(true); await act(async () => { (await wrapper.findByText('取 消'))?.click(); @@ -102,7 +102,7 @@ describe('ModalForm', () => { await waitFor(async () => { await waitForWaitTime(100); }); - expect(fn).toBeCalledWith(false); + expect(fn).toHaveBeenCalledWith(false); }); it('📦 ModalForm first no render items', async () => { @@ -266,8 +266,8 @@ describe('ModalForm', () => { await waitFor(async () => { await waitForWaitTime(100); }); - expect(fn).toBeCalledWith(false); - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledWith(false); + expect(fn).toHaveBeenCalledTimes(2); }); it('📦 modal open=true simulate onOpenChange', async () => { @@ -283,7 +283,7 @@ describe('ModalForm', () => { ); await waitFor(() => { - expect(fn).toBeCalledWith(true); + expect(fn).toHaveBeenCalledWith(true); }); }); @@ -305,7 +305,7 @@ describe('ModalForm', () => { await act(async () => { (await wrapper.findByText('取 消'))?.click(); }); - expect(fn).toBeCalledWith(false); + expect(fn).toHaveBeenCalledWith(false); }); it('📦 modal close button will simulate modalProps.onCancel', async () => { @@ -334,7 +334,7 @@ describe('ModalForm', () => { await waitFor(async () => { await waitForWaitTime(100); }); - expect(fn).toBeCalledWith(false); + expect(fn).toHaveBeenCalledWith(false); }); it('📦 form onFinish return true should close modal', async () => { @@ -359,7 +359,7 @@ describe('ModalForm', () => { await waitForWaitTime(100); }); - expect(fn).toBeCalledWith(false); + expect(fn).toHaveBeenCalledWith(false); await waitFor(async () => { await waitForWaitTime(100); }); @@ -385,7 +385,7 @@ describe('ModalForm', () => { await waitFor(async () => { await waitForWaitTime(100); }); - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); it('📦 ModalForm support submitter is false', async () => { @@ -570,7 +570,7 @@ describe('ModalForm', () => { (await html.queryByText('取 消'))?.click(); }); - expect(fn).not.toBeCalled(); + expect(fn).not.toHaveBeenCalled(); act(() => { vi.runOnlyPendingTimers(); @@ -588,7 +588,7 @@ describe('ModalForm', () => { act(() => { vi.runOnlyPendingTimers(); }); - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); vi.useRealTimers(); }); @@ -634,7 +634,7 @@ describe('ModalForm', () => { await waitForWaitTime(500); }); - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); act(() => { wrapper.unmount(); diff --git a/tests/form/queryFilter.test.tsx b/tests/form/queryFilter.test.tsx index e40fa00f2f1b..51ad87e81736 100644 --- a/tests/form/queryFilter.test.tsx +++ b/tests/form/queryFilter.test.tsx @@ -210,7 +210,7 @@ describe('QueryFilter', () => { fireEvent.click(await findByText('重置')); await waitFor(() => { - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); }); }); diff --git a/tests/form/schemaForm.test.tsx b/tests/form/schemaForm.test.tsx index 5b97db1d9188..56996de29207 100644 --- a/tests/form/schemaForm.test.tsx +++ b/tests/form/schemaForm.test.tsx @@ -116,7 +116,7 @@ describe('SchemaForm', () => { ); await waitFor(() => { - expect(requestFn).toBeCalledWith('name'); + expect(requestFn).toHaveBeenCalledWith('name'); }); fireEvent.change(container.querySelector('input#title')!, { @@ -126,9 +126,9 @@ describe('SchemaForm', () => { }); await waitFor(() => { - expect(requestFn).toBeCalledWith('qixian'); - expect(formItemPropsFn).toBeCalledTimes(2); - expect(fieldPropsFn).toBeCalledTimes(2); + expect(requestFn).toHaveBeenCalledWith('qixian'); + expect(formItemPropsFn).toHaveBeenCalledTimes(2); + expect(fieldPropsFn).toHaveBeenCalledTimes(2); }); }); @@ -167,9 +167,9 @@ describe('SchemaForm', () => { ); await waitFor(() => { - expect(fieldPropsFn).toBeCalledTimes(1); - expect(formItemPropsFn).toBeCalledTimes(1); - expect(renderFormItemFn).toBeCalledTimes(4); + expect(fieldPropsFn).toHaveBeenCalledTimes(1); + expect(formItemPropsFn).toHaveBeenCalledTimes(1); + expect(renderFormItemFn).toHaveBeenCalled(4); }); fireEvent.change(container.querySelector('input#title')!, { @@ -179,10 +179,10 @@ describe('SchemaForm', () => { }); await waitFor(() => { - expect(renderFormItemFn).toBeCalledTimes(5); - expect(fieldPropsFn).toBeCalledTimes(1); - expect(formItemPropsFn).toBeCalledTimes(1); - expect(onValuesChangeFn).toBeCalled(); + expect(renderFormItemFn).toHaveBeenCalled(5); + expect(fieldPropsFn).toHaveBeenCalledTimes(1); + expect(formItemPropsFn).toHaveBeenCalledTimes(1); + expect(onValuesChangeFn).toHaveBeenCalled(); }); }); @@ -238,10 +238,10 @@ describe('SchemaForm', () => { ); await waitFor(() => { - expect(shouldUpdateFn).toBeCalledTimes(0); - expect(fieldPropsFn).toBeCalledTimes(1); - expect(formItemPropsFn).toBeCalledTimes(1); - expect(renderFormItemFn).toBeCalledTimes(4); + expect(shouldUpdateFn).not.toHaveBeenCalled(); + expect(fieldPropsFn).toHaveBeenCalledTimes(1); + expect(formItemPropsFn).toHaveBeenCalledTimes(1); + expect(renderFormItemFn).toHaveBeenCalledTimes(4); }); fireEvent.change(container.querySelector('input#title')!, { @@ -251,10 +251,10 @@ describe('SchemaForm', () => { }); // Although shouldUpdate returns false, but using dependencies will still update await waitFor(() => { - expect(renderFormItemFn).toBeCalledTimes(5); - expect(formItemPropsFn).toBeCalledTimes(2); - expect(fieldPropsFn).toBeCalledTimes(2); - expect(shouldUpdateFn).toBeCalledTimes(1); + expect(renderFormItemFn).toHaveBeenCalled(5); + expect(formItemPropsFn).toHaveBeenCalledTimes(2); + expect(fieldPropsFn).toHaveBeenCalledTimes(2); + expect(shouldUpdateFn).toHaveBeenCalledTimes(1); }); fireEvent.change(container.querySelector('input#subtitle')!, { @@ -264,11 +264,11 @@ describe('SchemaForm', () => { }); await waitFor(() => { - expect(renderFormItemFn).toBeCalledTimes(6); - expect(formItemPropsFn).toBeCalledTimes(3); - expect(fieldPropsFn).toBeCalledTimes(3); - expect(shouldUpdateFn).toBeCalledTimes(2); - expect(shouldUpdateFn).toBeCalledWith(true); + expect(renderFormItemFn).toHaveBeenCalled(6); + expect(formItemPropsFn).toHaveBeenCalledTimes(3); + expect(fieldPropsFn).toHaveBeenCalledTimes(3); + expect(shouldUpdateFn).toHaveBeenCalledTimes(2); + expect(shouldUpdateFn).toHaveBeenCalledWith(true); }); }); @@ -306,9 +306,9 @@ describe('SchemaForm', () => { ); await waitFor(() => { - expect(fieldPropsFn).toBeCalledTimes(1); - expect(formItemPropsFn).toBeCalledTimes(1); - expect(renderFormItemFn).toBeCalledTimes(4); + expect(fieldPropsFn).toHaveBeenCalledTimes(1); + expect(formItemPropsFn).toHaveBeenCalledTimes(1); + expect(renderFormItemFn).toHaveBeenCalled(4); }); fireEvent.change(container.querySelector('input#title')!, { @@ -318,9 +318,9 @@ describe('SchemaForm', () => { }); await waitFor(() => { - expect(renderFormItemFn).toBeCalledTimes(5); - expect(formItemPropsFn).toBeCalledTimes(1); - expect(fieldPropsFn).toBeCalledTimes(1); + expect(renderFormItemFn).toHaveBeenCalled(5); + expect(formItemPropsFn).toHaveBeenCalledTimes(1); + expect(fieldPropsFn).toHaveBeenCalledTimes(1); }); }); @@ -623,7 +623,7 @@ describe('SchemaForm', () => { }); await waitFor(() => { - expect(onFinish).toBeCalledTimes(0); + expect(onFinish).not.toHaveBeenCalled(); }); await waitFor(async () => { expect((await wrapper.findAllByText('请填写列表')).length).toBe(1); @@ -899,7 +899,7 @@ describe('SchemaForm', () => { const wrapper = render(); - expect(fibonacci).toBeCalledTimes(1); + expect(fibonacci).toHaveBeenCalledTimes(1); fireEvent.change(wrapper.baseElement.querySelector('input#name')!, { target: { @@ -907,6 +907,6 @@ describe('SchemaForm', () => { }, }); - expect(fibonacci).toBeCalledTimes(1); + expect(fibonacci).toHaveBeenCalledTimes(1); }); }); diff --git a/tests/form/stepFormTest.test.tsx b/tests/form/stepFormTest.test.tsx index be62efabb899..f17d909198b1 100644 --- a/tests/form/stepFormTest.test.tsx +++ b/tests/form/stepFormTest.test.tsx @@ -138,17 +138,19 @@ describe('StepsForm', () => { await waitForWaitTime(100); - expect(fn).toBeCalled(); - expect(currentFn).toBeCalled(); + expect(fn).toHaveBeenCalled(); + expect(currentFn).toHaveBeenCalled(); await act(async () => { (await html.findByText('提 交')).click(); }); await waitForWaitTime(100); - expect(onFinish).toBeCalled(); - expect(fn).toBeCalled(); - expect(currentFn).toBeCalled(); + await waitFor(() => { + expect(onFinish).toHaveBeenCalled(); + }); + expect(fn).toHaveBeenCalled(); + expect(currentFn).toHaveBeenCalled(); await waitForWaitTime(100); html.unmount(); @@ -183,10 +185,10 @@ describe('StepsForm', () => { screen.findAllByText('邮箱'); }); await waitFor(() => { - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); }); await waitFor(() => { - expect(currentFn).toBeCalled(); + expect(currentFn).toHaveBeenCalled(); }); unmount(); }); @@ -217,8 +219,8 @@ describe('StepsForm', () => { userEvent.click(await screen.findByText('提 交')); await waitFor(() => { - expect(fn).toBeCalled(); - expect(currentFn).toBeCalledWith(0); + expect(fn).toHaveBeenCalled(); + expect(currentFn).toHaveBeenCalledWith(0); }); unmount(); }); @@ -247,7 +249,7 @@ describe('StepsForm', () => { await userEvent.click(await screen.findByText('提 交')); await waitFor(() => { - expect(currentFn).not.toBeCalledWith(0); + expect(currentFn).not.toHaveBeenCalledWith(0); }); unmount(); }); @@ -302,7 +304,7 @@ describe('StepsForm', () => { fireEvent.click(await screen.getByText('rest')); - expect(fn).toBeCalledWith(0); + expect(fn).toHaveBeenCalledWith(0); unmount(); }); @@ -339,8 +341,9 @@ describe('StepsForm', () => { /** 因为上一步有限制,所以应该不触发 */ fireEvent.click(await screen.getByTestId('rest')); - - expect(fn).toBeCalledTimes(0); + await waitFor(() => { + expect(fn).not.toHaveBeenCalled(); + }); unmount(); }); @@ -377,8 +380,9 @@ describe('StepsForm', () => { /** 因为上一步有限制,所以应该不触发 */ fireEvent.click(await screen.getByTestId('rest')); - - expect(fn).toBeCalledTimes(0); + await waitFor(() => { + expect(fn).not.toHaveBeenCalled(); + }); unmount(); }); @@ -507,7 +511,7 @@ describe('StepsForm', () => { }); await waitForWaitTime(100); - expect(submit).toBeCalledWith({ + expect(submit).toHaveBeenCalledWith({ info: { name: 'chenshuai', age: '22', diff --git a/tests/form/upload.test.tsx b/tests/form/upload.test.tsx index 09258400cb1e..654f7f2ccafb 100644 --- a/tests/form/upload.test.tsx +++ b/tests/form/upload.test.tsx @@ -74,8 +74,8 @@ describe('ProFormUpload', () => { ); }); await waitForWaitTime(1000); - expect(fn).toBeCalled(); - expect(onChangeFn).toBeCalledTimes(3); + expect(fn).toHaveBeenCalled(); + expect(onChangeFn).toHaveBeenCalledTimes(3); }); it('🏐 ProFormUploadButton support beforeUpload', async () => { @@ -214,8 +214,8 @@ describe('ProFormUpload', () => { ); }); await waitForWaitTime(200); - expect(fn).toBeCalled(); - expect(onChangeFn).toBeCalled(); + expect(fn).toHaveBeenCalled(); + expect(onChangeFn).toHaveBeenCalled(); }); it('🏐 ProFormUploadDragger hide when max', async () => { diff --git a/tests/layout/help.test.tsx b/tests/layout/help.test.tsx index 2861901aed97..a64d47ea54fe 100644 --- a/tests/layout/help.test.tsx +++ b/tests/layout/help.test.tsx @@ -786,7 +786,7 @@ describe('👍🏻 ProHelpPanel', () => { dom.click(); }); - expect(onSelectedKeyChangeFn).toBeCalledWith('name9'); + expect(onSelectedKeyChangeFn).toHaveBeenCalledWith('name9'); html.unmount(); @@ -871,7 +871,7 @@ describe('👍🏻 ProHelpPanel', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); await act(async () => { @@ -881,7 +881,7 @@ describe('👍🏻 ProHelpPanel', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); }); }); @@ -913,7 +913,7 @@ describe('👍🏻 ProHelpPanel', () => { }); await waitFor(() => { - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); }); await act(async () => { @@ -923,7 +923,7 @@ describe('👍🏻 ProHelpPanel', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); }); }); diff --git a/tests/layout/index.test.tsx b/tests/layout/index.test.tsx index 1c12dde5f093..a3759cd6a4d3 100644 --- a/tests/layout/index.test.tsx +++ b/tests/layout/index.test.tsx @@ -203,7 +203,7 @@ describe('BasicLayout', () => { }); await waitFor(() => { - expect(itemClicking).toBeCalled(); + expect(itemClicking).toHaveBeenCalled(); }); wrapper.unmount(); @@ -321,7 +321,7 @@ describe('BasicLayout', () => { }); await waitFor(() => { - expect(itemClicking).toBeCalled(); + expect(itemClicking).toHaveBeenCalled(); }); wrapper.unmount(); @@ -951,7 +951,7 @@ describe('BasicLayout', () => { ); }); - expect(onPageChange).toBeCalled(); + expect(onPageChange).toHaveBeenCalled(); await waitForWaitTime(100); act(() => { wrapper.unmount(); @@ -994,7 +994,7 @@ describe('BasicLayout', () => { .querySelector('div.ant-pro-global-header-logo') ?.click(); }); - expect(onMenuHeaderClick).toBeCalled(); + expect(onMenuHeaderClick).toHaveBeenCalled(); }); it('🥩 renderPageTitle return value should is string', async () => { @@ -1013,7 +1013,7 @@ describe('BasicLayout', () => { ); await waitFor(() => { - expect(renderPageTitle).toBeCalled(); + expect(renderPageTitle).toHaveBeenCalled(); }); }); @@ -1519,7 +1519,7 @@ describe('BasicLayout', () => { domLink?.click(); }); await waitForWaitTime(100); - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); }); it('🥩 ProLayout support menu.request', async () => { @@ -1587,7 +1587,7 @@ describe('BasicLayout', () => { render(); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); act(() => { @@ -1595,7 +1595,7 @@ describe('BasicLayout', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); }); }); @@ -1623,7 +1623,7 @@ describe('BasicLayout', () => { await waitForWaitTime(1000); - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); act(() => { html.rerender( @@ -1640,8 +1640,8 @@ describe('BasicLayout', () => { await waitForWaitTime(100); - expect(fn).toBeCalledTimes(2); - expect(fn).toBeCalledWith({ + expect(fn).toHaveBeenCalledTimes(2); + expect(fn).toHaveBeenCalledWith({ id: '1212', }); act(() => { @@ -1658,8 +1658,8 @@ describe('BasicLayout', () => { }); await waitForWaitTime(100); - expect(fn).toBeCalledTimes(3); - expect(fn).toBeCalledWith({ + expect(fn).toHaveBeenCalledTimes(3); + expect(fn).toHaveBeenCalledWith({ id: '123', }); @@ -1677,7 +1677,7 @@ describe('BasicLayout', () => { }); await waitForWaitTime(100); - expect(fn).toBeCalledTimes(3); + expect(fn).toHaveBeenCalledTimes(3); }); it('🥩 ProLayout support menu.defaultOpenAll', async () => { @@ -1995,7 +1995,7 @@ describe('BasicLayout', () => { await waitForWaitTime(1000); - expect(onCollapse).toBeCalledTimes(2); + expect(onCollapse).toHaveBeenCalledTimes(2); expect( html.baseElement.querySelectorAll('li.ant-menu-submenu-open').length, ).toBe(2); diff --git a/tests/layout/pageContainer.test.tsx b/tests/layout/pageContainer.test.tsx index 9da718b1043c..9290522abc1a 100644 --- a/tests/layout/pageContainer.test.tsx +++ b/tests/layout/pageContainer.test.tsx @@ -477,7 +477,7 @@ describe('PageContainer', () => { ); await waitFor(() => { - expect(fn).toBeCalledWith('info'); + expect(fn).toHaveBeenCalledWith('info'); }); }); diff --git a/tests/layout/settingDrawer.test.tsx b/tests/layout/settingDrawer.test.tsx index f1095b919a84..52c8f6f1ac54 100644 --- a/tests/layout/settingDrawer.test.tsx +++ b/tests/layout/settingDrawer.test.tsx @@ -113,7 +113,7 @@ describe('settingDrawer.test', () => { 'div.ant-pro-setting-drawer-theme-color-block', )[0], ); - expect(onSettingChange).toBeCalledWith('#1677FF'); + expect(onSettingChange).toHaveBeenCalledWith('#1677FF'); fireEvent.click( container.querySelectorAll( @@ -121,7 +121,7 @@ describe('settingDrawer.test', () => { )[1], ); - expect(onSettingChange).toBeCalledWith('#F5222D'); + expect(onSettingChange).toHaveBeenCalledWith('#F5222D'); expect( container.querySelectorAll( 'div.ant-pro-setting-drawer-theme-color-block', @@ -161,8 +161,8 @@ describe('settingDrawer.test', () => { fireEvent.click(container.querySelector('.ant-btn.ant-btn-block')!); fireEvent.click(container.querySelector('div.ant-drawer-mask')!); - expect(fn).toBeCalled(); - expect(fn).toBeCalledWith({ + expect(fn).toHaveBeenCalled(); + expect(fn).toHaveBeenCalledWith({ navTheme: 'realDark', layout: 'mix', contentWidth: 'Fluid', @@ -212,7 +212,7 @@ describe('settingDrawer.test', () => { ); fireEvent.click(container.querySelector('.ant-btn.ant-btn-block')!); - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); unmount(); }); @@ -255,7 +255,7 @@ describe('settingDrawer.test', () => { )[2], ); - expect(onSettingChange).toBeCalledWith('mix'); + expect(onSettingChange).toHaveBeenCalledWith('mix'); fireEvent.click( container.querySelectorAll( @@ -263,7 +263,7 @@ describe('settingDrawer.test', () => { )[1], ); - expect(onSettingChange).toBeCalledWith('top'); + expect(onSettingChange).toHaveBeenCalledWith('top'); }); it('🌺 fix-siderbar Change', async () => { @@ -281,11 +281,11 @@ describe('settingDrawer.test', () => { fireEvent.click(container.querySelector('button.fix-siderbar')!); - expect(onSettingChange).toBeCalledWith(true); + expect(onSettingChange).toHaveBeenCalledWith(true); fireEvent.click(container.querySelector('button.fix-siderbar')!); - expect(onSettingChange).toBeCalledWith(false); + expect(onSettingChange).toHaveBeenCalledWith(false); }); it('🌺 content-width change', async () => { @@ -310,7 +310,7 @@ describe('settingDrawer.test', () => { .querySelector('.ant-select-selector')!, ); - expect(onSettingChange).toBeCalledWith('Fluid'); + expect(onSettingChange).toHaveBeenCalledWith('Fluid'); }); it('🌺 splitMenu change', async () => { @@ -331,7 +331,7 @@ describe('settingDrawer.test', () => { fireEvent.click(container.querySelector('button.split-menus')!); - expect(onSettingChange).toBeCalledWith(true); + expect(onSettingChange).toHaveBeenCalledWith(true); }); it('🌺 fixed-header Change', async () => { @@ -349,11 +349,11 @@ describe('settingDrawer.test', () => { fireEvent.click(container.querySelector('button.fixed-header')!); - expect(onSettingChange).toBeCalledWith(true); + expect(onSettingChange).toHaveBeenCalledWith(true); fireEvent.click(container.querySelector('button.fixed-header')!); - expect(onSettingChange).toBeCalledWith(false); + expect(onSettingChange).toHaveBeenCalledWith(false); }); it('🌺 theme Change', async () => { @@ -375,7 +375,7 @@ describe('settingDrawer.test', () => { )[0], ); - expect(onSettingChange).toBeCalledWith('light'); + expect(onSettingChange).toHaveBeenCalledWith('light'); fireEvent.click( container.querySelectorAll( @@ -383,7 +383,7 @@ describe('settingDrawer.test', () => { )[1], ); - expect(onSettingChange).toBeCalledWith('realDark'); + expect(onSettingChange).toHaveBeenCalledWith('realDark'); }); it('🌺 colorWeak Change', async () => { @@ -407,7 +407,7 @@ describe('settingDrawer.test', () => { ); fireEvent.click(container.querySelector('button.color-weak')!); - expect(onSettingChange).toBeCalledWith(true); + expect(onSettingChange).toHaveBeenCalledWith(true); rerender( { ); fireEvent.click(container.querySelector('button.color-weak')!); - expect(onSettingChange).toBeCalledWith(false); + expect(onSettingChange).toHaveBeenCalledWith(false); }); ['header', 'footer', 'menu', 'menuHeader'].map((key) => { @@ -444,7 +444,7 @@ describe('settingDrawer.test', () => { fireEvent.click(container.querySelector(`button.regional-${key}`)!); - expect(fn).toBeCalledWith(key); + expect(fn).toHaveBeenCalledWith(key); unmount(); }); }); diff --git a/tests/list/index.test.tsx b/tests/list/index.test.tsx index 26ace9caffe2..68bb625e3bf7 100644 --- a/tests/list/index.test.tsx +++ b/tests/list/index.test.tsx @@ -391,7 +391,7 @@ describe('List', () => { expect(container.querySelectorAll('.expand-icon')).toHaveLength(1); await fireEvent.click(container.querySelector('#test_click')!); - expect(fn).toBeCalledWith('我是名称'); + expect(fn).toHaveBeenCalledWith('我是名称'); }); it('🚏 ProList support renderItem', async () => { @@ -578,11 +578,11 @@ describe('List', () => { fireEvent.click(container.querySelector('.ant-list-item')!); - expect(onClick).toBeCalled(); + expect(onClick).toHaveBeenCalled(); fireEvent.mouseEnter(container.querySelector('.ant-list-item')!); - expect(onMouseEnter).toBeCalledWith('我是名称'); + expect(onMouseEnter).toHaveBeenCalledWith('我是名称'); }); it('🚏 ProList support rowClassName as a string', async () => { @@ -855,8 +855,8 @@ describe('List', () => { }); await waitFor(() => { - expect(fn1).toBeCalledWith('我是名称'); - expect(fn2).toBeCalledWith('我是名称'); + expect(fn1).toHaveBeenCalledWith('我是名称'); + expect(fn2).toHaveBeenCalledWith('我是名称'); }); }); }); diff --git a/tests/table/column.test.tsx b/tests/table/column.test.tsx index 09a36bdc630e..85b3b405abe6 100644 --- a/tests/table/column.test.tsx +++ b/tests/table/column.test.tsx @@ -29,8 +29,8 @@ describe('Table ColumnSetting', () => { ); await waitFor(() => { - expect(callBack).toBeCalled(); - expect(callBack).toBeCalledWith('Edward King 0'); + expect(callBack).toHaveBeenCalled(); + expect(callBack).toHaveBeenCalledWith('Edward King 0'); }); }); @@ -69,8 +69,8 @@ describe('Table ColumnSetting', () => { ); await waitFor(() => { - expect(callBack).toBeCalled(); - expect(callBack).toBeCalledWith('2016-11-22'); + expect(callBack).toHaveBeenCalled(); + expect(callBack).toHaveBeenCalledWith('2016-11-22'); }); }); @@ -120,8 +120,8 @@ describe('Table ColumnSetting', () => { ); await waitFor(() => { - expect(callBack).toBeCalled(); - expect(callBack).toBeCalledWith('Edward King 0'); + expect(callBack).toHaveBeenCalled(); + expect(callBack).toHaveBeenCalledWith('Edward King 0'); }); }); diff --git a/tests/table/columnSetting.test.tsx b/tests/table/columnSetting.test.tsx index eb6d3a5c44b0..4080cd53db3f 100644 --- a/tests/table/columnSetting.test.tsx +++ b/tests/table/columnSetting.test.tsx @@ -198,7 +198,7 @@ describe('Table ColumnSetting', () => { }); await waitForWaitTime(100); - expect(callBack).toBeCalled(); + expect(callBack).toHaveBeenCalled(); }); it('🎏 columnSetting columnsState.value props', async () => { @@ -398,7 +398,7 @@ describe('Table ColumnSetting', () => { }); await waitForWaitTime(100); window.localStorage = localStorage; - expect(console.warn).toBeCalled(); + expect(console.warn).toHaveBeenCalled(); }); it('🎏 columnSetting columnsState.onChange', async () => { @@ -462,7 +462,7 @@ describe('Table ColumnSetting', () => { }); await waitForWaitTime(100); - expect(callBack).toBeCalled(); + expect(callBack).toHaveBeenCalled(); }); it('🎏 columnSetting columnsState.persistenceKey', async () => { @@ -781,7 +781,7 @@ describe('Table ColumnSetting', () => { ).length, ).toBe(2); - expect(callBack).toBeCalled(); + expect(callBack).toHaveBeenCalled(); act(() => { const input = html.baseElement @@ -876,7 +876,7 @@ describe('Table ColumnSetting', () => { ?.click(); }); - expect(onChange).toBeCalledTimes(1); + expect(onChange).toHaveBeenCalledTimes(1); expect((onChange.mock as any).lastCall[0]).toMatchInlineSnapshot(` { "age": { @@ -970,7 +970,7 @@ describe('Table ColumnSetting', () => { ?.click(); }); - expect(onChange).toBeCalledTimes(2); + expect(onChange).toHaveBeenCalledTimes(2); expect((onChange.mock as any).lastCall[0]).toMatchInlineSnapshot(` { "3": { @@ -1091,7 +1091,7 @@ describe('Table ColumnSetting', () => { ).length, ).toBe(2); - expect(callBack).toBeCalled(); + expect(callBack).toHaveBeenCalled(); }); it('🎏 columnSetting close checkable', async () => { @@ -1449,7 +1449,7 @@ describe('Table ColumnSetting', () => { dom?.click(); }); - expect(onChange).toBeCalledWith('small'); + expect(onChange).toHaveBeenCalledWith('small'); act(() => { const icon = html.baseElement.querySelector( @@ -1463,7 +1463,7 @@ describe('Table ColumnSetting', () => { dom?.click(); }); - expect(onChange).toBeCalledWith('middle'); + expect(onChange).toHaveBeenCalledWith('middle'); }); it('🎏 columnSetting ellipsis support showTitle', async () => { diff --git a/tests/table/dragSort.test.tsx b/tests/table/dragSort.test.tsx index 049abc2d6af7..dded306c8304 100644 --- a/tests/table/dragSort.test.tsx +++ b/tests/table/dragSort.test.tsx @@ -147,10 +147,6 @@ describe('dragSort', () => { return dragAndDrop(dragHandle); }); - // await waitFor(() => { - // expect(onDragSortEndFn).toBeCalled(); - // }); - expect(container.querySelector('.dragSortDefaultHandle')).toMatchSnapshot(); }); @@ -199,8 +195,8 @@ describe('dragSort', () => { ); expect(container.querySelector('.dragSortCustomHandle')).toMatchSnapshot(); - expect(callback).toBeCalled(); - expect(callback).toBeCalledWith('kiner', 0); + expect(callback).toHaveBeenCalled(); + expect(callback).toHaveBeenCalledWith('kiner', 0); }); it('🔥 [dragSort] custom render function', async () => { @@ -264,7 +260,7 @@ describe('dragSort', () => { expect(container.querySelector('.dragSortCustomHandle')).toMatchSnapshot(); expect(container.querySelector('.customRender')).toMatchSnapshot(); - expect(callback).toBeCalled(); - expect(callback).toBeCalledWith('kiner', 0); + expect(callback).toHaveBeenCalled(); + expect(callback).toHaveBeenCalledWith('kiner', 0); }); }); diff --git a/tests/table/editor-table-two.test.tsx b/tests/table/editor-table-two.test.tsx index b456a145978d..8e9e5c511ee3 100644 --- a/tests/table/editor-table-two.test.tsx +++ b/tests/table/editor-table-two.test.tsx @@ -284,14 +284,14 @@ describe('EditorProTable 2', () => { await waitFor( () => { - expect(onChange).toBeCalled(); + expect(onChange).toHaveBeenCalled(); }, { timeout: 1000, }, ); await waitFor(() => { - expect(onChange).toBeCalledWith({ + expect(onChange).toHaveBeenCalledWith({ id: '624748504', title: '🐛 [BUG]yarn install命令', labels: [{ name: 'bug', color: 'error' }], @@ -374,7 +374,7 @@ describe('EditorProTable 2', () => { await waitFor( () => { - expect(onChange).toBeCalled(); + expect(onChange).toHaveBeenCalled(); }, { timeout: 1000, @@ -382,7 +382,7 @@ describe('EditorProTable 2', () => { ); await waitFor(() => { - expect(onChange).toBeCalledWith({ + expect(onChange).toHaveBeenCalledWith({ id: '624748504', title: '🐛 [BUG]yarn install命令', labels: [{ name: 'bug', color: 'error' }], @@ -462,10 +462,10 @@ describe('EditorProTable 2', () => { }); await waitFor(() => { - expect(onChange).toBeCalled(); + expect(onChange).toHaveBeenCalled(); }); await waitFor(() => { - expect(onChange).toBeCalledWith({ + expect(onChange).toHaveBeenCalledWith({ id: '624748504', title: 'yarn install命令', labels: [{ name: 'bug', color: 'error' }], @@ -523,11 +523,11 @@ describe('EditorProTable 2', () => { }); await waitFor(() => { - expect(onChange).toBeCalled(); + expect(onChange).toHaveBeenCalled(); }); await waitFor(() => { - expect(onChange).toBeCalledWith( + expect(onChange).toHaveBeenCalledWith( JSON.stringify([ { id: '624748504', @@ -681,9 +681,9 @@ describe('EditorProTable 2', () => { ); await waitFor(() => { - expect(formItemPropsFn).toBeCalled(); - expect(fieldPropsFn).toBeCalled(); - expect(errorSpy).not.toBeCalled(); + expect(formItemPropsFn).toHaveBeenCalled(); + expect(fieldPropsFn).toHaveBeenCalled(); + expect(errorSpy).not.toHaveBeenCalled(); }); errorSpy.mockRestore(); @@ -754,7 +754,7 @@ describe('EditorProTable 2', () => { await waitFor(() => { expect(answerTitle).toMatch(resultTitle); - expect(errorSpy).not.toBeCalled(); + expect(errorSpy).not.toHaveBeenCalled(); }); errorSpy.mockRestore(); }); @@ -792,7 +792,7 @@ describe('EditorProTable 2', () => { }); await waitFor(() => { - expect(fn).toBeCalledWith([624748504]); + expect(fn).toHaveBeenCalledWith([624748504]); }); wrapper.unmount(); @@ -846,7 +846,7 @@ describe('EditorProTable 2', () => { await waitFor( () => { - expect(fn).toBeCalledWith(624748504); + expect(fn).toHaveBeenCalledWith(624748504); }, { timeout: 1000, @@ -922,7 +922,7 @@ describe('EditorProTable 2', () => { await waitFor( () => { - expect(fn).toBeCalledWith('命令'); + expect(fn).toHaveBeenCalledWith('命令'); }, { timeout: 1000, @@ -971,7 +971,7 @@ describe('EditorProTable 2', () => { await waitFor( () => { - expect(fn).toBeCalledWith('02'); + expect(fn).toHaveBeenCalledWith('02'); }, { timeout: 1000, @@ -1008,7 +1008,7 @@ describe('EditorProTable 2', () => { await waitFor( () => { - expect(fn).toBeCalledWith(4); + expect(fn).toHaveBeenCalledWith(4); }, { timeout: 1000, @@ -1088,7 +1088,7 @@ describe('EditorProTable 2', () => { }); await waitFor(() => { - expect(onValueChangeFn).toBeCalledWith('1223'); + expect(onValueChangeFn).toHaveBeenCalledWith('1223'); }); wrapper.unmount(); }); @@ -1171,7 +1171,7 @@ describe('EditorProTable 2', () => { }); await waitFor(() => { - expect(onValueChangeFn).toBeCalledWith(624748504); + expect(onValueChangeFn).toHaveBeenCalledWith(624748504); }); act(() => { @@ -1256,7 +1256,7 @@ describe('EditorProTable 2', () => { await waitFor( () => { - expect(fn).toBeCalledWith(newLineId); + expect(fn).toHaveBeenCalledWith(newLineId); }, { timeout: 2000, @@ -1492,7 +1492,7 @@ describe('EditorProTable 2', () => { await waitFor( () => { - expect(fn).not.toBeCalled(); + expect(fn).not.toHaveBeenCalled(); }, { timeout: 1000, @@ -1541,7 +1541,7 @@ describe('EditorProTable 2', () => { .querySelectorAll('input').length > 0, ).toBeFalsy(); - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); }); wrapper.unmount(); }); @@ -1564,7 +1564,7 @@ describe('EditorProTable 2', () => { .click(); }); await waitFor(() => { - expect(fn).toBeCalledWith([624748504, 624691229]); + expect(fn).toHaveBeenCalledWith([624748504, 624691229]); }); wrapper.unmount(); @@ -1607,11 +1607,11 @@ describe('EditorProTable 2', () => { }); await waitFor(() => { - expect(fn).not.toBeCalled(); + expect(fn).not.toHaveBeenCalled(); }); await waitFor( () => { - expect(fn).toBeCalledWith(624691229); + expect(fn).toHaveBeenCalledWith(624691229); }, { timeout: 2000, @@ -1659,7 +1659,7 @@ describe('EditorProTable 2', () => { await act(async () => vi.runOnlyPendingTimers()); await waitFor(() => { - expect(fn).not.toBeCalled(); + expect(fn).not.toHaveBeenCalled(); }); act(() => { @@ -1669,7 +1669,7 @@ describe('EditorProTable 2', () => { await act(async () => vi.runOnlyPendingTimers()); await waitFor(() => { - expect(fn).toBeCalledWith(624691229); + expect(fn).toHaveBeenCalledWith(624691229); }); wrapper.unmount(); vi.useRealTimers(); @@ -1721,11 +1721,11 @@ describe('EditorProTable 2', () => { await act(async () => vi.runOnlyPendingTimers()); await waitFor(() => { - expect(onSave).toBeCalledWith(624691229); + expect(onSave).toHaveBeenCalledWith(624691229); }); await waitFor(() => { - expect(onDataSourceChange).toBeCalledWith(3); + expect(onDataSourceChange).toHaveBeenCalledWith(3); }); vi.useRealTimers(); @@ -1871,7 +1871,7 @@ describe('EditorProTable 2', () => { ); }); await waitFor(() => { - expect(onSaveFn).toBeCalledWith(624691229); + expect(onSaveFn).toHaveBeenCalledWith(624691229); }); wrapper.unmount(); }); @@ -1902,7 +1902,7 @@ describe('EditorProTable 2', () => { }); await waitFor(() => { - expect(fn).toBeCalledWith(624691229); + expect(fn).toHaveBeenCalledWith(624691229); }); }); @@ -1945,7 +1945,7 @@ describe('EditorProTable 2', () => { ); }); await waitFor(() => { - expect(fn).toBeCalledWith(624691229); + expect(fn).toHaveBeenCalledWith(624691229); }); wrapper.unmount(); }); @@ -2025,7 +2025,7 @@ describe('EditorProTable 2', () => { }); await waitFor(() => { - expect(fn).toBeCalledWith(624691229); + expect(fn).toHaveBeenCalledWith(624691229); expect(wrapper.queryAllByText('删除').length > 0).toBeFalsy(); }); }); @@ -2063,7 +2063,7 @@ describe('EditorProTable 2', () => { }); await waitFor(() => { - expect(fn).toBeCalledWith(624691229); + expect(fn).toHaveBeenCalledWith(624691229); }); }); @@ -2107,7 +2107,7 @@ describe('EditorProTable 2', () => { await waitFor(() => { // 没有通过验证,不触发 onSave - expect(fn).not.toBeCalled(); + expect(fn).not.toHaveBeenCalled(); }); act(() => { @@ -2128,7 +2128,7 @@ describe('EditorProTable 2', () => { }); await waitFor(() => { - expect(fn).toBeCalledWith('qixian'); + expect(fn).toHaveBeenCalledWith('qixian'); }); wrapper.unmount(); }); @@ -2192,7 +2192,7 @@ describe('EditorProTable 2', () => { ?.click(); }); await waitFor(() => { - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); }); }); @@ -2317,7 +2317,7 @@ describe('EditorProTable 2', () => { ); }); await waitFor(() => { - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); }); }); diff --git a/tests/table/editor-table.test.tsx b/tests/table/editor-table.test.tsx index 6d86cc2a8140..738b0426cb1a 100644 --- a/tests/table/editor-table.test.tsx +++ b/tests/table/editor-table.test.tsx @@ -207,7 +207,7 @@ describe('EditorProTable', () => { await waitForWaitTime(1000); - expect(fn).toBeCalledWith(555); + expect(fn).toHaveBeenCalledWith(555); wrapper.unmount(); }); @@ -320,7 +320,7 @@ describe('EditorProTable', () => { ).toBe(4); }); await waitFor(() => { - expect(onChange).not.toBeCalled(); + expect(onChange).not.toHaveBeenCalled(); }); editAndChange('test value'); // save with recordKey @@ -332,7 +332,7 @@ describe('EditorProTable', () => { await act(() => vi.runOnlyPendingTimers()); await waitFor(() => { - expect(onChange).toBeCalled(); + expect(onChange).toHaveBeenCalled(); }); await waitFor(() => { expect(changedDataSource).toHaveLength(defaultData.length); @@ -349,7 +349,7 @@ describe('EditorProTable', () => { await act(() => vi.runOnlyPendingTimers()); await waitFor(() => { - expect(onChange).toBeCalled(); + expect(onChange).toHaveBeenCalled(); }); await waitFor(() => { expect(changedDataSource).toHaveLength(defaultData.length); @@ -414,7 +414,7 @@ describe('EditorProTable', () => { await waitForWaitTime(1000); - expect(onchange).toBeCalledWith(2); + expect(onchange).toHaveBeenCalledWith(2); wrapper.unmount(); }); @@ -477,7 +477,7 @@ describe('EditorProTable', () => { await waitForWaitTime(1000); - expect(onchange).toBeCalledWith(1); + expect(onchange).toHaveBeenCalledWith(1); wrapper.unmount(); }); @@ -538,7 +538,7 @@ describe('EditorProTable', () => { await waitForWaitTime(1000); - expect(onchange).not.toBeCalled(); + expect(onchange).not.toHaveBeenCalled(); wrapper.unmount(); }); @@ -572,7 +572,7 @@ describe('EditorProTable', () => { await waitForWaitTime(1200); - expect(fn).not.toBeCalled(); + expect(fn).not.toHaveBeenCalled(); act(() => { fireEvent.change( wrapper.container @@ -794,7 +794,7 @@ describe('EditorProTable', () => { await waitForWaitTime(200); - expect(fn).toBeCalledWith('1234'); + expect(fn).toHaveBeenCalledWith('1234'); }); it('📝 EditableProTable add newLine when position=top', async () => { @@ -1001,7 +1001,7 @@ describe('EditorProTable', () => { await waitForWaitTime(1000); - expect(fn).toBeCalledWith(555); + expect(fn).toHaveBeenCalledWith(555); wrapper.unmount(); }); @@ -1062,7 +1062,7 @@ describe('EditorProTable', () => { await waitForWaitTime(1000); - expect(fn).toBeCalledWith(555); + expect(fn).toHaveBeenCalledWith(555); const { dataset } = wrapper.container.querySelectorAll( '.ant-table-tbody tr.ant-table-row', @@ -1128,7 +1128,7 @@ describe('EditorProTable', () => { await waitForWaitTime(1000); - expect(fn).toBeCalledWith(555); + expect(fn).toHaveBeenCalledWith(555); const { dataset } = wrapper.container.querySelectorAll( '.ant-table-tbody tr.ant-table-row', @@ -1170,12 +1170,16 @@ describe('EditorProTable', () => { ); await waitForWaitTime(300); - expect(valuesChangeFn).toBeCalledTimes(0); + + await waitFor(() => { + expect(valuesChangeFn).not.toHaveBeenCalled(); + }); await act(async () => { (await wrapper.queryAllByText('编辑')).at(0)?.click(); }); await waitForWaitTime(1200); + act(() => { fireEvent.change( wrapper.container @@ -1188,8 +1192,8 @@ describe('EditorProTable', () => { }, ); }); - expect(valuesChangeFn).toBeCalledTimes(1); - expect(valuesChangeFn).toBeCalledWith('test'); + expect(valuesChangeFn).toHaveBeenCalledTimes(1); + expect(valuesChangeFn).toHaveBeenCalledWith('test'); }); it('📝 EditableProTable add new child line when position is top and tree level > 1 and parent has children', async () => { @@ -1253,7 +1257,7 @@ describe('EditorProTable', () => { await waitForWaitTime(1000); - expect(fn).toBeCalledWith(555); + expect(fn).toHaveBeenCalledWith(555); const { dataset } = wrapper.container.querySelectorAll( '.ant-table-tbody tr.ant-table-row', @@ -1313,7 +1317,7 @@ describe('EditorProTable', () => { await waitForWaitTime(1000); - expect(fn).toBeCalledWith(555); + expect(fn).toHaveBeenCalledWith(555); const { dataset } = wrapper.container.querySelectorAll( '.ant-table-tbody tr.ant-table-row', @@ -1383,7 +1387,7 @@ describe('EditorProTable', () => { await waitForWaitTime(1000); - expect(fn).toBeCalledWith(555); + expect(fn).toHaveBeenCalledWith(555); const { dataset } = wrapper.container.querySelectorAll( '.ant-table-tbody tr.ant-table-row', @@ -1442,7 +1446,7 @@ describe('EditorProTable', () => { await waitForWaitTime(1000); - expect(fn).toBeCalledWith(555); + expect(fn).toHaveBeenCalledWith(555); const { dataset } = wrapper.container.querySelectorAll( '.ant-table-tbody tr.ant-table-row', @@ -1512,7 +1516,7 @@ describe('EditorProTable', () => { }); await waitForWaitTime(1000); - expect(fn).toBeCalledWith(recordId); + expect(fn).toHaveBeenCalledWith(recordId); const trDoms = wrapper.container.querySelectorAll( '.ant-table-tbody tr.ant-table-row', ); diff --git a/tests/table/filter.test.tsx b/tests/table/filter.test.tsx index 4456475ff220..58e5596b381f 100644 --- a/tests/table/filter.test.tsx +++ b/tests/table/filter.test.tsx @@ -262,7 +262,7 @@ describe('BasicTable Search', () => { container.querySelectorAll('span.ant-table-column-sorter-down')[1], ); - expect(fn).toBeCalledTimes(4); + expect(fn).toHaveBeenCalled(4); }); it('🎏 order test', async () => { diff --git a/tests/table/form.test.tsx b/tests/table/form.test.tsx index 4307358b4901..8dcc07e6c8b5 100644 --- a/tests/table/form.test.tsx +++ b/tests/table/form.test.tsx @@ -49,7 +49,7 @@ describe('BasicTable Search', () => { ); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); fireEvent.change( @@ -64,7 +64,7 @@ describe('BasicTable Search', () => { container.querySelector('.ant-form button.ant-btn-primary')!, ); await waitFor(() => { - expect(fn).toBeCalledWith({ + expect(fn).toHaveBeenCalledWith({ name: 'name', }); }); @@ -106,7 +106,7 @@ describe('BasicTable Search', () => { ); await waitFor(() => { - expect(fn).toBeCalledWith({ + expect(fn).toHaveBeenCalledWith({ name: 'name', }); }); @@ -152,7 +152,7 @@ describe('BasicTable Search', () => { ); await waitFor(() => { - expect(fn).toBeCalledWith({ + expect(fn).toHaveBeenCalledWith({ name: 'name', }); }); @@ -202,7 +202,7 @@ describe('BasicTable Search', () => { ); await waitFor(() => { - expect(fn).toBeCalledWith({ + expect(fn).toHaveBeenCalledWith({ name: 'name', }); }); diff --git a/tests/table/index.test.tsx b/tests/table/index.test.tsx index 47e27cce3eab..4932247b1bbc 100644 --- a/tests/table/index.test.tsx +++ b/tests/table/index.test.tsx @@ -95,7 +95,7 @@ describe('BasicTable', () => { await waitFor( () => { - expect(pageSizeOnchange).toBeCalledWith(10); + expect(pageSizeOnchange).toHaveBeenCalledWith(10); }, { timeout: 1000, @@ -215,7 +215,7 @@ describe('BasicTable', () => { await html.findByText('查 询'); await waitFor(() => { - expect(requestFfn).toBeCalledTimes(1); + expect(requestFfn).toHaveBeenCalledTimes(1); }); act(() => { @@ -226,7 +226,7 @@ describe('BasicTable', () => { addEventListenerSpy.mockRestore(); await waitFor(() => { - expect(requestFfn).toBeCalledTimes(2); + expect(requestFfn).toHaveBeenCalledTimes(2); }); }); @@ -288,7 +288,7 @@ describe('BasicTable', () => { await html.findByText('序号'); await waitFor(() => { - expect(loadingChangerFn).toBeCalledWith(true, false); + expect(loadingChangerFn).toHaveBeenCalledWith(true, false); }); act(() => { @@ -298,7 +298,7 @@ describe('BasicTable', () => { return html.findByText('序号'); }); await waitFor(() => { - expect(loadingChangerFn).toBeCalledWith(false, true); + expect(loadingChangerFn).toHaveBeenCalledWith(false, true); }); vi.useRealTimers(); @@ -661,7 +661,7 @@ describe('BasicTable', () => { ); await html.findByText('查 询'); await waitFor(() => { - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); }); }); @@ -702,7 +702,7 @@ describe('BasicTable', () => { }); await waitFor(() => { - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); }); vi.useFakeTimers(); @@ -765,7 +765,7 @@ describe('BasicTable', () => { await html.findByText('查 询'); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); act(() => { @@ -782,7 +782,7 @@ describe('BasicTable', () => { await waitFor(() => { // 因为有 loading 的控制,所有只会触发两次 - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); }); act(() => { @@ -792,7 +792,7 @@ describe('BasicTable', () => { vi.runOnlyPendingTimers(); }); await waitFor(() => { - expect(fn).toBeCalledTimes(3); + expect(fn).toHaveBeenCalledTimes(3); }); vi.useRealTimers(); @@ -820,7 +820,7 @@ describe('BasicTable', () => { ); await waitFor(() => { - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); }); }); @@ -858,10 +858,10 @@ describe('BasicTable', () => { }); await waitFor(() => { - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); }); await waitFor(() => { - expect(onChangeFn).toBeCalled(); + expect(onChangeFn).toHaveBeenCalled(); }); }); @@ -900,7 +900,7 @@ describe('BasicTable', () => { await html.findByText('查 询'); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); act(() => { @@ -912,7 +912,7 @@ describe('BasicTable', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); }); }); @@ -1003,7 +1003,7 @@ describe('BasicTable', () => { await html.findByText('查 询'); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); act(() => { @@ -1015,7 +1015,7 @@ describe('BasicTable', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); }); }); @@ -1064,7 +1064,7 @@ describe('BasicTable', () => { ?.click(); }); - expect(fn).toBeCalledWith('large'); + expect(fn).toHaveBeenCalledWith('large'); }); it('🎏 request load array', async () => { @@ -1101,7 +1101,7 @@ describe('BasicTable', () => { vi.runOnlyPendingTimers(); }); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); act(() => { @@ -1117,7 +1117,7 @@ describe('BasicTable', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); }); vi.useRealTimers(); }); @@ -1147,7 +1147,7 @@ describe('BasicTable', () => { await html.findByText('查 询'); await waitFor(() => { - expect(postFn).toBeCalled(); + expect(postFn).toHaveBeenCalled(); }); }); @@ -1185,7 +1185,7 @@ describe('BasicTable', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); }); @@ -1225,7 +1225,7 @@ describe('BasicTable', () => { await html.findByText('查 询'); await waitFor(() => { - expect(fn).not.toBeCalled(); + expect(fn).not.toHaveBeenCalled(); }); }); @@ -1320,7 +1320,7 @@ describe('BasicTable', () => { expect(!!document.fullscreenElement).toBeFalsy(); }); await waitFor(() => { - expect(exitFullscreen).toBeCalled(); + expect(exitFullscreen).toHaveBeenCalled(); }); }); @@ -1364,7 +1364,7 @@ describe('BasicTable', () => { }); await waitFor(() => { - expect(fn).toBeCalledWith('middle'); + expect(fn).toHaveBeenCalledWith('middle'); }); }); @@ -1475,7 +1475,7 @@ describe('BasicTable', () => { }); await waitFor(() => { - expect(fn).toBeCalledWith('name'); + expect(fn).toHaveBeenCalledWith('name'); }); }); @@ -1528,7 +1528,7 @@ describe('BasicTable', () => { }); await waitFor(() => { - expect(fn).toBeCalledWith('name'); + expect(fn).toHaveBeenCalledWith('name'); }); }); @@ -1583,7 +1583,7 @@ describe('BasicTable', () => { }); await waitFor(() => { - expect(fn).toBeCalledWith(''); + expect(fn).toHaveBeenCalledWith(''); }); act(() => { @@ -1611,7 +1611,7 @@ describe('BasicTable', () => { }); await waitFor(() => { - expect(fn).toBeCalledWith('name1'); + expect(fn).toHaveBeenCalledWith('name1'); }); }); @@ -1703,7 +1703,7 @@ describe('BasicTable', () => { ); await waitFor(() => { - expect(fn).toBeCalledTimes(0); + expect(fn).toHaveBeenCalled(); }); act(() => { @@ -1715,7 +1715,7 @@ describe('BasicTable', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); act(() => { @@ -1735,7 +1735,7 @@ describe('BasicTable', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); }); await html.findByText('暂无数据'); diff --git a/tests/table/listtoolbar.test.tsx b/tests/table/listtoolbar.test.tsx index 97fb64d75f3e..2fbcb13bd860 100644 --- a/tests/table/listtoolbar.test.tsx +++ b/tests/table/listtoolbar.test.tsx @@ -89,7 +89,7 @@ describe('Table valueEnum', () => { }); await waitForWaitTime(100); - expect(onSearch).toBeCalledWith('1111111'); + expect(onSearch).toHaveBeenCalledWith('1111111'); }); it('ListToolBar action no array', async () => { diff --git a/tests/table/pagination.test.tsx b/tests/table/pagination.test.tsx index 019f508c290e..e46c2663b12a 100644 --- a/tests/table/pagination.test.tsx +++ b/tests/table/pagination.test.tsx @@ -36,14 +36,14 @@ describe('BasicTable pagination', () => { ); await waitForWaitTime(1200); - expect(fn).toBeCalledWith(1); + expect(fn).toHaveBeenCalledWith(1); await act(async () => { (await html.findByText('2'))?.click(); }); await waitForWaitTime(200); - expect(fn).toBeCalledWith(1); + expect(fn).toHaveBeenCalledWith(1); }); it('🎏 pagination pageSize test ', async () => { @@ -75,8 +75,8 @@ describe('BasicTable pagination', () => { ); await waitForWaitTime(1200); - expect(fn).toBeCalledWith(50); - expect(currentFn).toBeCalledWith(1); + expect(fn).toHaveBeenCalledWith(50); + expect(currentFn).toHaveBeenCalledWith(1); act(() => { html.rerender( { }); await waitForWaitTime(200); - expect(fn).toBeCalledWith(10); + expect(fn).toHaveBeenCalledWith(10); }); it('🎏 pagination current', async () => { @@ -134,9 +134,9 @@ describe('BasicTable pagination', () => { ); await waitForWaitTime(1200); - expect(fn).toBeCalledWith(2); + expect(fn).toHaveBeenCalledWith(2); - expect(pageSizeFn).toBeCalledWith(20); + expect(pageSizeFn).toHaveBeenCalledWith(20); act(() => { html.rerender( { await waitForWaitTime(1200); - expect(fn).toBeCalledWith(3); + expect(fn).toHaveBeenCalledWith(3); }); it('🎏 pagination=false, do not have pageParams', async () => { @@ -191,7 +191,7 @@ describe('BasicTable pagination', () => { ); await waitForWaitTime(1200); - expect(fn).toBeCalledWith(undefined); + expect(fn).toHaveBeenCalledWith(undefined); act(() => { html.rerender( @@ -219,7 +219,7 @@ describe('BasicTable pagination', () => { }); await waitForWaitTime(200); - expect(fn).toBeCalledWith(10); + expect(fn).toHaveBeenCalledWith(10); }); it('🎏 request call once when data.length more then pageSize', async () => { @@ -263,7 +263,7 @@ describe('BasicTable pagination', () => { html.queryByText('1')?.click(); }); await waitForWaitTime(200); - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); it('🎏 pagination was correct in controlled mode && params was in deep comparison', async () => { @@ -326,7 +326,7 @@ describe('BasicTable pagination', () => { ); }); await waitForWaitTime(200); - expect(currentFn).toBeCalledWith(2); + expect(currentFn).toHaveBeenCalledWith(2); }); }); @@ -358,6 +358,6 @@ describe('TableDropdown', () => { button.click(); }); - expect(fn).toBeCalledWith('copy'); + expect(fn).toHaveBeenCalledWith('copy'); }); }); diff --git a/tests/table/polling.test.tsx b/tests/table/polling.test.tsx index e45cbaa1e283..5049005cddd0 100644 --- a/tests/table/polling.test.tsx +++ b/tests/table/polling.test.tsx @@ -46,14 +46,14 @@ describe('polling', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); act(() => { vi.runOnlyPendingTimers(); }); await waitFor(() => { - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); }); act(() => { @@ -61,7 +61,7 @@ describe('polling', () => { }); await waitFor(() => { - expect(fn).toBeCalled(); + expect(fn).toHaveBeenCalled(); }); act(() => { @@ -69,10 +69,10 @@ describe('polling', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); }); - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); vi.useRealTimers(); }); @@ -109,14 +109,14 @@ describe('polling', () => { ); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); act(() => { vi.runAllTimers(); }); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); act(() => { @@ -124,10 +124,10 @@ describe('polling', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); }); - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); vi.useRealTimers(); }); @@ -163,7 +163,7 @@ describe('polling', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); await act(() => { @@ -171,7 +171,7 @@ describe('polling', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); }); vi.useRealTimers(); }); @@ -218,7 +218,7 @@ describe('polling', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); await act(() => { @@ -226,7 +226,7 @@ describe('polling', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); await act(() => { @@ -234,7 +234,7 @@ describe('polling', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); }); vi.useRealTimers(); }); @@ -283,7 +283,7 @@ describe('polling', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); await act(() => { @@ -291,11 +291,11 @@ describe('polling', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); await waitFor(() => { - expect(fn).toBeCalledTimes(2); + expect(fn).toHaveBeenCalledTimes(2); }); vi.useRealTimers(); diff --git a/tests/table/protableSpin.test.tsx b/tests/table/protableSpin.test.tsx index 7704160c406d..23fd6a950b9f 100644 --- a/tests/table/protableSpin.test.tsx +++ b/tests/table/protableSpin.test.tsx @@ -121,7 +121,7 @@ describe('ProTable test', () => { />, ); await waitForWaitTime(1200); - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); act(() => { html.rerender( { }); await waitFor(() => { - expect(fn).toBeCalledTimes(1); - expect(paramsFn).toBeCalledWith(1, 20); + expect(fn).toHaveBeenCalledTimes(1); + expect(paramsFn).toHaveBeenCalledWith(1, 20); }); }); @@ -111,7 +111,7 @@ describe('BasicTable Search', () => { ); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); const dom = await (await html.findAllByText('重 置')).at(0); @@ -121,8 +121,8 @@ describe('BasicTable Search', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(2); - expect(resetFn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(2); + expect(resetFn).toHaveBeenCalledTimes(1); }); }); @@ -168,8 +168,8 @@ describe('BasicTable Search', () => { }); await waitFor(() => { - expect(fn).toBeCalledTimes(2); - expect(resetFn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(2); + expect(resetFn).toHaveBeenCalledTimes(1); }); vi.useRealTimers(); }); @@ -217,7 +217,7 @@ describe('BasicTable Search', () => { await html.findAllByText('暂无数据'); await waitFor(() => { - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); await waitFor(() => { @@ -266,7 +266,9 @@ describe('BasicTable Search', () => { await html.findAllByText('姓名'); - expect(fn).toBeCalledTimes(0); + await waitFor(() => { + expect(fn).not.toHaveBeenCalled(); + }); expect(!!html.baseElement.querySelector('.ant-spin')).toBeFalsy(); @@ -306,7 +308,7 @@ describe('BasicTable Search', () => { ); await waitFor(() => { - expect(requestFn).toBeCalledTimes(0); + expect(requestFn).not.toHaveBeenCalled(); }); act(() => { @@ -319,7 +321,7 @@ describe('BasicTable Search', () => { await html.findAllByText('¥12,000.00'); await waitFor(() => { - expect(requestFn).toBeCalledTimes(1); + expect(requestFn).toHaveBeenCalledTimes(1); }); vi.useRealTimers(); @@ -416,7 +418,7 @@ describe('BasicTable Search', () => { expect(formValues.status).toBe('state'); expect(formValues.startTime).toBe('2020-09-11'); expect(formValues.endTime).toBe('2020-09-22'); - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); html.unmount(); @@ -471,8 +473,8 @@ describe('BasicTable Search', () => { ); }); await waitFor(() => { - expect(onChangeFn).toBeCalledWith('12'); - expect(fn).toBeCalledWith('12'); + expect(onChangeFn).toHaveBeenCalledWith('12'); + expect(fn).toHaveBeenCalledWith('12'); }); html.unmount(); @@ -726,7 +728,7 @@ describe('BasicTable Search', () => { }); await waitFor(() => { - expect(fn2).toBeCalledWith('2020-09-11 00:00:00'); + expect(fn2).toHaveBeenCalledWith('2020-09-11 00:00:00'); }); }); @@ -777,7 +779,7 @@ describe('BasicTable Search', () => { }); await waitFor(() => { - expect(onSubmitFn).toBeCalledWith('2020-09-11'); + expect(onSubmitFn).toHaveBeenCalledWith('2020-09-11'); }); expect(formRef.current?.getFieldFormatValue?.().since).toBe('2020-09-11'); diff --git a/tests/table/selectKeys.test.tsx b/tests/table/selectKeys.test.tsx index ffe5e011d819..38c307257af0 100644 --- a/tests/table/selectKeys.test.tsx +++ b/tests/table/selectKeys.test.tsx @@ -80,7 +80,7 @@ describe('BasicTable Search', () => { ?.click(); }); await waitForWaitTime(200); - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); }); it('✔️ selected rows support row is function', async () => { @@ -140,7 +140,7 @@ describe('BasicTable Search', () => { render(); await waitFor(() => { - expect(fn).toBeCalledWith('张三,李四'); + expect(fn).toHaveBeenCalledWith('张三,李四'); }); }); }); diff --git a/tests/utils/index.test.tsx b/tests/utils/index.test.tsx index d0fdeb4a7e79..bd28c3bc4063 100644 --- a/tests/utils/index.test.tsx +++ b/tests/utils/index.test.tsx @@ -187,14 +187,14 @@ describe('utils', () => { await html.findByText('test'); - expect(fn).toBeCalledTimes(1); + expect(fn).toHaveBeenCalledTimes(1); // wait === undefined act(() => { html.baseElement.querySelector('#test')?.click(); }); - expect(fn).toBeCalledTimes(3); + expect(fn).toHaveBeenCalledTimes(3); act(() => { html.rerender(); @@ -215,7 +215,7 @@ describe('utils', () => { await html.findByText('test'); await act(() => { - expect(fn).toBeCalledTimes(4); + expect(fn).toHaveBeenCalled(4); }); act(() => { @@ -227,7 +227,7 @@ describe('utils', () => { }); await act(() => { - expect(fn).toBeCalledTimes(6); + expect(fn).toHaveBeenCalled(6); }); // wait === 100 but callback is cancelled @@ -246,7 +246,7 @@ describe('utils', () => { html.unmount(); - expect(fn).toBeCalledTimes(7); + expect(fn).toHaveBeenCalled(7); vi.useRealTimers(); }); @@ -277,7 +277,7 @@ describe('utils', () => { render(); await waitFor(() => { - expect(catchFn).toBeCalledWith(error); + expect(catchFn).toHaveBeenCalledWith(error); }); vi.useRealTimers(); @@ -1087,7 +1087,7 @@ describe('utils', () => { nanoid(); - expect(cryptoSpy).toBeCalled(); + expect(cryptoSpy).toHaveBeenCalled(); }); it('🪓 stringify', () => { From b4633fc3850753318b247a55392e19e93e227fe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= Date: Wed, 21 Feb 2024 18:25:40 +0800 Subject: [PATCH 07/57] update snapshot --- tests/form/schemaForm.test.tsx | 12 ++++++------ tests/table/filter.test.tsx | 2 +- tests/utils/index.test.tsx | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/form/schemaForm.test.tsx b/tests/form/schemaForm.test.tsx index 56996de29207..1c73f07ea313 100644 --- a/tests/form/schemaForm.test.tsx +++ b/tests/form/schemaForm.test.tsx @@ -169,7 +169,7 @@ describe('SchemaForm', () => { await waitFor(() => { expect(fieldPropsFn).toHaveBeenCalledTimes(1); expect(formItemPropsFn).toHaveBeenCalledTimes(1); - expect(renderFormItemFn).toHaveBeenCalled(4); + expect(renderFormItemFn).toHaveBeenCalledTimes(4); }); fireEvent.change(container.querySelector('input#title')!, { @@ -179,7 +179,7 @@ describe('SchemaForm', () => { }); await waitFor(() => { - expect(renderFormItemFn).toHaveBeenCalled(5); + expect(renderFormItemFn).toHaveBeenCalledTimes(5); expect(fieldPropsFn).toHaveBeenCalledTimes(1); expect(formItemPropsFn).toHaveBeenCalledTimes(1); expect(onValuesChangeFn).toHaveBeenCalled(); @@ -251,7 +251,7 @@ describe('SchemaForm', () => { }); // Although shouldUpdate returns false, but using dependencies will still update await waitFor(() => { - expect(renderFormItemFn).toHaveBeenCalled(5); + expect(renderFormItemFn).toHaveBeenCalledTimes(5); expect(formItemPropsFn).toHaveBeenCalledTimes(2); expect(fieldPropsFn).toHaveBeenCalledTimes(2); expect(shouldUpdateFn).toHaveBeenCalledTimes(1); @@ -264,7 +264,7 @@ describe('SchemaForm', () => { }); await waitFor(() => { - expect(renderFormItemFn).toHaveBeenCalled(6); + expect(renderFormItemFn).toHaveBeenCalledTimes(6); expect(formItemPropsFn).toHaveBeenCalledTimes(3); expect(fieldPropsFn).toHaveBeenCalledTimes(3); expect(shouldUpdateFn).toHaveBeenCalledTimes(2); @@ -308,7 +308,7 @@ describe('SchemaForm', () => { await waitFor(() => { expect(fieldPropsFn).toHaveBeenCalledTimes(1); expect(formItemPropsFn).toHaveBeenCalledTimes(1); - expect(renderFormItemFn).toHaveBeenCalled(4); + expect(renderFormItemFn).toHaveBeenCalledTimes(4); }); fireEvent.change(container.querySelector('input#title')!, { @@ -318,7 +318,7 @@ describe('SchemaForm', () => { }); await waitFor(() => { - expect(renderFormItemFn).toHaveBeenCalled(5); + expect(renderFormItemFn).toHaveBeenCalledTimes(5); expect(formItemPropsFn).toHaveBeenCalledTimes(1); expect(fieldPropsFn).toHaveBeenCalledTimes(1); }); diff --git a/tests/table/filter.test.tsx b/tests/table/filter.test.tsx index 58e5596b381f..abb93f18e08a 100644 --- a/tests/table/filter.test.tsx +++ b/tests/table/filter.test.tsx @@ -262,7 +262,7 @@ describe('BasicTable Search', () => { container.querySelectorAll('span.ant-table-column-sorter-down')[1], ); - expect(fn).toHaveBeenCalled(4); + expect(fn).toHaveBeenCalledTimes(4); }); it('🎏 order test', async () => { diff --git a/tests/utils/index.test.tsx b/tests/utils/index.test.tsx index bd28c3bc4063..fad64c0a87a9 100644 --- a/tests/utils/index.test.tsx +++ b/tests/utils/index.test.tsx @@ -215,7 +215,7 @@ describe('utils', () => { await html.findByText('test'); await act(() => { - expect(fn).toHaveBeenCalled(4); + expect(fn).toHaveBeenCalledTimes(4); }); act(() => { @@ -227,7 +227,7 @@ describe('utils', () => { }); await act(() => { - expect(fn).toHaveBeenCalled(6); + expect(fn).toHaveBeenCalledTimes(6); }); // wait === 100 but callback is cancelled @@ -246,7 +246,7 @@ describe('utils', () => { html.unmount(); - expect(fn).toHaveBeenCalled(7); + expect(fn).toHaveBeenCalledTimes(7); vi.useRealTimers(); }); From e5e3b3c0dc7d11eb5317fbbfa4be716490bea791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= Date: Wed, 21 Feb 2024 18:42:46 +0800 Subject: [PATCH 08/57] update --- docs/playground/pro-layout.en-US.md | 4 ---- docs/playground/pro-layout.md | 4 ---- 2 files changed, 8 deletions(-) diff --git a/docs/playground/pro-layout.en-US.md b/docs/playground/pro-layout.en-US.md index f912b3654d29..91b9af0663f3 100644 --- a/docs/playground/pro-layout.en-US.md +++ b/docs/playground/pro-layout.en-US.md @@ -10,7 +10,3 @@ nav: ## Layout 自定义 - -## 水印自定义 - - diff --git a/docs/playground/pro-layout.md b/docs/playground/pro-layout.md index b1c7a8a07360..887a7dae2c9d 100644 --- a/docs/playground/pro-layout.md +++ b/docs/playground/pro-layout.md @@ -11,7 +11,3 @@ nav: ## Layout 自定义 - -## 水印自定义 - - From fc84bb5a94a29a600e6514b5cd7ea0dcd7b1cc11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= Date: Thu, 22 Feb 2024 10:28:47 +0800 Subject: [PATCH 09/57] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dumi/app.tsx | 1 + .../field/src/components/Checkbox/index.tsx | 7 +- packages/provider/src/index.tsx | 25 +- packages/provider/src/useStyle/index.ts | 18 +- packages/provider/src/useStyle/token.ts | 412 ------------------ .../skeleton/src/components/List/index.tsx | 1 - .../components/InlineErrorFormItem/index.tsx | 5 +- 7 files changed, 22 insertions(+), 447 deletions(-) delete mode 100644 packages/provider/src/useStyle/token.ts diff --git a/.dumi/app.tsx b/.dumi/app.tsx index f588a3a7ac5b..6e8ce149924a 100644 --- a/.dumi/app.tsx +++ b/.dumi/app.tsx @@ -1,5 +1,6 @@ import { Alert } from 'antd'; +// @ts-ignore export function rootContainer(container) { return (
    diff --git a/packages/field/src/components/Checkbox/index.tsx b/packages/field/src/components/Checkbox/index.tsx index 145d8511dfc6..900fb28fa315 100644 --- a/packages/field/src/components/Checkbox/index.tsx +++ b/packages/field/src/components/Checkbox/index.tsx @@ -1,10 +1,9 @@ -import { useToken } from '@ant-design/pro-provider'; -import { +import { objectToMap, proFieldParsingText, useStyle, } from '@ant-design/pro-utils'; -import { Checkbox, ConfigProvider, Form, Spin } from 'antd'; +import { Checkbox, ConfigProvider, Form, Spin, theme } from 'antd'; import type { CheckboxGroupProps } from 'antd/lib/checkbox'; import classNames from 'classnames'; import React, { useContext, useImperativeHandle, useRef } from 'react'; @@ -65,7 +64,7 @@ const FieldCheckbox: ProFieldFC = ( }; }); - const { token } = useToken?.(); + const { token } = theme.useToken?.(); const checkBoxRef = useRef(); useImperativeHandle( ref, diff --git a/packages/provider/src/index.tsx b/packages/provider/src/index.tsx index 5efa453623a3..16260234a28a 100644 --- a/packages/provider/src/index.tsx +++ b/packages/provider/src/index.tsx @@ -1,7 +1,7 @@ import type { Theme } from '@ant-design/cssinjs'; import { useCacheToken } from '@ant-design/cssinjs'; import { omitUndefined } from '@ant-design/pro-utils'; -import { ConfigProvider as AntdConfigProvider } from 'antd'; +import { ConfigProvider as AntdConfigProvider, theme as antdTheme } from 'antd'; import zh_CN from 'antd/lib/locale/zh_CN'; import React, { useContext, useEffect, useMemo } from 'react'; @@ -13,8 +13,6 @@ import dayjs from 'dayjs'; import type { DeepPartial, ProTokenType } from './typing/layoutToken'; import { getLayoutDesignToken } from './typing/layoutToken'; import type { ProAliasToken } from './useStyle'; -import { proTheme } from './useStyle'; -import { defaultToken, emptyTheme } from './useStyle/token'; import { merge } from './utils/merge'; import 'dayjs/locale/zh-cn'; @@ -154,7 +152,6 @@ export type ConfigContextPropsType = { hashId?: string; hashed?: boolean; dark?: boolean; - theme?: Theme; }; /* Creating a context object with the default values. */ @@ -164,10 +161,14 @@ const ProConfigContext = React.createContext({ locale: 'default', }, valueTypeMap: {}, - theme: emptyTheme, hashed: true, dark: false, - token: defaultToken as ProAliasToken, + token: { + ...antdTheme.getDesignToken(), + proComponentsCls: '.ant-pro', + antCls: '.ant', + themeId: 0, + }, }); export const { Consumer: ConfigConsumer } = ProConfigContext; @@ -216,7 +217,7 @@ const ConfigProviderContainer: React.FC<{ const { locale, getPrefixCls, ...restConfig } = useContext( AntdConfigProvider.ConfigContext, ); - const tokenContext = proTheme.useToken?.(); + const tokenContext = antdTheme.useToken?.(); const proProvide = useContext(ProConfigContext); /** @@ -236,10 +237,7 @@ const ConfigProviderContainer: React.FC<{ * 合并一下token,不然导致嵌套 token 失效 */ const proLayoutTokenMerge = useMemo(() => { - return getLayoutDesignToken( - propsToken || {}, - tokenContext.token || defaultToken, - ); + return getLayoutDesignToken(propsToken || {}, tokenContext.token); }, [propsToken, tokenContext.token]); const proProvideValue = useMemo(() => { @@ -327,7 +325,6 @@ const ConfigProviderContainer: React.FC<{ ...proProvideValue!, valueTypeMap: valueTypeMap || proProvideValue?.valueTypeMap, token, - theme: tokenContext.theme as unknown as Theme, hashed, hashId, }} @@ -392,10 +389,10 @@ export const ProConfigProvider: React.FC<{ const mergeAlgorithm = () => { const isDark = dark ?? proProvide.dark; if (isDark && !Array.isArray(theme?.algorithm)) { - return [proTheme.darkAlgorithm, theme?.algorithm].filter(Boolean); + return [antdTheme.darkAlgorithm, theme?.algorithm].filter(Boolean); } if (isDark && Array.isArray(theme?.algorithm)) { - return [proTheme.darkAlgorithm, ...(theme?.algorithm || [])].filter( + return [antdTheme.darkAlgorithm, ...(theme?.algorithm || [])].filter( Boolean, ); } diff --git a/packages/provider/src/useStyle/index.ts b/packages/provider/src/useStyle/index.ts index 28476cf357db..1a775c833d71 100644 --- a/packages/provider/src/useStyle/index.ts +++ b/packages/provider/src/useStyle/index.ts @@ -2,13 +2,12 @@ import type { CSSInterpolation, CSSObject } from '@ant-design/cssinjs'; import { useStyleRegister } from '@ant-design/cssinjs'; import { TinyColor } from '@ctrl/tinycolor'; -import { ConfigProvider as AntdConfigProvider, theme } from 'antd'; +import { ConfigProvider as AntdConfigProvider, theme as antdTheme } from 'antd'; import type { GlobalToken } from 'antd/lib/theme/interface'; import type React from 'react'; import { useContext } from 'react'; import { ProProvider } from '../index'; import type { ProTokenType } from '../typing/layoutToken'; -import * as batToken from './token'; /** * 把一个颜色设置一下透明度 @@ -37,14 +36,7 @@ export type GenerateStyle< ReturnType = CSSInterpolation, > = (token: ComponentToken, ...rest: any[]) => ReturnType; -const genTheme = (): any => { - if (typeof theme === 'undefined' || !theme) return batToken as any; - return theme; -}; - -export const proTheme = genTheme() as typeof theme; - -export const useToken = proTheme.useToken; +export const proTheme = antdTheme as typeof antdTheme; export type UseStyleResult = { wrapSSR: (node: React.ReactElement) => React.ReactElement; @@ -107,8 +99,8 @@ export function useStyle( ) { let { token = {} as Record as ProAliasToken } = useContext(ProProvider); - const { hashId = '', theme: provideTheme } = useContext(ProProvider); - const { token: antdToken } = useToken(); + const { hashId = '' } = useContext(ProProvider); + const { token: antdToken, theme } = antdTheme.useToken(); const { getPrefixCls } = useContext(AntdConfigProvider.ConfigContext); // 如果不在 ProProvider 里面,就用 antd 的 @@ -121,7 +113,7 @@ export function useStyle( return { wrapSSR: useStyleRegister( { - theme: provideTheme!, + theme, token, hashId, path: [componentName], diff --git a/packages/provider/src/useStyle/token.ts b/packages/provider/src/useStyle/token.ts deleted file mode 100644 index dea376cfe835..000000000000 --- a/packages/provider/src/useStyle/token.ts +++ /dev/null @@ -1,412 +0,0 @@ -import { createTheme } from '@ant-design/cssinjs'; - -import { theme } from 'antd'; -import type { GlobalToken } from 'antd/lib/theme/interface'; - -export const defaultToken = { - blue: '#1677ff', - purple: '#722ED1', - cyan: '#13C2C2', - green: '#52C41A', - magenta: '#EB2F96', - pink: '#eb2f96', - red: '#F5222D', - orange: '#FA8C16', - yellow: '#FADB14', - volcano: '#FA541C', - geekblue: '#2F54EB', - gold: '#FAAD14', - lime: '#A0D911', - colorPrimary: '#1677ff', - colorSuccess: '#52c41a', - colorWarning: '#faad14', - colorError: '#ff7875', - colorInfo: '#1677ff', - colorTextBase: '#000', - colorBgBase: '#fff', - fontFamily: - "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'", - fontSize: 14, - lineWidth: 1, - lineType: 'solid', - motionUnit: 0.1, - motionBase: 0, - motionEaseOutCirc: 'cubic-bezier(0.08, 0.82, 0.17, 1)', - motionEaseInOutCirc: 'cubic-bezier(0.78, 0.14, 0.15, 0.86)', - motionEaseOut: 'cubic-bezier(0.215, 0.61, 0.355, 1)', - motionEaseInOut: 'cubic-bezier(0.645, 0.045, 0.355, 1)', - motionEaseOutBack: 'cubic-bezier(0.12, 0.4, 0.29, 1.46)', - motionEaseInQuint: 'cubic-bezier(0.645, 0.045, 0.355, 1)', - motionEaseOutQuint: 'cubic-bezier(0.23, 1, 0.32, 1)', - borderRadius: 4, - sizeUnit: 4, - sizeStep: 4, - sizePopupArrow: 16, - controlHeight: 32, - zIndexBase: 0, - zIndexPopupBase: 1000, - opacityImage: 1, - wireframe: false, - 'blue-1': '#e6f4ff', - 'blue-2': '#bae0ff', - 'blue-3': '#91caff', - 'blue-4': '#69b1ff', - 'blue-5': '#4096ff', - 'blue-6': '#1677ff', - 'blue-7': '#0958d9', - 'blue-8': '#003eb3', - 'blue-9': '#002c8c', - 'blue-10': '#001d66', - 'purple-1': '#f9f0ff', - 'purple-2': '#efdbff', - 'purple-3': '#d3adf7', - 'purple-4': '#b37feb', - 'purple-5': '#9254de', - 'purple-6': '#722ed1', - 'purple-7': '#531dab', - 'purple-8': '#391085', - 'purple-9': '#22075e', - 'purple-10': '#120338', - 'cyan-1': '#e6fffb', - 'cyan-2': '#b5f5ec', - 'cyan-3': '#87e8de', - 'cyan-4': '#5cdbd3', - 'cyan-5': '#36cfc9', - 'cyan-6': '#13c2c2', - 'cyan-7': '#08979c', - 'cyan-8': '#006d75', - 'cyan-9': '#00474f', - 'cyan-10': '#002329', - 'green-1': '#f6ffed', - 'green-2': '#d9f7be', - 'green-3': '#b7eb8f', - 'green-4': '#95de64', - 'green-5': '#73d13d', - 'green-6': '#52c41a', - 'green-7': '#389e0d', - 'green-8': '#237804', - 'green-9': '#135200', - 'green-10': '#092b00', - 'magenta-1': '#fff0f6', - 'magenta-2': '#ffd6e7', - 'magenta-3': '#ffadd2', - 'magenta-4': '#ff85c0', - 'magenta-5': '#f759ab', - 'magenta-6': '#eb2f96', - 'magenta-7': '#c41d7f', - 'magenta-8': '#9e1068', - 'magenta-9': '#780650', - 'magenta-10': '#520339', - 'pink-1': '#fff0f6', - 'pink-2': '#ffd6e7', - 'pink-3': '#ffadd2', - 'pink-4': '#ff85c0', - 'pink-5': '#f759ab', - 'pink-6': '#eb2f96', - 'pink-7': '#c41d7f', - 'pink-8': '#9e1068', - 'pink-9': '#780650', - 'pink-10': '#520339', - 'red-1': '#fff1f0', - 'red-2': '#ffccc7', - 'red-3': '#ffa39e', - 'red-4': '#ff7875', - 'red-5': '#ff4d4f', - 'red-6': '#f5222d', - 'red-7': '#cf1322', - 'red-8': '#a8071a', - 'red-9': '#820014', - 'red-10': '#5c0011', - 'orange-1': '#fff7e6', - 'orange-2': '#ffe7ba', - 'orange-3': '#ffd591', - 'orange-4': '#ffc069', - 'orange-5': '#ffa940', - 'orange-6': '#fa8c16', - 'orange-7': '#d46b08', - 'orange-8': '#ad4e00', - 'orange-9': '#873800', - 'orange-10': '#612500', - 'yellow-1': '#feffe6', - 'yellow-2': '#ffffb8', - 'yellow-3': '#fffb8f', - 'yellow-4': '#fff566', - 'yellow-5': '#ffec3d', - 'yellow-6': '#fadb14', - 'yellow-7': '#d4b106', - 'yellow-8': '#ad8b00', - 'yellow-9': '#876800', - 'yellow-10': '#614700', - 'volcano-1': '#fff2e8', - 'volcano-2': '#ffd8bf', - 'volcano-3': '#ffbb96', - 'volcano-4': '#ff9c6e', - 'volcano-5': '#ff7a45', - 'volcano-6': '#fa541c', - 'volcano-7': '#d4380d', - 'volcano-8': '#ad2102', - 'volcano-9': '#871400', - 'volcano-10': '#610b00', - 'geekblue-1': '#f0f5ff', - 'geekblue-2': '#d6e4ff', - 'geekblue-3': '#adc6ff', - 'geekblue-4': '#85a5ff', - 'geekblue-5': '#597ef7', - 'geekblue-6': '#2f54eb', - 'geekblue-7': '#1d39c4', - 'geekblue-8': '#10239e', - 'geekblue-9': '#061178', - 'geekblue-10': '#030852', - 'gold-1': '#fffbe6', - 'gold-2': '#fff1b8', - 'gold-3': '#ffe58f', - 'gold-4': '#ffd666', - 'gold-5': '#ffc53d', - 'gold-6': '#faad14', - 'gold-7': '#d48806', - 'gold-8': '#ad6800', - 'gold-9': '#874d00', - 'gold-10': '#613400', - 'lime-1': '#fcffe6', - 'lime-2': '#f4ffb8', - 'lime-3': '#eaff8f', - 'lime-4': '#d3f261', - 'lime-5': '#bae637', - 'lime-6': '#a0d911', - 'lime-7': '#7cb305', - 'lime-8': '#5b8c00', - 'lime-9': '#3f6600', - 'lime-10': '#254000', - colorText: 'rgba(0, 0, 0, 0.88)', - colorTextSecondary: 'rgba(0, 0, 0, 0.65)', - colorTextTertiary: 'rgba(0, 0, 0, 0.45)', - colorTextQuaternary: 'rgba(0, 0, 0, 0.25)', - colorFill: 'rgba(0, 0, 0, 0.15)', - colorFillSecondary: 'rgba(0, 0, 0, 0.06)', - colorFillTertiary: 'rgba(0, 0, 0, 0.04)', - colorFillQuaternary: 'rgba(0, 0, 0, 0.02)', - colorBgLayout: 'hsl(220,23%,97%)', - colorBgContainer: '#ffffff', - colorBgElevated: '#ffffff', - colorBgSpotlight: 'rgba(0, 0, 0, 0.85)', - colorBorder: '#d9d9d9', - colorBorderSecondary: '#f0f0f0', - colorPrimaryBg: '#e6f4ff', - colorPrimaryBgHover: '#bae0ff', - colorPrimaryBorder: '#91caff', - colorPrimaryBorderHover: '#69b1ff', - colorPrimaryHover: '#4096ff', - colorPrimaryActive: '#0958d9', - colorPrimaryTextHover: '#4096ff', - colorPrimaryText: '#1677ff', - colorPrimaryTextActive: '#0958d9', - colorSuccessBg: '#f6ffed', - colorSuccessBgHover: '#d9f7be', - colorSuccessBorder: '#b7eb8f', - colorSuccessBorderHover: '#95de64', - colorSuccessHover: '#95de64', - colorSuccessActive: '#389e0d', - colorSuccessTextHover: '#73d13d', - colorSuccessText: '#52c41a', - colorSuccessTextActive: '#389e0d', - colorErrorBg: '#fff2f0', - colorErrorBgHover: '#fff1f0', - colorErrorBorder: '#ffccc7', - colorErrorBorderHover: '#ffa39e', - colorErrorHover: '#ffa39e', - colorErrorActive: '#d9363e', - colorErrorTextHover: '#ff7875', - colorErrorText: '#ff4d4f', - colorErrorTextActive: '#d9363e', - colorWarningBg: '#fffbe6', - colorWarningBgHover: '#fff1b8', - colorWarningBorder: '#ffe58f', - colorWarningBorderHover: '#ffd666', - colorWarningHover: '#ffd666', - colorWarningActive: '#d48806', - colorWarningTextHover: '#ffc53d', - colorWarningText: '#faad14', - colorWarningTextActive: '#d48806', - colorInfoBg: '#e6f4ff', - colorInfoBgHover: '#bae0ff', - colorInfoBorder: '#91caff', - colorInfoBorderHover: '#69b1ff', - colorInfoHover: '#69b1ff', - colorInfoActive: '#0958d9', - colorInfoTextHover: '#4096ff', - colorInfoText: '#1677ff', - colorInfoTextActive: '#0958d9', - colorBgMask: 'rgba(0, 0, 0, 0.45)', - colorWhite: '#fff', - sizeXXL: 48, - sizeXL: 32, - sizeLG: 24, - sizeMD: 20, - sizeMS: 16, - size: 16, - sizeSM: 12, - sizeXS: 8, - sizeXXS: 4, - controlHeightSM: 24, - controlHeightXS: 16, - controlHeightLG: 40, - motionDurationFast: '0.1s', - motionDurationMid: '0.2s', - motionDurationSlow: '0.3s', - fontSizes: [12, 14, 16, 20, 24, 30, 38, 46, 56, 68], - lineHeights: [ - 1.6666666666666667, 1.5714285714285714, 1.5, 1.4, 1.3333333333333333, - 1.2666666666666666, 1.2105263157894737, 1.173913043478261, - 1.1428571428571428, 1.1176470588235294, - ], - lineWidthBold: 2, - borderRadiusXS: 1, - borderRadiusSM: 4, - borderRadiusLG: 8, - borderRadiusOuter: 4, - colorLink: '#1677ff', - colorLinkHover: '#69b1ff', - colorLinkActive: '#0958d9', - colorFillContent: 'rgba(0, 0, 0, 0.06)', - colorFillContentHover: 'rgba(0, 0, 0, 0.15)', - colorFillAlter: 'rgba(0, 0, 0, 0.02)', - colorBgContainerDisabled: 'rgba(0, 0, 0, 0.04)', - colorBorderBg: '#ffffff', - colorSplit: 'rgba(5, 5, 5, 0.06)', - colorTextPlaceholder: 'rgba(0, 0, 0, 0.25)', - colorTextDisabled: 'rgba(0, 0, 0, 0.25)', - colorTextHeading: 'rgba(0, 0, 0, 0.88)', - colorTextLabel: 'rgba(0, 0, 0, 0.65)', - colorTextDescription: 'rgba(0, 0, 0, 0.45)', - colorTextLightSolid: '#fff', - colorHighlight: '#ff7875', - colorBgTextHover: 'rgba(0, 0, 0, 0.06)', - colorBgTextActive: 'rgba(0, 0, 0, 0.15)', - colorIcon: 'rgba(0, 0, 0, 0.45)', - colorIconHover: 'rgba(0, 0, 0, 0.88)', - colorErrorOutline: 'rgba(255, 38, 5, 0.06)', - colorWarningOutline: 'rgba(255, 215, 5, 0.1)', - fontSizeSM: 12, - fontSizeLG: 16, - fontSizeXL: 20, - fontSizeHeading1: 38, - fontSizeHeading2: 30, - fontSizeHeading3: 24, - fontSizeHeading4: 20, - fontSizeHeading5: 16, - fontSizeIcon: 12, - lineHeight: 1.5714285714285714, - lineHeightLG: 1.5, - lineHeightSM: 1.6666666666666667, - lineHeightHeading1: 1.2105263157894737, - lineHeightHeading2: 1.2666666666666666, - lineHeightHeading3: 1.3333333333333333, - lineHeightHeading4: 1.4, - lineHeightHeading5: 1.5, - controlOutlineWidth: 2, - controlInteractiveSize: 16, - controlItemBgHover: 'rgba(0, 0, 0, 0.04)', - controlItemBgActive: '#e6f4ff', - controlItemBgActiveHover: '#bae0ff', - controlItemBgActiveDisabled: 'rgba(0, 0, 0, 0.15)', - controlTmpOutline: 'rgba(0, 0, 0, 0.02)', - controlOutline: 'rgba(5, 145, 255, 0.1)', - fontWeightStrong: 600, - opacityLoading: 0.65, - linkDecoration: 'none', - linkHoverDecoration: 'none', - linkFocusDecoration: 'none', - controlPaddingHorizontal: 12, - controlPaddingHorizontalSM: 8, - paddingXXS: 4, - paddingXS: 8, - paddingSM: 12, - padding: 16, - paddingMD: 20, - paddingLG: 24, - paddingXL: 32, - paddingContentHorizontalLG: 24, - paddingContentVerticalLG: 16, - paddingContentHorizontal: 16, - paddingContentVertical: 12, - paddingContentHorizontalSM: 16, - paddingContentVerticalSM: 8, - marginXXS: 4, - marginXS: 8, - marginSM: 12, - margin: 16, - marginMD: 20, - marginLG: 24, - marginXL: 32, - marginXXL: 48, - boxShadow: - '0 1px 2px 0 rgba(0, 0, 0, 0.03),0 1px 6px -1px rgba(0, 0, 0, 0.02),0 2px 4px 0 rgba(0, 0, 0, 0.02)', - boxShadowSecondary: - '0 6px 16px 0 rgba(0, 0, 0, 0.08),0 3px 6px -4px rgba(0, 0, 0, 0.12),0 9px 28px 8px rgba(0, 0, 0, 0.05)', - screenXS: 480, - screenXSMin: 480, - screenXSMax: 479, - screenSM: 576, - screenSMMin: 576, - screenSMMax: 575, - screenMD: 768, - screenMDMin: 768, - screenMDMax: 767, - screenLG: 992, - screenLGMin: 992, - screenLGMax: 991, - screenXL: 1200, - screenXLMin: 1200, - screenXLMax: 1199, - screenXXL: 1600, - screenXXLMin: 1600, - screenXXLMax: 1599, - boxShadowPopoverArrow: '3px 3px 7px rgba(0, 0, 0, 0.1)', - boxShadowCard: - '0 1px 2px -2px rgba(0, 0, 0, 0.16),0 3px 6px 0 rgba(0, 0, 0, 0.12),0 5px 12px 4px rgba(0, 0, 0, 0.09)', - boxShadowDrawerRight: - '-6px 0 16px 0 rgba(0, 0, 0, 0.08),-3px 0 6px -4px rgba(0, 0, 0, 0.12),-9px 0 28px 8px rgba(0, 0, 0, 0.05)', - boxShadowDrawerLeft: - '6px 0 16px 0 rgba(0, 0, 0, 0.08),3px 0 6px -4px rgba(0, 0, 0, 0.12),9px 0 28px 8px rgba(0, 0, 0, 0.05)', - boxShadowDrawerUp: - '0 6px 16px 0 rgba(0, 0, 0, 0.08),0 3px 6px -4px rgba(0, 0, 0, 0.12),0 9px 28px 8px rgba(0, 0, 0, 0.05)', - boxShadowDrawerDown: - '0 -6px 16px 0 rgba(0, 0, 0, 0.08),0 -3px 6px -4px rgba(0, 0, 0, 0.12),0 -9px 28px 8px rgba(0, 0, 0, 0.05)', - boxShadowTabsOverflowLeft: 'inset 10px 0 8px -8px rgba(0, 0, 0, 0.08)', - boxShadowTabsOverflowRight: 'inset -10px 0 8px -8px rgba(0, 0, 0, 0.08)', - boxShadowTabsOverflowTop: 'inset 0 10px 8px -8px rgba(0, 0, 0, 0.08)', - boxShadowTabsOverflowBottom: 'inset 0 -10px 8px -8px rgba(0, 0, 0, 0.08)', - _tokenKey: '19w80ff', - _hashId: 'css-dev-only-do-not-override-i2zu9q', -} as any as GlobalToken; - -export const hashCode = (str: string, seed = 1) => { - let h1 = 0xdeadbeef ^ seed, - h2 = 0x41c6ce57 ^ seed; - for (let i = 0, ch; i < str.length; i++) { - ch = str.charCodeAt(i); - h1 = Math.imul(h1 ^ ch, 2654435761); - h2 = Math.imul(h2 ^ ch, 1597334677); - } - h1 = - Math.imul(h1 ^ (h1 >>> 16), 2246822507) ^ - Math.imul(h2 ^ (h2 >>> 13), 3266489909); - h2 = - Math.imul(h2 ^ (h2 >>> 16), 2246822507) ^ - Math.imul(h1 ^ (h1 >>> 13), 3266489909); - return 4294967296 * (2097151 & h2) + (h1 >>> 0); -}; - -// @ts-ignore -export const emptyTheme = createTheme((token) => token); - -export const token = { - theme: emptyTheme, - token: { - ...defaultToken, - ...(theme?.defaultAlgorithm?.(theme?.defaultSeed) as any), - } as GlobalToken, - hashId: `pro-${hashCode(JSON.stringify(defaultToken))}`, -}; - -export const useToken = () => token; diff --git a/packages/skeleton/src/components/List/index.tsx b/packages/skeleton/src/components/List/index.tsx index 117884fe5103..5e9377f46f88 100644 --- a/packages/skeleton/src/components/List/index.tsx +++ b/packages/skeleton/src/components/List/index.tsx @@ -108,7 +108,6 @@ export const ListSkeletonItem: React.FC<{ active: boolean }> = ({ active }) => ( <> { if (inputProps.validateStatus !== 'validating') { From b67b70e118a8d7fec99c16448c299d623a97c12a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= Date: Thu, 22 Feb 2024 10:39:49 +0800 Subject: [PATCH 10/57] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/provider/src/typing/layoutToken.ts | 2 +- tests/layout/index.test.tsx | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/packages/provider/src/typing/layoutToken.ts b/packages/provider/src/typing/layoutToken.ts index 9dcb1086acd7..985c0a78c2e7 100644 --- a/packages/provider/src/typing/layoutToken.ts +++ b/packages/provider/src/typing/layoutToken.ts @@ -19,7 +19,7 @@ export type BaseLayoutDesignToken = { /** * layout 的背景颜色 */ - bgLayout: string; + bgLayout: string | null; /** * 侧边side的 token 配置 diff --git a/tests/layout/index.test.tsx b/tests/layout/index.test.tsx index a3759cd6a4d3..b71e2a3c1080 100644 --- a/tests/layout/index.test.tsx +++ b/tests/layout/index.test.tsx @@ -804,6 +804,26 @@ describe('BasicLayout', () => { }); }); + it('🥩 do not render bgListDom', async () => { + const wrapper = render( +
    menuExtraRender
    } + menuHeaderRender={false} + />, + ); + await waitForWaitTime(100); + const dom = wrapper.baseElement.querySelector( + '.ant-pro-layout-bg-list', + ); + expect(!!dom).toBeFalsy(); + act(() => { + wrapper.unmount(); + }); + }); + it('🥩 customize render menu header', async () => { const wrapper = render( Date: Fri, 23 Feb 2024 14:48:55 +0800 Subject: [PATCH 11/57] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dumi/app.tsx | 34 +- packages/layout/src/ProLayout.tsx | 1 + packages/layout/src/demos/_defaultProps.tsx | 8 +- pnpm-lock.yaml | 307 +++---- tests/layout/__snapshots__/demo.test.ts.snap | 849 +++++++++++++++++-- 5 files changed, 966 insertions(+), 233 deletions(-) diff --git a/.dumi/app.tsx b/.dumi/app.tsx index 6e8ce149924a..5f282702bb03 100644 --- a/.dumi/app.tsx +++ b/.dumi/app.tsx @@ -1,33 +1 @@ -import { Alert } from 'antd'; - -// @ts-ignore -export function rootContainer(container) { - return ( -
    -
    - { - window.open( - 'https://forms.office.com/Pages/ResponsePage.aspx?id=DQSIkWdsW0yxEjajBLZtrQAAAAAAAAAAAAa__eHKeOtUOUM1QVkxMUczQjhUOENSWFJNMkMzRFY2SS4u', - ); - }} - > - 我们正在收集信息,以便为明年的计划做出更好的准备。您的反馈对我们非常重要,将帮助我们了解您的需求和期望,从而提供更好的服务,点击此处参与调查。 -
    - } - /> -
    - {container} -
    - ); -} + \ No newline at end of file diff --git a/packages/layout/src/ProLayout.tsx b/packages/layout/src/ProLayout.tsx index 367311a2a46f..60d11f8d941d 100644 --- a/packages/layout/src/ProLayout.tsx +++ b/packages/layout/src/ProLayout.tsx @@ -326,6 +326,7 @@ const renderSiderMenu = ( } // 这里走了可以少一次循环 const clearMenuData = clearMenuItem(menuData || []); + if ( clearMenuData && clearMenuData?.length < 1 && diff --git a/packages/layout/src/demos/_defaultProps.tsx b/packages/layout/src/demos/_defaultProps.tsx index c72164dd1603..c148ffc45bc7 100644 --- a/packages/layout/src/demos/_defaultProps.tsx +++ b/packages/layout/src/demos/_defaultProps.tsx @@ -8,7 +8,7 @@ import { export default { route: { path: '/', - routes: [ + children: [ { path: '/welcome', name: '欢迎', @@ -21,7 +21,7 @@ export default { icon: , access: 'canAdmin', component: './Admin', - routes: [ + children: [ { path: '/admin/sub-page1', name: '一级页面', @@ -47,12 +47,12 @@ export default { icon: , path: '/list', component: './ListTableList', - routes: [ + children: [ { path: '/list/sub-page', name: '列表页面', icon: , - routes: [ + children: [ { path: 'sub-sub-page1', name: '一一级列表页面', diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6aa7d3546d3f..d98c233deb72 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -132,16 +132,16 @@ importers: version: 4.0.1 '@umijs/plugin-analytics': specifier: ^0.2.4 - version: 0.2.4(umi@4.1.1) + version: 0.2.4(umi@4.1.2) '@umijs/test': specifier: ^3.5.41 version: 3.5.41(ts-node@10.9.2) '@umijs/test-utils': specifier: ^3.5.41 - version: 3.5.41(@testing-library/react@13.4.0)(umi@4.1.1) + version: 3.5.41(@testing-library/react@13.4.0)(umi@4.1.2) '@umijs/utils': specifier: ^4.1.1 - version: 4.1.1 + version: 4.1.2 '@vitest/coverage-istanbul': specifier: ^0.34.6 version: 0.34.6(vitest@0.34.6) @@ -270,7 +270,7 @@ importers: version: 3.2.4(prettier@2.8.8)(typescript@5.3.3) prettier-plugin-packagejson: specifier: ^2.4.10 - version: 2.4.11(prettier@2.8.8) + version: 2.4.12(prettier@2.8.8) pretty-quick: specifier: ^3.3.1 version: 3.3.1(prettier@2.8.8) @@ -348,7 +348,7 @@ importers: version: 5.3.3 umi: specifier: ^4.1.1 - version: 4.1.1(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)(stylelint@13.13.1)(typescript@5.3.3) + version: 4.1.2(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)(stylelint@13.13.1)(typescript@5.3.3) umi-request: specifier: ^1.4.0 version: 1.4.0 @@ -2838,6 +2838,27 @@ packages: resolution: {integrity: sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==} dev: true + /@esbuild-kit/cjs-loader@2.4.4: + resolution: {integrity: sha512-NfsJX4PdzhwSkfJukczyUiZGc7zNNWZcEAyqeISpDnn0PTfzMJR1aR8xAIPskBejIxBJbIgCCMzbaYa9SXepIg==} + dependencies: + '@esbuild-kit/core-utils': 3.3.2 + get-tsconfig: 4.7.2 + dev: true + + /@esbuild-kit/core-utils@3.3.2: + resolution: {integrity: sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ==} + dependencies: + esbuild: 0.18.20 + source-map-support: 0.5.21 + dev: true + + /@esbuild-kit/esm-loader@2.6.5: + resolution: {integrity: sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA==} + dependencies: + '@esbuild-kit/core-utils': 3.3.2 + get-tsconfig: 4.7.2 + dev: true + /@esbuild/aix-ppc64@0.19.12: resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==} engines: {node: '>=12'} @@ -6121,8 +6142,8 @@ packages: '@types/json-schema': 7.0.15 dev: true - /@types/estree-jsx@1.0.4: - resolution: {integrity: sha512-5idy3hvI9lAMqsyilBM+N+boaCf1MgoefbDxN6KEO5aK17TOHwFAYT9sjxzeKAiIWRUBgLxmZ9mPcnzZXtTcRQ==} + /@types/estree-jsx@1.0.5: + resolution: {integrity: sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==} dependencies: '@types/estree': 1.0.5 dev: true @@ -6555,10 +6576,10 @@ packages: eslint-visitor-keys: 3.4.3 dev: true - /@umijs/ast@4.1.1: - resolution: {integrity: sha512-YqrHx2K8X4oOJTVE1tHMeveXBESJdmrdv/VgTB7pCcE6/+mvmPmDx1RECeSRrbnCP4ABrol38XCzKS88Vx5oHg==} + /@umijs/ast@4.1.2: + resolution: {integrity: sha512-ejgp07sn4IEMf8Urxt+su9KrUWIWp0rhtnljB3XVR2A4mcVdz1jtSQbqYwQFtgn6Mp6tCMG+H1fkweRWj7+vfQ==} dependencies: - '@umijs/bundler-utils': 4.1.1 + '@umijs/bundler-utils': 4.1.2 transitivePeerDependencies: - supports-color dev: true @@ -6600,24 +6621,24 @@ packages: '@umijs/utils': 3.5.41 dev: true - /@umijs/babel-preset-umi@4.1.1: - resolution: {integrity: sha512-6pYZnF03euAJGZN3VLe8PKKRNMH6Zxj4GKNooLvJ0Wz0eMufmYDcA4CpbR6h8i1JpgcQ0Sngr8bqHLb7oMqrvw==} + /@umijs/babel-preset-umi@4.1.2: + resolution: {integrity: sha512-SdizYktVzp5ODwOQEeHzAwt+/WGUaIO/py9z1lGQdzxGfiTkEMU5hB70bh0fFKn3jOKCKTdBLw8BfIi2E/GwDQ==} dependencies: '@babel/runtime': 7.23.6 '@bloomberg/record-tuple-polyfill': 0.0.4 - '@umijs/bundler-utils': 4.1.1 - '@umijs/utils': 4.1.1 + '@umijs/bundler-utils': 4.1.2 + '@umijs/utils': 4.1.2 core-js: 3.34.0 transitivePeerDependencies: - supports-color dev: true - /@umijs/bundler-esbuild@4.1.1: - resolution: {integrity: sha512-+aUT2pGTCvcn6Vla0/5E9NN8fX2QBH7XxlZP0vh1vh8iAVhYkqTu6eMSWN2hGLxlBwf5xkFJDpn3cEQ5PMUPgw==} + /@umijs/bundler-esbuild@4.1.2: + resolution: {integrity: sha512-LcAlqoQKDUeEYmkLw2mB2T9FBOjZQsFSzCw6ZYItTV2zIdFNlH4U5slfhRqlwQbzxDgBrbPLEGl0M85CqEFE4w==} hasBin: true dependencies: - '@umijs/bundler-utils': 4.1.1 - '@umijs/utils': 4.1.1 + '@umijs/bundler-utils': 4.1.2 + '@umijs/utils': 4.1.2 enhanced-resolve: 5.9.3 postcss: 8.4.35 postcss-flexbugs-fixes: 5.0.2(postcss@8.4.35) @@ -6626,10 +6647,10 @@ packages: - supports-color dev: true - /@umijs/bundler-utils@4.1.1: - resolution: {integrity: sha512-k1I1tjDePgB1XqpQHZiLJ/5gS4EykY8hqqzEzD1CSbd5KFE614+q6W/gcpFZ0YLJDWY1GdjOYpRokvuI/MSRfg==} + /@umijs/bundler-utils@4.1.2: + resolution: {integrity: sha512-bcN3VSgCPZjyLmQrRWPfPkuhVP0GCFyBLTxzr4vPHQTYx7FjHJcvpEbOsXoVNiBHowRA8J6PGCB/jxqRSO1yxw==} dependencies: - '@umijs/utils': 4.1.1 + '@umijs/utils': 4.1.2 esbuild: 0.17.19 regenerate: 1.4.2 regenerate-unicode-properties: 10.1.1 @@ -6638,13 +6659,13 @@ packages: - supports-color dev: true - /@umijs/bundler-vite@4.1.1(@types/node@14.18.63)(postcss@8.4.35)(sass@1.71.1): - resolution: {integrity: sha512-gTu/9TpsBYEHcaQY/ybW1ZDLAQA75lH2kI6FVx/Tg8HutwSB9mIaD4DHZOMDM/9C1W/+DwxXemKZXVkR3iRtVw==} + /@umijs/bundler-vite@4.1.2(@types/node@14.18.63)(postcss@8.4.35)(sass@1.71.1): + resolution: {integrity: sha512-znqi0rb8zsh90jT8duCkGj/gcli8xEkjQDi1y6BA/dshIO9Ra4KT9riijJsaumiD+OJrABpV2DWjX7JrszzByg==} hasBin: true dependencies: '@svgr/core': 6.5.1 - '@umijs/bundler-utils': 4.1.1 - '@umijs/utils': 4.1.1 + '@umijs/bundler-utils': 4.1.2 + '@umijs/utils': 4.1.2 '@vitejs/plugin-react': 4.0.0(vite@4.3.1) core-js: 3.34.0 less: 4.1.3 @@ -6663,20 +6684,20 @@ packages: - terser dev: true - /@umijs/bundler-webpack@4.1.1(typescript@5.3.3): - resolution: {integrity: sha512-LL+ZmPmSIGOMo1+OHsBtMARqr+dTZEqDkTbQ/ZPrrrtxK27rXi/lHFEUnzKjPeHVL+xtJ4m9QR13zGWlhLT+UA==} + /@umijs/bundler-webpack@4.1.2(typescript@5.3.3): + resolution: {integrity: sha512-rCf+H/k1Ru/twlCvAlqjjRIZRZJNZmaXpROaQ6VviPDj1F5YLDWMCunvdGf8KOeBVTLy4syhdxn95ZIyKcPpPA==} hasBin: true dependencies: '@svgr/core': 6.5.1 '@svgr/plugin-jsx': 6.5.1(@svgr/core@6.5.1) '@svgr/plugin-svgo': 6.5.1(@svgr/core@6.5.1) '@types/hapi__joi': 17.1.9 - '@umijs/babel-preset-umi': 4.1.1 - '@umijs/bundler-utils': 4.1.1 + '@umijs/babel-preset-umi': 4.1.2 + '@umijs/bundler-utils': 4.1.2 '@umijs/case-sensitive-paths-webpack-plugin': 1.0.1 - '@umijs/mfsu': 4.1.1 + '@umijs/mfsu': 4.1.2 '@umijs/react-refresh-webpack-plugin': 0.5.11(react-refresh@0.14.0) - '@umijs/utils': 4.1.1 + '@umijs/utils': 4.1.2 cors: 2.8.5 css-loader: 6.7.1 es5-imcompatible-versions: 0.1.88 @@ -6704,11 +6725,11 @@ packages: resolution: {integrity: sha512-kDKJ8yTarxwxGJDInG33hOpaQRZ//XpNuuznQ/1Mscypw6kappzFmrBr2dOYave++K7JHouoANF354UpbEQw0Q==} dev: true - /@umijs/core@4.1.1: - resolution: {integrity: sha512-frMq29AfyLThIfrsDmNGKueT49mhL6o7P9GhnSCP3ICwTYl2aTaI3GYzf32ZCmEhFYH8cU0Bcgx5GpOIdEJrLQ==} + /@umijs/core@4.1.2: + resolution: {integrity: sha512-OZlZKG+26coItwPJBtPmqB2zGSnVJqi/BVFm4MYB3fDtY5+/KmPCSXur/FJvpmRInoVAJkahbsycmMh+dUT0wQ==} dependencies: - '@umijs/bundler-utils': 4.1.1 - '@umijs/utils': 4.1.1 + '@umijs/bundler-utils': 4.1.2 + '@umijs/utils': 4.1.2 transitivePeerDependencies: - supports-color dev: true @@ -6922,15 +6943,15 @@ packages: query-string: 6.14.1 dev: true - /@umijs/lint@4.1.1(eslint@8.56.0)(stylelint@13.13.1)(typescript@5.3.3): - resolution: {integrity: sha512-fy2edKuYw42eM3LuH/2AiH0ZKdembFx3SR8dIGKxf7BmEQOSfUhskLiNGE8tSRubCiVzGUWvZQDw1YQcU0bsHg==} + /@umijs/lint@4.1.2(eslint@8.56.0)(stylelint@13.13.1)(typescript@5.3.3): + resolution: {integrity: sha512-sdau5ICWOtyEsQrRHuS5wx4iPZhu56DGrxZkASAXGtQxntoJeWzx/e+qAhdsiFiWZrNXbbOOdlafpGyLy6BoKA==} dependencies: '@babel/core': 7.23.6 '@babel/eslint-parser': 7.23.3(@babel/core@7.23.6)(eslint@8.56.0) '@stylelint/postcss-css-in-js': 0.38.0(postcss-syntax@0.36.2)(postcss@8.4.35) '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@5.3.3) '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@5.3.3) - '@umijs/babel-preset-umi': 4.1.1 + '@umijs/babel-preset-umi': 4.1.2 eslint-plugin-jest: 27.2.3(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.56.0)(typescript@5.3.3) eslint-plugin-react: 7.33.2(eslint@8.56.0) eslint-plugin-react-hooks: 4.6.0(eslint@8.56.0) @@ -6950,54 +6971,54 @@ packages: - typescript dev: true - /@umijs/mfsu@4.1.1: - resolution: {integrity: sha512-5W4vl0vtZvD36wPUo0EMDO6p04GGPBb7MwJVQCYGdumKEwdCQ+cnzEYoJE9Q9D5PBAwnOzbf2UNrAQgtJG70tA==} + /@umijs/mfsu@4.1.2: + resolution: {integrity: sha512-PxkSdQWR0323B1PKLjn2F3ZLfxByg3MmwgRipUbwX3dC8ae9kqIR5wEB2bfL1uXSg9x63o2JMsv5/ObfhrsmYw==} dependencies: - '@umijs/bundler-esbuild': 4.1.1 - '@umijs/bundler-utils': 4.1.1 - '@umijs/utils': 4.1.1 + '@umijs/bundler-esbuild': 4.1.2 + '@umijs/bundler-utils': 4.1.2 + '@umijs/utils': 4.1.2 enhanced-resolve: 5.9.3 is-equal: 1.7.0 transitivePeerDependencies: - supports-color dev: true - /@umijs/plugin-analytics@0.2.4(umi@4.1.1): + /@umijs/plugin-analytics@0.2.4(umi@4.1.2): resolution: {integrity: sha512-aIHc/okDmCae/6iJS3lRV2b9/cuFUoGQhioeoZzC2mBYy43o0Z6KWSY5TlzraY4bDdGurWsFQC6dB1TVUCMGbg==} peerDependencies: umi: 3.x dependencies: - umi: 4.1.1(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)(stylelint@13.13.1)(typescript@5.3.3) + umi: 4.1.2(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)(stylelint@13.13.1)(typescript@5.3.3) dev: true - /@umijs/plugin-run@4.1.1: - resolution: {integrity: sha512-n2E1eV065qsfuNL0kKn6N2zv75s7aRD9j0ZL3tqhAf7UqtUEx3hmODlnrIIMNzBI5YxSYwyjWxZCLvpzu5S8hQ==} + /@umijs/plugin-run@4.1.2: + resolution: {integrity: sha512-SkCOd1ZMe5zJp0avxC0UWr4/MK4QU3iqMzNOk6kBYPMIZgsNSn+6+iol+Sb3aqn3RzU3TQWHeKtO2ckZyrD+vw==} dependencies: - tsx: 3.14.0 + tsx: 3.12.2 dev: true - /@umijs/preset-umi@4.1.1(@types/node@14.18.63)(@types/react@18.2.57)(sass@1.71.1)(typescript@5.3.3): - resolution: {integrity: sha512-mpm2aqyRttfAQRstCoA98oya5r0eZL6dWe3oddTsScjyO/T9rT9vOb2xyqlsE95DTNFEBeyCjr8dcvs2HifJ1w==} + /@umijs/preset-umi@4.1.2(@types/node@14.18.63)(@types/react@18.2.57)(sass@1.71.1)(typescript@5.3.3): + resolution: {integrity: sha512-tZe7mWS2vCoULXcY5Zx10nVWxMHPXl1+Pj3X0hiPE2oPYJYw5eYtE0+IivNAOUH2M2d5c8j257MgG+XND8Gpbw==} dependencies: '@iconify/utils': 2.1.1 '@svgr/core': 6.5.1 - '@umijs/ast': 4.1.1 - '@umijs/babel-preset-umi': 4.1.1 - '@umijs/bundler-esbuild': 4.1.1 - '@umijs/bundler-utils': 4.1.1 - '@umijs/bundler-vite': 4.1.1(@types/node@14.18.63)(postcss@8.4.35)(sass@1.71.1) - '@umijs/bundler-webpack': 4.1.1(typescript@5.3.3) - '@umijs/core': 4.1.1 + '@umijs/ast': 4.1.2 + '@umijs/babel-preset-umi': 4.1.2 + '@umijs/bundler-esbuild': 4.1.2 + '@umijs/bundler-utils': 4.1.2 + '@umijs/bundler-vite': 4.1.2(@types/node@14.18.63)(postcss@8.4.35)(sass@1.71.1) + '@umijs/bundler-webpack': 4.1.2(typescript@5.3.3) + '@umijs/core': 4.1.2 '@umijs/did-you-know': 1.0.3 '@umijs/es-module-parser': 0.0.7 '@umijs/history': 5.3.1 - '@umijs/mfsu': 4.1.1 - '@umijs/plugin-run': 4.1.1 - '@umijs/renderer-react': 4.1.1(react-dom@18.1.0)(react@18.1.0) - '@umijs/server': 4.1.1 + '@umijs/mfsu': 4.1.2 + '@umijs/plugin-run': 4.1.2 + '@umijs/renderer-react': 4.1.2(react-dom@18.1.0)(react@18.1.0) + '@umijs/server': 4.1.2 '@umijs/ui': 3.0.1 - '@umijs/utils': 4.1.1 - '@umijs/zod2ts': 4.1.1 + '@umijs/utils': 4.1.2 + '@umijs/zod2ts': 4.1.2 babel-plugin-dynamic-import-node: 2.3.3 click-to-react-component: 1.1.0(@types/react@18.2.57)(react-dom@18.1.0)(react@18.1.0) core-js: 3.34.0 @@ -7071,8 +7092,8 @@ packages: source-map: 0.7.4 dev: true - /@umijs/renderer-react@4.1.1(react-dom@18.1.0)(react@18.1.0): - resolution: {integrity: sha512-h6mXzTeadXGjUUDfBOjNjIFPkiyt1N0oIEK+eS2PH3SaZGCUa8HNm+yWJmUxxDqbo/+1rvnN8z1oEGDRHfHwXA==} + /@umijs/renderer-react@4.1.2(react-dom@18.1.0)(react@18.1.0): + resolution: {integrity: sha512-zAZ1yU/PTkit/Nl0JsArS8ZwWyhmFpMEMRKpFZqw1rYieXTlNGvZTm2twJj+rNzsxwoNmW7E24glJGjpm1CunA==} peerDependencies: react: '>=16.8' react-dom: '>=16.8' @@ -7086,8 +7107,8 @@ packages: react-router-dom: 6.3.0(react-dom@18.1.0)(react@18.1.0) dev: true - /@umijs/renderer-react@4.1.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-h6mXzTeadXGjUUDfBOjNjIFPkiyt1N0oIEK+eS2PH3SaZGCUa8HNm+yWJmUxxDqbo/+1rvnN8z1oEGDRHfHwXA==} + /@umijs/renderer-react@4.1.2(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-zAZ1yU/PTkit/Nl0JsArS8ZwWyhmFpMEMRKpFZqw1rYieXTlNGvZTm2twJj+rNzsxwoNmW7E24glJGjpm1CunA==} peerDependencies: react: '>=16.8' react-dom: '>=16.8' @@ -7105,10 +7126,10 @@ packages: resolution: {integrity: sha512-+1ixf1BTOLuH+ORb4x8vYMPeIt38n9q0fJDwhv9nSxrV46mxbLF0nmELIo9CKQB2gHfuC4+hww6xejJ6VYnBHQ==} dev: false - /@umijs/server@4.1.1: - resolution: {integrity: sha512-MNwj2jbmAcpHP+uNyhAQWZdLfNpsKy05ETpVWtOmBlAmkK8J9IBpHGSPkWSJgTiq6NiYM6vIRm9wKyVwGUxYGA==} + /@umijs/server@4.1.2: + resolution: {integrity: sha512-1oUWhF4qW2T4BqYKRTtZm+REJpDzPdQ3oeXubAIpFqek5Z0ABKcp7/mkH68AVRztsag0t9cXuBN/AL5GkvjXww==} dependencies: - '@umijs/bundler-utils': 4.1.1 + '@umijs/bundler-utils': 4.1.2 history: 5.3.0 react: 18.1.0 react-dom: 18.1.0(react@18.1.0) @@ -7117,14 +7138,14 @@ packages: - supports-color dev: true - /@umijs/test-utils@3.5.41(@testing-library/react@13.4.0)(umi@4.1.1): + /@umijs/test-utils@3.5.41(@testing-library/react@13.4.0)(umi@4.1.2): resolution: {integrity: sha512-pav4pFzppHtRKvl84bdVtrsKdvPDw1DvDPK24g5lkj3j/ZYxD9PMLaKvnMoHPXvetp+xjfQllDjfIvTWxL7RKw==} peerDependencies: '@testing-library/react': ^9.4.0 umi: ^3.0.0 dependencies: '@testing-library/react': 13.4.0(react-dom@18.2.0)(react@18.2.0) - umi: 4.1.1(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)(stylelint@13.13.1)(typescript@5.3.3) + umi: 4.1.2(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)(stylelint@13.13.1)(typescript@5.3.3) dev: true /@umijs/test@3.5.41(ts-node@10.9.2): @@ -7149,13 +7170,13 @@ packages: - utf-8-validate dev: true - /@umijs/test@4.1.1(@babel/core@7.23.9): - resolution: {integrity: sha512-4Q5qaYX86mZbw0Jbirr0kZpaU1Jfi1Lq440EmRYqoPtKQBT5hX5fo98LWxyMPv1PTL/g/PC6sYr0uSLp+qjtOA==} + /@umijs/test@4.1.2(@babel/core@7.23.9): + resolution: {integrity: sha512-mmP0bmvYx/gHIgq8mxbMJSgLxBKh5Tp2ZiuK68aoqlBWSBXU2xB9LM4KGno3Or9vihSFAUzK1wWEcVj7CQCY4w==} dependencies: '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.9) '@jest/types': 27.5.1 - '@umijs/bundler-utils': 4.1.1 - '@umijs/utils': 4.1.1 + '@umijs/bundler-utils': 4.1.2 + '@umijs/utils': 4.1.2 babel-jest: 29.7.0(@babel/core@7.23.9) esbuild: 0.17.19 identity-obj-proxy: 3.0.0 @@ -7184,15 +7205,15 @@ packages: '@umijs/deps': 3.5.41 dev: true - /@umijs/utils@4.1.1: - resolution: {integrity: sha512-hbnbJR3RA7fu4E7q4JFZ47XMYArr6Zn5bftr8YZ+o6hzJlomr4gzoOXE+XxM7rVMK4AFZoc+QZgNTJyISd08Pg==} + /@umijs/utils@4.1.2: + resolution: {integrity: sha512-YBzN7Zn3595W93t8XPh8IbKMInr6NecXPtHVD+L7fJFv5oCrzHxCkvSZBTmTXuFMyW+9rHT0TlsXM4gqQ1n18Q==} dependencies: chokidar: 3.5.3 pino: 7.11.0 dev: true - /@umijs/zod2ts@4.1.1: - resolution: {integrity: sha512-ni4at60OdOL4qMKi7USdq8T6lNWAbaylXmDNUg063nT/FIzbwD7bFzKO0OYnt4SoV20dtBLSV5zlundFK4hVSQ==} + /@umijs/zod2ts@4.1.2: + resolution: {integrity: sha512-h5P45gXxTVWdDeIuB/EQ9lDqJgPrm747Ox77WvK1ooG+jN4xBB6uoH5slCLenl3ig+M1nRLIadVsD/8kjrWWHw==} dev: true /@ungap/structured-clone@1.2.0: @@ -7586,7 +7607,7 @@ packages: rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-notification: 5.3.0(react-dom@18.2.0)(react@18.2.0) rc-pagination: 4.0.4(react-dom@18.2.0)(react@18.2.0) - rc-picker: 4.1.3(dayjs@1.11.10)(moment@2.30.1)(react-dom@18.2.0)(react@18.2.0) + rc-picker: 4.1.4(dayjs@1.11.10)(moment@2.30.1)(react-dom@18.2.0)(react@18.2.0) rc-progress: 3.5.1(react-dom@18.2.0)(react@18.2.0) rc-rate: 2.12.0(react-dom@18.2.0)(react@18.2.0) rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) @@ -7956,7 +7977,7 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.23.0 - caniuse-lite: 1.0.30001588 + caniuse-lite: 1.0.30001589 fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -7969,7 +7990,7 @@ packages: hasBin: true dependencies: browserslist: 4.23.0 - caniuse-lite: 1.0.30001588 + caniuse-lite: 1.0.30001589 normalize-range: 0.1.2 num2fraction: 1.2.2 picocolors: 0.2.1 @@ -7989,15 +8010,15 @@ packages: hasBin: true requiresBuild: true dependencies: - aws-sdk: 2.1562.0 + aws-sdk: 2.1564.0 commander: 3.0.2 js-yaml: 3.14.1 watchpack: 2.4.0 dev: true optional: true - /aws-sdk@2.1562.0: - resolution: {integrity: sha512-HsdlDRfVamH4tv+M+d0lnEYdtx+yEpqWA4T2XuJCjtV5JjjHDUQTKm+9C+EoTxLWtuw+SYSVWyuclwETv6CmHQ==} + /aws-sdk@2.1564.0: + resolution: {integrity: sha512-597Ugza41QCTknjv2VDeUMBFHvHVdg/h9qydDwnX+2kK/EcdE+Vjopcz2+lhHBlbqLi9yUbT4yc1nfo8T+f53w==} engines: {node: '>= 10.0.0'} requiresBuild: true dependencies: @@ -8564,8 +8585,8 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001588 - electron-to-chromium: 1.4.677 + caniuse-lite: 1.0.30001589 + electron-to-chromium: 1.4.680 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.23.0) dev: true @@ -8873,8 +8894,8 @@ packages: engines: {node: '>=10'} dev: true - /caniuse-lite@1.0.30001588: - resolution: {integrity: sha512-+hVY9jE44uKLkH0SrUTqxjxqNTOWHsbnQDIKjwkZ3lNTzUUVdBLBGXtj/q5Mp5u98r3droaZAewQuEDzjQdZlQ==} + /caniuse-lite@1.0.30001589: + resolution: {integrity: sha512-vNQWS6kI+q6sBlHbh71IIeC+sRwK2N3EDySc/updIGhIee2x5z00J4c1242/5/d6EpEMdOnk/m+6tuk4/tcsqg==} dev: true /capture-exit@2.0.0: @@ -10684,9 +10705,9 @@ packages: '@swc/core': 1.3.72 '@types/hast': 2.3.10 '@types/mdast': 3.0.15 - '@umijs/bundler-utils': 4.1.1 - '@umijs/core': 4.1.1 - '@umijs/utils': 4.1.1 + '@umijs/bundler-utils': 4.1.2 + '@umijs/core': 4.1.2 + '@umijs/utils': 4.1.2 animated-scroll-to: 2.3.0 classnames: 2.3.2 codesandbox: 2.2.3 @@ -10735,7 +10756,7 @@ packages: remark-rehype: 10.1.0 sass: 1.71.1 sitemap: 7.1.1 - umi: 4.1.1(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)(stylelint@13.13.1)(typescript@5.3.3) + umi: 4.1.2(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)(stylelint@13.13.1)(typescript@5.3.3) unified: 10.1.2 unist-util-visit: 4.1.2 unist-util-visit-parents: 5.1.3 @@ -10830,8 +10851,8 @@ packages: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} dev: true - /electron-to-chromium@1.4.677: - resolution: {integrity: sha512-erDa3CaDzwJOpyvfKhOiJjBVNnMM0qxHq47RheVVwsSQrgBA9ZSGV9kdaOfZDPXcHzhG7lBxhj6A7KvfLJBd6Q==} + /electron-to-chromium@1.4.680: + resolution: {integrity: sha512-4nToZ5jlPO14W82NkF32wyjhYqQByVaDmLy4J2/tYcAbJfgO2TKJC780Az1V13gzq4l73CJ0yuyalpXvxXXD9A==} dev: true /elegant-spinner@1.0.1: @@ -11720,7 +11741,7 @@ packages: /estree-util-to-js@1.2.0: resolution: {integrity: sha512-IzU74r1PK5IMMGZXUVZbmiu4A1uhiPgW5hm1GjcOfr4ZzHaMPpLNJjR7HjXiIOzi25nZDrgFTobHTkV5Q6ITjA==} dependencies: - '@types/estree-jsx': 1.0.4 + '@types/estree-jsx': 1.0.5 astring: 1.8.6 source-map: 0.7.4 dev: true @@ -11728,7 +11749,7 @@ packages: /estree-util-visit@1.2.1: resolution: {integrity: sha512-xbgqcrkIVbIG+lI/gzbvd9SGTJL4zqJKBFttUl5pP27KhAjtMKbX/mQXJ7qgyXpMgVy/zvpm0xoQQaGL8OloOw==} dependencies: - '@types/estree-jsx': 1.0.4 + '@types/estree-jsx': 1.0.5 '@types/unist': 2.0.10 dev: true @@ -11851,7 +11872,7 @@ packages: human-signals: 4.3.1 is-stream: 3.0.0 merge-stream: 2.0.0 - npm-run-path: 5.2.0 + npm-run-path: 5.3.0 onetime: 6.0.0 signal-exit: 3.0.7 strip-final-newline: 3.0.0 @@ -12071,12 +12092,12 @@ packages: hasBin: true dependencies: '@microsoft/api-extractor': 7.39.1(@types/node@14.18.63) - '@umijs/babel-preset-umi': 4.1.1 - '@umijs/bundler-utils': 4.1.1 - '@umijs/bundler-webpack': 4.1.1(typescript@5.3.3) + '@umijs/babel-preset-umi': 4.1.2 + '@umijs/bundler-utils': 4.1.2 + '@umijs/bundler-webpack': 4.1.2(typescript@5.3.3) '@umijs/case-sensitive-paths-webpack-plugin': 1.0.1 - '@umijs/core': 4.1.1 - '@umijs/utils': 4.1.1 + '@umijs/core': 4.1.2 + '@umijs/utils': 4.1.2 '@vercel/ncc': 0.33.3 babel-plugin-dynamic-import-node: 2.3.3 babel-plugin-module-resolver: 4.1.0 @@ -12343,13 +12364,13 @@ packages: resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==} engines: {node: ^10.12.0 || >=12.0.0} dependencies: - flatted: 3.3.0 + flatted: 3.3.1 keyv: 4.5.4 rimraf: 3.0.2 dev: true - /flatted@3.3.0: - resolution: {integrity: sha512-noqGuLw158+DuD9UPRKHpJ2hGxpFyDlYYrfM0mWt4XhT4n0lwzTLh70Tkdyy4kyTmyTT9Bv7bWAJqw7cgkEXDg==} + /flatted@3.3.1: + resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} dev: true /flush-write-stream@1.1.1: @@ -13318,7 +13339,7 @@ packages: resolution: {integrity: sha512-ihhPIUPxN0v0w6M5+IiAZZrn0LH2uZomeWwhn7uP7avZC6TE7lIiEh2yBMPr5+zi1aUCXq6VoYRgs2Bw9xmycQ==} dependencies: '@types/estree': 1.0.5 - '@types/estree-jsx': 1.0.4 + '@types/estree-jsx': 1.0.5 '@types/hast': 2.3.10 '@types/unist': 2.0.10 comma-separated-tokens: 2.0.3 @@ -16627,7 +16648,7 @@ packages: /mdast-util-mdx-expression@1.3.2: resolution: {integrity: sha512-xIPmR5ReJDu/DHH1OoIT1HkuybIfRGYRywC+gJtI7qHjCJp/M9jrmBEJW22O8lskDWm562BX2W8TiAwRTb0rKA==} dependencies: - '@types/estree-jsx': 1.0.4 + '@types/estree-jsx': 1.0.5 '@types/hast': 2.3.10 '@types/mdast': 3.0.15 mdast-util-from-markdown: 1.3.1 @@ -16639,7 +16660,7 @@ packages: /mdast-util-mdxjs-esm@1.3.1: resolution: {integrity: sha512-SXqglS0HrEvSdUEfoXFtcg7DRl7S2cwOXc7jkuusG472Mmjag34DUDeOJUZtl+BVnyeO1frIgVpHlNRWc2gk/w==} dependencies: - '@types/estree-jsx': 1.0.4 + '@types/estree-jsx': 1.0.5 '@types/hast': 2.3.10 '@types/mdast': 3.0.15 mdast-util-from-markdown: 1.3.1 @@ -17641,8 +17662,8 @@ packages: hasBin: true dev: true - /mlly@1.5.0: - resolution: {integrity: sha512-NPVQvAY1xr1QoVeG0cy8yUYC7FQcOx6evl/RjT1wL5FvzPnzOysoqB/jmx/DhssT2dYa8nxECLAaFI/+gVLhDQ==} + /mlly@1.6.0: + resolution: {integrity: sha512-YOvg9hfYQmnaB56Yb+KrJE2u0Yzz5zR+sLejEvF4fzwzV1Al6hkf2vyHTwqCRyv0hCi9rVCqVoXpyYevQIRwLQ==} dependencies: acorn: 8.11.3 pathe: 1.1.2 @@ -18127,8 +18148,8 @@ packages: path-key: 3.1.1 dev: true - /npm-run-path@5.2.0: - resolution: {integrity: sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==} + /npm-run-path@5.3.0: + resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dependencies: path-key: 4.0.0 @@ -19097,7 +19118,7 @@ packages: resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==} dependencies: jsonc-parser: 3.2.1 - mlly: 1.5.0 + mlly: 1.6.0 pathe: 1.1.2 dev: true @@ -19719,8 +19740,8 @@ packages: typescript: 5.3.3 dev: true - /prettier-plugin-packagejson@2.4.11(prettier@2.8.8): - resolution: {integrity: sha512-zmOmM96GkAjT2zUdHSQJnpyVpbisBkewDluo2NLHjI/JN7uOCZlEzWVaMhdqyZ8LVdQDfzamvbvSw4swd3Az1A==} + /prettier-plugin-packagejson@2.4.12(prettier@2.8.8): + resolution: {integrity: sha512-hifuuOgw5rHHTdouw9VrhT8+Nd7UwxtL1qco8dUfd4XUFQL6ia3xyjSxhPQTsGnSYFraTWy5Omb+MZm/OWDTpQ==} peerDependencies: prettier: '>= 1.16.0' peerDependenciesMeta: @@ -19728,7 +19749,7 @@ packages: optional: true dependencies: prettier: 2.8.8 - sort-package-json: 2.7.0 + sort-package-json: 2.8.0 synckit: 0.9.0 dev: true @@ -20396,8 +20417,8 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true - /rc-picker@4.1.3(dayjs@1.11.10)(moment@2.30.1)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-zmS64uYgiuWNmaWAxbVoAvSMuyNzGL9iO0Z8SIZzzm8U03taHHP0/jncWuM9v+O/F7Ghm7+IrFL0dDyk7aAqIw==} + /rc-picker@4.1.4(dayjs@1.11.10)(moment@2.30.1)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-sAdgj1kW9wvuoS5p2Zw3pT52iUYxidYaqXVLooaKxTqgYbhe8cG8Ld3b8cgwYfKrIkm/j+qp9nDQlrFPSl16lQ==} engines: {node: '>=8.x'} peerDependencies: date-fns: '>= 2.x' @@ -22352,8 +22373,8 @@ packages: sort-object-keys: 1.1.3 dev: true - /sort-package-json@2.7.0: - resolution: {integrity: sha512-6AayF8bp6L+WROgpbhTMUtB9JSFmpGHjmW7DyaNPS1HwlTw2oSVlUUtlkHSEZmg5o89F3zvLBZNvMeZ1T4fjQg==} + /sort-package-json@2.8.0: + resolution: {integrity: sha512-PxeNg93bTJWmDGnu0HADDucoxfFiKkIr73Kv85EBThlI1YQPdc0XovBgg2llD0iABZbu2SlKo8ntGmOP9wOj/g==} hasBin: true dependencies: detect-indent: 7.0.1 @@ -23696,13 +23717,13 @@ packages: typescript: 5.3.3 dev: true - /tsx@3.14.0: - resolution: {integrity: sha512-xHtFaKtHxM9LOklMmJdI3BEnQq/D5F73Of2E1GDrITi9sgoVkvIsrQUTY1G8FlmGtA+awCI4EBlTRRYxkL2sRg==} + /tsx@3.12.2: + resolution: {integrity: sha512-ykAEkoBg30RXxeOMVeZwar+JH632dZn9EUJVyJwhfag62k6UO/dIyJEV58YuLF6e5BTdV/qmbQrpkWqjq9cUnQ==} hasBin: true dependencies: - esbuild: 0.18.20 - get-tsconfig: 4.7.2 - source-map-support: 0.5.21 + '@esbuild-kit/cjs-loader': 2.4.4 + '@esbuild-kit/core-utils': 3.3.2 + '@esbuild-kit/esm-loader': 2.6.5 optionalDependencies: fsevents: 2.3.3 dev: true @@ -23893,21 +23914,21 @@ packages: qs: 6.11.2 dev: true - /umi@4.1.1(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)(stylelint@13.13.1)(typescript@5.3.3): - resolution: {integrity: sha512-FGSyS4V2kyXnrOudT3JBavhNjSIzgC1FJjOCmhjElmGIZV/FY9gpqOKk9WExdO96xSOvff0+16SK2WtQj/xQgQ==} + /umi@4.1.2(@babel/core@7.23.9)(@types/node@14.18.63)(@types/react@18.2.57)(eslint@8.56.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)(stylelint@13.13.1)(typescript@5.3.3): + resolution: {integrity: sha512-lP/qxOo4CmjcJKFrOy8PCIsW/nRLGXsH5CY0/WEUAkHd63M+osbv/t1fhAhsgKpb7/ofaiSpkNsev5XJz+M3aQ==} engines: {node: '>=14'} hasBin: true dependencies: '@babel/runtime': 7.23.6 - '@umijs/bundler-utils': 4.1.1 - '@umijs/bundler-webpack': 4.1.1(typescript@5.3.3) - '@umijs/core': 4.1.1 - '@umijs/lint': 4.1.1(eslint@8.56.0)(stylelint@13.13.1)(typescript@5.3.3) - '@umijs/preset-umi': 4.1.1(@types/node@14.18.63)(@types/react@18.2.57)(sass@1.71.1)(typescript@5.3.3) - '@umijs/renderer-react': 4.1.1(react-dom@18.2.0)(react@18.2.0) - '@umijs/server': 4.1.1 - '@umijs/test': 4.1.1(@babel/core@7.23.9) - '@umijs/utils': 4.1.1 + '@umijs/bundler-utils': 4.1.2 + '@umijs/bundler-webpack': 4.1.2(typescript@5.3.3) + '@umijs/core': 4.1.2 + '@umijs/lint': 4.1.2(eslint@8.56.0)(stylelint@13.13.1)(typescript@5.3.3) + '@umijs/preset-umi': 4.1.2(@types/node@14.18.63)(@types/react@18.2.57)(sass@1.71.1)(typescript@5.3.3) + '@umijs/renderer-react': 4.1.2(react-dom@18.2.0)(react@18.2.0) + '@umijs/server': 4.1.2 + '@umijs/test': 4.1.2(@babel/core@7.23.9) + '@umijs/utils': 4.1.2 prettier-plugin-organize-imports: 3.2.4(prettier@2.8.8)(typescript@5.3.3) prettier-plugin-packagejson: 2.4.3(prettier@2.8.8) transitivePeerDependencies: @@ -24533,10 +24554,10 @@ packages: dependencies: cac: 6.7.14 debug: 4.3.4 - mlly: 1.5.0 + mlly: 1.6.0 pathe: 1.1.2 picocolors: 1.0.0 - vite: 5.1.3(@types/node@14.18.63) + vite: 5.1.4(@types/node@14.18.63) transitivePeerDependencies: - '@types/node' - less @@ -24583,8 +24604,8 @@ packages: fsevents: 2.3.3 dev: true - /vite@5.1.3(@types/node@14.18.63): - resolution: {integrity: sha512-UfmUD36DKkqhi/F75RrxvPpry+9+tTkrXfMNZD+SboZqBCMsxKtO52XeGzzuh7ioz+Eo/SYDBbdb0Z7vgcDJew==} + /vite@5.1.4(@types/node@14.18.63): + resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -24672,7 +24693,7 @@ packages: strip-literal: 1.3.0 tinybench: 2.6.0 tinypool: 0.7.0 - vite: 5.1.3(@types/node@14.18.63) + vite: 5.1.4(@types/node@14.18.63) vite-node: 0.34.6(@types/node@14.18.63) why-is-node-running: 2.2.2 transitivePeerDependencies: diff --git a/tests/layout/__snapshots__/demo.test.ts.snap b/tests/layout/__snapshots__/demo.test.ts.snap index c7a23c8dcb6c..458ea4901182 100644 --- a/tests/layout/__snapshots__/demo.test.ts.snap +++ b/tests/layout/__snapshots__/demo.test.ts.snap @@ -4358,6 +4358,20 @@ exports[`layout demos > 📸 renders ./packages/layout/src/demos/api.tsx correct
    +
    +
    + + 欢迎 + +
    +
    @@ -4504,7 +4518,7 @@ exports[`layout demos > 📸 renders ./packages/layout/src/demos/appList-group.t />
    📸 renders ./packages/layout/src/demos/appList-group-s />
    📸 renders ./packages/layout/src/demos/background-cont
    📸 renders ./packages/layout/src/demos/background-cont class="ant-pro-page-container" >
    + class="ant-page-header ant-pro-page-container-warp-page-header ant-page-header-has-breadcrumb ant-page-header-ghost" + > + +
    +
    + + 一一级列表页面 + +
    +
    +
    @@ -5521,7 +5583,7 @@ exports[`layout demos > 📸 renders ./packages/layout/src/demos/base.tsx correc
    📸 renders ./packages/layout/src/demos/base.tsx correc class="ant-pro-page-container ant-pro-page-container-with-footer" >
    +
    + + 一一级列表页面 + 📸 renders ./packages/layout/src/demos/base.tsx correc
    📸 renders ./packages/layout/src/demos/classicMode.tsx