minie4/Timetable-V2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ Support subroutes of settings

Browse Source
This commit is contained in:
minie4
2023-06-06 19:35:02 +02:00
parent e416e599fa
commit 9164f56172
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/titlebar-element.vue
View File

@ -2,14 +2,14 @@
import { MenuIcon } from "lucide-vue-next"; import { MenuIcon } from "lucide-vue-next";
import { computed } from "vue"; import { computed } from "vue";
import { useRoute, useRouter, RouterLink } from "vue-router"; import { useRoute, useRouter, RouterLink } from "vue-router";
import { lastRoute } from "../router/index"; import { lastDataRoute } from "../router/index";
const route = useRoute(); const route = useRoute();
const router = useRouter(); const router = useRouter();
const routeName = computed(() => route.name); const routeName = computed(() => route.name);
function goBack() { function goBack() {
if (routeName.value != "title.settings") return; if (!routeName.value.startsWith("title.settings")) return;
if (lastRoute.value.name) router.go(-1); if (lastDataRoute.value.name) router.push(lastDataRoute.value.path);
else router.push("/timetable"); else router.push("/timetable");
} }
</script> </script>

6
src/router/index.js
View File

@ -57,9 +57,11 @@ const router = createRouter({
], ],
}); });
export let lastRoute = ref(); export let lastDataRoute = ref();
router.beforeEach((_to, from) => { router.beforeEach((_to, from) => {
lastRoute.value = from; if (from.meta.dataView) {
lastDataRoute.value = from;
}
return true; return true;
}); });