fix: 修复切换 tab 页签后参数丢失的问题

同步 Gi Demo 升级
This commit is contained in:
2024-09-04 23:01:41 +08:00
parent 23ca50c99d
commit 13181bbb89
7 changed files with 92 additions and 63 deletions

View File

@@ -34,7 +34,7 @@
import { type FormInstance, Message } from '@arco-design/web-vue'
import { useStorage } from '@vueuse/core'
import { getImageCaptcha } from '@/apis'
import { useUserStore } from '@/stores'
import { useTabsStore, useUserStore } from '@/stores'
import { encryptByRsa } from '@/utils/encrypt'
const loginConfig = useStorage('login-config', {
@@ -94,6 +94,7 @@ const getCaptcha = () => {
}
const userStore = useUserStore()
const tabsStore = useTabsStore()
const router = useRouter()
const loading = ref(false)
// 登录
@@ -108,6 +109,7 @@ const handleLogin = async () => {
captcha: form.captcha,
uuid: form.uuid
})
tabsStore.reset()
const { redirect, ...othersQuery } = router.currentRoute.value.query
router.push({
path: (redirect as string) || '/',

View File

@@ -35,7 +35,7 @@
<script setup lang="ts">
// import { getEmailCaptcha } from '@/apis'
import { type FormInstance, Message } from '@arco-design/web-vue'
import { useUserStore } from '@/stores'
import { useTabsStore, useUserStore } from '@/stores'
import * as Regexp from '@/utils/regexp'
const formRef = ref<FormInstance>()
@@ -53,6 +53,7 @@ const rules: FormInstance['rules'] = {
}
const userStore = useUserStore()
const tabsStore = useTabsStore()
const router = useRouter()
const loading = ref(false)
// 登录
@@ -62,6 +63,7 @@ const handleLogin = async () => {
if (isInvalid) return
loading.value = true
await userStore.emailLogin(form)
tabsStore.reset()
const { redirect, ...othersQuery } = router.currentRoute.value.query
router.push({
path: (redirect as string) || '/',

View File

@@ -42,7 +42,7 @@
<script setup lang="ts">
// import { getSmsCaptcha } from '@/apis'
import { type FormInstance, Message } from '@arco-design/web-vue'
import { useUserStore } from '@/stores'
import { useTabsStore, useUserStore } from '@/stores'
import * as Regexp from '@/utils/regexp'
const formRef = ref<FormInstance>()
@@ -60,6 +60,7 @@ const rules: FormInstance['rules'] = {
}
const userStore = useUserStore()
const tabsStore = useTabsStore()
const router = useRouter()
const loading = ref(false)
// 登录
@@ -69,6 +70,7 @@ const handleLogin = async () => {
try {
loading.value = true
await userStore.phoneLogin(form)
tabsStore.reset()
const { redirect, ...othersQuery } = router.currentRoute.value.query
router.push({
path: (redirect as string) || '/',

View File

@@ -8,12 +8,13 @@
import { Message } from '@arco-design/web-vue'
import { useRoute, useRouter } from 'vue-router'
import { bindSocialAccount } from '@/apis'
import { useUserStore } from '@/stores'
import { useTabsStore, useUserStore } from '@/stores'
import { isLogin } from '@/utils/auth'
const route = useRoute()
const router = useRouter()
const userStore = useUserStore()
const tabsStore = useTabsStore()
const source = route.query.source as string
const loading = ref(false)
@@ -25,6 +26,7 @@ const handleSocialLogin = () => {
userStore
.socialLogin(source, othersQuery)
.then(() => {
tabsStore.reset()
router.push({
path: (redirect as string) || '/',
query: {

View File

@@ -33,9 +33,7 @@ const selectedKey = ref('0')
watch(
() => route.query,
() => {
if (route.query.type) {
selectedKey.value = route.query.type as string
}
selectedKey.value = route.query.type as string || '0'
},
{
immediate: true
@@ -44,7 +42,7 @@ watch(
// 点击事件
const onClickItem = (item: FileTypeListItem) => {
router.push({ name: 'SystemFile', query: { type: item.value } })
router.replace({ name: 'SystemFile', query: { type: item.value } })
}
</script>