xyyd
/
xyyd-fatfox
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xyyd:d7557dc3187cb8ebf48e02250acefc1440c2c03a
Branches Tags
xyyd:master
xyyd:dev
xyyd:fix
xyyd:widget
..
compare: xyyd:4f571eed13e791874b85149339de82118e052e9d
Branches Tags
xyyd:dev
xyyd:fix
xyyd:master
xyyd:widget

No commits in common. "d7557dc3187cb8ebf48e02250acefc1440c2c03a" and "4f571eed13e791874b85149339de82118e052e9d" have entirely different histories.
d7557dc318 ... 4f571eed13

10 changed files with 65 additions and 205 deletions
Show Stats Expand all files Collapse all files

2
package.json
View File

@ -19,7 +19,6 @@
"ali-oss": "^6.21.0",
"ant-design-vue": "4.x",
"clsx": "^2.1.1",
"crypto-js": "^4.2.0",
"dayjs": "^1.11.13",
"gsap": "^3.12.5",
"localforage": "^1.10.0",
@ -42,7 +41,6 @@
"@rushstack/eslint-patch": "^1.8.0",
"@tsconfig/node20": "^20.1.4",
"@types/ali-oss": "^6.16.11",
"@types/crypto-js": "^4.2.2",
"@types/node": "^20.14.5",
"@types/sortablejs": "^1.15.8",
"@types/ua-parser-js": "^0.7.39",

BIN
public/bg/game.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.6 KiB

BIN
public/icons/gameicon.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

9
src/config.ts
View File

@ -2,13 +2,8 @@ export const aIUrl = 'https://metaso.cn/?s=uitab&referrer_s=uitab&q='
export const translateUrl = 'https://fanyi.baidu.com/mtpe-individual/multimodal?lang=zh2en&query='
// oss地址
export const ossBase = import.meta.env.PROD
? 'http://newfatfox.oss-cn-beijing.aliyuncs.com'
: 'http://newfatfox.oss-cn-beijing.aliyuncs.com'
// 前端地址
export const frontAddress = import.meta.env.PROD
? 'http://goosetab.com'
: 'http://goosetab.com'
? 'http://btab.oss-cn-hangzhou.aliyuncs.com'
: 'http://btab.oss-cn-hangzhou.aliyuncs.com'
// oss cdn 加速地址
export const ossCdnBase = import.meta.env.PROD ? ossBase : ossBase

20
src/layout/adder/AdderPage.tsx
View File

