From f5c0cb8665d7be0d8c7b9b8ec575b8dab86bc8a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=A5=E6=B5=A9?= Date: Fri, 3 Jan 2025 16:47:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=8C=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BC=98=E5=8C=96=E6=9A=97?= =?UTF-8?q?=E9=BB=91=E4=B8=BB=E9=A2=98=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sakai-vue/styles/variables/_dark.scss | 11 +- src/pages/_1.page.vue | 3 + src/pages/a/a1.page.vue | 1 - src/pages/a/a2.page.vue | 1 - src/pages/a/b/c.page.vue | 1 - src/pages/a/b/index.page.vue | 1 - src/pages/a/index.page.vue | 5 - src/pages/data-loaders.[id]/index.page.vue | 2 +- .../data-loaders.[id]/sub-1.[userId].page.vue | 120 +----------------- src/plugins/primevue.ts | 12 +- typed-router.d.ts | 6 +- unocss.config.ts | 27 +--- 12 files changed, 22 insertions(+), 168 deletions(-) create mode 100644 src/pages/_1.page.vue delete mode 100644 src/pages/a/a1.page.vue delete mode 100644 src/pages/a/a2.page.vue delete mode 100644 src/pages/a/b/c.page.vue delete mode 100644 src/pages/a/b/index.page.vue delete mode 100644 src/pages/a/index.page.vue diff --git a/src/layouts/sakai-vue/styles/variables/_dark.scss b/src/layouts/sakai-vue/styles/variables/_dark.scss index 48ebe87..e91e4f4 100644 --- a/src/layouts/sakai-vue/styles/variables/_dark.scss +++ b/src/layouts/sakai-vue/styles/variables/_dark.scss @@ -1,14 +1,5 @@ -@mixin dark-theme { +:root[class*='app-dark'] { --surface-ground: var(--p-surface-950); --code-background: var(--p-surface-800); --code-color: var(--p-surface-100); } -:root[class*='app-dark'] { - @include dark-theme; -} - -@media (prefers-color-scheme: dark) { - :root { - @include dark-theme; - } -} diff --git a/src/pages/_1.page.vue b/src/pages/_1.page.vue new file mode 100644 index 0000000..a65057e --- /dev/null +++ b/src/pages/_1.page.vue @@ -0,0 +1,3 @@ + diff --git a/src/pages/a/a1.page.vue b/src/pages/a/a1.page.vue deleted file mode 100644 index 4640c1a..0000000 --- a/src/pages/a/a1.page.vue +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/pages/a/a2.page.vue b/src/pages/a/a2.page.vue deleted file mode 100644 index c3cbc90..0000000 --- a/src/pages/a/a2.page.vue +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/pages/a/b/c.page.vue b/src/pages/a/b/c.page.vue deleted file mode 100644 index ca33019..0000000 --- a/src/pages/a/b/c.page.vue +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/pages/a/b/index.page.vue b/src/pages/a/b/index.page.vue deleted file mode 100644 index 2468d6c..0000000 --- a/src/pages/a/b/index.page.vue +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/pages/a/index.page.vue b/src/pages/a/index.page.vue deleted file mode 100644 index 3461bc3..0000000 --- a/src/pages/a/index.page.vue +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/pages/data-loaders.[id]/index.page.vue b/src/pages/data-loaders.[id]/index.page.vue index ebcf862..db37071 100644 --- a/src/pages/data-loaders.[id]/index.page.vue +++ b/src/pages/data-loaders.[id]/index.page.vue @@ -77,5 +77,5 @@ watch( meta: - layout: second + // layout: second diff --git a/src/pages/data-loaders.[id]/sub-1.[userId].page.vue b/src/pages/data-loaders.[id]/sub-1.[userId].page.vue index c427a6a..6c8c5d3 100644 --- a/src/pages/data-loaders.[id]/sub-1.[userId].page.vue +++ b/src/pages/data-loaders.[id]/sub-1.[userId].page.vue @@ -38,7 +38,7 @@ const route = useRoute('DataLoadersIdSub1UserId'); - + meta: - layout: second + // layout: second diff --git a/src/plugins/primevue.ts b/src/plugins/primevue.ts index c3c89ac..0261c5b 100644 --- a/src/plugins/primevue.ts +++ b/src/plugins/primevue.ts @@ -16,11 +16,13 @@ export function install({ app }: { app: import('vue').App }) { pending: '待上传', completed: '已上传', }, // usePrimeVue().config.locale - theme: { preset: Aura }, - options: { - prefix: 'p', - darkModeSelector: 'system', - cssLayer: false, + theme: { + preset: Aura, + options: { + prefix: 'p', + darkModeSelector: '.app-dark' /* 'system' */, + cssLayer: false, + }, }, }); } diff --git a/typed-router.d.ts b/typed-router.d.ts index cff7d19..5266570 100644 --- a/typed-router.d.ts +++ b/typed-router.d.ts @@ -19,13 +19,9 @@ declare module 'vue-router/auto-routes' { */ export interface RouteNamedMap { 'Root': RouteRecordInfo<'Root', '/', Record, Record>, + '1': RouteRecordInfo<'1', '/_1', Record, Record>, '$Path': RouteRecordInfo<'$Path', '/:path(.*)', { path: ParamValue }, { path: ParamValue }>, '中文页面': RouteRecordInfo<'中文页面', '/中文-页面', Record, Record>, - 'A': RouteRecordInfo<'A', '/a', Record, Record>, - 'AA1': RouteRecordInfo<'AA1', '/a/a1', Record, Record>, - 'AA2': RouteRecordInfo<'AA2', '/a/a2', Record, Record>, - 'AB': RouteRecordInfo<'AB', '/a/b', Record, Record>, - 'ABC': RouteRecordInfo<'ABC', '/a/b/c', Record, Record>, 'Api': RouteRecordInfo<'Api', '/api', Record, Record>, 'DataLoadersId': RouteRecordInfo<'DataLoadersId', '/data-loaders/:id', { id: ParamValue }, { id: ParamValue }>, 'DataLoadersIdSub1UserId': RouteRecordInfo<'DataLoadersIdSub1UserId', '/data-loaders/:id/sub-1/:userId', { id: ParamValue, userId: ParamValue }, { id: ParamValue, userId: ParamValue }>, diff --git a/unocss.config.ts b/unocss.config.ts index 7d29281..ce8c5a2 100644 --- a/unocss.config.ts +++ b/unocss.config.ts @@ -47,34 +47,13 @@ export default defineConfig({ presets: [ presetUno({ /* prefix: "u-", */ + dark: { + dark: '.app-dark', + }, }), - // https://unocss.dev/presets/rem-to-px - // presetRemToPx({ baseFontSize: 4 }), - // https://unocss.dev/presets/attributify presetAttributify(), - - // presetIcons({ - // /*extraProperties: { - // display: "inline-block", - // "vertical-align": "middle", - // },*/ - // cdn: 'https://esm.sh/', - // customizations: { - // iconCustomizer(collection, icon, props) { - // props.width = '1em'; - // props.height = '1em'; - // }, - // }, - // collections: { - // icon: FileSystemIconLoader('src/assets/icons/svgs', (svg) => { - // return svg.replace(/#000000|#000/g, 'currentColor'); - // }), - // carbon: () => import('@iconify-json/carbon/icons.json').then((i) => i.default), - // }, - // warn: true, - // }), // https://unocss.dev/presets/icons ], transformers: [ //https://unocss.dev/transformers/variant-group