游戏不能拖入文件夹

This commit is contained in:
expdsn 2024-10-28 18:51:44 +08:00
parent 583b296ace
commit d7557dc318
8 changed files with 98 additions and 42 deletions

View File

@ -19,6 +19,7 @@
"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",
@ -41,6 +42,7 @@
"@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 Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
public/icons/gameicon.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -2,8 +2,13 @@ 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://btab.oss-cn-hangzhou.aliyuncs.com'
: 'http://btab.oss-cn-hangzhou.aliyuncs.com'
? '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'
// oss cdn 加速地址
export const ossCdnBase = import.meta.env.PROD ? ossBase : ossBase

View File

@ -154,17 +154,15 @@ export default defineComponent(() => {
</Form>
<div class="w-full h-0 flex-grow p-6">
<div class="w-full h-full relative">
<Transition>
{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 />
)}
</div>
</div>
</div>

View File

@ -35,18 +35,35 @@ export const LinkItem = defineComponent({
const addTo = inject(AddToToken)
return () => (
<div
class={clsx(' w-full h-full rounded-lg flex flex-col justify-between shadow p-4', {
class={clsx(' w-full h-full rounded-lg relative 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
}}
/>
@ -82,10 +99,10 @@ export const LinkItem = defineComponent({
layout.addBlock(
{
id: uuid(),
link: '',
link: props.content.url,
name: props.content.name,
label: props.content.name,
icon: '',
icon: props.content.icon,
text: '',
background: '',
color: '',
@ -150,10 +167,10 @@ export default defineComponent(() => {
select: (text: string) => (
<button
class={clsx(
'px-[20px] py-1 items-center justify-center duration-75 shrink-0 flex rounded-2xl whitespace-nowrap ',
'px-[20px] text-[14px] 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-[#000] bg-[#D6D6D6]'
: 'text-white bg-[#D6D6D6] bg-gradient-to-b from-[#ffaa4e] to-[#ff6227]'
)}
>
{text}
@ -162,10 +179,10 @@ export default defineComponent(() => {
unSelect: (text: string) => (
<button
class={clsx(
'px-[20px] py-1 items-center justify-center duration-75 shrink-0 flex rounded-2xl whitespace-nowrap',
'px-[20px] text-[14px] 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-[#000] hover:bg-[#f0ecec]'
: 'text-[#666] hover:bg-black/10 bg-black/[0.05] hover:bg-[#f0ecec]'
)}
>
{text}
@ -188,9 +205,10 @@ export default defineComponent(() => {
.fill(0)
.map((el, idx) => (
<div
class={
' relative cursor-pointer bg-gray-500 group w-full flex-grow-0 rounded-xl overflow-hidden'
}
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'
)}
key={idx}
/>
))}

View File

@ -61,9 +61,13 @@ 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:')) {
@ -132,7 +136,7 @@ export default defineComponent({
</div>
{settings.state.showBlockLabel && (
<div
class="absolute left-0 -bottom-3 text-sm text-white text-center w-full overflow-hidden text-ellipsis whitespace-nowrap break-all font-bold"
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"
style="text-shadow: 0 0 4px rgba(0,0,0,.6)"
>
{layout.getLabel(props.block)}

View File

@ -19,22 +19,51 @@ export default defineComponent({
},
setup(props) {
const menu = useMenuStore()
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>
)
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>
)
}
}
})