@ -154,15 +154,17 @@ export default defineComponent(() => {
</Form>
<div class="w-full h-0 flex-grow p-6">
<div class="w-full h-full relative">
{type.value === 0 ? (
<WidgetAdder />
) : type.value === 1 ? (
<HotAdder />
) : type.value === 2 ? (
<CustomAdder />
) : (
<GameAdder />
)}
<Transition>
{type.value === 0 ? (
<WidgetAdder />
) : type.value === 1 ? (
<HotAdder />
) : type.value === 2 ? (
<CustomAdder />
) : (
<GameAdder />
)}
</Transition>
</div>
</div>
</div>

114
src/layout/adder/GameAdder.tsx
View File

@ -7,11 +7,6 @@ import useLayoutStore from '../useLayoutStore'
import { AddToToken } from './AdderPage'
import { v4 as uuid } from 'uuid'
import { Button } from 'ant-design-vue'
import { frontAddress, ossBase } from '@/config'
import dayjs from 'dayjs'
import { generateRandomString } from '@/utils/tool'
import MD5 from 'crypto-js/md5'
const SECRET = 'A1Cv12olxT12dOE3xA1vPA=='
const URL_ADDRESS = 'http://newfatfox.oss-cn-beijing.aliyuncs.com'
interface GameType {
id: string
@ -23,18 +18,6 @@ interface GameType {
despt: string
icon: string
}
interface OtherGame {
id: number // 游戏ID
category_ids: number[] // 分类ID数组
rank: number // 排名
name: string // 游戏名称
short_description: string // 简短描述
description: string // 详细描述
url: string // 游戏详情链接
icon: string // 图标URL
cover_url: string // 封面URL
corner_mark: number // 角标标识
}
export const GameItem = defineComponent({
props: {
content: {
@ -48,7 +31,7 @@ export const GameItem = defineComponent({
const addTo = inject(AddToToken)
return () => (
<div
class={clsx(' w-full h-full rounded-lg flex flex-col justify-between shadow p-4 relative', {
class={clsx(' w-full h-full rounded-lg flex flex-col justify-between shadow p-4', {
'bg-white/20': isGame.value,
'bg-white/80': !isGame.value
})}
@ -56,12 +39,7 @@ export const GameItem = defineComponent({
>
<div class="flex">
<img
loading="lazy"
src={
props.content.icon.startsWith('http')
? props.content.icon
: URL_ADDRESS + '/' + props.content.icon
}
src={props.content.icon.replace('res/game', URL_ADDRESS)}
class="w-[58px] h-[58px] bg-cover rounded-lg shadow-lg"
style={{
background: props.content.icon
@ -70,7 +48,7 @@ export const GameItem = defineComponent({
<div class="px-2 w-0 flex-grow">
<div
class={clsx('text text-sm text-ellipsis overflow-hidden whitespace-nowrap', {
class={clsx('text text-sm', {
'text-white': isGame.value,
'text-black/80': !isGame.value
})}
@ -100,21 +78,14 @@ export const GameItem = defineComponent({
layout.addBlock(
{
id: uuid(),
link: !props.content.rom.startsWith('http')
? `${frontAddress}/emu/#/home?params=${JSON.stringify({
...props.content,
rom: ossBase + '/' + props.content.rom
})}`
: props.content.rom,
name: '',
link: '',
name: props.content.name,
label: props.content.name,
icon: props.content.icon.startsWith('http')
? props.content.icon
: URL_ADDRESS + '/' + props.content.icon,
icon: '',
text: '',
background: '',
color: '',
w: props.content.rom.startsWith('http') ? 1 : 2,
w: 1,
h: 1
},
addTo?.value
@ -135,53 +106,21 @@ export default defineComponent(() => {
const isGame = computed(() => layout.state.current === 0)
const appList = ref<GameType[]>([])
const selectType = ref('fc')
const fetchGame = async (page: number) => {
const parems = `nonce=${generateRandomString(8)}&pid=PIDc8uT24mpo&timestamp=${dayjs().unix()}`
const sign = MD5(parems + SECRET).toString()
const response = await fetch(
`https://ge.yiqiyoo.com/game/v2/third-part/games?${parems}&sign=${sign}&paginate.limit=99&paginate.page=${page}`
)
const res = await response.json()
return res.data.items
}
watch(
selectType,
(val) => {
loading.value = true
if (val !== 'yiqiyoo') {
request<GameType[]>('GET', `/api/games?type=${val}`)
.then((res) => {
appList.value = res
})
.finally(() => {
setTimeout(() => {
loading.value = false
}, 200)
})
} else {
try {
Promise.all([fetchGame(1), fetchGame(2), fetchGame(3)]).then((res) => {
console.log(res.flat())
const resData = res.flat() as OtherGame[]
appList.value = resData.map((el) => ({
id: el.id.toString(),
name: el.name,
despt: el.short_description,
icon: el.icon,
rom: el.url,
playstation: el.url,
hot: el.rank,
category: el.category_ids[0].toString()
}))
})
} catch (err) {
console.error(err)
} finally {
request<GameType[]>('GET', `/api/games?type=${val}`)
.then((res) => {
appList.value = res
})
.finally(() => {
setTimeout(() => {
loading.value = false
}, 200)
}
}
})
},
{
immediate: true
@ -205,13 +144,7 @@ export default defineComponent(() => {
oridinal: 1
},
{
id: 'yiqiyoo',
type: '休闲游戏',
attr: 1,
oridinal: 2
},
{
id: 'gba',
id: 'gma',
type: '经典GBA',
attr: 3,
oridinal: 3
@ -225,10 +158,10 @@ export default defineComponent(() => {
select: (text: string) => (
<button
class={clsx(
'px-[20px] text-[14px] py-1 items-center justify-center duration-75 shrink-0 flex rounded-2xl whitespace-nowrap ',
'px-[20px] py-1 items-center justify-center duration-75 shrink-0 flex rounded-2xl whitespace-nowrap ',
isGame.value
? 'bg-white/30 text-white bg-gradient-to-b from-[#ffaa4e] to-[#ff6227]'
: 'text-white bg-[#D6D6D6] bg-gradient-to-b from-[#ffaa4e] to-[#ff6227]'
: 'text-[#000] bg-[#D6D6D6]'
)}
>
{text}
@ -237,10 +170,10 @@ export default defineComponent(() => {
unSelect: (text: string) => (
<button
class={clsx(
'px-[20px] text-[14px] py-1 items-center justify-center duration-75 shrink-0 flex rounded-2xl whitespace-nowrap',
'px-[20px] py-1 items-center justify-center duration-75 shrink-0 flex rounded-2xl whitespace-nowrap',
isGame.value
? ' text-[#999] bg-white/10 hover:bg-white/20'
: 'text-[#666] hover:bg-black/10 bg-black/[0.05] hover:bg-[#f0ecec]'
: 'text-[#000] hover:bg-[#f0ecec]'
)}
>
{text}
@ -263,10 +196,9 @@ export default defineComponent(() => {
.fill(0)
.map((el, idx) => (
<div
class={clsx(
' relative cursor-pointer bg-white/20 group w-full flex-grow-0 rounded-lg overflow-hidden',
isGame.value ? 'bg-white/30 ' : ' bg-[#fff]/70'
)}
class={
' relative cursor-pointer bg-gray-500 group w-full flex-grow-0 rounded-xl overflow-hidden'
}
key={idx}
/>
))}

40
src/layout/adder/HotAdder.tsx
View File

@ -35,35 +35,18 @@ export const LinkItem = defineComponent({
const addTo = inject(AddToToken)
return () => (
<div
class={clsx(' w-full h-full rounded-lg relative flex flex-col justify-between shadow p-4', {
class={clsx(' w-full h-full rounded-lg flex flex-col justify-between shadow p-4', {
'bg-white/20': isGame.value,
'bg-white/80': !isGame.value
})}
key={props.content.name}
>
<div
onClick={() => {
window.open(props.content.url, '_blank')
}}
class={
'h-0 w-0 absolute right-0 top-0 border-t-[38px] cursor-pointer border-l-[38px] group border-t-[#fff1e2] hover:border-t-[#ffaa4e] border-l-transparent'
}
>
<p
class={
'rotate-45 top-[-35px] scale-90 text-[#999] group-hover:text-white text-[12px] absolute right-0 whitespace-nowrap'
}
>
预览
</p>
</div>
<div class="flex">
<img
src={props.content.icon}
loading="lazy"
class="w-[58px] h-[58px] bg-cover rounded-lg shadow-lg"
style={{
background: props.content.background
background: props.content.background,
}}
/>
@ -99,10 +82,10 @@ export const LinkItem = defineComponent({
layout.addBlock(
{
id: uuid(),
link: props.content.url,
link: '',
name: props.content.name,
label: props.content.name,
icon: props.content.icon,
icon: '',
text: '',
background: '',
color: '',
@ -167,10 +150,10 @@ export default defineComponent(() => {
select: (text: string) => (
<button
class={clsx(
'px-[20px] text-[14px] py-1 items-center justify-center duration-75 shrink-0 flex rounded-2xl whitespace-nowrap ',
'px-[20px] py-1 items-center justify-center duration-75 shrink-0 flex rounded-2xl whitespace-nowrap ',
isGame.value
? 'bg-white/30 text-white bg-gradient-to-b from-[#ffaa4e] to-[#ff6227]'
: 'text-white bg-[#D6D6D6] bg-gradient-to-b from-[#ffaa4e] to-[#ff6227]'
: 'text-[#000] bg-[#D6D6D6]'
)}
>
{text}
@ -179,10 +162,10 @@ export default defineComponent(() => {
unSelect: (text: string) => (
<button
class={clsx(
'px-[20px] text-[14px] py-1 items-center justify-center duration-75 shrink-0 flex rounded-2xl whitespace-nowrap',
'px-[20px] py-1 items-center justify-center duration-75 shrink-0 flex rounded-2xl whitespace-nowrap',
isGame.value
? ' text-[#999] bg-white/10 hover:bg-white/20'
: 'text-[#666] hover:bg-black/10 bg-black/[0.05] hover:bg-[#f0ecec]'
: 'text-[#000] hover:bg-[#f0ecec]'
)}
>
{text}
@ -205,10 +188,9 @@ export default defineComponent(() => {
.fill(0)
.map((el, idx) => (
<div
class={clsx(
' relative cursor-pointer bg-white/20 group w-full flex-grow-0 rounded-lg overflow-hidden',
isGame.value ? 'bg-white/30 ' : ' bg-[#fff]/70'
)}
class={
' relative cursor-pointer bg-gray-500 group w-full flex-grow-0 rounded-xl overflow-hidden'
}
key={idx}
/>
))}

6
src/layout/grid/BlockWrapper.tsx
View File

@ -61,13 +61,9 @@ export default defineComponent({
const link = props.block.link
// 小组件无法合并
if (!link) return
//游戏不能合并
if (props.block.w !== 1) return
const oldIdx = layout.currentPage.list.findIndex((el) => el.id === dragging.id)
if (oldIdx < 0) return
const oldBlock = layout.currentPage.list[oldIdx]
//游戏不能合并
if (oldBlock.w !== 1) return
// 文件夹不能移入文件夹
if (!oldBlock || oldBlock.link.startsWith('id:')) return
if (link.startsWith('id:')) {
@ -136,7 +132,7 @@ export default defineComponent({
</div>
{settings.state.showBlockLabel && (
<div
class="absolute left-1/2 -translate-x-1/2 -bottom-3 text-sm text-white text-center w-[172px] overflow-hidden text-ellipsis whitespace-nowrap break-all font-bold"
class="absolute left-0 -bottom-3 text-sm text-white text-center w-full overflow-hidden text-ellipsis whitespace-nowrap break-all font-bold"
style="text-shadow: 0 0 4px rgba(0,0,0,.6)"
>
{layout.getLabel(props.block)}

63
src/layout/grid/LinkBlock.tsx
View File

@ -19,51 +19,22 @@ export default defineComponent({
},
setup(props) {
const menu = useMenuStore()
if (props.block.w === 1 && props.block.h === 1) {
return () => (
<div
class="w-full h-full flex justify-center items-center font-bold bg-cover bg-center bg-no-repeat"
onContextmenu={(e) => {
e.preventDefault()
menu.open(props.block)
}}
onClick={() => {
window.open(props.block.link, '_blank')
}}
style={{
backgroundColor: props.block.background || 'white',
color: props.block.color || 'black',
backgroundImage: props.block.icon ? `url('${props.block.icon}')` : '',
fontSize: props.dock ? '16px' : props.brief ? '12px' : 'calc(var(--block-size) / 5)'
}}
>
<div>{props.brief ? props.block.text[0] : props.block.text}</div>
</div>
)
} else {
return () => (
<div
class="w-full h-full flex justify-between px-3 items-center font-bold bg-cover bg-center bg-no-repeat"
onContextmenu={(e) => {
e.preventDefault()
menu.open(props.block)
}}
onClick={() => {
window.open(props.block.link, '_blank')
}}
style={{
backgroundImage: `url('/bg/game.webp')`
}}
>
<img src={props.block.icon} class={'w-[50px] h-[50px] rounded-lg'} alt="game icon" />
<div class={'flex-1 text-white flex justify-center'}>
<span class={'w-[70px] text-ellipsis overflow-hidden whitespace-nowrap'}>
{props.block.label}
</span>
</div>
<img src="/icons/gameicon.webp" alt="game_icon" class={'absolute right-0 bottom-0 w-[36px]'} />
</div>
)
}
return () => (
<div
class="w-full h-full flex justify-center items-center font-bold bg-cover bg-center bg-no-repeat"
onContextmenu={(e) => {
e.preventDefault()
menu.open(props.block)
}}
style={{
backgroundColor: props.block.background || 'white',
color: props.block.color || 'black',
backgroundImage: props.block.icon ? `url('${props.block.icon}')` : '',
fontSize: props.dock ? '16px' : props.brief ? '12px' : 'calc(var(--block-size) / 5)'
}}
>
<div>{props.brief ? props.block.text[0] : props.block.text}</div>
</div>
)
}
})

16
src/utils/tool.ts
View File

@ -7,19 +7,3 @@
export function randomNum(min: number, max: number) {
return Math.floor(Math.random() * (max - min + 1)) + min;
}
/**
* 生成一个长度在 0 到 n 之间的随机字符串。
* @param n 最大字符串长度。
* @returns 随机生成的字符串。
*/
export function generateRandomString(n: number): string {
const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
const length = Math.floor(Math.random() * (n + 1));
let result = '';
for (let i = 0; i < length; i++) {
result += characters.charAt(Math.floor(Math.random() * characters.length));
}
return result;
}