From efe71b9d8ec21daf46f631e62821c2adbc4055d0 Mon Sep 17 00:00:00 2001 From: xingyu Date: Mon, 25 Sep 2023 16:32:19 +0800 Subject: [PATCH] feat: use unocss --- .vscode/settings.json | 1 + .../VirtualScroll/src/VirtualScroll.vue | 2 +- src/layouts/default/feature/index.vue | 40 ++++--------------- .../setting/components/SettingFooter.vue | 4 +- src/layouts/default/setting/index.vue | 2 +- 5 files changed, 12 insertions(+), 37 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index c7608880..4b294f99 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -157,6 +157,7 @@ "vben", "vditor", "videojs", + "vite", "vitejs", "vuedraggable", "vueuse", diff --git a/src/components/VirtualScroll/src/VirtualScroll.vue b/src/components/VirtualScroll/src/VirtualScroll.vue index b26e882f..bc0a5e04 100644 --- a/src/components/VirtualScroll/src/VirtualScroll.vue +++ b/src/components/VirtualScroll/src/VirtualScroll.vue @@ -104,7 +104,7 @@ export default defineComponent({ if (!wrapEl) return 0 - const height = Number.parseInt(props.height || 0, 10) || wrapEl.clientHeight + const height = Number.parseInt(`${props.height || 0}`, 10) || wrapEl.clientHeight return first + Math.ceil(height / unref(getItemHeightRef)) } diff --git a/src/layouts/default/feature/index.vue b/src/layouts/default/feature/index.vue index 61946232..9aedecd0 100644 --- a/src/layouts/default/feature/index.vue +++ b/src/layouts/default/feature/index.vue @@ -6,7 +6,6 @@ import { computed, unref } from 'vue' import { SettingButtonPositionEnum } from '@/enums/appEnum' import { useHeaderSetting } from '@/hooks/setting/useHeaderSetting' import { useRootSetting } from '@/hooks/setting/useRootSetting' -import { useDesign } from '@/hooks/web/useDesign' import { useUserStoreWithOut } from '@/store/modules/user' import { createAsyncComponent } from '@/utils/factory/createAsyncComponent' import SessionTimeoutLogin from '@/views/base/login/SessionTimeoutLogin.vue' @@ -18,11 +17,10 @@ const LayoutLockPage = createAsyncComponent(() => import('@/views/base/lock/inde const SettingDrawer = createAsyncComponent(() => import('@/layouts/default/setting/index.vue')) const { getUseOpenBackTop, getShowSettingButton, getSettingButtonPosition, getFullContent } - = useRootSetting() + = useRootSetting() const getTarget = () => document.body const userStore = useUserStoreWithOut() -const { prefixCls } = useDesign('setting-drawer-feature') const { getShowHeader } = useHeaderSetting() const getIsSessionTimeout = computed(() => userStore.getSessionTimeout) @@ -44,41 +42,17 @@ const getIsFixedSettingDrawer = computed(() => { - + - - diff --git a/src/layouts/default/setting/components/SettingFooter.vue b/src/layouts/default/setting/components/SettingFooter.vue index 80910a43..266c61ec 100644 --- a/src/layouts/default/setting/components/SettingFooter.vue +++ b/src/layouts/default/setting/components/SettingFooter.vue @@ -67,12 +67,12 @@ function handleClearAndRedo() { {{ t('layout.setting.copyBtn') }} - + {{ t('common.resetText') }} - + {{ t('layout.setting.clearBtn') }} diff --git a/src/layouts/default/setting/index.vue b/src/layouts/default/setting/index.vue index dd585295..0ddff896 100644 --- a/src/layouts/default/setting/index.vue +++ b/src/layouts/default/setting/index.vue @@ -11,7 +11,7 @@ const [register, { openDrawer }] = useDrawer()