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

Fix:1; Refactor:2 #58

Merged
FatttSnake merged 3 commits from FatttSnake into dev 2024-05-21 16:44:17 +08:00
Conversation 0 Commits 3 Files Changed 10 +53 -38
10 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.env.development
View File

@@ -1,4 +1,5 @@
VITE_PLATFORM=WEB
VITE_UI_URL=${DEV_UI_URL}
VITE_API_URL=${DEV_API_URL}
VITE_API_TOKEN_URL=${VITE_API_URL}/token
VITE_TURNSTILE_SITE_KEY=${TURNSTILE_SITE_KEY}

1
.env.production
View File

@@ -1,4 +1,5 @@
VITE_PLATFORM=WEB
VITE_UI_URL=${PRODUCT_UI_URL}
VITE_API_URL=${PRODUCT_API_URL}
VITE_API_TOKEN_URL=${VITE_API_URL}/token
VITE_TURNSTILE_SITE_KEY=${TURNSTILE_SITE_KEY}

1
.env.testing
View File

@@ -1,5 +1,6 @@
NODE_ENV=development
VITE_PLATFORM=WEB
VITE_UI_URL=${TEST_UI_URL}
VITE_API_URL=${TEST_API_URL}
VITE_API_TOKEN_URL=${VITE_API_URL}/token
VITE_TURNSTILE_SITE_KEY=${TURNSTILE_SITE_KEY}

2
src/assets/css/pages/user/index.scss
View File

