From 900414366018d7f7a82a170e47706b6927f82c7b Mon Sep 17 00:00:00 2001 From: godo Date: Mon, 2 Sep 2024 08:45:55 +0800 Subject: [PATCH] change login member --- frontend/components.d.ts | 5 +- .../components/desktop/DesktopBackground.vue | 6 +- .../src/components/desktop/LockDesktop.vue | 129 +++++++++++------- frontend/src/components/setting/SetSystem.vue | 1 + frontend/src/system/index.ts | 109 +++++++++++---- frontend/src/system/type/enum.ts | 2 +- 6 files changed, 167 insertions(+), 85 deletions(-) diff --git a/frontend/components.d.ts b/frontend/components.d.ts index f8bbe10..f86d08a 100644 --- a/frontend/components.d.ts +++ b/frontend/components.d.ts @@ -42,11 +42,9 @@ declare module 'vue' { EditType: typeof import('./src/components/builtin/EditType.vue')['default'] ElBadge: typeof import('element-plus/es')['ElBadge'] ElButton: typeof import('element-plus/es')['ElButton'] - ElCard: typeof import('element-plus/es')['ElCard'] ElCarousel: typeof import('element-plus/es')['ElCarousel'] ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] ElCol: typeof import('element-plus/es')['ElCol'] - ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElDrawer: typeof import('element-plus/es')['ElDrawer'] ElEmpty: typeof import('element-plus/es')['ElEmpty'] @@ -64,7 +62,6 @@ declare module 'vue' { ElSpace: typeof import('element-plus/es')['ElSpace'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] - ElText: typeof import('element-plus/es')['ElText'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] Error: typeof import('./src/components/taskbar/Error.vue')['default'] FileIcon: typeof import('./src/components/builtin/FileIcon.vue')['default'] @@ -81,6 +78,8 @@ declare module 'vue' { InstallMember: typeof import('./src/components/install/InstallMember.vue')['default'] InstallPerson: typeof import('./src/components/install/InstallPerson.vue')['default'] LockDesktop: typeof import('./src/components/desktop/LockDesktop.vue')['default'] + LoginDeskop: typeof import('./src/components/desktop/LoginDeskop.vue')['default'] + LoginDesktop: typeof import('./src/components/desktop/LoginDesktop.vue')['default'] Magnet: typeof import('./src/components/taskbar/Magnet.vue')['default'] MarkDown: typeof import('./src/components/builtin/MarkDown.vue')['default'] MenuBar: typeof import('./src/components/window/MenuBar.vue')['default'] diff --git a/frontend/src/components/desktop/DesktopBackground.vue b/frontend/src/components/desktop/DesktopBackground.vue index 486f4d2..3ddc442 100644 --- a/frontend/src/components/desktop/DesktopBackground.vue +++ b/frontend/src/components/desktop/DesktopBackground.vue @@ -18,7 +18,7 @@ import { onMounted, ref, watch } from "vue"; import { useSystem } from "@/system"; const rootState = useSystem()._rootState; const backgroundType = ref("color"); -const background = ref("#3A98CE"); +const background:any = ref("#3A98CE"); const loaded = ref(false); function imgload() { @@ -32,8 +32,8 @@ watch(rootState.options, (nv) => { }); function refershBack(val: string | undefined) { background.value = val || "#3A98CE"; - - if (background.value.startsWith("/image/")) { + console.log(background.value) + if (background.value || background.value.startsWith("/image/")) { backgroundType.value = "image"; } else { backgroundType.value = "color"; diff --git a/frontend/src/components/desktop/LockDesktop.vue b/frontend/src/components/desktop/LockDesktop.vue index a31ba6e..a9c74a3 100644 --- a/frontend/src/components/desktop/LockDesktop.vue +++ b/frontend/src/components/desktop/LockDesktop.vue @@ -1,31 +1,71 @@ @@ -33,60 +73,32 @@ async function onLogin() {