diff --git a/packages/varlet-cli/site/utils.ts b/packages/varlet-cli/site/utils.ts index b8c574cb752..b7d3dde22d2 100644 --- a/packages/varlet-cli/site/utils.ts +++ b/packages/varlet-cli/site/utils.ts @@ -1,7 +1,6 @@ import { onMounted, onUnmounted } from 'vue' import { get } from 'lodash-es' import { formatStyleVars } from './components/utils/elements' -import dark from '@varlet/ui/src/themes/dark' export * from './components/utils/components' export * from './components/utils/elements' @@ -150,7 +149,7 @@ export function getBrowserThemes(): 'darkThemes' | 'themes' { return currentThemes } -export function watchDarkMode(cb?: (themes: 'darkThemes' | 'themes') => void) { +export function watchDarkMode(dark: StyleVars, cb?: (themes: 'darkThemes' | 'themes') => void) { watchThemes((themes) => { StyleProvider(themes === 'darkThemes' ? dark : null) diff --git a/packages/varlet-ui/src/action-sheet/example/index.vue b/packages/varlet-ui/src/action-sheet/example/index.vue index 6cdbcf01825..88fdaf16761 100644 --- a/packages/varlet-ui/src/action-sheet/example/index.vue +++ b/packages/varlet-ui/src/action-sheet/example/index.vue @@ -29,6 +29,7 @@ import AppType from '@varlet/cli/site/mobile/components/AppType' import VarButton from '../../button' import Snackbar from '../../snackbar' import context from '../../context' +import dark from '../../themes/dark' import { ref, reactive, onUnmounted } from 'vue' import { pack, use } from './locale' import { watchLang, watchPlatform, watchDarkMode } from '@varlet/cli/site/utils' @@ -163,7 +164,7 @@ export default { }) watchLang(use) - watchDarkMode() + watchDarkMode(dark) return { pack, diff --git a/packages/varlet-ui/src/app-bar/example/index.vue b/packages/varlet-ui/src/app-bar/example/index.vue index 1eed3f21f13..a31bed772cc 100644 --- a/packages/varlet-ui/src/app-bar/example/index.vue +++ b/packages/varlet-ui/src/app-bar/example/index.vue @@ -64,6 +64,7 @@ import Snackbar from '../../snackbar' import VarMenu from '../../menu' import VarButton from '../../button' import VarCell from '../../cell' +import dark from '../../themes/dark' import { pack, use } from './locale' import { watchLang, watchDarkMode } from '@varlet/cli/site/utils' @@ -112,7 +113,7 @@ export default { offsetY.value = false }) - watchDarkMode((themes) => { + watchDarkMode(dark, (themes) => { bgColor.value = themes === 'darkThemes' ? '#272727' : '#fff' }) diff --git a/packages/varlet-ui/src/back-top/example/index.vue b/packages/varlet-ui/src/back-top/example/index.vue index 5d728606008..38aea46d635 100644 --- a/packages/varlet-ui/src/back-top/example/index.vue +++ b/packages/varlet-ui/src/back-top/example/index.vue @@ -8,6 +8,7 @@ diff --git a/packages/varlet-ui/src/table/example/Basic.vue b/packages/varlet-ui/src/table/example/Basic.vue index a8e62a9aabf..9e6b4fb4d7d 100644 --- a/packages/varlet-ui/src/table/example/Basic.vue +++ b/packages/varlet-ui/src/table/example/Basic.vue @@ -24,6 +24,7 @@ diff --git a/packages/varlet-ui/src/tabs/example/index.vue b/packages/varlet-ui/src/tabs/example/index.vue index a6cf1043277..3f8e2707b64 100644 --- a/packages/varlet-ui/src/tabs/example/index.vue +++ b/packages/varlet-ui/src/tabs/example/index.vue @@ -141,6 +141,7 @@ import VarIcon from '../../icon' import VarTabsItems from '../../tabs-items' import VarTabItem from '../../tab-item' import context from '../../context' +import dark from '../../themes/dark' import { use, pack } from './locale' import { computed, onUnmounted, reactive, ref, toRefs } from 'vue' import { watchPlatform, watchLang, watchDarkMode } from '@varlet/cli/site/utils' @@ -174,7 +175,7 @@ export default { })) watchLang(use) - watchDarkMode((mode) => { + watchDarkMode(dark, (mode) => { themes.value = mode }) diff --git a/packages/varlet-ui/src/time-picker/example/index.vue b/packages/varlet-ui/src/time-picker/example/index.vue index 065fd4a10ce..9068ee707e6 100644 --- a/packages/varlet-ui/src/time-picker/example/index.vue +++ b/packages/varlet-ui/src/time-picker/example/index.vue @@ -44,6 +44,7 @@ import { reactive, toRefs } from 'vue' import AppType from '@varlet/cli/site/mobile/components/AppType' import VarTimePicker from '..' +import dark from '../../themes/dark' import { pack, use } from './locale' import { watchLang, watchDarkMode } from '@varlet/cli/site/utils' @@ -80,7 +81,7 @@ export default { } watchLang(use) - watchDarkMode() + watchDarkMode(dark) return { ...toRefs(dates), diff --git a/packages/varlet-ui/src/uploader/example/index.vue b/packages/varlet-ui/src/uploader/example/index.vue index d9688889ca1..ae32ea2cea9 100644 --- a/packages/varlet-ui/src/uploader/example/index.vue +++ b/packages/varlet-ui/src/uploader/example/index.vue @@ -42,6 +42,7 @@ import VarUploader from '..' import VarButton from '../../button' import Dialog from '../../dialog' import AppType from '@varlet/cli/site/mobile/components/AppType' +import dark from '../../themes/dark' import { reactive, toRefs } from 'vue' import { watchLang, watchDarkMode } from '@varlet/cli/site/utils' import { use, pack } from './locale' @@ -128,7 +129,7 @@ export default { } watchLang(use) - watchDarkMode() + watchDarkMode(dark) return { pack,