hjq/mart-admin
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!14 修复固定header后没有回到顶部的bug，修复拉取项目后运行不起来的bug

Browse Source 
Merge pull request !14 from wjs0509/master
This commit is contained in:
lyt-Top 2021-08-21 09:42:43 +00:00 committed by Gitee
commit a4da51c179
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/layout/main/columns.vue
View File

@ -3,9 +3,9 @@
<ColumnsAside /> <ColumnsAside />
<div class="layout-columns-warp"> <div class="layout-columns-warp">
<Aside /> <Aside />
<el-container class="flex-center layout-backtop"> <el-container class="flex-center layout-backtop" :class="{'layout-backtop':!isFixedHeader}">
<Header v-if="isFixedHeader" /> <Header v-if="isFixedHeader" />
<el-scrollbar> <el-scrollbar :class="{'layout-backtop':isFixedHeader}">
<Header v-if="!isFixedHeader" /> <Header v-if="!isFixedHeader" />
<Main /> <Main />
</el-scrollbar> </el-scrollbar>

6
src/layout/main/defaults.vue
View File

@ -1,9 +1,9 @@
<template> <template>
<el-container class="layout-container"> <el-container class="layout-container">
<Aside /> <Aside />
<el-container class="flex-center layout-backtop"> <el-container class="flex-center" :class="{'layout-backtop':!isFixedHeader}">
<Header v-if="isFixedHeader" /> <Header v-if="isFixedHeader" />
<el-scrollbar ref="layoutDefaultsScrollbarRef"> <el-scrollbar ref="layoutDefaultsScrollbarRef" :class="{'layout-backtop':isFixedHeader}">
<Header v-if="!isFixedHeader" /> <Header v-if="!isFixedHeader" />
<Main /> <Main />
</el-scrollbar> </el-scrollbar>
@ -23,7 +23,7 @@ export default {
name: 'layoutDefaults', name: 'layoutDefaults',
components: { Aside, Header, Main }, components: { Aside, Header, Main },
setup() { setup() {
const { proxy } = getCurrentInstance(); const { proxy }:any = getCurrentInstance();
const store = useStore(); const store = useStore();
const route = useRoute(); const route = useRoute();
const isFixedHeader = computed(() => { const isFixedHeader = computed(() => {

6
src/views/system/user/index.vue
View File

@ -30,9 +30,9 @@
class="mt15" class="mt15"
:pager-count="5" :pager-count="5"
:page-sizes="[10, 20, 30]" :page-sizes="[10, 20, 30]"
:current-page="tableData.param.pageNum" v-model:current-page="tableData.param.pageNum"
background background
:page-size="tableData.param.pageSize" v-model:page-size="tableData.param.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="tableData.total" :total="tableData.total"
> >
@ -84,7 +84,7 @@ export default {
}; };
// 分页改变 // 分页改变
const onHandleCurrentChange = (val: number) => { const onHandleCurrentChange = (val: number) => {
state.tableData.param.pageSize = val; state.tableData.param.pageNum = val;
}; };
// 页面加载时 // 页面加载时
onMounted(() => { onMounted(() => {

2
vite.config.ts
View File

@ -10,7 +10,7 @@ const pathResolve = (dir: string): any => {
const { VITE_PORT, VITE_OPEN, VITE_PUBLIC_PATH } = loadEnv(); const { VITE_PORT, VITE_OPEN, VITE_PUBLIC_PATH } = loadEnv();
const alias: Record<string, string> = { const alias: Record<string, string> = {
'/@': pathResolve('/src/'), '/@': pathResolve('./src/'),
'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js', 'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js',
}; };