diff --git a/src/layouts/default/LayoutSideBar.tsx b/src/layouts/default/LayoutSideBar.tsx index 4f959f13b..8deb7a0d9 100644 --- a/src/layouts/default/LayoutSideBar.tsx +++ b/src/layouts/default/LayoutSideBar.tsx @@ -4,8 +4,8 @@ import { Layout } from 'ant-design-vue'; import SideBarTrigger from './SideBarTrigger'; import { menuStore } from '/@/store/modules/menu'; -import darkMiniIMg from '/@/assets/images/sidebar/dark-mini.png'; -import lightMiniImg from '/@/assets/images/sidebar/light-mini.png'; +// import darkMiniIMg from '/@/assets/images/sidebar/dark-mini.png'; +// import lightMiniImg from '/@/assets/images/sidebar/light-mini.png'; import darkImg from '/@/assets/images/sidebar/dark.png'; import lightImg from '/@/assets/images/sidebar/light.png'; import { appStore } from '/@/store/modules/app'; @@ -27,15 +27,17 @@ export default defineComponent({ // 根据展开状态设置背景图片 const getStyle = computed((): any => { - const collapse = unref(collapseRef); + // const collapse = unref(collapseRef); const theme = unref(getProjectConfigRef).menuSetting.theme; let bg = ''; if (theme === MenuThemeEnum.DARK) { - bg = collapse ? darkMiniIMg : darkImg; + // bg = collapse ? darkMiniIMg : darkImg; + bg = darkImg; } if (theme === MenuThemeEnum.LIGHT) { - bg = collapse ? lightMiniImg : lightImg; + bg = lightImg; + // bg = collapse ? lightMiniImg : lightImg; } return { 'background-image': `url(${bg})`, diff --git a/src/layouts/iframe/useFrameKeepAlive.ts b/src/layouts/iframe/useFrameKeepAlive.ts index 0501763ef..3eebfd61b 100644 --- a/src/layouts/iframe/useFrameKeepAlive.ts +++ b/src/layouts/iframe/useFrameKeepAlive.ts @@ -38,7 +38,7 @@ export function useFrameKeepAlive() { const getOpenTabList = computed((): string[] => { return tabStore.getTabsState.reduce((prev: string[], next) => { if (next.meta && Reflect.has(next.meta, 'frameSrc')) { - prev.push(next.path); + prev.push(next.path!); } return prev; }, []); diff --git a/src/views/sys/login/Login.vue b/src/views/sys/login/Login.vue index 10bcd8231..6e1bbd16c 100644 --- a/src/views/sys/login/Login.vue +++ b/src/views/sys/login/Login.vue @@ -60,8 +60,8 @@ const openLoginVerifyRef = computed(() => appStore.getProjectConfig.openLoginVerify); const formData = reactive({ - account: '', - password: '', + account: 'vben', + password: '123456', verify: undefined, }); const formState = reactive({