diff --git a/src/layout/components/Setting/src/Setting.vue b/src/layout/components/Setting/src/Setting.vue index e1908b63..717472ac 100644 --- a/src/layout/components/Setting/src/Setting.vue +++ b/src/layout/components/Setting/src/Setting.vue @@ -126,6 +126,8 @@ const copyConfig = async () => { message: ${appStore.getMessage}, // 标签页 tagsView: ${appStore.getTagsView}, + // 标签页 + tagsViewImmerse: ${appStore.getTagsViewImmerse}, // 标签页图标 getTagsViewIcon: ${appStore.getTagsViewIcon}, // logo diff --git a/src/layout/components/Setting/src/components/InterfaceDisplay.vue b/src/layout/components/Setting/src/components/InterfaceDisplay.vue index ebbbf4bc..3ba5c6b0 100644 --- a/src/layout/components/Setting/src/components/InterfaceDisplay.vue +++ b/src/layout/components/Setting/src/components/InterfaceDisplay.vue @@ -73,6 +73,13 @@ const tagsViewChange = (show: boolean) => { appStore.setTagsView(show) } +// 标签页沉浸 +const tagsViewImmerse = ref(appStore.getTagsViewImmerse) + +const tagsViewImmerseChange = (immerse: boolean) => { + appStore.setTagsViewImmerse(immerse) +} + // 标签页图标 const tagsViewIcon = ref(appStore.getTagsViewIcon) @@ -181,6 +188,11 @@ watch( +
+ {{ t('setting.tagsViewImmerse') }} + +
+
{{ t('setting.tagsViewIcon') }} diff --git a/src/layout/components/TagsView/src/TagsView.vue b/src/layout/components/TagsView/src/TagsView.vue index 01610968..cdd7494d 100644 --- a/src/layout/components/TagsView/src/TagsView.vue +++ b/src/layout/components/TagsView/src/TagsView.vue @@ -33,6 +33,8 @@ const affixTagArr = ref([]) const appStore = useAppStore() +const tagsViewImmerse = computed(() => appStore.getTagsViewImmerse) + const tagsViewIcon = computed(() => appStore.getTagsViewIcon) const isDark = computed(() => appStore.getIsDark) @@ -266,7 +268,7 @@ watch( class="relative w-full flex bg-[#fff] dark:bg-[var(--el-bg-color)]" > @@ -343,6 +345,9 @@ watch( :tag-item="item" :class="[ `${prefixCls}__item`, + tagsViewImmerse ? `${prefixCls}__item--immerse` : '', + tagsViewIcon ? `${prefixCls}__item--icon` : '', + tagsViewImmerse && tagsViewIcon ? `${prefixCls}__item--immerse--icon` : '', item?.meta?.affix ? `${prefixCls}__item--affix` : '', { 'is-active': isActive(item) @@ -354,7 +359,7 @@ watch(
@@ -395,7 +400,7 @@ watch( /> @@ -460,7 +465,7 @@ watch( ]" > { const code = route?.query?.code as string const state = route?.query?.state as string + const loginDataLoginForm = { ...loginData.loginForm } const res = await LoginApi.login({ // 账号密码登录 - username: loginData.loginForm.username, - password: loginData.loginForm.password, + username: loginDataLoginForm.username, + password: loginDataLoginForm.password, captchaVerification: params.captchaVerification, // 社交登录 socialCode: code, @@ -294,8 +295,8 @@ const handleLogin = async (params) => { text: '正在加载系统中...', background: 'rgba(0, 0, 0, 0.7)' }) - if (loginData.loginForm.rememberMe) { - authUtil.setLoginForm(loginData.loginForm) + if (loginDataLoginForm.rememberMe) { + authUtil.setLoginForm(loginDataLoginForm) } else { authUtil.removeLoginForm() } diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue index 3dbaff3f..0bdf55c5 100644 --- a/src/views/Login/components/LoginForm.vue +++ b/src/views/Login/components/LoginForm.vue @@ -249,8 +249,9 @@ const handleLogin = async (params) => { if (!data) { return } - loginData.loginForm.captchaVerification = params.captchaVerification - const res = await LoginApi.login(loginData.loginForm) + const loginDataLoginForm = { ...loginData.loginForm } + loginDataLoginForm.captchaVerification = params.captchaVerification + const res = await LoginApi.login(loginDataLoginForm) if (!res) { return } @@ -259,8 +260,8 @@ const handleLogin = async (params) => { text: '正在加载系统中...', background: 'rgba(0, 0, 0, 0.7)' }) - if (loginData.loginForm.rememberMe) { - authUtil.setLoginForm(loginData.loginForm) + if (loginDataLoginForm.rememberMe) { + authUtil.setLoginForm(loginDataLoginForm) } else { authUtil.removeLoginForm() }