Commit 508109e727dd4f2eb2dd5847d33decbcdf229a22
1 parent
6211ba87
chore: remove menu mini bg img
Showing
3 changed files
with
10 additions
and
8 deletions
src/layouts/default/LayoutSideBar.tsx
| @@ -4,8 +4,8 @@ import { Layout } from 'ant-design-vue'; | @@ -4,8 +4,8 @@ import { Layout } from 'ant-design-vue'; | ||
| 4 | import SideBarTrigger from './SideBarTrigger'; | 4 | import SideBarTrigger from './SideBarTrigger'; |
| 5 | import { menuStore } from '/@/store/modules/menu'; | 5 | import { menuStore } from '/@/store/modules/menu'; |
| 6 | 6 | ||
| 7 | -import darkMiniIMg from '/@/assets/images/sidebar/dark-mini.png'; | ||
| 8 | -import lightMiniImg from '/@/assets/images/sidebar/light-mini.png'; | 7 | +// import darkMiniIMg from '/@/assets/images/sidebar/dark-mini.png'; |
| 8 | +// import lightMiniImg from '/@/assets/images/sidebar/light-mini.png'; | ||
| 9 | import darkImg from '/@/assets/images/sidebar/dark.png'; | 9 | import darkImg from '/@/assets/images/sidebar/dark.png'; |
| 10 | import lightImg from '/@/assets/images/sidebar/light.png'; | 10 | import lightImg from '/@/assets/images/sidebar/light.png'; |
| 11 | import { appStore } from '/@/store/modules/app'; | 11 | import { appStore } from '/@/store/modules/app'; |
| @@ -27,15 +27,17 @@ export default defineComponent({ | @@ -27,15 +27,17 @@ export default defineComponent({ | ||
| 27 | 27 | ||
| 28 | // 根据展开状态设置背景图片 | 28 | // 根据展开状态设置背景图片 |
| 29 | const getStyle = computed((): any => { | 29 | const getStyle = computed((): any => { |
| 30 | - const collapse = unref(collapseRef); | 30 | + // const collapse = unref(collapseRef); |
| 31 | 31 | ||
| 32 | const theme = unref(getProjectConfigRef).menuSetting.theme; | 32 | const theme = unref(getProjectConfigRef).menuSetting.theme; |
| 33 | let bg = ''; | 33 | let bg = ''; |
| 34 | if (theme === MenuThemeEnum.DARK) { | 34 | if (theme === MenuThemeEnum.DARK) { |
| 35 | - bg = collapse ? darkMiniIMg : darkImg; | 35 | + // bg = collapse ? darkMiniIMg : darkImg; |
| 36 | + bg = darkImg; | ||
| 36 | } | 37 | } |
| 37 | if (theme === MenuThemeEnum.LIGHT) { | 38 | if (theme === MenuThemeEnum.LIGHT) { |
| 38 | - bg = collapse ? lightMiniImg : lightImg; | 39 | + bg = lightImg; |
| 40 | + // bg = collapse ? lightMiniImg : lightImg; | ||
| 39 | } | 41 | } |
| 40 | return { | 42 | return { |
| 41 | 'background-image': `url(${bg})`, | 43 | 'background-image': `url(${bg})`, |
src/layouts/iframe/useFrameKeepAlive.ts
| @@ -38,7 +38,7 @@ export function useFrameKeepAlive() { | @@ -38,7 +38,7 @@ export function useFrameKeepAlive() { | ||
| 38 | const getOpenTabList = computed((): string[] => { | 38 | const getOpenTabList = computed((): string[] => { |
| 39 | return tabStore.getTabsState.reduce((prev: string[], next) => { | 39 | return tabStore.getTabsState.reduce((prev: string[], next) => { |
| 40 | if (next.meta && Reflect.has(next.meta, 'frameSrc')) { | 40 | if (next.meta && Reflect.has(next.meta, 'frameSrc')) { |
| 41 | - prev.push(next.path); | 41 | + prev.push(next.path!); |
| 42 | } | 42 | } |
| 43 | return prev; | 43 | return prev; |
| 44 | }, []); | 44 | }, []); |
src/views/sys/login/Login.vue
| @@ -60,8 +60,8 @@ | @@ -60,8 +60,8 @@ | ||
| 60 | const openLoginVerifyRef = computed(() => appStore.getProjectConfig.openLoginVerify); | 60 | const openLoginVerifyRef = computed(() => appStore.getProjectConfig.openLoginVerify); |
| 61 | 61 | ||
| 62 | const formData = reactive({ | 62 | const formData = reactive({ |
| 63 | - account: '', | ||
| 64 | - password: '', | 63 | + account: 'vben', |
| 64 | + password: '123456', | ||
| 65 | verify: undefined, | 65 | verify: undefined, |
| 66 | }); | 66 | }); |
| 67 | const formState = reactive({ | 67 | const formState = reactive({ |