Skip to content

Commit

Permalink
chore: remove menu mini bg img
Browse files Browse the repository at this point in the history
  • Loading branch information
anncwb committed Oct 15, 2020
1 parent 6211ba8 commit 508109e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
12 changes: 7 additions & 5 deletions src/layouts/default/LayoutSideBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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})`,
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/iframe/useFrameKeepAlive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}, []);
Expand Down
4 changes: 2 additions & 2 deletions src/views/sys/login/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
const openLoginVerifyRef = computed(() => appStore.getProjectConfig.openLoginVerify);
const formData = reactive({
account: '',
password: '',
account: 'vben',
password: '123456',
verify: undefined,
});
const formState = reactive({
Expand Down

0 comments on commit 508109e

Please sign in to comment.