renxiaodong/lingji-work-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/v1.3_营销资产中台

Browse Source 
# Conflicts:
#	src/main.ts
#	src/styles/components/index.scss
#	src/styles/components/table.scss
#	src/styles/index.ts
#	src/views/components/dataEngine/keyWord.vue
This commit is contained in:
rd
2025-07-02 09:22:21 +08:00
parent 30b2eb8211 6ef12fafe4
commit 3f5aa63d89
37 changed files with 1498 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/layouts/Basic.vue
View File

@ -11,8 +11,10 @@ const appStore = useAppStore();
const router = useRouter();
const route = useRoute();
console.log({ appStore });
useResponsive(true);
const navbarHeight = `60px`;
const navbarHeight = `72px`;
const navbar = computed(() => appStore.navbar);
const renderMenu = computed(() => appStore.menu && !appStore.topMenu);
const hideMenu = computed(() => appStore.hideMenu);
@ -23,14 +25,17 @@ const menuWidth = computed(() => {
const collapsed = computed(() => {
return appStore.menuCollapse;
});
const paddingStyle = computed(() => {
const paddingLeft = renderMenu.value && !hideMenu.value ? { paddingLeft: `${menuWidth.value}px` } : {};
const paddingTop = navbar.value ? { paddingTop: navbarHeight } : {};
return { ...paddingLeft, ...paddingTop };
});
const showSidebar = computed(() => {
return !(route.meta && route.meta.hideSidebar);
});
const paddingStyle = computed(() => {
const paddingLeft =
showSidebar.value && renderMenu.value && !hideMenu.value ? { paddingLeft: `${menuWidth.value}px` } : {};
const paddingTop = navbar.value ? { paddingTop: navbarHeight } : {};
return { ...paddingLeft, ...paddingTop };
});
console.log('showSidebar', showSidebar);
onMounted(() => {
checkHasInviteCode();
@ -69,7 +74,7 @@ provide('toggleDrawerMenu', () => {
breakpoint="xl"
:collapsed="collapsed"
:width="menuWidth"
:style="{ paddingTop: navbar ? '60px' : '' }"
:style="{ paddingTop: navbar ? '72px' : '' }"
collapsible
hide-trigger
@collapse="setCollapsed"
@ -102,7 +107,7 @@ provide('toggleDrawerMenu', () => {
</template>
<style scoped lang="less">
@nav-size-height: 60px;
@nav-size-height: 72px;
@layout-max-width: 1100px;
.layout {