diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index d849dac4..1dbb6ce3 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -22,6 +22,7 @@
### 🐛 Bug Fixes
- 修复 tree 文本超出挡住操作按钮问题
+- 修复通过 useRedo 刷新页面参数丢失问题
### 🎫 Chores
diff --git a/src/hooks/web/usePage.ts b/src/hooks/web/usePage.ts
index 6dcd8cf5..d6661886 100644
--- a/src/hooks/web/usePage.ts
+++ b/src/hooks/web/usePage.ts
@@ -36,9 +36,12 @@ export function useGo() {
*/
export const useRedo = () => {
const { push, currentRoute } = useRouter();
+ const { query, params } = currentRoute.value;
function redo() {
push({
path: '/redirect' + unref(currentRoute).fullPath,
+ query,
+ params,
});
}
return redo;
diff --git a/src/hooks/web/useTitle.ts b/src/hooks/web/useTitle.ts
deleted file mode 100644
index 31eb746a..00000000
--- a/src/hooks/web/useTitle.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { watch } from 'vue';
-import { useRouter } from 'vue-router';
-import { useGlobSetting } from '../setting';
-import { useI18n } from './useI18n';
-import { setTitle } from '/@/utils/browser';
-
-export function useTitle() {
- const { currentRoute } = useRouter();
- const { t } = useI18n();
- watch(
- () => currentRoute.value.path,
- () => {
- const globSetting = useGlobSetting();
- setTitle(t(currentRoute.value.meta.title), globSetting.title);
- },
- { immediate: true, flush: 'post' }
- );
-}
diff --git a/src/locales/lang/en/routes/demo/page.ts b/src/locales/lang/en/routes/demo/page.ts
index 4f0420d5..15956941 100644
--- a/src/locales/lang/en/routes/demo/page.ts
+++ b/src/locales/lang/en/routes/demo/page.ts
@@ -24,4 +24,5 @@ export default {
list: 'List page',
listCard: 'Card list',
+ basic: 'Basic list',
};
diff --git a/src/locales/lang/zh_CN/routes/demo/page.ts b/src/locales/lang/zh_CN/routes/demo/page.ts
index d976670f..eb5ce6f3 100644
--- a/src/locales/lang/zh_CN/routes/demo/page.ts
+++ b/src/locales/lang/zh_CN/routes/demo/page.ts
@@ -24,4 +24,5 @@ export default {
list: '列表页',
listCard: '卡片列表',
+ basic: '标准列表',
};
diff --git a/src/router/guard/index.ts b/src/router/guard/index.ts
index 15845170..c5ee2f73 100644
--- a/src/router/guard/index.ts
+++ b/src/router/guard/index.ts
@@ -57,7 +57,7 @@ export function createGuard(router: Router) {
router.afterEach((to) => {
const { t } = useI18n();
// change html title
- setTitle(t(to.meta.title), globSetting.title);
+ to.name !== 'Redirect' && setTitle(t(to.meta.title), globSetting.title);
});
createProgressGuard(router);
createPermissionGuard(router);
diff --git a/src/router/routes/modules/demo/page.ts b/src/router/routes/modules/demo/page.ts
index 4947506e..65eed7c8 100644
--- a/src/router/routes/modules/demo/page.ts
+++ b/src/router/routes/modules/demo/page.ts
@@ -223,7 +223,7 @@ const page: AppRouteModule = {
name: 'ListBasicPage',
component: () => import('/@/views/demo/page/list/basic/index.vue'),
meta: {
- title: '标准列表',
+ title: 'routes.demo.page.basic',
},
},
{
diff --git a/src/views/sys/redirect/index.vue b/src/views/sys/redirect/index.vue
index 12318975..cc8efda3 100644
--- a/src/views/sys/redirect/index.vue
+++ b/src/views/sys/redirect/index.vue
@@ -1,6 +1,3 @@
-
-
-