FatttSnake/oxygen-ui
1
0
Fork 0
Code Pull Requests Activity

Build:4; Fix:1 #60

Merged
FatttSnake merged 5 commits from FatttSnake into dev 2024-06-24 17:37:27 +08:00
Conversation 0 Commits 5 Files Changed 13 +494 -624
13 changed files with 494 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@@ -1,6 +1,6 @@
VITE_PLATFORM=WEB VITE_PLATFORM=WEB
VITE_DESKTOP_PROTOCOL=oxygen-desktop VITE_DESKTOP_PROTOCOL=dev-oxygen-desktop
VITE_APP_PROTOCOL=oxygen-app VITE_APP_PROTOCOL=dev-oxygen-app
VITE_UI_URL=${DEV_UI_URL} VITE_UI_URL=${DEV_UI_URL}
VITE_API_URL=${DEV_API_URL} VITE_API_URL=${DEV_API_URL}
VITE_API_TOKEN_URL=${VITE_API_URL}/token VITE_API_TOKEN_URL=${VITE_API_URL}/token

4
.env.testing
View File

@@ -1,7 +1,7 @@
NODE_ENV=development NODE_ENV=development
VITE_PLATFORM=WEB VITE_PLATFORM=WEB
VITE_DESKTOP_PROTOCOL=oxygen-desktop VITE_DESKTOP_PROTOCOL=test-oxygen-desktop
VITE_APP_PROTOCOL=oxygen-app VITE_APP_PROTOCOL=test-oxygen-app
VITE_UI_URL=${TEST_UI_URL} VITE_UI_URL=${TEST_UI_URL}
VITE_API_URL=${TEST_API_URL} VITE_API_URL=${TEST_API_URL}
VITE_API_TOKEN_URL=${VITE_API_URL}/token VITE_API_TOKEN_URL=${VITE_API_URL}/token

992
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

55
package.json
View File

@@ -1,8 +1,15 @@
{ {
"name": "oxygen-ui", "name": "oxygen-ui",
"private": true, "private": true,
"version": "1.0.0-SNAPSHOT",
"type": "module", "type": "module",
"version": "1.0.0-SNAPSHOT",
"description": "Oxygen Toolbox browser version",
"author": {
"name": "FatttSnake",
"email": "fatttsnake@fatweb.top",
"url": "https://fatweb.top"
},
"homepage": "https://tool.fatweb.top",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"dev-host": "vite --host 0.0.0.0", "dev-host": "vite --host 0.0.0.0",
@@ -19,15 +26,14 @@
"@dnd-kit/core": "^6.1.0", "@dnd-kit/core": "^6.1.0",
"@dnd-kit/sortable": "^8.0.0", "@dnd-kit/sortable": "^8.0.0",
"@dnd-kit/utilities": "^3.2.2", "@dnd-kit/utilities": "^3.2.2",
"@marsidev/react-turnstile": "^0.6.0", "@marsidev/react-turnstile": "^0.7.1",
"@monaco-editor/react": "^4.6.0", "@monaco-editor/react": "^4.6.0",
"@typescript/ata": "^0.9.4", "antd": "^5.18.1",
"antd": "^5.17.0", "axios": "^1.7.2",
"axios": "^1.6.8",
"custom-protocol-check": "^1.4.0", "custom-protocol-check": "^1.4.0",
"dayjs": "^1.11.11", "dayjs": "^1.11.11",
"echarts": "^5.5.0", "echarts": "^5.5.0",
"esbuild-wasm": "^0.20.2", "esbuild-wasm": "^0.21.5",
"fast-deep-equal": "^3.1.3", "fast-deep-equal": "^3.1.3",
"fflate": "^0.8.2", "fflate": "^0.8.2",
"jwt-decode": "^4.0.0", "jwt-decode": "^4.0.0",
@@ -35,42 +41,43 @@
"lodash": "^4.17.21", "lodash": "^4.17.21",
"match-sorter": "^6.3.4", "match-sorter": "^6.3.4",
"moment": "^2.30.1", "moment": "^2.30.1",
"monaco-editor": "^0.48.0", "monaco-editor": "^0.49.0",
"monaco-jsx-syntax-highlight": "^1.2.0", "monaco-jsx-syntax-highlight": "^1.2.0",
"react": "^18.3.1", "react": "^18.3.1",
"react-dom": "^18.3.1", "react-dom": "^18.3.1",
"react-draggable": "^4.4.6", "react-draggable": "^4.4.6",
"react-router": "^6.23.0", "react-router": "^6.23.1",
"react-router-dom": "^6.23.0", "react-router-dom": "^6.23.1",
"size-sensor": "^1.0.2", "size-sensor": "^1.0.2",
"vanilla-tilt": "^1.8.1" "vanilla-tilt": "^1.8.1"
}, },
"devDependencies": { "devDependencies": {
"@svgr/core": "^8.1.0", "@svgr/core": "^8.1.0",
"@svgr/plugin-jsx": "^8.1.0", "@svgr/plugin-jsx": "^8.1.0",
"@types/jsdom": "^21.1.6", "@types/jsdom": "^21.1.7",
"@types/lodash": "^4.17.1", "@types/lodash": "^4.17.5",
"@types/node": "^20.12.8", "@types/node": "^20.14.2",
"@types/react": "^18.3.1", "@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0", "@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^7.8.0", "@typescript-eslint/eslint-plugin": "^7.13.0",
"@typescript-eslint/parser": "^7.8.0", "@typescript-eslint/parser": "^7.13.0",
"@vitejs/plugin-react": "^4.2.1", "@typescript/ata": "^0.9.6",
"@vitejs/plugin-react": "^4.3.1",
"eslint": "^8.57.0", "eslint": "^8.57.0",
"eslint-config-love": "^47.0.0", "eslint-config-love": "^52.0.0",
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1", "eslint-plugin-import": "^2.29.1",
"eslint-plugin-prettier": "^5.1.3", "eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.1.1", "eslint-plugin-promise": "^6.2.0",
"eslint-plugin-react-hooks": "^4.6.2", "eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.6", "eslint-plugin-react-refresh": "^0.4.7",
"jsdom": "^24.0.0", "jsdom": "^24.1.0",
"prettier": "^3.2.5", "prettier": "^3.3.2",
"sass": "^1.76.0", "sass": "^1.77.5",
"stylelint-config-prettier": "^9.0.5", "stylelint-config-prettier": "^9.0.5",
"typescript": "^5.4.5", "typescript": "^5.4.5",
"unplugin-auto-import": "^0.17.5", "unplugin-auto-import": "^0.17.6",
"unplugin-icons": "^0.19.0", "unplugin-icons": "^0.19.0",
"vite": "^5.2.11" "vite": "^5.2.13"
} }
} }

