perf: optimize multiple-tab switching effect
This commit is contained in:
parent
949db9639f
commit
f2bdf0b86d
|
|
@ -1,11 +1,11 @@
|
||||||
.transition-default() {
|
.transition-default() {
|
||||||
&-enter-active,
|
&-enter-active,
|
||||||
&-leave-active {
|
&-leave-active {
|
||||||
transition: 0.3s cubic-bezier(0.25, 0.8, 0.5, 1) !important;
|
transition: 0.2s cubic-bezier(0.25, 0.8, 0.5, 1) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-move {
|
&-move {
|
||||||
transition: transform 0.6s;
|
transition: transform 0.5s;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
.breadcrumb-enter-active,
|
.breadcrumb-enter-active,
|
||||||
.breadcrumb-leave-active {
|
.breadcrumb-leave-active {
|
||||||
transition: all 0.38s;
|
transition: all 0.24s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.breadcrumb-enter-from,
|
.breadcrumb-enter-from,
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
.fade-enter-active,
|
.fade-enter-active,
|
||||||
.fade-leave-active {
|
.fade-leave-active {
|
||||||
transition: opacity 0.28s ease-in-out;
|
transition: opacity 0.2s ease-in-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
.fade-enter-from,
|
.fade-enter-from,
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
// side-fade
|
// side-fade
|
||||||
.slide-fade-enter-active,
|
.slide-fade-enter-active,
|
||||||
.slide-fade-leave-active {
|
.slide-fade-leave-active {
|
||||||
transition: opacity 0.35s, transform 0.4s;
|
transition: opacity 0.3s, transform 0.35s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.slide-enter-from,
|
.slide-enter-from,
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
// Speed: 1x
|
// Speed: 1x
|
||||||
.fade-bottom-enter-active,
|
.fade-bottom-enter-active,
|
||||||
.fade-bottom-leave-active {
|
.fade-bottom-leave-active {
|
||||||
transition: opacity 0.3s, transform 0.35s;
|
transition: opacity 0.2s, transform 0.25s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.fade-bottom-enter-from,
|
.fade-bottom-enter-from,
|
||||||
|
|
@ -53,7 +53,7 @@
|
||||||
// Speed: 1x
|
// Speed: 1x
|
||||||
.fade-top-enter-active,
|
.fade-top-enter-active,
|
||||||
.fade-top-leave-active {
|
.fade-top-leave-active {
|
||||||
transition: opacity 0.3s, transform 0.35s;
|
transition: opacity 0.2s, transform 0.25s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.fade-top-enter-from {
|
.fade-top-enter-from {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
// zoom-out
|
// zoom-out
|
||||||
.zoom-out-enter-active,
|
.zoom-out-enter-active,
|
||||||
.zoom-out-leave-active {
|
.zoom-out-leave-active {
|
||||||
transition: opacity 0.35s ease-in-out, transform 0.45s ease-out;
|
transition: opacity 0.2 ease-in-out, transform 0.2s ease-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
.zoom-out-enter-from,
|
.zoom-out-enter-from,
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
// zoom-fade
|
// zoom-fade
|
||||||
.zoom-fade-enter-active,
|
.zoom-fade-enter-active,
|
||||||
.zoom-fade-leave-active {
|
.zoom-fade-leave-active {
|
||||||
transition: transform 0.35s, opacity 0.35s ease-out;
|
transition: transform 0.2s, opacity 0.2s ease-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
.zoom-fade-enter-from {
|
.zoom-fade-enter-from {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,9 @@
|
||||||
|
import { useTimeout } from '/@/hooks/core/useTimeout';
|
||||||
|
import { PageEnum } from '/@/enums/pageEnum';
|
||||||
import { TabItem, tabStore } from '/@/store/modules/tab';
|
import { TabItem, tabStore } from '/@/store/modules/tab';
|
||||||
import { appStore } from '/@/store/modules/app';
|
import { appStore } from '/@/store/modules/app';
|
||||||
|
import router from '/@/router';
|
||||||
|
|
||||||
type Fn = () => void;
|
type Fn = () => void;
|
||||||
type RouteFn = (tabItem: TabItem) => void;
|
type RouteFn = (tabItem: TabItem) => void;
|
||||||
|
|
||||||
|
|
@ -66,5 +70,12 @@ export function useTabs() {
|
||||||
closeOther: () => canIUseFn() && closeOther(tabStore.getCurrentTab),
|
closeOther: () => canIUseFn() && closeOther(tabStore.getCurrentTab),
|
||||||
closeCurrent: () => canIUseFn() && closeCurrent(tabStore.getCurrentTab),
|
closeCurrent: () => canIUseFn() && closeCurrent(tabStore.getCurrentTab),
|
||||||
resetCache: () => canIUseFn() && resetCache(),
|
resetCache: () => canIUseFn() && resetCache(),
|
||||||
|
addTab: (path: PageEnum, goTo = false) => {
|
||||||
|
useTimeout(() => {
|
||||||
|
tabStore.addTabByPathAction(path);
|
||||||
|
}, 0);
|
||||||
|
|
||||||
|
goTo && router.push(path);
|
||||||
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ import { computed, defineComponent, unref, ref, onMounted, watch } from 'vue';
|
||||||
import { BasicMenu } from '/@/components/Menu/index';
|
import { BasicMenu } from '/@/components/Menu/index';
|
||||||
import Logo from '/@/layouts/Logo.vue';
|
import Logo from '/@/layouts/Logo.vue';
|
||||||
|
|
||||||
import { PageEnum } from '/@/enums/pageEnum';
|
|
||||||
import { MenuModeEnum, MenuSplitTyeEnum, MenuTypeEnum } from '/@/enums/menuEnum';
|
import { MenuModeEnum, MenuSplitTyeEnum, MenuTypeEnum } from '/@/enums/menuEnum';
|
||||||
|
|
||||||
// store
|
// store
|
||||||
|
|
@ -20,10 +19,11 @@ import {
|
||||||
getFlatChildrenMenus,
|
getFlatChildrenMenus,
|
||||||
getCurrentParentPath,
|
getCurrentParentPath,
|
||||||
} from '/@/router/menus/index';
|
} from '/@/router/menus/index';
|
||||||
import { useGo } from '/@/hooks/web/usePage';
|
|
||||||
import { useRouter } from 'vue-router';
|
import { useRouter } from 'vue-router';
|
||||||
import { useThrottle } from '/@/hooks/core/useThrottle';
|
import { useThrottle } from '/@/hooks/core/useThrottle';
|
||||||
import { permissionStore } from '/@/store/modules/permission';
|
import { permissionStore } from '/@/store/modules/permission';
|
||||||
|
import { useTabs } from '/@/hooks/web/useTabs';
|
||||||
|
import { PageEnum } from '/@/enums/pageEnum';
|
||||||
|
|
||||||
// import
|
// import
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
|
|
@ -54,6 +54,7 @@ export default defineComponent({
|
||||||
const menusRef = ref<Menu[]>([]);
|
const menusRef = ref<Menu[]>([]);
|
||||||
const flatMenusRef = ref<Menu[]>([]);
|
const flatMenusRef = ref<Menu[]>([]);
|
||||||
const { currentRoute } = useRouter();
|
const { currentRoute } = useRouter();
|
||||||
|
const { addTab } = useTabs();
|
||||||
|
|
||||||
const getProjectConfigRef = computed(() => {
|
const getProjectConfigRef = computed(() => {
|
||||||
return appStore.getProjectConfig;
|
return appStore.getProjectConfig;
|
||||||
|
|
@ -63,7 +64,6 @@ export default defineComponent({
|
||||||
return unref(getProjectConfigRef).menuSetting.mode === MenuModeEnum.HORIZONTAL;
|
return unref(getProjectConfigRef).menuSetting.mode === MenuModeEnum.HORIZONTAL;
|
||||||
});
|
});
|
||||||
|
|
||||||
const go = useGo();
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
genMenus();
|
genMenus();
|
||||||
});
|
});
|
||||||
|
|
@ -144,7 +144,7 @@ export default defineComponent({
|
||||||
if (splitType === MenuSplitTyeEnum.TOP) {
|
if (splitType === MenuSplitTyeEnum.TOP) {
|
||||||
menuStore.commitCurrentTopSplitMenuPathState(path);
|
menuStore.commitCurrentTopSplitMenuPathState(path);
|
||||||
}
|
}
|
||||||
go(path as PageEnum);
|
addTab(path as PageEnum, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ import type { TabContentProps } from './tab.data';
|
||||||
import type { TabItem } from '/@/store/modules/tab';
|
import type { TabItem } from '/@/store/modules/tab';
|
||||||
import type { AppRouteRecordRaw } from '/@/router/types';
|
import type { AppRouteRecordRaw } from '/@/router/types';
|
||||||
|
|
||||||
import { defineComponent, watch, computed, ref, unref } from 'vue';
|
import { defineComponent, watch, computed, ref, unref, onMounted } from 'vue';
|
||||||
import { Tabs } from 'ant-design-vue';
|
import { Tabs } from 'ant-design-vue';
|
||||||
import TabContent from './TabContent';
|
import TabContent from './TabContent';
|
||||||
|
|
||||||
|
|
@ -16,12 +16,21 @@ import './index.less';
|
||||||
import { tabStore } from '/@/store/modules/tab';
|
import { tabStore } from '/@/store/modules/tab';
|
||||||
import { closeTab } from './useTabDropdown';
|
import { closeTab } from './useTabDropdown';
|
||||||
import router from '/@/router';
|
import router from '/@/router';
|
||||||
|
import { useTabs } from '/@/hooks/web/useTabs';
|
||||||
|
import { PageEnum } from '/@/enums/pageEnum';
|
||||||
|
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
name: 'MultiTabs',
|
name: 'MultiTabs',
|
||||||
setup() {
|
setup() {
|
||||||
let isAddAffix = false;
|
let isAddAffix = false;
|
||||||
const go = useGo();
|
const go = useGo();
|
||||||
const { currentRoute } = useRouter();
|
const { currentRoute } = useRouter();
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
const { addTab } = useTabs();
|
||||||
|
addTab(unref(currentRoute).path as PageEnum);
|
||||||
|
});
|
||||||
|
|
||||||
// 当前激活tab
|
// 当前激活tab
|
||||||
const activeKeyRef = ref<string>('');
|
const activeKeyRef = ref<string>('');
|
||||||
// 当前tab列表
|
// 当前tab列表
|
||||||
|
|
@ -38,7 +47,9 @@ export default defineComponent({
|
||||||
}
|
}
|
||||||
activeKeyRef.value = path;
|
activeKeyRef.value = path;
|
||||||
|
|
||||||
tabStore.commitAddTab((unref(currentRoute) as unknown) as AppRouteRecordRaw);
|
// 监听路由的话虽然可以,但是路由切换的时间会造成卡顿现象?
|
||||||
|
// 使用useTab的addTab的话,当用户手动调转,需要自行调用addTab
|
||||||
|
// tabStore.commitAddTab((unref(currentRoute) as unknown) as AppRouteRecordRaw);
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
immediate: true,
|
immediate: true,
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,9 @@ import { userStore } from '/@/store/modules/user';
|
||||||
export function createPageLoadingGuard(router: Router) {
|
export function createPageLoadingGuard(router: Router) {
|
||||||
let isFirstLoad = true;
|
let isFirstLoad = true;
|
||||||
router.beforeEach(async (to) => {
|
router.beforeEach(async (to) => {
|
||||||
|
console.log('======================');
|
||||||
|
console.log(2);
|
||||||
|
console.log('======================');
|
||||||
const {
|
const {
|
||||||
openKeepAlive,
|
openKeepAlive,
|
||||||
openRouterTransition,
|
openRouterTransition,
|
||||||
|
|
@ -21,6 +24,7 @@ export function createPageLoadingGuard(router: Router) {
|
||||||
}
|
}
|
||||||
if (show && openKeepAlive && !isFirstLoad) {
|
if (show && openKeepAlive && !isFirstLoad) {
|
||||||
const tabList = tabStore.getTabsState;
|
const tabList = tabStore.getTabsState;
|
||||||
|
|
||||||
const isOpen = tabList.some((tab) => tab.path === to.path);
|
const isOpen = tabList.some((tab) => tab.path === to.path);
|
||||||
appStore.setPageLoadingAction(!isOpen);
|
appStore.setPageLoadingAction(!isOpen);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -180,6 +180,14 @@ class Tab extends VuexModule {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Action
|
||||||
|
addTabByPathAction(path: string): void {
|
||||||
|
if (!path) return;
|
||||||
|
const routes = router.getRoutes();
|
||||||
|
const to = routes.find((item) => item.path === path);
|
||||||
|
to && this.commitAddTab((to as unknown) as AppRouteRecordRaw);
|
||||||
|
}
|
||||||
|
|
||||||
@Action
|
@Action
|
||||||
closeRightTabAction(route: AppRouteRecordRaw | TabItem): void {
|
closeRightTabAction(route: AppRouteRecordRaw | TabItem): void {
|
||||||
const index = this.tabsState.findIndex((item) => item.path === route.path);
|
const index = this.tabsState.findIndex((item) => item.path === route.path);
|
||||||
|
|
|
||||||
|
|
@ -11,19 +11,40 @@
|
||||||
<a-button class="mr-2" @click="closeOther">关闭其他</a-button>
|
<a-button class="mr-2" @click="closeOther">关闭其他</a-button>
|
||||||
<a-button class="mr-2" @click="closeCurrent">关闭当前</a-button>
|
<a-button class="mr-2" @click="closeCurrent">关闭当前</a-button>
|
||||||
<a-button class="mr-2" @click="refreshPage">刷新当前</a-button>
|
<a-button class="mr-2" @click="refreshPage">刷新当前</a-button>
|
||||||
|
<a-button class="mr-2" @click="openTab">打开图标界面tab</a-button>
|
||||||
</CollapseContainer>
|
</CollapseContainer>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { defineComponent } from 'vue';
|
import { defineComponent } from 'vue';
|
||||||
import { CollapseContainer } from '/@/components/Container/index';
|
import { CollapseContainer } from '/@/components/Container/index';
|
||||||
|
import { PageEnum } from '/@/enums/pageEnum';
|
||||||
import { useTabs } from '/@/hooks/web/useTabs';
|
import { useTabs } from '/@/hooks/web/useTabs';
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
name: 'TabsDemo',
|
name: 'TabsDemo',
|
||||||
components: { CollapseContainer },
|
components: { CollapseContainer },
|
||||||
setup() {
|
setup() {
|
||||||
const { closeAll, closeLeft, closeRight, closeOther, closeCurrent, refreshPage } = useTabs();
|
const {
|
||||||
return { closeAll, closeLeft, closeRight, closeOther, closeCurrent, refreshPage };
|
closeAll,
|
||||||
|
closeLeft,
|
||||||
|
closeRight,
|
||||||
|
closeOther,
|
||||||
|
closeCurrent,
|
||||||
|
refreshPage,
|
||||||
|
addTab,
|
||||||
|
} = useTabs();
|
||||||
|
|
||||||
|
return {
|
||||||
|
closeAll,
|
||||||
|
closeLeft,
|
||||||
|
closeRight,
|
||||||
|
closeOther,
|
||||||
|
closeCurrent,
|
||||||
|
refreshPage,
|
||||||
|
openTab: () => {
|
||||||
|
addTab('/feat/icon' as PageEnum, true);
|
||||||
|
},
|
||||||
|
};
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue