diff --git a/package.json b/package.json index 96e1af194..a8e575c46 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "scripts": { "i": "pnpm install", "dev": "vite --mode base", - "ts:check": "vue-tsc --noEmit", + "ts:check": "vue-tsc --noEmit --skipLibCheck", "build:pro": "vite build --mode pro", "build:gitee": "vite build --mode gitee", "build:dev": "vite build --mode dev", diff --git a/src/App.vue b/src/App.vue index 9a1beebd3..c0976546a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,7 +4,7 @@ import { useAppStore } from '@/store/modules/app' import { ConfigGlobal } from '@/components/ConfigGlobal' import { isDark } from '@/utils/is' import { useDesign } from '@/hooks/web/useDesign' -import { useCache } from '@/hooks/web/useCache' +import { useStorage } from '@/hooks/web/useStorage' const { getPrefixCls } = useDesign() @@ -16,12 +16,12 @@ const currentSize = computed(() => appStore.getCurrentSize) const greyMode = computed(() => appStore.getGreyMode) -const { wsCache } = useCache() +const { getStorage } = useStorage() // 根据浏览器当前主题设置系统主题色 const setDefaultTheme = () => { - if (wsCache.get('isDark') !== null) { - appStore.setIsDark(wsCache.get('isDark')) + if (getStorage('isDark') !== null) { + appStore.setIsDark(getStorage('isDark')) return } const isDarkTheme = isDark() diff --git a/src/components/Setting/src/Setting.vue b/src/components/Setting/src/Setting.vue index 142e0b067..7f6e4a4a7 100644 --- a/src/components/Setting/src/Setting.vue +++ b/src/components/Setting/src/Setting.vue @@ -10,10 +10,12 @@ import { trim, setCssVar } from '@/utils' import ColorRadioPicker from './components/ColorRadioPicker.vue' import InterfaceDisplay from './components/InterfaceDisplay.vue' import LayoutRadioPicker from './components/LayoutRadioPicker.vue' -import { useCache } from '@/hooks/web/useCache' +import { useStorage } from '@/hooks/web/useStorage' import { useClipboard } from '@vueuse/core' import { useDesign } from '@/hooks/web/useDesign' +const { removeStorage } = useStorage() + const { getPrefixCls } = useDesign() const prefixCls = getPrefixCls('setting') @@ -186,10 +188,9 @@ const copyConfig = async () => { // 清空缓存 const clear = () => { - const { wsCache } = useCache() - wsCache.delete('layout') - wsCache.delete('theme') - wsCache.delete('isDark') + removeStorage('layout') + removeStorage('theme') + removeStorage('isDark') window.location.reload() } diff --git a/src/components/UserInfo/src/UserInfo.vue b/src/components/UserInfo/src/UserInfo.vue index cdd0805a5..095000e75 100644 --- a/src/components/UserInfo/src/UserInfo.vue +++ b/src/components/UserInfo/src/UserInfo.vue @@ -1,7 +1,7 @@