@@ -70,6 +70,8 @@
}
.url {
cursor: pointer;
> span {
margin-left: 8px;
}

2
src/components/Playground/Output/Preview/iframe.html
View File

@@ -11,7 +11,7 @@
window.addEventListener("message", ({ data }) => {
if (data?.type === "UPDATE") {
// Record old styles that need to be removed
const appStyleElement = document.querySelectorAll("style[id^=\"style_\"]") || [];
const appStyleElement = document.querySelectorAll("style:not(style[id$=\"_oxygen_base_style.css\"])") || [];
// Remove old app
const appSrcElement = document.querySelector("#appSrc");

1
src/global.d.ts vendored
View File

@@ -5,6 +5,7 @@ type Platform = 'WEB' | 'DESKTOP' | 'ANDROID'
interface ImportMetaEnv {
readonly VITE_PLATFORM: Platform
readonly VITE_UI_URL: string
readonly VITE_API_URL: string
readonly VITE_API_TOKEN_URL: string
readonly VITE_TURNSTILE_SITE_KEY: string

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

@@ -637,8 +637,10 @@ const Base = () => {
rules={[
{ required: true },
{
pattern: /\.(jsx|tsx|js|ts|css|json)$/,
message: '仅支持 *.jsx, *.tsx, *.js, *.ts, *.css, *.json 文件'
pattern:
/(\.jsx|\.tsx|\.js|\.ts|_oxygen_base_style\.css|\.json)$/,
message:
'仅支持 *.jsx, *.tsx, *.js, *.ts, *_oxygen_base_style.css, *.json 文件'
},
({ getFieldValue }) => ({
validator() {
@@ -829,9 +831,10 @@ const Base = () => {
rules={[
{ required: true },
{
pattern: /\.(jsx|tsx|js|ts|css|json)$/,
pattern:
/(\.jsx|\.tsx|\.js|\.ts|_oxygen_base_style\.css|\.json)$/,
message:
'仅支持 *.jsx, *.tsx, *.js, *.ts, *.css, *.json 文件'
'仅支持 *.jsx, *.tsx, *.js, *.ts, *_oxygen_base_style.css, *.json 文件'
},
({ getFieldValue }) => ({
validator() {

8
src/pages/Tools/User.tsx
View File

@@ -30,7 +30,7 @@ const User = () => {
return username
? () => {
void navigator.clipboard
.writeText(new URL(`/store/${username}`, location.href).href)
.writeText(new URL(`/store/${username}`, import.meta.env.VITE_UI_URL).href)
.then(() => {
void message.success('已复制到剪切板')
})
@@ -153,8 +153,10 @@ const User = () => {
onClick={handleOnCopyToClipboard(userWithInfoVo?.username)}
>
{userWithInfoVo?.username &&
new URL(`/store/${userWithInfoVo.username}`, location.href)
.href}
new URL(
`/store/${userWithInfoVo.username}`,
import.meta.env.VITE_UI_URL
).href}
<Icon component={IconOxygenCopy} />
</a>
</FlexBox>

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

@@ -39,6 +39,18 @@ const User = () => {
const [userWithPowerInfoVo, setUserWithPowerInfoVo] = useState<UserWithPowerInfoVo>()
const [changePasswordForm] = AntdForm.useForm<ChangePasswordFields>()
const handleOnCopyToClipboard = (username?: string) => {
return username
? () => {
void navigator.clipboard
.writeText(new URL(`/store/${username}`, import.meta.env.VITE_UI_URL).href)
.then(() => {
void message.success('已复制到剪切板')
})
}
: undefined
}
const handleOnReset = () => {
getProfile()
}
@@ -474,20 +486,14 @@ const User = () => {
</div>
<a
className={'url'}
href={
userWithPowerInfoVo?.username &&
new URL(
`/store/${userWithPowerInfoVo.username}`,
location.href
).href
}
onClick={handleOnCopyToClipboard(userWithPowerInfoVo?.username)}
>
{userWithPowerInfoVo?.username &&
new URL(
`/store/${userWithPowerInfoVo.username}`,
location.href
import.meta.env.VITE_UI_URL
).href}
<Icon component={IconOxygenShare} />
<Icon component={IconOxygenCopy} />
</a>
</FlexBox>
</FlexBox>

40
src/util/navigation.ts
View File

@@ -37,15 +37,15 @@ export const navigateToView = (
version?: string,
options?: NavigateOptions
) => {
const url = new URL(
`/view/${username}/${toolId}${version ? `/${version}` : ''}`,
window.location.href
)
const searchParams = new URLSearchParams()
if (platform !== import.meta.env.VITE_PLATFORM) {
url.searchParams.append('platform', platform)
searchParams.append('platform', platform)
}
navigate(`${url.pathname}${url.search}`, options)
navigate(
`/view/${username}/${toolId}${version ? `/${version}` : ''}${searchParams.size ? `?${searchParams.toString()}` : ''}`,
options
)
}
export const navigateToSource = (
@@ -56,14 +56,15 @@ export const navigateToSource = (
version?: string,
options?: NavigateOptions
) => {
const url = new URL(
`/source/${username}/${toolId}${version ? `/${version}` : ''}`,
window.location.href
)
const searchParams = new URLSearchParams()
if (platform !== import.meta.env.VITE_PLATFORM) {
url.searchParams.append('platform', platform)
searchParams.append('platform', platform)
}
navigate(`${url.pathname}${url.search}`, options)
navigate(
`/source/${username}/${toolId}${version ? `/${version}` : ''}${searchParams.size ? `?${searchParams.toString()}` : ''}`,
options
)
}
export const navigateToRedirect = (
@@ -113,12 +114,12 @@ export const navigateToEdit = (
platform: Platform,
options?: NavigateOptions
) => {
const url = new URL(`/edit/${toolId}`, window.location.href)
const searchParams = new URLSearchParams()
if (platform !== import.meta.env.VITE_PLATFORM) {
url.searchParams.append('platform', platform)
searchParams.append('platform', platform)
}
navigate(`${url.pathname}${url.search}`, options)
navigate(`/edit/${toolId}${searchParams.size ? `?${searchParams.toString()}` : ''}`, options)
}
export const navigateToUser = (navigate: NavigateFunction, options?: NavigateOptions) => {
@@ -135,15 +136,12 @@ export const getViewPath = (
platform: Platform,
version?: string
) => {
const url = new URL(
`/view/${username}/${toolId}${version ? `/${version}` : ''}`,
window.location.href
)
const searchParams = new URLSearchParams()
if (platform !== import.meta.env.VITE_PLATFORM) {
url.searchParams.append('platform', platform)
searchParams.append('platform', platform)
}
return `${url.pathname}${url.search}`
return `/view/${username}/${toolId}${version ? `/${version}` : ''}${searchParams.size ? `?${searchParams.toString()}` : ''}`
}
export const getAndroidUrl = (username: string, toolId: string) =>