Merge branch 'develop' into feat-1714

This commit is contained in:
かっこかり 2024-07-25 17:42:47 +09:00 committed by GitHub
commit fa356fa149
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 212 additions and 92 deletions

View file

@ -53,7 +53,7 @@ function resolveNested(current: Resolved, d = 0): Resolved | null {
const current = resolveNested(router.current)!;
const currentPageComponent = shallowRef('component' in current.route ? current.route.component : MkLoadingPage);
const currentPageProps = ref(current.props);
const key = ref(current.route.path + JSON.stringify(Object.fromEntries(current.props)));
const key = ref(router.getCurrentKey() + JSON.stringify(Object.fromEntries(current.props)));
function onChange({ resolved, key: newKey }) {
const current = resolveNested(resolved);