From 36881f1fd31554b73d07e67a631c61ab61c5df03 Mon Sep 17 00:00:00 2001 From: expdsn <18111002318@163.com> Date: Sun, 29 Sep 2024 15:17:52 +0800 Subject: [PATCH] svae --- public/icons/weatherIcon.png | Bin 0 -> 3539 bytes src/layout/GlobalMenu.tsx | 17 ++++++ src/layout/background/BackgroundPage.tsx | 9 ++- src/layout/background/BackgroundSwtich.tsx | 11 ++++ src/settings/SettingsOverlay.tsx | 65 +++++++++++++-------- src/useRouterStore.ts | 4 +- src/vite-env.d.ts | 8 +++ src/widgets/index.ts | 4 +- src/widgets/weather/Large.tsx | 5 ++ src/widgets/weather/Middle.tsx | 5 ++ src/widgets/weather/Modal.tsx | 5 ++ src/widgets/weather/Small.tsx | 5 ++ src/widgets/weather/index.ts | 29 +++++++++ tsconfig.json | 3 + 14 files changed, 141 insertions(+), 29 deletions(-) create mode 100644 public/icons/weatherIcon.png create mode 100644 src/layout/background/BackgroundSwtich.tsx create mode 100644 src/vite-env.d.ts create mode 100644 src/widgets/weather/Large.tsx create mode 100644 src/widgets/weather/Middle.tsx create mode 100644 src/widgets/weather/Modal.tsx create mode 100644 src/widgets/weather/Small.tsx create mode 100644 src/widgets/weather/index.ts diff --git a/public/icons/weatherIcon.png b/public/icons/weatherIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..e155bc73cdb45fa7cdf815e6798fd98b61fa8ed4 GIT binary patch literal 3539 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 N002ovPDHLkV1nJV)$#xU literal 0 HcmV?d00001 diff --git a/src/layout/GlobalMenu.tsx b/src/layout/GlobalMenu.tsx index 33a2c35..e30139c 100644 --- a/src/layout/GlobalMenu.tsx +++ b/src/layout/GlobalMenu.tsx @@ -142,6 +142,23 @@ export default defineComponent(() => { > 大 + { + + menu.dismiss() + const idx = layout.currentPage.list.findIndex((el) => el.id === block.id) + if (idx < 0) return + layout.state.dir[id].list.forEach(val => { + layout.addBlock(val, layout.state.currentPage) + + }) + layout.currentPage.list.splice(idx, 1) + delete layout.state.dir[id] + menu.dismiss() + }} + > + 释放 + { diff --git a/src/layout/background/BackgroundPage.tsx b/src/layout/background/BackgroundPage.tsx index 73c9d70..6b3b8dd 100644 --- a/src/layout/background/BackgroundPage.tsx +++ b/src/layout/background/BackgroundPage.tsx @@ -7,9 +7,12 @@ import { DownloadOutlined, EyeInvisibleOutlined, SwapOutlined } from '@ant-desig import SettingItem from '@/settings/SettingItem' import useSettingsStore from '@/settings/useSettingsStore' import { v4 as uuid } from 'uuid' +import useRouterStore from '@/useRouterStore' export default defineComponent(() => { const layout = useLayoutStore() + const router = useRouterStore() + const selected = ref(0) watch( () => layout.state.current, @@ -55,7 +58,11 @@ export default defineComponent(() => { )}
-
+ ) + } +}) \ No newline at end of file diff --git a/src/settings/SettingsOverlay.tsx b/src/settings/SettingsOverlay.tsx index 9598b4e..bb6efca 100644 --- a/src/settings/SettingsOverlay.tsx +++ b/src/settings/SettingsOverlay.tsx @@ -1,6 +1,7 @@ import AvatarCircle from '@/user/AvatarCircle' import useRouterStore from '@/useRouterStore' import asyncLoader from '@/utils/asyncLoader' +import { OhVueIcon } from 'oh-vue-icons' import { computed, defineComponent, Transition } from 'vue' const Content = asyncLoader(() => import('./SettingsOverlayContent')) @@ -51,31 +52,45 @@ export default defineComponent(() => { {show.value && (
-
-
{ - router.path = 'settings-user' - }} - > -
- -
-
- - - - - - - - - -
- + { + router.path.startsWith('settings-') ? + <> +
+
{ + router.path = 'settings-user' + }} + > +
+ +
+
+ + + + + + + + + +
+ + + : + router.path.startsWith('s2') ? + <> +
+
+ + : '' + + } +
)} diff --git a/src/useRouterStore.ts b/src/useRouterStore.ts index d33bfa9..c9dc305 100644 --- a/src/useRouterStore.ts +++ b/src/useRouterStore.ts @@ -14,7 +14,9 @@ export type SettingStr = | 'dock' | 'reset' | 'fallback' -export type RouteStr = '' | `widget-${WidgetStr}` | `global-${GlobalStr}` | `settings-${SettingStr}` +export type SettingSecond = + | 'background' +export type RouteStr = '' | `widget-${WidgetStr}` | `global-${GlobalStr}` | `settings-${SettingStr}` | `s2-${SettingSecond}` export default defineStore('router', () => { const path = ref('') diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts new file mode 100644 index 0000000..d84755a --- /dev/null +++ b/src/vite-env.d.ts @@ -0,0 +1,8 @@ +declare module '*.vue' { + import type { DefineComponent } from 'vue' + import Vue from 'vue' + + const component: DefineComponent<{}, {}, any> | Vue + + export default component + } \ No newline at end of file diff --git a/src/widgets/index.ts b/src/widgets/index.ts index 5dd7fb1..2236740 100644 --- a/src/widgets/index.ts +++ b/src/widgets/index.ts @@ -1,5 +1,5 @@ import calendar from './calendar' - +import weather from './weather' export interface Widget { name: string // 小组件类型唯一标识 label: string // 小组件名称 @@ -14,4 +14,4 @@ export interface Widget { }[] // 不同尺寸小组件块 } -export default [calendar] as Widget[] +export default [calendar, weather] as Widget[] diff --git a/src/widgets/weather/Large.tsx b/src/widgets/weather/Large.tsx new file mode 100644 index 0000000..9c16be7 --- /dev/null +++ b/src/widgets/weather/Large.tsx @@ -0,0 +1,5 @@ +import { defineComponent } from 'vue' + +export default defineComponent(() => { + return () =>
+}) diff --git a/src/widgets/weather/Middle.tsx b/src/widgets/weather/Middle.tsx new file mode 100644 index 0000000..9c16be7 --- /dev/null +++ b/src/widgets/weather/Middle.tsx @@ -0,0 +1,5 @@ +import { defineComponent } from 'vue' + +export default defineComponent(() => { + return () =>
+}) diff --git a/src/widgets/weather/Modal.tsx b/src/widgets/weather/Modal.tsx new file mode 100644 index 0000000..9c16be7 --- /dev/null +++ b/src/widgets/weather/Modal.tsx @@ -0,0 +1,5 @@ +import { defineComponent } from 'vue' + +export default defineComponent(() => { + return () =>
+}) diff --git a/src/widgets/weather/Small.tsx b/src/widgets/weather/Small.tsx new file mode 100644 index 0000000..9c16be7 --- /dev/null +++ b/src/widgets/weather/Small.tsx @@ -0,0 +1,5 @@ +import { defineComponent } from 'vue' + +export default defineComponent(() => { + return () =>
+}) diff --git a/src/widgets/weather/index.ts b/src/widgets/weather/index.ts new file mode 100644 index 0000000..a6e16a3 --- /dev/null +++ b/src/widgets/weather/index.ts @@ -0,0 +1,29 @@ +import type { Widget } from '..' + +export default { + name: 'calendar', + label: '天气', + description: '天气资讯', + icon: '/icons/weatherIcon.png', + modal: () => import('./Modal'), + list: [ + { + w: 2, + h: 1, + label: '小', + component: () => import('./Small') + }, + { + w: 2, + h: 2, + label: '中', + component: () => import('./Middle') + }, + { + w: 4, + h: 2, + label: '大', + component: () => import('./Large') + } + ] +} as Widget diff --git a/tsconfig.json b/tsconfig.json index 66b5e57..8577b47 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,5 +7,8 @@ { "path": "./tsconfig.app.json" } + ], + "exclude": [ + "src/utils/UploadAndCut.tsx", ] }