diff --git a/frontend/src/components/complex-table/index.vue b/frontend/src/components/complex-table/index.vue index 68912da5af8c..2978527cc425 100644 --- a/frontend/src/components/complex-table/index.vue +++ b/frontend/src/components/complex-table/index.vue @@ -53,6 +53,10 @@ const props = defineProps({ type: Number, default: 0, }, + height: { + type: Number, + default: 0, + }, }); const emit = defineEmits(['search', 'update:selects', 'update:paginationConfig']); const globalStore = GlobalStore(); @@ -105,11 +109,19 @@ onMounted(() => { if (props.heightDiff) { heightDiff = props.heightDiff; } + if (props.height) { + tableHeight.value = props.height; + } else { + tableHeight.value = window.innerHeight - heightDiff; + } - tableHeight.value = window.innerHeight - heightDiff; window.onresize = () => { return (() => { - tableHeight.value = window.innerHeight - heightDiff; + if (props.height) { + tableHeight.value = props.height; + } else { + tableHeight.value = window.innerHeight - heightDiff; + } })(); }; }); diff --git a/frontend/src/components/layout-content/index.vue b/frontend/src/components/layout-content/index.vue index 656c94b46e7f..c1db90ab730f 100644 --- a/frontend/src/components/layout-content/index.vue +++ b/frontend/src/components/layout-content/index.vue @@ -19,7 +19,7 @@
-
+
diff --git a/frontend/src/routers/index.ts b/frontend/src/routers/index.ts index cd40cb6a0268..90ff4ce466de 100644 --- a/frontend/src/routers/index.ts +++ b/frontend/src/routers/index.ts @@ -56,8 +56,15 @@ router.beforeEach((to, from, next) => { router.afterEach((to) => { if (to.meta.activeMenu && !isRedirecting) { - localStorage.setItem('cachedRoute' + to.meta.activeMenu, to.path); + let notMathParam = true; + if (to.matched.some((record) => record.path.includes(':'))) { + notMathParam = false; + } + if (notMathParam) { + localStorage.setItem('cachedRoute' + to.meta.activeMenu, to.path); + } } + isRedirecting = false; NProgress.done(); }); diff --git a/frontend/src/routers/modules/website.ts b/frontend/src/routers/modules/website.ts index 05ccd2c2f2df..9f868d471b8d 100644 --- a/frontend/src/routers/modules/website.ts +++ b/frontend/src/routers/modules/website.ts @@ -45,6 +45,7 @@ const webSiteRouter = { component: () => import('@/views/website/runtime/php/index.vue'), meta: { title: 'menu.runtime', + activeMenu: '/websites/runtimes/php', requiresAuth: false, }, },