2
src/components/Playground/CodeEditor/Editor/loader.ts
View File

@@ -2,6 +2,6 @@ import { loader } from '@monaco-editor/react'
loader.config({ loader.config({
paths: { paths: {
vs: 'https://unpkg.com/monaco-editor@0.48.0/min/vs' vs: 'https://unpkg.com/monaco-editor@0.49.0/min/vs'
} }
}) })

2
src/components/Playground/compiler.ts
View File

@@ -16,7 +16,7 @@ class Compiler {
void esbuild void esbuild
.initialize({ .initialize({
worker: true, worker: true,
wasmURL: 'https://esm.sh/esbuild-wasm@0.20.2/esbuild.wasm' wasmURL: 'https://esm.sh/esbuild-wasm@0.21.5/esbuild.wasm'
}) })
.finally(() => { .finally(() => {
this.init = true this.init = true

9
src/pages/Sign/SignIn.tsx
View File

@@ -124,10 +124,13 @@ const SignIn = () => {
<> <>
<AntdForm <AntdForm
form={twoFactorForm} form={twoFactorForm}
ref={(ref) => { ref={() => {
setTimeout(() => { setTimeout(() => {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access // eslint-disable-next-line @typescript-eslint/no-unsafe-call
ref?.getFieldInstance('twoFactorCode').focus() twoFactorForm
.getFieldInstance('twoFactorCode')
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
.focus()
}, 50) }, 50)
}} }}
> >

4
src/pages/System/Settings/Mail.tsx
View File

@@ -29,10 +29,10 @@ const Mail = () => {
<> <>
<AntdForm <AntdForm
form={mailSendForm} form={mailSendForm}
ref={(ref) => { ref={() => {
setTimeout(() => { setTimeout(() => {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
ref?.getFieldInstance('to').focus() mailSendForm?.getFieldInstance('to').focus()
}, 50) }, 50)
}} }}
> >

8
src/pages/System/Tools/Base.tsx
View File

@@ -623,10 +623,10 @@ const Base = () => {
content: ( content: (
<AntdForm <AntdForm
form={addFileForm} form={addFileForm}
ref={(ref) => { ref={() => {
setTimeout(() => { setTimeout(() => {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
ref?.getFieldInstance('fileName').focus() addFileForm?.getFieldInstance('fileName').focus()
}, 50) }, 50)
}} }}
> >
@@ -817,10 +817,10 @@ const Base = () => {
content: ( content: (
<AntdForm <AntdForm
form={renameFileForm} form={renameFileForm}
ref={(ref) => { ref={() => {
setTimeout(() => { setTimeout(() => {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
ref?.getFieldInstance('fileName').focus() renameFileForm?.getFieldInstance('fileName').focus()
}, 50) }, 50)
}} }}
> >

8
src/pages/System/Tools/Template.tsx
View File

@@ -477,10 +477,10 @@ const Template = () => {
content: ( content: (
<AntdForm <AntdForm
form={addFileForm} form={addFileForm}
ref={(ref) => { ref={() => {
setTimeout(() => { setTimeout(() => {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
ref?.getFieldInstance('fileName').focus() addFileForm?.getFieldInstance('fileName').focus()
}, 50) }, 50)
}} }}
> >
@@ -672,10 +672,10 @@ const Template = () => {
content: ( content: (
<AntdForm <AntdForm
form={renameFileForm} form={renameFileForm}
ref={(ref) => { ref={() => {
setTimeout(() => { setTimeout(() => {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
ref?.getFieldInstance('fileName').focus() renameFileForm?.getFieldInstance('fileName').focus()
}, 50) }, 50)
}} }}
> >

4
src/pages/System/User.tsx
View File

@@ -351,10 +351,10 @@ const User = () => {
style={{ marginTop: 20 }} style={{ marginTop: 20 }}
labelCol={{ span: 6 }} labelCol={{ span: 6 }}
wrapperCol={{ span: 18 }} wrapperCol={{ span: 18 }}
ref={(ref) => { ref={() => {
setTimeout(() => { setTimeout(() => {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
ref?.getFieldInstance('password').focus() changePasswordForm?.getFieldInstance('password').focus()
}, 50) }, 50)
}} }}
> >

4
src/pages/Tools/index.tsx
View File

@@ -264,10 +264,10 @@ const Tools = () => {
<> <>
<AntdForm <AntdForm
form={upgradeForm} form={upgradeForm}
ref={(ref) => { ref={() => {
setTimeout(() => { setTimeout(() => {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
ref?.getFieldInstance('toolId').focus() upgradeForm?.getFieldInstance('toolId').focus()
}, 50) }, 50)
}} }}
labelCol={{ span: 4 }} labelCol={{ span: 4 }}

22
src/pages/User/index.tsx
View File

@@ -125,10 +125,10 @@ const User = () => {
style={{ marginTop: 20 }} style={{ marginTop: 20 }}
labelCol={{ span: 6 }} labelCol={{ span: 6 }}
wrapperCol={{ span: 18 }} wrapperCol={{ span: 18 }}
ref={(ref) => { ref={() => {
setTimeout(() => { setTimeout(() => {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
ref?.getFieldInstance('originalPassword').focus() changePasswordForm?.getFieldInstance('originalPassword').focus()
}, 50) }, 50)
}} }}
> >
@@ -258,10 +258,13 @@ const User = () => {
<> <>
<AntdForm <AntdForm
form={twoFactorForm} form={twoFactorForm}
ref={(ref) => { ref={() => {
setTimeout(() => { setTimeout(() => {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access // eslint-disable-next-line @typescript-eslint/no-unsafe-call
ref?.getFieldInstance('twoFactorCode').focus() twoFactorForm
?.getFieldInstance('twoFactorCode')
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
.focus()
}, 50) }, 50)
}} }}
> >
@@ -347,10 +350,13 @@ const User = () => {
</AntdTag> </AntdTag>
<AntdForm <AntdForm
form={twoFactorForm} form={twoFactorForm}
ref={(ref) => { ref={() => {
setTimeout(() => { setTimeout(() => {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access // eslint-disable-next-line @typescript-eslint/no-unsafe-call
ref?.getFieldInstance('twoFactorCode').focus() twoFactorForm
?.getFieldInstance('twoFactorCode')
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
.focus()
}, 50) }, 50)
}} }}
> >