Skip to content

Commit 6d660df

Browse files
committed
Merge branch 'dev'
2 parents 0fb8bc9 + 9cb3027 commit 6d660df

82 files changed

Lines changed: 1964 additions & 1576 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

biome.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://biomejs.dev/schemas/2.3.8/schema.json",
2+
"$schema": "https://biomejs.dev/schemas/2.3.10/schema.json",
33
"vcs": {
44
"enabled": true,
55
"clientKind": "git",

package.json

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,25 @@
3131
"@flowgram.ai/shortcuts-plugin": "^1.0.6",
3232
"@monaco-editor/react": "^4.7.0",
3333
"@tanstack/react-query": "^5.90.12",
34-
"@tanstack/react-router": "^1.141.1",
34+
"@tanstack/react-router": "^1.141.8",
3535
"@zxcvbn-ts/core": "^3.0.4",
3636
"ahooks": "^3.9.6",
37-
"antd": "^6.1.0",
37+
"antd": "^6.1.1",
3838
"axios": "^1.13.2",
3939
"clsx": "^2.1.1",
4040
"crypto-js": "^4.2.0",
4141
"dayjs": "^1.11.19",
4242
"echarts": "^6.0.0",
43-
"i18next": "^25.7.2",
43+
"i18next": "^25.7.3",
4444
"jsencrypt": "^3.5.4",
4545
"keepalive-for-react": "5.0.6",
46-
"lodash-es": "^4.17.21",
46+
"lodash-es": "^4.17.22",
4747
"react": "^19.2.3",
4848
"react-dom": "^19.2.3",
4949
"react-draggable": "^4.5.0",
5050
"react-error-boundary": "^6.0.0",
5151
"react-hotkeys-hook": "^5.2.1",
52-
"react-i18next": "^16.4.1",
52+
"react-i18next": "^16.5.0",
5353
"react-is": "^19.2.3",
5454
"screenfull": "^6.0.2",
5555
"tailwind-merge": "^3.4.0",
@@ -58,26 +58,29 @@
5858
"devDependencies": {
5959
"@babel/plugin-proposal-class-properties": "^7.18.6",
6060
"@babel/plugin-proposal-decorators": "^7.28.0",
61-
"@biomejs/biome": "^2.3.8",
61+
"@biomejs/biome": "^2.3.10",
6262
"@flowgram.ai/ts-config": "^1.0.6",
63-
"@iconify/react": "^6.0.2",
63+
"@iconify/json": "^2.2.419",
64+
"@svgr/core": "^8.1.0",
65+
"@svgr/plugin-jsx": "^8.1.0",
6466
"@tailwindcss/vite": "^4.1.18",
65-
"@tanstack/react-router-devtools": "^1.141.1",
67+
"@tanstack/react-router-devtools": "^1.141.8",
6668
"@types/crypto-js": "^4.2.2",
6769
"@types/lodash-es": "^4.17.12",
68-
"@types/node": "^22.19.2",
70+
"@types/node": "^22.19.3",
6971
"@types/react": "^19.2.7",
7072
"@types/react-dom": "^19.2.3",
7173
"@types/react-is": "^19.2.0",
7274
"@types/react-resizable": "^3.0.8",
7375
"@vitejs/plugin-react": "^5.1.2",
7476
"babel-plugin-react-compiler": "^1.0.0",
75-
"sass-embedded": "^1.96.0",
77+
"sass-embedded": "^1.97.1",
7678
"styled-components": "^6.1.19",
7779
"tailwindcss": "^4.1.18",
7880
"terser": "^5.44.1",
7981
"typescript": "~5.9.3",
80-
"vite": "^8.0.0-beta.2",
82+
"unplugin-icons": "^22.5.0",
83+
"vite": "^8.0.0-beta.3",
8184
"vite-plugin-compression": "^0.5.1",
8285
"vite-plugin-mock-dev-server": "^2.0.6"
8386
},

src/App.tsx

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { Icon } from '@iconify/react';
21
import { useQuery, useQueryClient } from '@tanstack/react-query';
32
import { App as AntdApp, Spin } from 'antd';
43
import type React from 'react';
54
import { useEffect } from 'react';
65
import { useShallow } from 'zustand/react/shallow';
6+
import { BubbleLoading } from '@/components/icons';
77
import { Router } from '@/router';
88
import { commonService } from '@/services/common';
99
import { useMenuStore } from '@/stores/store';
@@ -53,15 +53,7 @@ const App: React.FC = () => {
5353
}
5454
}, [isLogin, roleId]);
5555

56-
return (
57-
<>
58-
{isLoading ? (
59-
<Spin indicator={<Icon icon="eos-icons:bubble-loading" width={48} />} size="large" fullscreen />
60-
) : (
61-
<Router />
62-
)}
63-
</>
64-
);
56+
return <>{isLoading ? <Spin indicator={<BubbleLoading width={48} />} size="large" fullscreen /> : <Router />}</>;
6557
};
6658

6759
export default App;

src/components/IconPanel/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import * as AntdIcon from '@ant-design/icons';
22
import { Pagination } from 'antd';
33
import { random } from 'lodash-es';
4-
import React from 'react';
5-
import { useEffect, useState } from 'react';
4+
import React, { useEffect, useState } from 'react';
65
import { isValidElementType } from 'react-is';
76

87
// antd中所有的图标库

0 commit comments

Comments
 (0)