Compare commits

..

4 Commits

Author SHA1 Message Date
Timi
5e192a90e1 block scroll when touch chart 2026-04-16 11:08:21 +08:00
Timi
6f067477f0 fix iOS tabbar transition 2026-04-14 16:07:41 +08:00
Timi
11c1199449 fix iOS back transition 2026-04-14 15:47:03 +08:00
Timi
42efa2b370 fix iOS t-navbar style 2026-04-14 14:38:48 +08:00
9 changed files with 176 additions and 27 deletions

View File

@@ -14,6 +14,7 @@
import type { RouteLocationNormalized } from "vue-router";
import { viewDepthKey } from "vue-router";
import { useGlobalUIStore } from "@/store/globalUIStore";
import { hasProgrammaticBackNavigation } from "@/utils/backNavigationSignal";
defineOptions({
name: "PageTransition"
@@ -26,6 +27,8 @@ const viewDepth = inject(viewDepthKey, 0);
const transitionName = ref("");
const hasTransition = ref(false);
// iOS 左滑返回由系统接管,页面侧不应叠加离场动画。
const isIOS = /iP(ad|hone|od)/i.test(window.navigator.userAgent);
const pageBackground = computed(() => globalUIStore.bodyBackground);
const currentDepth = computed(() => Number(unref(viewDepth)));
const pageKey = computed(() => {
@@ -72,6 +75,17 @@ const unregisterGuard = router.beforeEach((to, from) => {
const toDepth = calcDepth(to);
const fromDepth = calcDepth(from);
const isBackwardNavigation = toDepth < fromDepth;
// 主动触发的返回(如导航栏返回)保留动画。
const isProgrammaticBack = hasProgrammaticBackNavigation();
// 仅在 iOS 系统返回手势下关闭动画。
const shouldDisableTransition = isIOS && isBackwardNavigation && !isProgrammaticBack;
if (shouldDisableTransition) {
transitionName.value = "";
hasTransition.value = false;
return;
}
if (fromDepth < toDepth) {
transitionName.value = "push-left";
@@ -102,8 +116,8 @@ onUnmounted(() => {
width: 100%;
height: 100%;
display: grid;
min-height: 100%;
position: relative;
min-height: 100%;
overflow-x: hidden;
.pages {

View File

@@ -22,8 +22,9 @@
<div :class="{ 'is-fixed-height': isContentFixedHeight }" class="router-view">
<page-transition />
</div>
<!-- iOS 手势返回场景下临时关闭 tabbar 过渡避免系统回退与页面动画叠加 -->
<t-tab-bar
:class="{ 'is-hidden': !tabBarStore.isShowing }"
:class="{ 'is-hidden': !tabBarStore.isShowing, 'skip-transition': tabBarStore.shouldSkipTransition }"
class="tab-bar glass-white"
v-model="tabVal"
shape="round"
@@ -129,33 +130,29 @@ function resolveTabValue(path: string): string {
if (path === "/" || path.startsWith("/files/")) {
return "/";
}
return path;
}
watch(
() => route.path,
(newPath: string) => {
watch(() => route.path, (newPath: string) => {
tabVal.value = resolveTabValue(newPath);
},
{ immediate: true }
);
}, { immediate: true });
function onChangeTab(value: string): void {
async function onChangeTab(value: string): Promise<void> {
if (value === "__music__") {
musicPlayerStore.setPopupVisible(true);
tabVal.value = resolveTabValue(route.path);
return;
}
router.push(value);
if (resolveTabValue(route.path) === value) {
return;
}
await router.replace(value);
}
const isTabBarPaddingNeeded = computed(() => {
if (!tabBarStore.isShowing) {
return false;
}
return route.meta.tabBarPadding !== false;
});
@@ -163,7 +160,6 @@ const tabBarPadding = computed(() => {
if (isTabBarPaddingNeeded.value) {
return "6rem";
}
return "0rem";
});
@@ -184,6 +180,7 @@ const contentHeight = computed(() => {
.main-layout {
--app-nav-offset: v-bind(topPadding);
--safe-top: env(safe-area-inset-top, 0px);
box-sizing: border-box;
isolation: isolate;
position: relative;
@@ -192,6 +189,8 @@ const contentHeight = computed(() => {
transition: padding-bottom .24s ease;
.nav-bar {
--td-navbar-padding-top: var(--safe-top);
top: 0;
left: 0;
right: 0;
@@ -199,11 +198,8 @@ const contentHeight = computed(() => {
position: fixed;
:deep(.t-navbar) {
z-index: 1;
position: relative;
}
:deep(.t-navbar__content) {
&__content {
color: var(--tui-black, #000);
border-bottom: 1px solid rgba(0, 0, 0, .1);
background: rgba(250, 250, 250, .8);
@@ -211,6 +207,13 @@ const contentHeight = computed(() => {
-webkit-backdrop-filter: blur(10px);
}
&__left,
&__right {
top: var(----td-navbar-padding-top);
height: var(--td-navbar-height, 48px);
}
}
.nav-extra {
gap: .35rem;
display: inline-flex;
@@ -237,9 +240,9 @@ const contentHeight = computed(() => {
}
.tab-bar {
bottom: 1rem;
left: 1rem;
right: 1rem;
bottom: 1rem;
position: fixed;
z-index: 1000;
opacity: 1;
@@ -259,6 +262,11 @@ const contentHeight = computed(() => {
transform: translateY(calc(100% + 1rem));
}
&.skip-transition {
// 配合 tabBarStore.shouldSkipTransition仅本次导航禁用过渡
transition: none;
}
.item {
margin: 0;
padding: 0;

View File

@@ -731,6 +731,12 @@ function clearAutoRefreshTimer(): void {
width: 100%;
height: 16rem;
background: #FFF;
touch-action: none;
:deep(svg),
:deep(canvas) {
touch-action: none;
}
}
.slider {

View File

@@ -772,6 +772,12 @@ onMounted(restartAutoRefresh);
width: 100%;
height: 16rem;
background: #FFF;
touch-action: none;
:deep(svg),
:deep(canvas) {
touch-action: none;
}
}
.slider {

View File

@@ -615,6 +615,12 @@ function clearAutoRefreshTimer(): void {
width: 100%;
height: 16rem;
background: #FFF;
touch-action: none;
:deep(svg),
:deep(canvas) {
touch-action: none;
}
}
.slider {

View File

@@ -91,6 +91,7 @@ function saveConnect(): void {
theme: "success",
message: "连接配置已保存"
});
router.back();
}
onMounted(() => {

View File

@@ -14,6 +14,12 @@ import ServerDetail from "@/pages/dashboard/ServerDashboard/ServerDetail.vue";
import ServerPerformanceDetail from "@/pages/dashboard/ServerDashboard/ServerPerformanceDetail.vue";
import ServerPartitionsDetail from "@/pages/dashboard/ServerDashboard/ServerPartitionsDetail.vue";
import DockerContainerDetail from "@/pages/dashboard/DockerDashboard/DockerContainerDetail.vue";
import {
hasProgrammaticBackNavigation,
clearProgrammaticBackNavigation,
markProgrammaticBackNavigation
} from "@/utils/backNavigationSignal";
import { useTabBarStore } from "@/store/tabBarStore";
const router = createRouter({
history: createWebHistory("/"),
@@ -180,8 +186,60 @@ const router = createRouter({
]
});
router.beforeEach((to: RouteLocationNormalized) => {
const rawBack = router.back.bind(router);
const rawGo = router.go.bind(router);
const isIOS = /iP(ad|hone|od)/i.test(window.navigator.userAgent);
// 与 MainLayout 的 tabbar 过渡时长保持一致,额外预留一点缓冲时间
const TAB_BAR_TRANSITION_MS = 520;
const TAB_BAR_SKIP_EXTRA_MS = 180;
const depthCache = new Map<string, number>();
function calcDepth(sourceRoute: RouteLocationNormalized): number {
if (!sourceRoute.meta.dynamicDepth) {
return Number(sourceRoute.meta.depth ?? 0);
}
const fullPath = sourceRoute.fullPath;
const cachedDepth = depthCache.get(fullPath);
if (cachedDepth !== undefined) {
return cachedDepth;
}
const baseDepth = Number(sourceRoute.meta.baseDepth ?? 0);
const pathSegments = fullPath.split("?")[0].split("/").filter((pathSegment) => pathSegment !== "");
const routeDepth = baseDepth + (pathSegments.length - 1);
depthCache.set(fullPath, routeDepth);
return routeDepth;
}
// 全局代理:所有代码触发的后退都自动标记为“主动返回”。
router.back = () => {
markProgrammaticBackNavigation();
rawBack();
};
// 覆盖 go(-1 / -n) 场景,保证与 back() 行为一致。
router.go = (delta) => {
if (delta < 0) {
markProgrammaticBackNavigation();
}
rawGo(delta);
};
router.beforeEach((to: RouteLocationNormalized, from: RouteLocationNormalized) => {
const tabBarStore = useTabBarStore();
const settingStore = useSettingStore();
const toDepth = calcDepth(to);
const fromDepth = calcDepth(from);
const isBackwardNavigation = toDepth < fromDepth;
// 代码主动调用 back/go(-1) 的返回,仍保留 tabbar 进入动画
const isProgrammaticBack = hasProgrammaticBackNavigation();
const isTabBarEntering = !from.meta.tabBarVisible && !!to.meta.tabBarVisible;
// 仅 iOS 手势返回(非代码触发)且无 tabbar -> 有 tabbar 时,禁用本次 tabbar 进入动画
const shouldSkipTabBarEnterTransition = isIOS && isBackwardNavigation && !isProgrammaticBack && isTabBarEntering;
if (shouldSkipTabBarEnterTransition) {
tabBarStore.skipTransitionOnce();
}
if (to.meta.ignoreConnectCheck) {
return true;
@@ -200,6 +258,15 @@ router.beforeEach((to: RouteLocationNormalized) => {
});
router.afterEach((to: RouteLocationNormalized) => {
const tabBarStore = useTabBarStore();
if (tabBarStore.shouldSkipTransition) {
// 本次导航稳定后再恢复过渡,避免手势返回期间出现二次进入动画
window.setTimeout(() => {
tabBarStore.restoreTransition();
}, TAB_BAR_TRANSITION_MS + TAB_BAR_SKIP_EXTRA_MS);
}
// 一次导航结束后清理信号,防止影响后续动画判定。
clearProgrammaticBackNavigation();
const globalUIStore = useGlobalUIStore();
const targetBackground = typeof to.meta.bodyBackground === "string" ? to.meta.bodyBackground : DEFAULT_BODY_BACKGROUND;
globalUIStore.setBodyBackground(targetBackground);

View File

@@ -2,10 +2,23 @@ import { defineStore } from "pinia";
export const useTabBarStore = defineStore("tab-bar", () => {
const router = useRouter();
// 仅用于“当前这一次”禁用 tabbar 过渡,导航结束后会恢复
const shouldSkipTransition = ref(false);
const isShowing = computed(() => !!router.currentRoute.value.meta.tabBarVisible);
function skipTransitionOnce(): void {
shouldSkipTransition.value = true;
}
function restoreTransition(): void {
shouldSkipTransition.value = false;
}
return {
isShowing
isShowing,
shouldSkipTransition,
skipTransitionOnce,
restoreTransition
};
});

View File

@@ -0,0 +1,28 @@
let programmaticBackAt = 0;
// 主动返回信号有效期,避免历史信号污染后续导航
const PROGRAMMATIC_BACK_SIGNAL_TTL_MS = 1200;
// 由代码触发 router.back / router.go(-1) 时打标
export function markProgrammaticBackNavigation(): void {
programmaticBackAt = Date.now();
}
// 读取主动返回信号,超时后自动清理
export function hasProgrammaticBackNavigation(): boolean {
if (programmaticBackAt < 1) {
return false;
}
const hasSignal = Date.now() - programmaticBackAt <= PROGRAMMATIC_BACK_SIGNAL_TTL_MS;
if (!hasSignal) {
programmaticBackAt = 0;
}
return hasSignal;
}
// 在导航结束后统一清理信号
export function clearProgrammaticBackNavigation(): void {
programmaticBackAt = 0;
}