fix(RangePicker): fix shortcut invalid (#2586)

* chore: upgrade antd to v5.8.4

* test: add test

* chore: fix build

* chore: upgrade @formily/antd-v5 to v1.1.1

* fix: should not close Popover when selected option

* fix: add a new Popover and to replace old Popover with new Popover

* refactor: remove useless code

* fix: fix dark theme

* chore: fix build

* chore: antd version

* fix: uniformly use the latest version of antd
This commit is contained in:
被雨水过滤的空气-Rain 2023-09-04 16:25:49 +08:00 committed by GitHub
parent fed3eb1a51
commit aff559882f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 323 additions and 136 deletions

View File

@ -41,7 +41,8 @@
"react-router-dom": "^6.11.2",
"react-router": "^6.11.2",
"react": "^18.0.0",
"react-dom": "^18.0.0"
"react-dom": "^18.0.0",
"antd": "5.8.6"
},
"config": {
"ghooks": {

View File

@ -8,14 +8,14 @@
"dependencies": {
"@ant-design/cssinjs": "^1.11.1",
"@ant-design/icons": "^5.1.4",
"@ant-design/pro-layout": "^7.14.3",
"@ant-design/pro-layout": "^7.16.11",
"@antv/g2plot": "^2.4.18",
"@ctrl/tinycolor": "^3.6.0",
"@dnd-kit/core": "^5.0.1",
"@dnd-kit/modifiers": "^6.0.0",
"@dnd-kit/sortable": "^6.0.0",
"@emotion/css": "^11.7.1",
"@formily/antd-v5": "^1.1.0",
"@formily/antd-v5": "1.1.1",
"@formily/core": "^2.2.27",
"@formily/grid": "^2.2.27",
"@formily/json-schema": "^2.2.27",
@ -30,8 +30,8 @@
"@nocobase/utils": "0.13.0-alpha.5",
"@types/requirejs": "^2.1.34",
"ahooks": "^3.7.2",
"antd": "^5.7.3",
"antd-style": "^3.3.0",
"antd": "5.8.6",
"antd-style": "3.x",
"axios": "^0.26.1",
"classnames": "^2.3.1",
"cron-parser": "^4.6.0",

View File

@ -1,8 +1,6 @@
import { Cascader } from '@formily/antd-v5';
import { useField, useForm } from '@formily/react';
import { Input, Select, Spin, Table, Tag } from 'antd';
import { Cascader, Input, Select, Spin, Table, Tag } from 'antd';
import { last } from 'lodash';
import { boolean } from 'mathjs';
import React, { useContext, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { ResourceActionContext, useCompile } from '../../../';

View File

@ -1,4 +1,4 @@
import { MappingAlgorithm } from 'antd/es/config-provider/context';
import { MappingAlgorithm } from 'antd-style';
import { OverrideToken } from 'antd/es/theme/interface';
import { AliasToken } from 'antd/es/theme/internal';

View File

@ -11,6 +11,9 @@ export const useStyles = createStyles(({ token }) => {
'& .ant-tabs-nav': {
marginBottom: 0,
},
'.ant-page-header-heading-title': {
color: token.colorText,
},
},
pageContent: {

View File

@ -1,5 +1,5 @@
import { observer, RecursionField, useField, useFieldSchema, useForm } from '@formily/react';
import { App, Button, Popover } from 'antd';
import { App, Button } from 'antd';
import classnames from 'classnames';
import lodash from 'lodash';
import React, { useEffect, useState } from 'react';
@ -11,6 +11,7 @@ import { useRecord } from '../../../record-provider';
import { SortableItem } from '../../common';
import { useCompile, useComponent, useDesigner } from '../../hooks';
import { useProps } from '../../hooks/useProps';
import { Popover } from '../popover';
import ActionContainer from './Action.Container';
import { ActionDesigner } from './Action.Designer';
import { ActionDrawer } from './Action.Drawer';

View File

@ -1,13 +1,13 @@
import { Popover } from 'antd';
import { css } from '@emotion/css';
import { EditOutlined } from '@ant-design/icons';
import { css } from '@emotion/css';
import { observer } from '@formily/react';
import React, { useContext, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { ReadPrettyInternalViewer } from './InternalViewer';
import { ActionContext, ActionContextProvider } from '../action/context';
import { Popover } from '../popover';
import { InternalNester } from './InternalNester';
import { ReadPrettyInternalViewer } from './InternalViewer';
import { useAssociationFieldContext } from './hooks';
import { ActionContextProvider, ActionContext } from '../action/context';
export const InternaPopoverNester = observer(
(props) => {

View File

@ -1,6 +1,7 @@
import React from 'react';
import { render, screen, sleep, userEvent, waitFor } from 'testUtils';
import App1 from '../demos/demo1';
import App11 from '../demos/demo11';
import App2 from '../demos/demo2';
import App3 from '../demos/demo3';
import App4 from '../demos/demo4';
@ -68,8 +69,11 @@ describe('DatePicker', () => {
await userEvent.click(picker);
await userEvent.type(input, '2023/05/01');
const selected = document.querySelector('.ant-picker-cell-selected') as HTMLElement;
expect(selected).toBeInTheDocument();
let selected;
await waitFor(() => {
selected = document.querySelector('.ant-picker-cell-selected') as HTMLElement;
expect(selected).toBeInTheDocument();
});
await userEvent.click(selected);
expect(input).toHaveValue('2023/05/01');
@ -138,15 +142,20 @@ describe('RangePicker', () => {
const endInput = getByPlaceholderText('End date');
await userEvent.click(picker);
await sleep();
await userEvent.click(document.querySelector('[title="2023-05-01"]') as HTMLElement);
await userEvent.click(document.querySelector('[title="2023-05-02"]') as HTMLElement);
expect(startInput).toHaveValue('2023-05-01');
expect(endInput).toHaveValue('2023-05-02');
await waitFor(() => expect(startInput).toHaveValue('2023-05-01'));
await waitFor(() => expect(endInput).toHaveValue('2023-05-02'));
// Read pretty
expect(screen.getByText('2023-05-01~2023-05-02', { selector: '.ant-description-text' })).toBeInTheDocument();
await waitFor(() =>
expect(screen.getByText('2023-05-01~2023-05-02', { selector: '.ant-description-text' })).toBeInTheDocument(),
);
// Value
expect(screen.getByText('2023-05-01 ~ 2023-05-02')).toBeInTheDocument();
await waitFor(() => expect(screen.getByText('2023-05-01 ~ 2023-05-02')).toBeInTheDocument());
});
it('showTime=false,gmt=true,utc=true', async () => {
@ -219,4 +228,25 @@ describe('RangePicker', () => {
expect(screen.getByText(`${currentDateString}T00:00:00.000Z`)).toBeInTheDocument();
});
});
// fix T-1506
it('shortcut', async () => {
const { container } = render(<App11 />);
await sleep();
const picker = container.querySelector('.ant-picker') as HTMLElement;
const startInput = screen.getByPlaceholderText('Start date');
const endInput = screen.getByPlaceholderText('End date');
await userEvent.click(picker);
// shortcut: Today
await userEvent.click(screen.getByText(/today/i));
await sleep();
// 因为 Today 快捷键的值是动态生成的,所以这里没有断言具体的值
await waitFor(() => expect(startInput.getAttribute('value')).toBeTruthy());
await waitFor(() => expect(endInput.getAttribute('value')).toBeTruthy());
});
});

View File

@ -0,0 +1,65 @@
/**
* title: DatePicker.RangePicker
*/
import { FormItem } from '@formily/antd-v5';
import { DatePicker, Input, SchemaComponent, SchemaComponentProvider } from '@nocobase/client';
import React from 'react';
const schema = {
type: 'object',
properties: {
input: {
type: 'boolean',
title: `Editable`,
'x-decorator': 'FormItem',
'x-component': 'DatePicker.RangePicker',
'x-component-props': {
gmt: true,
},
'x-reactions': [
{
target: 'read1',
fulfill: {
state: {
value: '{{$self.value}}',
},
},
},
{
target: 'read2',
fulfill: {
state: {
value: '{{$self.value && $self.value.join(" ~ ")}}',
},
},
},
],
},
read1: {
type: 'boolean',
title: `Read pretty`,
'x-read-pretty': true,
'x-decorator': 'FormItem',
'x-component': 'DatePicker.RangePicker',
'x-component-props': {
gmt: true,
},
},
read2: {
type: 'string',
title: `Value`,
'x-read-pretty': true,
'x-decorator': 'FormItem',
'x-component': 'Input',
'x-component-props': {},
},
},
};
export default () => {
return (
<SchemaComponentProvider components={{ Input, DatePicker, FormItem }}>
<SchemaComponent schema={schema} />
</SchemaComponentProvider>
);
};

View File

@ -1,13 +1,14 @@
import { css } from '@emotion/css';
import { createForm, Field, Form } from '@formily/core';
import { observer, useField, useFieldSchema, useForm } from '@formily/react';
import { Button, Popover, Space } from 'antd';
import React, { createContext, useContext, useMemo, useState } from 'react';
import { Button, Space } from 'antd';
import React, { createContext, useCallback, useContext, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { FormProvider, SchemaComponent } from '../../core';
import { useDesignable } from '../../hooks';
import { useProps } from '../../hooks/useProps';
import { Action } from '../action';
import { Popover } from '../popover';
export const FilterActionContext = createContext<any>(null);
@ -20,15 +21,17 @@ export const FilterAction = observer(
const fieldSchema = useFieldSchema();
const form = useMemo<Form>(() => props.form || createForm(), []);
const { options, onSubmit, onReset, ...others } = useProps(props);
const onOpenChange = useCallback((visible: boolean): void => {
setVisible(visible);
}, []);
return (
<FilterActionContext.Provider value={{ field, fieldSchema, designable, dn }}>
<Popover
destroyTooltipOnHide
placement={'bottomLeft'}
open={visible}
onOpenChange={(visible) => {
setVisible(visible);
}}
onOpenChange={onOpenChange}
trigger={'click'}
content={
<form>

View File

@ -2,10 +2,11 @@ import { CloseOutlined, LoadingOutlined } from '@ant-design/icons';
import { useFormLayout } from '@formily/antd-v5';
import { connect, mapProps, mapReadPretty } from '@formily/react';
import { isValid } from '@formily/shared';
import { Button, Input, Popover } from 'antd';
import { Button, Input } from 'antd';
import React, { useState } from 'react';
import { useTranslation } from 'react-i18next';
import { Icon, hasIcon, icons } from '../../../icon';
import { Popover } from '../popover';
function IconField(props: any) {
const layout = useFormLayout();

View File

@ -35,6 +35,7 @@ export * from './page';
export * from './pagination';
export * from './password';
export * from './percent';
export * from './popover';
export * from './preview';
export * from './quick-edit';
export * from './radio';

View File

@ -1,5 +1,5 @@
import { Popover } from 'antd';
import React, { CSSProperties, forwardRef, useImperativeHandle, useState, useRef } from 'react';
import React, { CSSProperties, forwardRef, useImperativeHandle, useRef, useState } from 'react';
import { Popover } from '../popover';
const getContentWidth = (element) => {
if (element) {

View File

@ -49,6 +49,9 @@ export const useStyles = genStyleHook('nb-page', (token) => {
'.ant-page-header-footer': { marginBlockStart: '0' },
},
'.ant-tabs-nav': { marginBottom: '0' },
'.ant-page-header-heading-title': {
color: token.colorText,
},
},
'.height0': {

View File

@ -0,0 +1,16 @@
import { Popover as AntdPopover, PopoverProps } from 'antd';
import React, { useCallback } from 'react';
export const Popover = (props: PopoverProps) => {
// 参见https://github.com/ant-design/ant-design/issues/44119
// fix T-1508
const avoidClose = useCallback((e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
e.stopPropagation();
}, []);
return (
<div onClick={avoidClose}>
<AntdPopover {...props} />
</div>
);
};

View File

@ -0,0 +1 @@
export * from './Popover';

View File

@ -2,9 +2,9 @@ import { css } from '@emotion/css';
import { FormItem } from '@formily/antd-v5';
import { Field, createForm } from '@formily/core';
import { FormContext, RecursionField, observer, useField, useFieldSchema } from '@formily/react';
import { Popover } from 'antd';
import React, { useMemo, useRef } from 'react';
import { useCollectionManager } from '../../../collection-manager';
import { Popover } from '../popover';
export const Editable = observer((props) => {
const field: any = useField();

View File

@ -1,9 +1,9 @@
import { LoadingOutlined } from '@ant-design/icons';
import { connect, mapProps, mapReadPretty } from '@formily/react';
import { isValid } from '@formily/shared';
import { css, Icon } from '@nocobase/client';
import { Icon, Popover, css } from '@nocobase/client';
import type { SelectProps } from 'antd';
import { Popover, Select as AntdSelect } from 'antd';
import { Select as AntdSelect } from 'antd';
import React from 'react';
import { lang } from '../locale';
import { ReadPretty } from './ReadPretty';
@ -35,7 +35,7 @@ const InternalSelect = connect(
>
<OptGroup label={lang('Basic charts')}>
{group1.map((option) => (
<Option value={option.key} label={lang(option.title)}>
<Option key={option.key} value={option.key} label={lang(option.title)}>
<Popover
placement={'right'}
zIndex={99999999999}
@ -43,9 +43,7 @@ const InternalSelect = connect(
<span>
{lang(option?.description)
?.split(',')
.map((item) => (
<div>{item}</div>
))}
.map((item) => <div key={item}>{item}</div>)}
</span>
)}
trigger="hover"
@ -68,7 +66,7 @@ const InternalSelect = connect(
</OptGroup>
<OptGroup label={lang('More charts')}>
{group2.map((option) => (
<Option value={option.key} label={lang(option.title)}>
<Option key={option.key} value={option.key} label={lang(option.title)}>
<Popover
placement={'right'}
zIndex={99999999999}
@ -76,9 +74,7 @@ const InternalSelect = connect(
<span>
{lang(option?.description)
?.split(',')
.map((item) => (
<div>{item}</div>
))}
.map((item) => <div key={item}>{item}</div>)}
</span>
)}
trigger="hover"

View File

@ -7,11 +7,12 @@ import {
ShareAltOutlined,
} from '@ant-design/icons';
import { Graph } from '@antv/x6';
import { register } from '@antv/x6-react-shape';
import { Scroller } from '@antv/x6-plugin-scroller';
import { MiniMap } from '@antv/x6-plugin-minimap';
import { Scroller } from '@antv/x6-plugin-scroller';
import { Selection } from '@antv/x6-plugin-selection';
import { Snapline } from '@antv/x6-plugin-snapline';
import { register } from '@antv/x6-react-shape';
import { css, cx } from '@emotion/css';
import { SchemaOptionsContext } from '@formily/react';
import {
APIClientProvider,
@ -20,6 +21,7 @@ import {
CollectionManagerContext,
CollectionManagerProvider,
CurrentAppInfoContext,
Popover,
SchemaComponent,
SchemaComponentOptions,
Select,
@ -30,11 +32,10 @@ import {
useCurrentAppInfo,
useGlobalTheme,
} from '@nocobase/client';
import { css, cx } from '@emotion/css';
import lodash from 'lodash';
import { useFullscreen } from 'ahooks';
import { Button, ConfigProvider, Input, Layout, Menu, Popover, Switch, Tooltip, App, Spin } from 'antd';
import { App, Button, ConfigProvider, Input, Layout, Menu, Spin, Switch, Tooltip } from 'antd';
import dagre from 'dagre';
import lodash from 'lodash';
import React, { createContext, forwardRef, useContext, useEffect, useLayoutEffect, useState } from 'react';
import { useAsyncDataSource, useCreateActionAndRefreshCM } from './action-hooks';
import { AddCollectionAction } from './components/AddCollectionAction';

View File

@ -1,9 +1,11 @@
import { DeleteOutlined, DownOutlined, EditOutlined, UpOutlined } from '@ant-design/icons';
import { uid } from '@formily/shared';
import { css } from '@emotion/css';
import { SchemaOptionsContext } from '@formily/react';
import { uid } from '@formily/shared';
import {
CollectionCategroriesContext,
CollectionProvider,
Popover,
SchemaComponent,
SchemaComponentProvider,
Select,
@ -13,9 +15,8 @@ import {
useCurrentAppInfo,
useRecord,
} from '@nocobase/client';
import { Badge, Tag } from 'antd';
import lodash from 'lodash';
import { SchemaOptionsContext } from '@formily/react';
import { Badge, Popover, Tag } from 'antd';
import React, { useContext, useRef, useState } from 'react';
import {
useAsyncDataSource,

View File

@ -4,6 +4,7 @@ import { Field, useField, useForm } from '@formily/react';
import {
FormProvider,
Input,
Popover,
Radio,
SchemaComponent,
locale,
@ -13,7 +14,7 @@ import {
useResourceActionContext,
useResourceContext,
} from '@nocobase/client';
import { Input as AntdInput, Button, Card, Checkbox, Col, Divider, Popover, Row, Tag, Typography, message } from 'antd';
import { Input as AntdInput, Button, Card, Checkbox, Col, Divider, Row, Tag, Typography, message } from 'antd';
import React, { useMemo, useState } from 'react';
import { useLocalTranslation } from './locale';
import { localizationSchema } from './schemas/localization';

View File

@ -16,7 +16,7 @@
"ahooks": "^3.7.2",
"antd": "5.x",
"antd-mobile": "^5.29.1",
"antd-style": "^3.3.0",
"antd-style": "3.x",
"classnames": "^2.3.1",
"react": "^18.0.0",
"react-dom": "^18.0.0",

View File

@ -1,5 +1,6 @@
import { CaretRightOutlined, ExpandOutlined, QuestionCircleOutlined } from '@ant-design/icons';
import { Button, Checkbox, Collapse, ConfigProvider, Popover, Switch, Tooltip, Typography } from 'antd';
import { Popover } from '@nocobase/client';
import { Button, Checkbox, Collapse, ConfigProvider, Switch, Tooltip, Typography } from 'antd';
import type { ThemeConfig } from 'antd/es/config-provider/context';
import seed from 'antd/es/theme/themes/seed';
import classNames from 'classnames';
@ -60,9 +61,10 @@ const useStyle = makeStyle('ColorTokenContent', (token) => ({
transition: 'box-shadow 0.2s ease-in-out',
borderRadius: 8,
},
[`> ${token.rootCls}-collapse-item > ${token.rootCls}-collapse-content > ${token.rootCls}-collapse-content-box`]: {
paddingBlock: '0 12px',
},
[`> ${token.rootCls}-collapse-item > ${token.rootCls}-collapse-content > ${token.rootCls}-collapse-content-box`]:
{
paddingBlock: '0 12px',
},
'.token-panel-pro-token-collapse-description': {
color: token.colorTextTertiary,

229
yarn.lock
View File

@ -138,7 +138,7 @@
dependencies:
"@ctrl/tinycolor" "^3.4.0"
"@ant-design/cssinjs@^1", "@ant-design/cssinjs@^1.3.1", "@ant-design/cssinjs@^1.9.1":
"@ant-design/cssinjs@^1", "@ant-design/cssinjs@^1.3.1":
version "1.10.1"
resolved "https://registry.npmmirror.com/@ant-design/cssinjs/-/cssinjs-1.10.1.tgz#c9173f38e3d61f0883ca3c17d7cf1e30784e0dd7"
dependencies:
@ -162,9 +162,10 @@
rc-util "^5.34.1"
stylis "^4.0.13"
"@ant-design/cssinjs@^1.13.2":
version "1.16.1"
resolved "https://registry.npmmirror.com/@ant-design/cssinjs/-/cssinjs-1.16.1.tgz#0032044db5678dd25ac12def1abb1d52e6a4d583"
"@ant-design/cssinjs@^1.16.0":
version "1.17.0"
resolved "https://registry.npmmirror.com/@ant-design/cssinjs/-/cssinjs-1.17.0.tgz#a3f69cf5131539b76ccdbfced43d242557599fea"
integrity sha512-MgGCZ6sfD3yQB0XW0hN4jgixMxApTlDYyct+pc7fRZNO4CaqWWm/9iXkkljNR27lyWLZmm+XiDfcIOo1bnrnMA==
dependencies:
"@babel/runtime" "^7.11.1"
"@emotion/hash" "^0.8.0"
@ -178,7 +179,12 @@
version "4.2.1"
resolved "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz#8630da8eb4471a4aabdaed7d1ff6a97dcb2cf05a"
"@ant-design/icons@5.x", "@ant-design/icons@^5.0.0", "@ant-design/icons@^5.1.0", "@ant-design/icons@^5.1.3", "@ant-design/icons@^5.1.4":
"@ant-design/icons-svg@^4.3.0":
version "4.3.1"
resolved "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.3.1.tgz#4b2f65a17d4d32b526baa6414aca2117382bf8da"
integrity sha512-4QBZg8ccyC6LPIRii7A0bZUk3+lEDCLnhB+FVsflGdcWPPmV+j3fire4AwwoqHV/BibgvBmR9ZIo4s867smv+g==
"@ant-design/icons@5.x", "@ant-design/icons@^5.0.0", "@ant-design/icons@^5.1.3", "@ant-design/icons@^5.1.4":
version "5.1.4"
resolved "https://registry.npmmirror.com/@ant-design/icons/-/icons-5.1.4.tgz#614e29e26d092c2c1c1a2acbc0d84434d8d1474e"
dependencies:
@ -198,6 +204,17 @@
classnames "^2.2.6"
rc-util "^5.9.4"
"@ant-design/icons@^5.2.2":
version "5.2.6"
resolved "https://registry.npmmirror.com/@ant-design/icons/-/icons-5.2.6.tgz#2d4a9a37f531eb2a20cebec01d6fb69cf593900d"
integrity sha512-4wn0WShF43TrggskBJPRqCD0fcHbzTYjnaoskdiJrVHg86yxoZ8ZUqsXvyn4WUqehRiFKnaclOhqk9w4Ui2KVw==
dependencies:
"@ant-design/colors" "^7.0.0"
"@ant-design/icons-svg" "^4.3.0"
"@babel/runtime" "^7.11.2"
classnames "^2.2.6"
rc-util "^5.31.1"
"@ant-design/plots@^1.2.5":
version "1.2.5"
resolved "https://registry.npmmirror.com/@ant-design/plots/-/plots-1.2.5.tgz#404caf0e2c8d052590fe080c6f0fdf0e0c3119ab"
@ -206,13 +223,14 @@
"@antv/util" "^2.0.9"
react-content-loader "^5.0.4"
"@ant-design/pro-layout@^7.14.3":
version "7.15.3"
resolved "https://registry.npmmirror.com/@ant-design/pro-layout/-/pro-layout-7.15.3.tgz#2082132e86e244c02925856a2b501c667cd1d084"
"@ant-design/pro-layout@^7.16.11":
version "7.16.11"
resolved "https://registry.npmmirror.com/@ant-design/pro-layout/-/pro-layout-7.16.11.tgz#e9bee6ea95786b98644ca271d5d97456f2f1d015"
integrity sha512-7BqsuRMavMeroWFHKHARQo46mjv9ZFdnxNREFEnoj6Zfdi+TncG5DGKUqgFR/ppliMJ7K4xEkJUlbjnP1rzmkg==
dependencies:
"@ant-design/icons" "^5.0.0"
"@ant-design/pro-provider" "2.10.5"
"@ant-design/pro-utils" "2.12.2"
"@ant-design/pro-provider" "2.12.2"
"@ant-design/pro-utils" "2.14.2"
"@babel/runtime" "^7.18.0"
"@umijs/route-utils" "^4.0.0"
"@umijs/use-params" "^1.0.9"
@ -223,30 +241,32 @@
rc-resize-observer "^1.1.0"
rc-util "^5.0.6"
swr "^2.0.0"
use-json-comparison "^1.0.3"
use-media-antd-query "^1.1.0"
warning "^4.0.3"
"@ant-design/pro-provider@2.10.5":
version "2.10.5"
resolved "https://registry.npmmirror.com/@ant-design/pro-provider/-/pro-provider-2.10.5.tgz#9f6f3cab5ab7ca28b9a12e04c35f9ac809808a9e"
"@ant-design/pro-provider@2.12.2":
version "2.12.2"
resolved "https://registry.npmmirror.com/@ant-design/pro-provider/-/pro-provider-2.12.2.tgz#e1e07df7cdb1c5e3c277793873ab22816d5b8c3d"
integrity sha512-1ocfp56wcVKduRbDedLsBO7enEMh4i5ckq1sPCBaEb9M4vrZ2haKiYDe51qTBviUvxSCPAwNmIyluozmWnPwwg==
dependencies:
"@ant-design/cssinjs" "^1.9.1"
"@ant-design/cssinjs" "^1.11.1"
"@babel/runtime" "^7.18.0"
"@ctrl/tinycolor" "^3.4.0"
rc-util "^5.0.1"
swr "^2.0.0"
"@ant-design/pro-utils@2.12.2":
version "2.12.2"
resolved "https://registry.npmmirror.com/@ant-design/pro-utils/-/pro-utils-2.12.2.tgz#447ddb2b1f1975e265babe3e6815ccffa9535c08"
"@ant-design/pro-utils@2.14.2":
version "2.14.2"
resolved "https://registry.npmmirror.com/@ant-design/pro-utils/-/pro-utils-2.14.2.tgz#3b136e53f25ad7c56ccddf44a126ef1616e4f47e"
integrity sha512-srMDRis/TbNcmPVT48UlgfV5arjITHb8kt4VTgySRXrDaV3kGzJr/xcW9LcQOLTHTfY0cbdPmXS3GooBNzMZAQ==
dependencies:
"@ant-design/icons" "^5.0.0"
"@ant-design/pro-provider" "2.10.5"
"@ant-design/pro-provider" "2.12.2"
"@babel/runtime" "^7.18.0"
classnames "^2.3.2"
dayjs "^1.11.8"
dayjs "^1.11.9"
lodash.merge "^4.6.2"
rc-util "^5.0.6"
safe-stable-stringify "^2.4.3"
swr "^2.0.0"
"@ant-design/react-slick@~1.0.0":
@ -2967,7 +2987,26 @@
intl-messageformat "10.5.0"
tslib "^2.4.0"
"@formily/antd-v5@1.x", "@formily/antd-v5@^1.1.0":
"@formily/antd-v5@1.1.1":
version "1.1.1"
resolved "https://registry.npmmirror.com/@formily/antd-v5/-/antd-v5-1.1.1.tgz#b1f103cbb99b88d14ebf66a362e6fd2177046478"
integrity sha512-fubuPHWjHVtBNWQ3iGfwy44mIRHSLn7DfvtLIYAdszHt3c4jk3ermUW2hCAeBTd9bX0NXery/VSy+yTd1Myzyg==
dependencies:
"@ant-design/cssinjs" "^1.3.1"
"@ant-design/icons" "^5.0.0"
"@dnd-kit/core" "^6.0.0"
"@dnd-kit/sortable" "^7.0.0"
"@formily/core" "^2.2.0"
"@formily/grid" "^2.2.0"
"@formily/json-schema" "^2.2.0"
"@formily/react" "^2.2.0"
"@formily/reactive" "^2.2.0"
"@formily/reactive-react" "^2.2.0"
"@formily/shared" "^2.2.0"
classnames "^2.2.6"
react-sticky-box "^1.0.2"
"@formily/antd-v5@1.x":
version "1.1.0"
resolved "https://registry.npmmirror.com/@formily/antd-v5/-/antd-v5-1.1.0.tgz#e2f20df64c62df348a78b4c44aa17c23a24887d1"
dependencies:
@ -4584,7 +4623,7 @@
classnames "^2.3.2"
rc-util "^5.24.4"
"@rc-component/trigger@^1.0.4", "@rc-component/trigger@^1.13.0", "@rc-component/trigger@^1.3.6", "@rc-component/trigger@^1.5.0", "@rc-component/trigger@^1.6.2", "@rc-component/trigger@^1.7.0":
"@rc-component/trigger@^1.0.4", "@rc-component/trigger@^1.3.6", "@rc-component/trigger@^1.5.0", "@rc-component/trigger@^1.6.2", "@rc-component/trigger@^1.7.0":
version "1.14.1"
resolved "https://registry.npmmirror.com/@rc-component/trigger/-/trigger-1.14.1.tgz#ac24fec4372408514eeb6ac7c557a207ac4a8cb4"
dependencies:
@ -4596,6 +4635,19 @@
rc-resize-observer "^1.3.1"
rc-util "^5.33.0"
"@rc-component/trigger@^1.15.0":
version "1.15.6"
resolved "https://registry.npmmirror.com/@rc-component/trigger/-/trigger-1.15.6.tgz#ccb71f16229e832e15b3869817cbe24f5e59b54c"
integrity sha512-Tl19KaGsShf4yzqxumsXVT4c7j0l20Dxe5hgP5S0HmxyhCg3oKen28ntGavRCIPW7cl7wgsGotntqcIokgDHzg==
dependencies:
"@babel/runtime" "^7.18.3"
"@rc-component/portal" "^1.1.0"
classnames "^2.3.2"
rc-align "^4.0.0"
rc-motion "^2.0.0"
rc-resize-observer "^1.3.1"
rc-util "^5.33.0"
"@react-spring/animated@~9.6.1":
version "9.6.1"
resolved "https://registry.npmmirror.com/@react-spring/animated/-/animated-9.6.1.tgz#ccc626d847cbe346f5f8815d0928183c647eb425"
@ -7066,9 +7118,10 @@ antd-mobile@^5.29.1:
tslib "^2.5.0"
use-sync-external-store "^1.2.0"
antd-style@^3.3.0:
version "3.4.1"
resolved "https://registry.npmmirror.com/antd-style/-/antd-style-3.4.1.tgz#169f99e4568060af0060b82e5fc3bb720ba8f5b7"
antd-style@3.x:
version "3.4.4"
resolved "https://registry.npmmirror.com/antd-style/-/antd-style-3.4.4.tgz#7224491a0b3998711d93e2e6395468a85e9f0458"
integrity sha512-Pf/Ewbnz8s1hcvBLKZO5B5Tmiqs85bFU3itq9vi/7J4MUKWyUgnrn4URtWQV4lUPvhc2qTlPUw68qon484ooaA==
dependencies:
"@ant-design/cssinjs" "^1"
"@babel/runtime" "^7"
@ -7098,46 +7151,47 @@ antd-token-previewer@2.0.0-alpha.8, antd-token-previewer@^2.0.0-alpha.6:
use-debouncy "^4.3.0"
vanilla-jsoneditor "^0.16.1"
antd@5.x, antd@^5.4.2, antd@^5.5.1, antd@^5.7.3:
version "5.7.3"
resolved "https://registry.npmmirror.com/antd/-/antd-5.7.3.tgz#3a1b84fa3987554931b9d974efe9cb7454ff1347"
antd@5.8.6, antd@5.x, antd@^5.4.2, antd@^5.5.1:
version "5.8.6"
resolved "https://registry.npmmirror.com/antd/-/antd-5.8.6.tgz#48af8d4221098dbd1faa5e56f0a1344741e2a3dc"
integrity sha512-DQdHJSq7AH303NgAUZcMRrWqwRYLT9LjesrfhB9xwwi3ooWTMAnS0LrL2NIYHvXZQy1kV0C4mMSiSbBqEKatLA==
dependencies:
"@ant-design/colors" "^7.0.0"
"@ant-design/cssinjs" "^1.13.2"
"@ant-design/icons" "^5.1.0"
"@ant-design/cssinjs" "^1.16.0"
"@ant-design/icons" "^5.2.2"
"@ant-design/react-slick" "~1.0.0"
"@babel/runtime" "^7.18.3"
"@ctrl/tinycolor" "^3.6.0"
"@rc-component/color-picker" "~1.4.0"
"@rc-component/mutate-observer" "^1.0.0"
"@rc-component/tour" "~1.8.1"
"@rc-component/trigger" "^1.13.0"
"@rc-component/trigger" "^1.15.0"
classnames "^2.2.6"
copy-to-clipboard "^3.2.0"
dayjs "^1.11.1"
qrcode.react "^3.1.0"
rc-cascader "~3.12.0"
rc-cascader "~3.14.0"
rc-checkbox "~3.1.0"
rc-collapse "~3.7.0"
rc-dialog "~9.1.0"
rc-drawer "~6.2.0"
rc-dropdown "~4.1.0"
rc-field-form "~1.34.0"
rc-image "~7.0.0"
rc-field-form "~1.36.0"
rc-image "~7.1.0"
rc-input "~1.1.0"
rc-input-number "~8.0.2"
rc-mentions "~2.5.0"
rc-menu "~9.10.0"
rc-motion "^2.7.3"
rc-notification "~5.0.4"
rc-pagination "~3.5.0"
rc-picker "~3.10.0"
rc-notification "~5.1.1"
rc-pagination "~3.6.0"
rc-picker "~3.13.0"
rc-progress "~3.4.1"
rc-rate "~2.12.0"
rc-resize-observer "^1.2.0"
rc-segmented "~2.2.0"
rc-select "~14.5.0"
rc-slider "~10.1.0"
rc-select "~14.7.1"
rc-slider "~10.2.1"
rc-steps "~6.0.1"
rc-switch "~4.1.0"
rc-table "~7.32.1"
@ -7145,9 +7199,9 @@ antd@5.x, antd@^5.4.2, antd@^5.5.1, antd@^5.7.3:
rc-textarea "~1.3.3"
rc-tooltip "~6.0.0"
rc-tree "~5.7.6"
rc-tree-select "~5.9.0"
rc-tree-select "~5.11.0"
rc-upload "~4.3.0"
rc-util "^5.32.0"
rc-util "^5.37.0"
scroll-into-view-if-needed "^3.0.3"
throttle-debounce "^5.0.0"
@ -19236,16 +19290,17 @@ rc-align@^4.0.0:
rc-util "^5.26.0"
resize-observer-polyfill "^1.5.1"
rc-cascader@~3.12.0:
version "3.12.0"
resolved "https://registry.npmmirror.com/rc-cascader/-/rc-cascader-3.12.0.tgz#709fdbede6c36f7e62d0daea76ba76b825cc7182"
rc-cascader@~3.14.0:
version "3.14.1"
resolved "https://registry.npmmirror.com/rc-cascader/-/rc-cascader-3.14.1.tgz#495f00b8d047a54fa64df3102f4d6e4a664feaf2"
integrity sha512-fCsgjLIQqYZMhFj9UT+x2ZW4uobx7OP5yivcn6Xto5fuxHaldphsryzCeUVmreQOHEo0RP+032Ip9RDzrKVKJA==
dependencies:
"@babel/runtime" "^7.12.5"
array-tree-filter "^2.1.0"
classnames "^2.3.1"
rc-select "~14.5.0"
rc-select "~14.7.0"
rc-tree "~5.7.0"
rc-util "^5.6.1"
rc-util "^5.35.0"
rc-checkbox@~3.1.0:
version "3.1.0"
@ -19311,17 +19366,19 @@ rc-field-form@~1.27.4:
async-validator "^4.1.0"
rc-util "^5.8.0"
rc-field-form@~1.34.0:
version "1.34.1"
resolved "https://registry.npmmirror.com/rc-field-form/-/rc-field-form-1.34.1.tgz#31be2ca12c7e37a4873e776dc7aee27965df53d8"
rc-field-form@~1.36.0:
version "1.36.2"
resolved "https://registry.npmmirror.com/rc-field-form/-/rc-field-form-1.36.2.tgz#0a4e75ab9849e3c2517b8b07c1f97ecd3e52db55"
integrity sha512-tCF/JjUsnxW80Gk4E4ZH74ONsaQMxVTRtui6XhQB8DJc4FHWLLa5pP8zwhxtPKC5NaO0QZ0Cv79JggDubn6n2g==
dependencies:
"@babel/runtime" "^7.18.0"
async-validator "^4.1.0"
rc-util "^5.32.2"
rc-image@~7.0.0:
version "7.0.0"
resolved "https://registry.npmmirror.com/rc-image/-/rc-image-7.0.0.tgz#cad2105dd1708304328bc9c178f7953cb0198403"
rc-image@~7.1.0:
version "7.1.3"
resolved "https://registry.npmmirror.com/rc-image/-/rc-image-7.1.3.tgz#0072547c7c0a70e6badfb4bee320806c5bf7427b"
integrity sha512-foMl1rcit1F0+vgxE5kf0c8TygQcHhILsOohQUL+JMUbzOo3OBFRcehJudYbqbCTArzCecS8nA1irUU9vvgQbg==
dependencies:
"@babel/runtime" "^7.11.2"
"@rc-component/portal" "^1.0.2"
@ -19379,9 +19436,10 @@ rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.3.0, rc-motion@^2.3.4, rc-motio
classnames "^2.2.1"
rc-util "^5.21.0"
rc-notification@~5.0.4:
version "5.0.4"
resolved "https://registry.npmmirror.com/rc-notification/-/rc-notification-5.0.4.tgz#4ad33d4aa291528fee9095b0be80ae41f1728a38"
rc-notification@~5.1.1:
version "5.1.1"
resolved "https://registry.npmmirror.com/rc-notification/-/rc-notification-5.1.1.tgz#62b38890575a1726ed6c1dd0e10caf4ce45a9e69"
integrity sha512-BPnded/WmWFE57ubqhVCgRSuedfQQNeSOYqdwppyr2B/Wt909gYFKyWAkFJVXuppAjsOGop05a93UaxjmUFdkg==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "2.x"
@ -19397,17 +19455,19 @@ rc-overflow@^1.0.0, rc-overflow@^1.3.1:
rc-resize-observer "^1.0.0"
rc-util "^5.19.2"
rc-pagination@~3.5.0:
version "3.5.0"
resolved "https://registry.npmmirror.com/rc-pagination/-/rc-pagination-3.5.0.tgz#8692a62f3c24d8bfe58f1b3059bc5262ddce5d87"
rc-pagination@~3.6.0:
version "3.6.1"
resolved "https://registry.npmmirror.com/rc-pagination/-/rc-pagination-3.6.1.tgz#2db6678a57cd2f4f29d6c0416e282543af52d0df"
integrity sha512-R/sUnKKXx1Nm4kZfUKS3YKa7yEPF1ZkVB/AynQaHt+nMER7h9wPTfliDJFdYo+RM/nk2JD4Yc5QpUq8fIQHeug==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.1"
rc-util "^5.32.2"
rc-picker@~3.10.0:
version "3.10.0"
resolved "https://registry.npmmirror.com/rc-picker/-/rc-picker-3.10.0.tgz#d34e659d88782eb1eac5939a1be0d6ba508f6f42"
rc-picker@~3.13.0:
version "3.13.1"
resolved "https://registry.npmmirror.com/rc-picker/-/rc-picker-3.13.1.tgz#06adc7b1ccbcfa05ff1ac9aae0c696fb5546f20d"
integrity sha512-211SrinX5IXZ9FMMDUMyPLuGOdfftUtd8zj4lqudpFxlMdtgV5+hXUJMBKb26xmDsleOm5iySK6KIHgiaI+U4w==
dependencies:
"@babel/runtime" "^7.10.1"
"@rc-component/trigger" "^1.5.0"
@ -19460,21 +19520,23 @@ rc-select@~14.1.0:
rc-util "^5.16.1"
rc-virtual-list "^3.2.0"
rc-select@~14.5.0:
version "14.5.2"
resolved "https://registry.npmmirror.com/rc-select/-/rc-select-14.5.2.tgz#1ac1ab58c874696cfa01cb15e1fc9a7bba81b29e"
rc-select@~14.7.0, rc-select@~14.7.1:
version "14.7.4"
resolved "https://registry.npmmirror.com/rc-select/-/rc-select-14.7.4.tgz#742d85861e83604237784f60e2ba9dabcde8eac9"
integrity sha512-qRUpvMVXFy6rdHe+qzHXAqyQAfhErC/oY8dcRtoRjoz0lz2Nx3J+lLL5AnEbjnwlS+/kQTJUZ/65WyCwWwcLwQ==
dependencies:
"@babel/runtime" "^7.10.1"
"@rc-component/trigger" "^1.5.0"
classnames "2.x"
rc-motion "^2.0.1"
rc-overflow "^1.0.0"
rc-overflow "^1.3.1"
rc-util "^5.16.1"
rc-virtual-list "^3.5.2"
rc-slider@~10.1.0:
version "10.1.1"
resolved "https://registry.npmmirror.com/rc-slider/-/rc-slider-10.1.1.tgz#5e82036e60b61021aba3ea0e353744dd7c74e104"
rc-slider@~10.2.1:
version "10.2.1"
resolved "https://registry.npmmirror.com/rc-slider/-/rc-slider-10.2.1.tgz#9b571d19f740adcacdde271f44901a47717fd8da"
integrity sha512-l355C/65iV4UFp7mXq5xBTNX2/tF2g74VWiTVlTpNp+6vjE/xaHHNiQq5Af+Uu28uUiqCuH/QXs5HfADL9KJ/A==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "^2.2.5"
@ -19546,13 +19608,14 @@ rc-tree-select@5.5.5:
rc-tree "~5.7.0"
rc-util "^5.16.1"
rc-tree-select@~5.9.0:
version "5.9.0"
resolved "https://registry.npmmirror.com/rc-tree-select/-/rc-tree-select-5.9.0.tgz#e8af859ff7751d22b6f4d98941cf13f775686475"
rc-tree-select@~5.11.0:
version "5.11.2"
resolved "https://registry.npmmirror.com/rc-tree-select/-/rc-tree-select-5.11.2.tgz#66b4a95843c6c1e04ba923a485e8b13def3ad6d0"
integrity sha512-ujRFO3pcjSg8R4ndXX2oiNcCu+RgO9ZPcd23CZy18Khm+nRsfWWS3Su7qB0iuoJgzAJ5LK7b6Dio0t7IQDGs9g==
dependencies:
"@babel/runtime" "^7.10.1"
classnames "2.x"
rc-select "~14.5.0"
rc-select "~14.7.0"
rc-tree "~5.7.0"
rc-util "^5.16.1"
@ -19594,7 +19657,7 @@ rc-upload@~4.3.0:
classnames "^2.2.5"
rc-util "^5.2.0"
rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.15.0, rc-util@^5.16.0, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.19.2, rc-util@^5.2.0, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.21.2, rc-util@^5.21.5, rc-util@^5.22.5, rc-util@^5.24.4, rc-util@^5.25.2, rc-util@^5.26.0, rc-util@^5.27.0, rc-util@^5.27.1, rc-util@^5.28.0, rc-util@^5.30.0, rc-util@^5.31.1, rc-util@^5.32.0, rc-util@^5.32.2, rc-util@^5.33.0, rc-util@^5.34.1, rc-util@^5.6.1, rc-util@^5.8.0, rc-util@^5.9.4:
rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.15.0, rc-util@^5.16.0, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.19.2, rc-util@^5.2.0, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.21.2, rc-util@^5.21.5, rc-util@^5.22.5, rc-util@^5.24.4, rc-util@^5.25.2, rc-util@^5.26.0, rc-util@^5.27.0, rc-util@^5.27.1, rc-util@^5.28.0, rc-util@^5.30.0, rc-util@^5.31.1, rc-util@^5.32.0, rc-util@^5.32.2, rc-util@^5.33.0, rc-util@^5.34.1, rc-util@^5.8.0, rc-util@^5.9.4:
version "5.34.1"
resolved "https://registry.npmmirror.com/rc-util/-/rc-util-5.34.1.tgz#0becf411d8f09bdb0f1b61322964f27efeeba642"
dependencies:
@ -19608,6 +19671,14 @@ rc-util@^5.35.0:
"@babel/runtime" "^7.18.3"
react-is "^16.12.0"
rc-util@^5.37.0:
version "5.37.0"
resolved "https://registry.npmmirror.com/rc-util/-/rc-util-5.37.0.tgz#6df9a55cb469b41b6995530a45b5f3dd3219a4ea"
integrity sha512-cPMV8DzaHI1KDaS7XPRXAf4J7mtBqjvjikLpQieaeOO7+cEbqY2j7Kso/T0R0OiEZTNcLS/8Zl9YrlXiO9UbjQ==
dependencies:
"@babel/runtime" "^7.18.3"
react-is "^16.12.0"
rc-virtual-list@^3.2.0, rc-virtual-list@^3.5.1, rc-virtual-list@^3.5.2:
version "3.5.2"
resolved "https://registry.npmmirror.com/rc-virtual-list/-/rc-virtual-list-3.5.2.tgz#5e1028869bae900eacbae6788d4eca7210736006"
@ -20665,7 +20736,7 @@ safe-regex@^1.1.0:
dependencies:
ret "~0.1.10"
safe-stable-stringify@^2.1.0, safe-stable-stringify@^2.3.1:
safe-stable-stringify@^2.1.0, safe-stable-stringify@^2.3.1, safe-stable-stringify@^2.4.3:
version "2.4.3"
resolved "https://registry.npmmirror.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886"
@ -22937,14 +23008,6 @@ use-isomorphic-layout-effect@^1.1.1:
version "1.1.2"
resolved "https://registry.npmmirror.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb"
use-json-comparison@^1.0.3:
version "1.0.6"
resolved "https://registry.npmmirror.com/use-json-comparison/-/use-json-comparison-1.0.6.tgz#a012bbc258ce745db1f56745dc653f575226cb21"
use-media-antd-query@^1.1.0:
version "1.1.0"
resolved "https://registry.npmmirror.com/use-media-antd-query/-/use-media-antd-query-1.1.0.tgz#f083ad7e292c1c0261b6bbfaac0edc3e0920d85d"
use-memo-one@^1.1.1:
version "1.1.3"
resolved "https://registry.npmmirror.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"