From 2bc535a55f4071a89288d93c4103aa0d996e5eb7 Mon Sep 17 00:00:00 2001 From: dengfuping Date: Fri, 12 Apr 2024 18:06:14 +0800 Subject: [PATCH 1/2] improve(style): Remove fixed barWidth for Bar and columnWidth for Column & TinyColumn & DualAxes --- packages/charts/src/Bar/demo/basic.tsx | 13 ++----------- packages/charts/src/Bar/demo/group.tsx | 21 +++++---------------- packages/charts/src/Bar/demo/percent.tsx | 20 ++++---------------- packages/charts/src/Bar/demo/progress.tsx | 3 +-- packages/charts/src/Bar/demo/range.tsx | 20 ++++---------------- packages/charts/src/Bar/demo/stack.tsx | 20 ++++---------------- packages/charts/src/Bar/index.tsx | 14 ++++++-------- packages/charts/src/Column/demo/basic.tsx | 12 +----------- packages/charts/src/Column/demo/group.tsx | 20 ++++---------------- packages/charts/src/Column/demo/percent.tsx | 21 +++++---------------- packages/charts/src/Column/demo/range.tsx | 21 +++++---------------- packages/charts/src/Column/demo/stack.tsx | 21 +++++---------------- packages/charts/src/Column/index.tsx | 2 -- packages/charts/src/DualAxes/index.tsx | 14 ++++++-------- packages/charts/src/Tiny/TinyColumn.tsx | 2 -- packages/charts/src/theme/light.ts | 4 ---- 16 files changed, 52 insertions(+), 176 deletions(-) diff --git a/packages/charts/src/Bar/demo/basic.tsx b/packages/charts/src/Bar/demo/basic.tsx index 28c17d5e5..1eeb1c7ad 100644 --- a/packages/charts/src/Bar/demo/basic.tsx +++ b/packages/charts/src/Bar/demo/basic.tsx @@ -1,7 +1,6 @@ import React from 'react'; import { Bar } from '@oceanbase/charts'; import type { BarConfig } from '@oceanbase/charts'; -import { Col, Row } from '@oceanbase/design'; export default () => { const data = [ @@ -34,14 +33,6 @@ export default () => { position: 'top-left', }, }; - return ( - - - - - - - - - ); + + return ; }; diff --git a/packages/charts/src/Bar/demo/group.tsx b/packages/charts/src/Bar/demo/group.tsx index dc4c860ab..a08c0443f 100644 --- a/packages/charts/src/Bar/demo/group.tsx +++ b/packages/charts/src/Bar/demo/group.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { Bar } from '@oceanbase/charts'; -import { Col, Row } from '@oceanbase/design'; +import type { BarConfig } from '@oceanbase/charts'; export default () => { const data = [ @@ -55,24 +55,13 @@ export default () => { value: 100, }, ]; - const config = { + const config: BarConfig = { + data, isGroup: true, xField: 'value', yField: 'label', seriesField: 'type', }; - return ( - - - - - - ['Mon.', 'Tues.'].includes(item.label))} - {...config} - /> - - - ); + + return ; }; diff --git a/packages/charts/src/Bar/demo/percent.tsx b/packages/charts/src/Bar/demo/percent.tsx index 5cf9e73b5..a5d1a80e0 100644 --- a/packages/charts/src/Bar/demo/percent.tsx +++ b/packages/charts/src/Bar/demo/percent.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { Bar } from '@oceanbase/charts'; -import { Col, Row } from '@oceanbase/design'; +import type { BarConfig } from '@oceanbase/charts'; export default () => { const data = [ @@ -110,25 +110,13 @@ export default () => { value: 628, }, ]; - const config = { + const config: BarConfig = { + data, xField: 'value', yField: 'year', seriesField: 'country', isPercent: true, isStack: true, }; - return ( - - - - - - ['1750', '1800'].includes(item.year))} - {...config} - /> - - - ); + return ; }; diff --git a/packages/charts/src/Bar/demo/progress.tsx b/packages/charts/src/Bar/demo/progress.tsx index ba2772ca5..f5bbdb4b9 100644 --- a/packages/charts/src/Bar/demo/progress.tsx +++ b/packages/charts/src/Bar/demo/progress.tsx @@ -26,10 +26,9 @@ export default () => { }, ]; const config1 = { + isProgress: true, xField: 'value', yField: 'type', - isProgress: true, - meta: { value: { alias: '比赛进度', diff --git a/packages/charts/src/Bar/demo/range.tsx b/packages/charts/src/Bar/demo/range.tsx index 075dc122f..b0e5ff054 100644 --- a/packages/charts/src/Bar/demo/range.tsx +++ b/packages/charts/src/Bar/demo/range.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { Bar } from '@oceanbase/charts'; -import { Col, Row } from '@oceanbase/design'; +import type { BarConfig } from '@oceanbase/charts'; export default () => { const data = [ @@ -37,23 +37,11 @@ export default () => { values: [18, 34], }, ]; - const config = { + const config: BarConfig = { + data, xField: 'values', yField: 'type', isRange: true, }; - return ( - - - - - - ['分类一', '分类二'].includes(item.type))} - {...config} - /> - - - ); + return ; }; diff --git a/packages/charts/src/Bar/demo/stack.tsx b/packages/charts/src/Bar/demo/stack.tsx index 5023abaee..39f77c35b 100644 --- a/packages/charts/src/Bar/demo/stack.tsx +++ b/packages/charts/src/Bar/demo/stack.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { Bar } from '@oceanbase/charts'; -import { Col, Row } from '@oceanbase/design'; +import type { BarConfig } from '@oceanbase/charts'; export default () => { const data = [ @@ -80,24 +80,12 @@ export default () => { type: 'Jon', }, ]; - const config = { + const config: BarConfig = { + data, isStack: true, xField: 'value', yField: 'year', seriesField: 'type', }; - return ( - - - - - - ['1991', '1992'].includes(item.year))} - {...config} - /> - - - ); + return ; }; diff --git a/packages/charts/src/Bar/index.tsx b/packages/charts/src/Bar/index.tsx index a88e1d90b..55dd50116 100644 --- a/packages/charts/src/Bar/index.tsx +++ b/packages/charts/src/Bar/index.tsx @@ -57,8 +57,6 @@ const Bar = forwardRef( isPercent, isRange, seriesField, - maxBarWidth: themeConfig.barWidth, - minBarWidth: themeConfig.barWidth, meta: isProgress ? { ...meta, @@ -101,12 +99,12 @@ const Bar = forwardRef( isRange ? 2 : !isStack || - (isStack && - seriesField && - // 堆叠条形图仅最后一段末端展示 2px 圆角 - datum[seriesField] === lastStackValue) - ? [2, 2, 0, 0] - : [], + (isStack && + seriesField && + // 堆叠条形图仅最后一段末端展示 2px 圆角 + datum[seriesField] === lastStackValue) + ? [2, 2, 0, 0] + : [], }; }, xAxis: { diff --git a/packages/charts/src/Column/demo/basic.tsx b/packages/charts/src/Column/demo/basic.tsx index 560b751d0..c713145e7 100644 --- a/packages/charts/src/Column/demo/basic.tsx +++ b/packages/charts/src/Column/demo/basic.tsx @@ -1,7 +1,6 @@ import React from 'react'; import { Column } from '@oceanbase/charts'; import type { ColumnConfig } from '@oceanbase/charts'; -import { Col, Row } from '@oceanbase/design'; export default () => { const data = [ @@ -47,14 +46,5 @@ export default () => { position: 'top', }, }; - return ( - - - - - - - - - ); + return ; }; diff --git a/packages/charts/src/Column/demo/group.tsx b/packages/charts/src/Column/demo/group.tsx index d6a315ed1..b16f269b8 100644 --- a/packages/charts/src/Column/demo/group.tsx +++ b/packages/charts/src/Column/demo/group.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { Column } from '@oceanbase/charts'; -import { Col, Row } from '@oceanbase/design'; +import type { ColumnConfig } from '@oceanbase/charts'; export default () => { const data = [ @@ -55,24 +55,12 @@ export default () => { value: 100, }, ]; - const config = { + const config: ColumnConfig = { + data, isGroup: true, xField: 'label', yField: 'value', seriesField: 'type', }; - return ( - - - - - - ['Mon.', 'Tues.'].includes(item.label))} - {...config} - /> - - - ); + return ; }; diff --git a/packages/charts/src/Column/demo/percent.tsx b/packages/charts/src/Column/demo/percent.tsx index 044f9b009..21be20e4b 100644 --- a/packages/charts/src/Column/demo/percent.tsx +++ b/packages/charts/src/Column/demo/percent.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { Column } from '@oceanbase/charts'; -import { Col, Row } from '@oceanbase/design'; +import type { ColumnConfig } from '@oceanbase/charts'; export default () => { const data = [ @@ -110,25 +110,14 @@ export default () => { value: 628, }, ]; - const config = { + const config: ColumnConfig = { + data, xField: 'year', yField: 'value', seriesField: 'country', isPercent: true, isStack: true, }; - return ( - - - - - - ['1750', '1800'].includes(item.year))} - {...config} - /> - - - ); + + return ; }; diff --git a/packages/charts/src/Column/demo/range.tsx b/packages/charts/src/Column/demo/range.tsx index e56195061..d07c7798e 100644 --- a/packages/charts/src/Column/demo/range.tsx +++ b/packages/charts/src/Column/demo/range.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { Column } from '@oceanbase/charts'; -import { Col, Row } from '@oceanbase/design'; +import type { ColumnConfig } from '@oceanbase/charts'; export default () => { const data = [ @@ -37,23 +37,12 @@ export default () => { values: [18, 34], }, ]; - const config = { + const config: ColumnConfig = { + data, xField: 'type', yField: 'values', isRange: true, }; - return ( - - - - - - ['分类一', '分类二'].includes(item.type))} - {...config} - /> - - - ); + + return ; }; diff --git a/packages/charts/src/Column/demo/stack.tsx b/packages/charts/src/Column/demo/stack.tsx index 988da3109..57e3b279e 100644 --- a/packages/charts/src/Column/demo/stack.tsx +++ b/packages/charts/src/Column/demo/stack.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { Column } from '@oceanbase/charts'; -import { Col, Row } from '@oceanbase/design'; +import type { ColumnConfig } from '@oceanbase/charts'; export default () => { const data = [ @@ -125,24 +125,13 @@ export default () => { type: 'Jon', }, ]; - const config = { + const config: ColumnConfig = { + data, isStack: true, xField: 'year', yField: 'value', seriesField: 'type', }; - return ( - - - - - - ['1991', '1992'].includes(item.year))} - {...config} - /> - - - ); + + return ; }; diff --git a/packages/charts/src/Column/index.tsx b/packages/charts/src/Column/index.tsx index abd87b8aa..c39e3cccb 100644 --- a/packages/charts/src/Column/index.tsx +++ b/packages/charts/src/Column/index.tsx @@ -48,8 +48,6 @@ const Column = forwardRef( isGroup, isRange, seriesField, - maxColumnWidth: themeConfig.columnWidth, - minColumnWidth: themeConfig.columnWidth, // 普通柱状图 label 会展示在顶部，需要留出一定空间，否则 label 会被遮挡 appendPadding: isStack || isGroup || isRange ? 0 : [16, 0, 0, 0], // 分组柱状图组内柱子间距，仅分组柱状图生效 diff --git a/packages/charts/src/DualAxes/index.tsx b/packages/charts/src/DualAxes/index.tsx index d2346ac01..08b9511c6 100644 --- a/packages/charts/src/DualAxes/index.tsx +++ b/packages/charts/src/DualAxes/index.tsx @@ -114,8 +114,6 @@ const DualAxes = forwardRef( // 堆叠柱状图中最后一段对应的值 const lastStackValue = stackValues?.[0]; defaultGeometryOption = { - maxColumnWidth: themeConfig.columnWidth, - minColumnWidth: themeConfig.columnWidth, columnStyle: datum => { return { radius: @@ -123,12 +121,12 @@ const DualAxes = forwardRef( isRange ? 2 : !isStack || - (isStack && - seriesField && - // 堆叠柱状图仅最后一段末端展示 2px 圆角 - datum[seriesField] === lastStackValue) - ? [2, 2, 0, 0] - : [], + (isStack && + seriesField && + // 堆叠柱状图仅最后一段末端展示 2px 圆角 + datum[seriesField] === lastStackValue) + ? [2, 2, 0, 0] + : [], }; }, }; diff --git a/packages/charts/src/Tiny/TinyColumn.tsx b/packages/charts/src/Tiny/TinyColumn.tsx index c94d218e1..9eed1e24d 100644 --- a/packages/charts/src/Tiny/TinyColumn.tsx +++ b/packages/charts/src/Tiny/TinyColumn.tsx @@ -21,8 +21,6 @@ const TinyColumn = forwardRef( const newConfig: TinyColumnConfig = { height, appendPadding: label ? [16, 0, 0, 0] : 0, - maxColumnWidth: themeConfig.columnWidth, - minColumnWidth: themeConfig.columnWidth, columnStyle: { radius: [2, 2, 0, 0], ...columnStyle, diff --git a/packages/charts/src/theme/light.ts b/packages/charts/src/theme/light.ts index 4c9e956b9..7212a0a9c 100644 --- a/packages/charts/src/theme/light.ts +++ b/packages/charts/src/theme/light.ts @@ -95,11 +95,7 @@ const lightTheme = { semanticRedGradient: 'l(270) 0:rgba(229,54,59,0) 1:rgba(229,54,59,0.2)', semanticDarkRedGradient: 'l(270) 0:rgba(137,39,63,0) 1:rgba(137,39,63,0.2)', semanticGrayGradient: 'l(270) 0:rgba(171,184,213,0) 1:rgba(171,184,213,0.2)', - // 条形宽度 - barWidth: 12, barBackgroundColor: AXIS_LINE_COLOR, - // 柱子宽度 - columnWidth: 16, styleSheet: { /** 默认颜色 */ brandColor: COLORS_10[0], From ff5feeb884b5ef98e4447ee23bba8840766f4cd0 Mon Sep 17 00:00:00 2001 From: dengfuping Date: Fri, 12 Apr 2024 18:59:49 +0800 Subject: [PATCH 2/2] fix(test): Downgrade part of deps to avoid test failed, to #555 --- package.json | 16 ++--- pnpm-lock.yaml | 175 +++++++++++++++++++++++++++---------------------- 2 files changed, 104 insertions(+), 87 deletions(-) diff --git a/package.json b/package.json index f42e6cf62..bcdb72d6c 100644 --- a/package.json +++ b/package.json @@ -48,24 +48,24 @@ "@babel/cli": "^7.24.1", "@babel/preset-env": "^7.24.4", "@chenshuai2144/less2cssinjs": "^1.0.7", - "@ctrl/tinycolor": "^4.0.4", + "@ctrl/tinycolor": "^4.0.3", "@emotion/babel-preset-css-prop": "^11.11.0", "@emotion/css": "^11.11.2", "@emotion/react": "^11.11.4", "@emotion/server": "^11.11.0", "@qixian.cs/github-contributors-list": "^2.0.1", - "@rc-component/trigger": "^2.1.1", + "@rc-component/trigger": "^2.0.0", "@stackblitz/sdk": "^1.9.0", "@testing-library/dom": "^9.3.4", "@testing-library/jest-dom": "^6.4.2", - "@testing-library/react": "^14.3.0", + "@testing-library/react": "^14.2.2", "@testing-library/react-hooks": "^8.0.1", "@testing-library/user-event": "^14.5.2", "@types/lodash": "^4.17.0", - "@types/node": "^20.12.7", - "@types/react": "^18.2.77", + "@types/node": "^20.12.5", + "@types/react": "^18.2.74", "@umijs/fabric": "^4.0.1", - "@umijs/test": "^4.1.9", + "@umijs/test": "^4.1.8", "@vercel/analytics": "^1.2.2", "antd": "^5.16.1", "antd-style": "^3.6.2", @@ -111,9 +111,9 @@ "react-router-dom": "^6.22.3", "runscript": "^1.6.0", "ts-node": "^10.9.2", - "typescript": "^5.4.5", + "typescript": "^5.4.4", "vanilla-jsoneditor": "^0.23.1", - "vitest": "^1.4.0", + "vitest": "^1.5.0", "vitest-canvas-mock": "^0.3.3", "vitest-fetch-mock": "^0.2.2", "web-vitals": "^3.5.2" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3d94fb5fe..a3cd3559f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27,7 +27,7 @@ importers: specifier: ^1.0.7 version: 1.0.7(typescript@5.4.5) '@ctrl/tinycolor': - specifier: ^4.0.4 + specifier: ^4.0.3 version: 4.0.4 '@emotion/babel-preset-css-prop': specifier: ^11.11.0 @@ -45,7 +45,7 @@ importers: specifier: ^2.0.1 version: 2.0.1(react-dom@18.2.0)(react@18.2.0) '@rc-component/trigger': - specifier: ^2.1.1 + specifier: ^2.0.0 version: 2.1.1(react-dom@18.2.0)(react@18.2.0) '@stackblitz/sdk': specifier: ^1.9.0 @@ -55,10 +55,10 @@ importers: version: 9.3.4 '@testing-library/jest-dom': specifier: ^6.4.2 - version: 6.4.2(vitest@1.4.0) + version: 6.4.2(vitest@1.5.0) '@testing-library/react': - specifier: ^14.3.0 - version: 14.3.0(react-dom@18.2.0)(react@18.2.0) + specifier: ^14.2.2 + version: 14.3.1(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.77)(react-dom@18.2.0)(react@18.2.0) @@ -69,16 +69,16 @@ importers: specifier: ^4.17.0 version: 4.17.0 '@types/node': - specifier: ^20.12.7 + specifier: ^20.12.5 version: 20.12.7 '@types/react': - specifier: ^18.2.77 + specifier: ^18.2.74 version: 18.2.77 '@umijs/fabric': specifier: ^4.0.1 version: 4.0.1(postcss@8.4.38) '@umijs/test': - specifier: ^4.1.9 + specifier: ^4.1.8 version: 4.1.9(@babel/core@7.24.4) '@vercel/analytics': specifier: ^1.2.2 @@ -216,20 +216,20 @@ importers: specifier: ^10.9.2 version: 10.9.2(@types/node@20.12.7)(typescript@5.4.5) typescript: - specifier: ^5.4.5 + specifier: ^5.4.4 version: 5.4.5 vanilla-jsoneditor: specifier: ^0.23.1 version: 0.23.1(@lezer/common@1.2.1) vitest: - specifier: ^1.4.0 - version: 1.4.0(@types/node@20.12.7) + specifier: ^1.5.0 + version: 1.5.0(@types/node@20.12.7) vitest-canvas-mock: specifier: ^0.3.3 - version: 0.3.3(vitest@1.4.0) + version: 0.3.3(vitest@1.5.0) vitest-fetch-mock: specifier: ^0.2.2 - version: 0.2.2(vitest@1.4.0) + version: 0.2.2(vitest@1.5.0) web-vitals: specifier: ^3.5.2 version: 3.5.2 @@ -4789,7 +4789,7 @@ packages: peerDependencies: react: '>=16.3.0' dependencies: - '@babel/runtime': 7.23.6 + '@babel/runtime': 7.24.4 hoist-non-react-statics: 3.3.2 react: 18.1.0 react-is: 16.13.1 @@ -4801,7 +4801,7 @@ packages: peerDependencies: react: '>=16.3.0' dependencies: - '@babel/runtime': 7.23.6 + '@babel/runtime': 7.24.4 hoist-non-react-statics: 3.3.2 react: 18.2.0 react-is: 16.13.1 @@ -5291,7 +5291,7 @@ packages: '@octokit/request-error': 3.0.3 '@octokit/types': 9.3.2 is-plain-object: 5.0.0 - node-fetch: 2.6.7 + node-fetch: 2.7.0 universal-user-agent: 6.0.1 transitivePeerDependencies: - encoding @@ -6165,7 +6165,7 @@ packages: pretty-format: 27.5.1 dev: true - /@testing-library/jest-dom@6.4.2(vitest@1.4.0): + /@testing-library/jest-dom@6.4.2(vitest@1.5.0): resolution: {integrity: sha512-CzqH0AFymEMG48CpzXFriYYkOjk6ZGPCLMhW9e9jg3KMCn5OfJecF8GtGW7yGfR/IgCe3SX8BSwjdzI6BBbZLw==} engines: {node: '>=14', npm: '>=6', yarn: '>=1'} peerDependencies: @@ -6194,7 +6194,7 @@ packages: dom-accessibility-api: 0.6.3 lodash: 4.17.21 redent: 3.0.0 - vitest: 1.4.0(@types/node@20.12.7) + vitest: 1.5.0(@types/node@20.12.7) dev: true /@testing-library/react-hooks@8.0.1(@types/react@18.2.77)(react-dom@18.2.0)(react@18.2.0): @@ -6220,8 +6220,8 @@ packages: react-error-boundary: 3.1.4(react@18.2.0) dev: true - /@testing-library/react@14.3.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-AYJGvNFMbCa5vt1UtDCa/dcaABrXq8gph6VN+cffIx0UeA0qiGqS+sT60+sb+Gjc8tGXdECWYQgaF0khf8b+Lg==} + /@testing-library/react@14.3.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-H99XjUhWQw0lTgyMN05W3xQG1Nh4lq574D8keFf1dDoNTJgp66VbJozRaczoF+wsiaPJNt/TcnfpLGufGxSrZQ==} engines: {node: '>=14'} peerDependencies: react: ^18.0.0 @@ -7040,7 +7040,7 @@ packages: - supports-color dev: true - /@umijs/bundler-vite@4.1.9(@types/node@20.12.7)(postcss@8.4.38)(sass@1.74.1): + /@umijs/bundler-vite@4.1.9(@types/node@20.12.7)(postcss@8.4.38)(sass@1.75.0): resolution: {integrity: sha512-iv8LXxMYq9nLMRTEVbn4AjQPpkW77DR006QFL3/lW/K7driAthYfBNx+9XdqTeFvYJ7yjsr27ZdtSAXHwmYqlA==} hasBin: true dependencies: @@ -7053,7 +7053,7 @@ packages: postcss-preset-env: 7.5.0(postcss@8.4.38) rollup-plugin-visualizer: 5.9.0 systemjs: 6.14.3 - vite: 4.5.2(@types/node@20.12.7)(less@4.1.3)(sass@1.74.1) + vite: 4.5.2(@types/node@20.12.7)(less@4.1.3)(sass@1.75.0) transitivePeerDependencies: - '@types/node' - lightningcss @@ -7302,7 +7302,7 @@ packages: /@umijs/history@5.3.1: resolution: {integrity: sha512-/e0cEGrR2bIWQD7pRl3dl9dcyRGeC9hoW0OCvUTT/hjY0EfUrkd6G8ZanVghPMpDuY5usxq9GVcvrT8KNXLWvA==} dependencies: - '@babel/runtime': 7.23.6 + '@babel/runtime': 7.24.4 query-string: 6.14.1 dev: true @@ -7352,7 +7352,7 @@ packages: tsx: 3.12.2 dev: true - /@umijs/preset-umi@4.1.9(@types/node@20.12.7)(@types/react@18.2.77)(sass@1.74.1)(typescript@5.4.5)(webpack@5.91.0): + /@umijs/preset-umi@4.1.9(@types/node@20.12.7)(@types/react@18.2.77)(sass@1.75.0)(typescript@5.4.5)(webpack@5.91.0): resolution: {integrity: sha512-RiDOVM3+b5UaH2BbqZxxAbBl+4g8OOvBNJqF8YJlBrVCwHS2/SDiS3habhbtpJiNa79c/0Te/ZLfRxVK2vyzjQ==} dependencies: '@iconify/utils': 2.1.1 @@ -7361,7 +7361,7 @@ packages: '@umijs/babel-preset-umi': 4.1.9 '@umijs/bundler-esbuild': 4.1.9 '@umijs/bundler-utils': 4.1.9 - '@umijs/bundler-vite': 4.1.9(@types/node@20.12.7)(postcss@8.4.38)(sass@1.74.1) + '@umijs/bundler-vite': 4.1.9(@types/node@20.12.7)(postcss@8.4.38)(sass@1.75.0) '@umijs/bundler-webpack': 4.1.9(typescript@5.4.5)(webpack@5.91.0) '@umijs/core': 4.1.9 '@umijs/did-you-know': 1.0.3 @@ -7566,43 +7566,43 @@ packages: '@babel/plugin-transform-react-jsx-self': 7.24.1(@babel/core@7.24.4) '@babel/plugin-transform-react-jsx-source': 7.24.1(@babel/core@7.24.4) react-refresh: 0.14.0 - vite: 4.5.2(@types/node@20.12.7)(less@4.1.3)(sass@1.74.1) + vite: 4.5.2(@types/node@20.12.7)(less@4.1.3)(sass@1.75.0) transitivePeerDependencies: - supports-color dev: true - /@vitest/expect@1.4.0: - resolution: {integrity: sha512-Jths0sWCJZ8BxjKe+p+eKsoqev1/T8lYcrjavEaz8auEJ4jAVY0GwW3JKmdVU4mmNPLPHixh4GNXP7GFtAiDHA==} + /@vitest/expect@1.5.0: + resolution: {integrity: sha512-0pzuCI6KYi2SIC3LQezmxujU9RK/vwC1U9R0rLuGlNGcOuDWxqWKu6nUdFsX9tH1WU0SXtAxToOsEjeUn1s3hA==} dependencies: - '@vitest/spy': 1.4.0 - '@vitest/utils': 1.4.0 + '@vitest/spy': 1.5.0 + '@vitest/utils': 1.5.0 chai: 4.4.1 dev: true - /@vitest/runner@1.4.0: - resolution: {integrity: sha512-EDYVSmesqlQ4RD2VvWo3hQgTJ7ZrFQ2VSJdfiJiArkCerDAGeyF1i6dHkmySqk573jLp6d/cfqCN+7wUB5tLgg==} + /@vitest/runner@1.5.0: + resolution: {integrity: sha512-7HWwdxXP5yDoe7DTpbif9l6ZmDwCzcSIK38kTSIt6CFEpMjX4EpCgT6wUmS0xTXqMI6E/ONmfgRKmaujpabjZQ==} dependencies: - '@vitest/utils': 1.4.0 + '@vitest/utils': 1.5.0 p-limit: 5.0.0 pathe: 1.1.2 dev: true - /@vitest/snapshot@1.4.0: - resolution: {integrity: sha512-saAFnt5pPIA5qDGxOHxJ/XxhMFKkUSBJmVt5VgDsAqPTX6JP326r5C/c9UuCMPoXNzuudTPsYDZCoJ5ilpqG2A==} + /@vitest/snapshot@1.5.0: + resolution: {integrity: sha512-qpv3fSEuNrhAO3FpH6YYRdaECnnRjg9VxbhdtPwPRnzSfHVXnNzzrpX4cJxqiwgRMo7uRMWDFBlsBq4Cr+rO3A==} dependencies: magic-string: 0.30.9 pathe: 1.1.2 pretty-format: 29.7.0 dev: true - /@vitest/spy@1.4.0: - resolution: {integrity: sha512-Ywau/Qs1DzM/8Uc+yA77CwSegizMlcgTJuYGAi0jujOteJOUf1ujunHThYo243KG9nAyWT3L9ifPYZ5+As/+6Q==} + /@vitest/spy@1.5.0: + resolution: {integrity: sha512-vu6vi6ew5N5MMHJjD5PoakMRKYdmIrNJmyfkhRpQt5d9Ewhw9nZ5Aqynbi3N61bvk9UvZ5UysMT6ayIrZ8GA9w==} dependencies: tinyspy: 2.2.1 dev: true - /@vitest/utils@1.4.0: - resolution: {integrity: sha512-mx3Yd1/6e2Vt/PUC98DcqTirtfxUyAZ32uK82r8rZzbtBeBo+nqgnjx/LvqQdWsrvNtm14VmurNgcf4nqY5gJg==} + /@vitest/utils@1.5.0: + resolution: {integrity: sha512-BDU0GNL8MWkRkSRdNFvCUCAVOeHaUlVJ9Tx0TYBZyXaaOTmGtUFObzchCivIBrIwKzvZA7A9sCejVhXM2aY98A==} dependencies: diff-sequences: 29.6.3 estree-walker: 3.0.3 @@ -8151,7 +8151,7 @@ packages: copy-to-clipboard: 3.3.3 dayjs: 1.11.10 qrcode.react: 3.1.0(react@18.2.0) - rc-cascader: 3.24.0(react-dom@18.2.0)(react@18.2.0) + rc-cascader: 3.24.1(react-dom@18.2.0)(react@18.2.0) rc-checkbox: 3.2.0(react-dom@18.2.0)(react@18.2.0) rc-collapse: 3.7.3(react-dom@18.2.0)(react@18.2.0) rc-dialog: 9.4.0(react-dom@18.2.0)(react@18.2.0) @@ -8166,12 +8166,12 @@ packages: rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-notification: 5.4.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.3.0(dayjs@1.11.10)(moment@2.30.1)(react-dom@18.2.0)(react@18.2.0) + rc-picker: 4.3.1(dayjs@1.11.10)(moment@2.30.1)(react-dom@18.2.0)(react@18.2.0) rc-progress: 4.0.0(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) rc-segmented: 2.3.0(react-dom@18.2.0)(react@18.2.0) - rc-select: 14.13.0(react-dom@18.2.0)(react@18.2.0) + rc-select: 14.13.1(react-dom@18.2.0)(react@18.2.0) rc-slider: 10.5.0(react-dom@18.2.0)(react@18.2.0) rc-steps: 6.0.1(react-dom@18.2.0)(react@18.2.0) rc-switch: 4.1.0(react-dom@18.2.0)(react@18.2.0) @@ -11132,9 +11132,9 @@ packages: remark-gfm: 3.0.1 remark-parse: 10.0.2 remark-rehype: 10.1.0 - sass: 1.74.1 + sass: 1.75.0 sitemap: 7.1.1 - umi: 4.1.9(@babel/core@7.24.4)(@types/node@20.12.7)(@types/react@18.2.77)(eslint@8.57.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(sass@1.74.1)(stylelint@14.16.1)(typescript@5.4.5)(webpack@5.91.0) + umi: 4.1.9(@babel/core@7.24.4)(@types/node@20.12.7)(@types/react@18.2.77)(eslint@8.57.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(sass@1.75.0)(stylelint@14.16.1)(typescript@5.4.5)(webpack@5.91.0) unified: 10.1.2 unist-util-visit: 4.1.2 unist-util-visit-parents: 5.1.3 @@ -13641,7 +13641,7 @@ packages: /history@5.3.0: resolution: {integrity: sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==} dependencies: - '@babel/runtime': 7.23.6 + '@babel/runtime': 7.24.4 dev: true /hmac-drbg@1.0.1: @@ -14839,7 +14839,7 @@ packages: hasBin: true dependencies: async: 3.2.5 - chalk: 4.1.0 + chalk: 4.1.2 filelist: 1.0.4 minimatch: 3.1.2 dev: true @@ -14855,7 +14855,7 @@ packages: resolution: {integrity: sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - chalk: 4.1.0 + chalk: 4.1.2 diff-sequences: 29.6.3 jest-get-type: 29.6.3 pretty-format: 29.7.0 @@ -17583,7 +17583,7 @@ packages: '@yarnpkg/parsers': 3.0.0-rc.46 '@zkochan/js-yaml': 0.0.6 axios: 1.6.8 - chalk: 4.1.0 + chalk: 4.1.2 cli-cursor: 3.1.0 cli-spinners: 2.6.1 cliui: 8.0.1 @@ -17856,7 +17856,7 @@ packages: engines: {node: '>=10'} dependencies: bl: 4.1.0 - chalk: 4.1.0 + chalk: 4.1.2 cli-cursor: 3.1.0 cli-spinners: 2.6.1 is-interactive: 1.0.0 @@ -19520,8 +19520,8 @@ packages: resize-observer-polyfill: 1.5.1 dev: false - /rc-cascader@3.24.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-NwkYsVULA61S085jbOYbq8Z7leyIxVmLwf+71mWLjA3kCfUf/rAKC0WfjQbqBDaLGlU9d4z1EzyPaHBKLYWv6A==} + /rc-cascader@3.24.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-RgKuYgEGPx+6wCgguYFHjMsDZdCyydZd58YJRCfYQ8FObqLnZW0x/vUcEyPjhWIj1EhjV958IcR+NFPDbbj9kg==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' @@ -19529,7 +19529,7 @@ packages: '@babel/runtime': 7.24.4 array-tree-filter: 2.1.0 classnames: 2.5.1 - rc-select: 14.13.0(react-dom@18.2.0)(react@18.2.0) + rc-select: 14.13.1(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.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -20015,8 +20015,8 @@ packages: shallowequal: 1.1.0 dev: false - /rc-picker@4.3.0(dayjs@1.11.10)(moment@2.30.1)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-bQNB/+NdW55jlQ5lPnNqF5J90Tq4SihLbAF7tzPBvGDJyoYmDgwLm4FN0ZB3Ot9i1v6vJY/1mgqZZTT9jbYc5w==} + /rc-picker@4.3.1(dayjs@1.11.10)(moment@2.30.1)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-1/TGosPALu/CWBEEpBTmZVNTSQXC5qpsI9jSiZdlLSrz6xhgBj39WNGJsmveiWPRgbHlq/vf5nI8cLMCMinZ5w==} engines: {node: '>=8.x'} peerDependencies: date-fns: '>= 2.x' @@ -20173,6 +20173,23 @@ packages: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) + /rc-select@14.13.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-A1VHqjIOemxLnUGRxLGVqXBs8jGcJemI5NXxOJwU5PQc1wigAu1T4PRLgMkTPDOz8gPhlY9dwsPzMgakMc2QjQ==} + engines: {node: '>=8.x'} + peerDependencies: + react: '*' + react-dom: '*' + dependencies: + '@babel/runtime': 7.24.4 + '@rc-component/trigger': 2.1.1(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-overflow: 1.3.2(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(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) + /rc-slider@10.0.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-igTKF3zBet7oS/3yNiIlmU8KnZ45npmrmHlUUio8PNbIhzMcsh+oE/r2UD42Y6YD2D/s+kzCQkzQrPD6RY435Q==} engines: {node: '>=8.x'} @@ -20679,7 +20696,7 @@ packages: react: ^16.6.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.6.0 || ^17.0.0 || ^18.0.0 dependencies: - '@babel/runtime': 7.23.6 + '@babel/runtime': 7.24.4 invariant: 2.2.4 prop-types: 15.8.1 react: 18.1.0 @@ -20694,7 +20711,7 @@ packages: react: ^16.6.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.6.0 || ^17.0.0 || ^18.0.0 dependencies: - '@babel/runtime': 7.23.6 + '@babel/runtime': 7.24.4 invariant: 2.2.4 prop-types: 15.8.1 react: 18.2.0 @@ -21769,8 +21786,8 @@ packages: /safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - /sass@1.74.1: - resolution: {integrity: sha512-w0Z9p/rWZWelb88ISOLyvqTWGmtmu2QJICqDBGyNnfG4OUnPX9BBjjYIXUpXCMOOg5MQWNpqzt876la1fsTvUA==} + /sass@1.75.0: + resolution: {integrity: sha512-ShMYi3WkrDWxExyxSZPst4/okE9ts46xZmJDSawJQrnte7M1V9fScVB+uNXOVKRBt0PggHOwoZcn8mYX4trnBw==} engines: {node: '>=14.0.0'} hasBin: true dependencies: @@ -23844,7 +23861,7 @@ packages: dev: false optional: true - /umi@4.1.9(@babel/core@7.24.4)(@types/node@20.12.7)(@types/react@18.2.77)(eslint@8.57.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(sass@1.74.1)(stylelint@14.16.1)(typescript@5.4.5)(webpack@5.91.0): + /umi@4.1.9(@babel/core@7.24.4)(@types/node@20.12.7)(@types/react@18.2.77)(eslint@8.57.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(sass@1.75.0)(stylelint@14.16.1)(typescript@5.4.5)(webpack@5.91.0): resolution: {integrity: sha512-2hFc4PJdMhiqBjMKh/p8D1XiBjLk4yWGlj9NyrgE+VPyJTVvfB0Xh+0J7t4qZ3FZy5NfAV+5rYlKxVtIYlCCig==} engines: {node: '>=14'} hasBin: true @@ -23854,7 +23871,7 @@ packages: '@umijs/bundler-webpack': 4.1.9(typescript@5.4.5)(webpack@5.91.0) '@umijs/core': 4.1.9 '@umijs/lint': 4.1.9(eslint@8.57.0)(stylelint@14.16.1)(typescript@5.4.5) - '@umijs/preset-umi': 4.1.9(@types/node@20.12.7)(@types/react@18.2.77)(sass@1.74.1)(typescript@5.4.5)(webpack@5.91.0) + '@umijs/preset-umi': 4.1.9(@types/node@20.12.7)(@types/react@18.2.77)(sass@1.75.0)(typescript@5.4.5)(webpack@5.91.0) '@umijs/renderer-react': 4.1.9(react-dom@18.2.0)(react@18.2.0) '@umijs/server': 4.1.9 '@umijs/test': 4.1.9(@babel/core@7.24.4) @@ -24363,7 +24380,7 @@ packages: lodash-es: 4.17.21 memoize-one: 6.0.0 natural-compare-lite: 1.4.0 - sass: 1.74.1 + sass: 1.75.0 svelte: 4.2.13 vanilla-picker: 2.12.3 transitivePeerDependencies: @@ -24420,8 +24437,8 @@ packages: gl-matrix: 3.4.3 dev: false - /vite-node@1.4.0(@types/node@20.12.7): - resolution: {integrity: sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==} + /vite-node@1.5.0(@types/node@20.12.7): + resolution: {integrity: sha512-tV8h6gMj6vPzVCa7l+VGq9lwoJjW8Y79vst8QZZGiuRAfijU+EEWuc0kFpmndQrWhMMhet1jdSF+40KSZUqIIw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true dependencies: @@ -24441,7 +24458,7 @@ packages: - terser dev: true - /vite@4.5.2(@types/node@20.12.7)(less@4.1.3)(sass@1.74.1): + /vite@4.5.2(@types/node@20.12.7)(less@4.1.3)(sass@1.75.0): resolution: {integrity: sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -24474,7 +24491,7 @@ packages: less: 4.1.3 postcss: 8.4.38 rollup: 3.29.4 - sass: 1.74.1 + sass: 1.75.0 optionalDependencies: fsevents: 2.3.3 dev: true @@ -24515,36 +24532,36 @@ packages: fsevents: 2.3.3 dev: true - /vitest-canvas-mock@0.3.3(vitest@1.4.0): + /vitest-canvas-mock@0.3.3(vitest@1.5.0): resolution: {integrity: sha512-3P968tYBpqYyzzOaVtqnmYjqbe13576/fkjbDEJSfQAkHtC5/UjuRHOhFEN/ZV5HVZIkaROBUWgazDKJ+Ibw+Q==} peerDependencies: vitest: '*' dependencies: jest-canvas-mock: 2.5.2 - vitest: 1.4.0(@types/node@20.12.7) + vitest: 1.5.0(@types/node@20.12.7) dev: true - /vitest-fetch-mock@0.2.2(vitest@1.4.0): + /vitest-fetch-mock@0.2.2(vitest@1.5.0): resolution: {integrity: sha512-XmH6QgTSjCWrqXoPREIdbj40T7i1xnGmAsTAgfckoO75W1IEHKR8hcPCQ7SO16RsdW1t85oUm6pcQRLeBgjVYQ==} engines: {node: '>=14.14.0'} peerDependencies: vitest: '>=0.16.0' dependencies: cross-fetch: 3.1.8 - vitest: 1.4.0(@types/node@20.12.7) + vitest: 1.5.0(@types/node@20.12.7) transitivePeerDependencies: - encoding dev: true - /vitest@1.4.0(@types/node@20.12.7): - resolution: {integrity: sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==} + /vitest@1.5.0(@types/node@20.12.7): + resolution: {integrity: sha512-d8UKgR0m2kjdxDWX6911uwxout6GHS0XaGH1cksSIVVG8kRlE7G7aBw7myKQCvDI5dT4j7ZMa+l706BIORMDLw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 1.4.0 - '@vitest/ui': 1.4.0 + '@vitest/browser': 1.5.0 + '@vitest/ui': 1.5.0 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -24562,11 +24579,11 @@ packages: optional: true dependencies: '@types/node': 20.12.7 - '@vitest/expect': 1.4.0 - '@vitest/runner': 1.4.0 - '@vitest/snapshot': 1.4.0 - '@vitest/spy': 1.4.0 - '@vitest/utils': 1.4.0 + '@vitest/expect': 1.5.0 + '@vitest/runner': 1.5.0 + '@vitest/snapshot': 1.5.0 + '@vitest/spy': 1.5.0 + '@vitest/utils': 1.5.0 acorn-walk: 8.3.2 chai: 4.4.1 debug: 4.3.4(supports-color@5.5.0) @@ -24580,7 +24597,7 @@ packages: tinybench: 2.6.0 tinypool: 0.8.3 vite: 5.2.8(@types/node@20.12.7) - vite-node: 1.4.0(@types/node@20.12.7) + vite-node: 1.5.0(@types/node@20.12.7) why-is-node-running: 2.2.2 transitivePeerDependencies: - less