From 34290d8cadf70dfbf8674a2bcfb64eef25537f86 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 五月 2024 10:21:35 +0800
Subject: [PATCH] ♥️发布 5.2.0-BETA 公测版本
---
src/views/login.vue | 142 ++++++++++++++++++++++++++---------------------
1 files changed, 79 insertions(+), 63 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 9becbc3..7e1394e 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -2,7 +2,7 @@
<div class="login">
<el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</h3>
- <el-form-item prop="tenantId" v-if="tenantEnabled">
+ <el-form-item v-if="tenantEnabled" prop="tenantId">
<el-select v-model="loginForm.tenantId" filterable placeholder="璇烽�夋嫨/杈撳叆鍏徃鍚嶇О" style="width: 100%">
<el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>
<template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
@@ -18,42 +18,45 @@
<template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
</el-input>
</el-form-item>
- <el-form-item prop="code" v-if="captchaEnabled">
+ <el-form-item v-if="captchaEnabled" prop="code">
<el-input v-model="loginForm.code" size="large" auto-complete="off" placeholder="楠岃瘉鐮�" style="width: 63%" @keyup.enter="handleLogin">
<template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
</el-input>
<div class="login-code">
- <img :src="codeUrl" @click="getCode" class="login-code-img" />
+ <img :src="codeUrl" class="login-code-img" @click="getCode" />
</div>
</el-form-item>
- <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">璁颁綇瀵嗙爜</el-checkbox>
- <el-form-item style="width:100%;">
- <el-button :loading="loading" size="large" type="primary" style="width:100%;" @click.prevent="handleLogin">
+ <el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">璁颁綇瀵嗙爜</el-checkbox>
+ <el-form-item style="float: right">
+ <el-button circle title="寰俊鐧诲綍" @click="doSocialLogin('wechat')">
+ <svg-icon icon-class="wechat" />
+ </el-button>
+ <el-button circle title="MaxKey鐧诲綍" @click="doSocialLogin('maxkey')">
+ <svg-icon icon-class="maxkey" />
+ </el-button>
+ <el-button circle title="TopIam鐧诲綍" @click="doSocialLogin('topiam')">
+ <svg-icon icon-class="topiam" />
+ </el-button>
+ <el-button circle title="Gitee鐧诲綍" @click="doSocialLogin('gitee')">
+ <svg-icon icon-class="gitee" />
+ </el-button>
+ <el-button circle title="Github鐧诲綍" @click="doSocialLogin('github')">
+ <svg-icon icon-class="github" />
+ </el-button>
+ </el-form-item>
+ <el-form-item style="width: 100%">
+ <el-button :loading="loading" size="large" type="primary" style="width: 100%" @click.prevent="handleLogin">
<span v-if="!loading">鐧� 褰�</span>
<span v-else>鐧� 褰� 涓�...</span>
</el-button>
- <div style="float: right;" v-if="register">
+ <div v-if="register" style="float: right">
<router-link class="link-type" :to="'/register'">绔嬪嵆娉ㄥ唽</router-link>
</div>
</el-form-item>
- <div style="display: flex;justify-content: flex-end;flex-direction: row;">
- <el-button circle>
- <svg-icon icon-class="qq" @click="doSocialLogin('qq')" />
- </el-button>
- <el-button circle>
- <svg-icon icon-class="wechat" @click="doSocialLogin('wechat')" />
- </el-button>
- <el-button circle>
- <svg-icon icon-class="gitee" @click="doSocialLogin('gitee')" />
- </el-button>
- <el-button circle>
- <svg-icon icon-class="github" @click="doSocialLogin('github')" />
- </el-button>
- </div>
</el-form>
<!-- 搴曢儴 -->
<div class="el-login-footer">
- <span>Copyright 漏 2018-2023 鐤媯鐨勭嫯瀛怢i All Rights Reserved.</span>
+ <span>Copyright 漏 2018-2024 鐤媯鐨勭嫯瀛怢i All Rights Reserved.</span>
</div>
</div>
</template>
@@ -61,27 +64,25 @@
<script setup lang="ts">
import { getCodeImg, getTenantList } from '@/api/login';
import { authBinding } from '@/api/system/social/auth';
-import Cookies from 'js-cookie';
-import { encrypt, decrypt } from '@/utils/jsencrypt';
import { useUserStore } from '@/store/modules/user';
import { LoginData, TenantVO } from '@/api/types';
-import { ElForm, FormRules } from 'element-plus';
import { to } from 'await-to-js';
+import { HttpStatus } from '@/enums/RespEnum';
const userStore = useUserStore();
const router = useRouter();
const loginForm = ref<LoginData>({
- tenantId: "000000",
+ tenantId: '000000',
username: 'admin',
password: 'admin123',
rememberMe: false,
code: '',
uuid: ''
-});
+} as LoginData);
-const loginRules: FormRules = {
- tenantId: [{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勭鎴风紪鍙�" }],
+const loginRules: ElFormRules = {
+ tenantId: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勭鎴风紪鍙�' }],
username: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勮处鍙�' }],
password: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勫瘑鐮�' }],
code: [{ required: true, trigger: 'change', message: '璇疯緭鍏ラ獙璇佺爜' }]
@@ -94,36 +95,44 @@
// 绉熸埛寮�鍏�
const tenantEnabled = ref(true);
-
// 娉ㄥ唽寮�鍏�
const register = ref(false);
const redirect = ref(undefined);
-const loginRef = ref(ElForm);
+const loginRef = ref<ElFormInstance>();
// 绉熸埛鍒楄〃
const tenantList = ref<TenantVO[]>([]);
+watch(
+ () => router.currentRoute.value,
+ (newRoute: any) => {
+ redirect.value = newRoute.query && newRoute.query.redirect;
+ },
+ { immediate: true }
+);
+
const handleLogin = () => {
- loginRef.value.validate(async (valid: boolean, fields: any) => {
+ loginRef.value?.validate(async (valid: boolean, fields: any) => {
if (valid) {
loading.value = true;
- // 鍕鹃�変簡闇�瑕佽浣忓瘑鐮佽缃湪 cookie 涓缃浣忕敤鎴峰悕鍜屽瘑鐮�
+ // 鍕鹃�変簡闇�瑕佽浣忓瘑鐮佽缃湪 localStorage 涓缃浣忕敤鎴峰悕鍜屽瘑鐮�
if (loginForm.value.rememberMe) {
- Cookies.set("tenantId", loginForm.value.tenantId, { expires: 30 });
- Cookies.set('username', loginForm.value.username, { expires: 30 });
- Cookies.set('password', String(encrypt(loginForm.value.password)), { expires: 30 });
- Cookies.set('rememberMe', String(loginForm.value.rememberMe), { expires: 30 });
+ localStorage.setItem('tenantId', String(loginForm.value.tenantId));
+ localStorage.setItem('username', String(loginForm.value.username));
+ localStorage.setItem('password', String(loginForm.value.password));
+ localStorage.setItem('rememberMe', String(loginForm.value.rememberMe));
} else {
// 鍚﹀垯绉婚櫎
- Cookies.remove("tenantId");
- Cookies.remove('username');
- Cookies.remove('password');
- Cookies.remove('rememberMe');
+ localStorage.removeItem('tenantId');
+ localStorage.removeItem('username');
+ localStorage.removeItem('password');
+ localStorage.removeItem('rememberMe');
}
// 璋冪敤action鐨勭櫥褰曟柟娉�
- // prittier-ignore
const [err] = await to(userStore.login(loginForm.value));
if (!err) {
- await router.push({ path: redirect.value || '/' });
+ const redirectUrl = redirect.value || '/';
+ await router.push(redirectUrl);
+ loading.value = false;
} else {
loading.value = false;
// 閲嶆柊鑾峰彇楠岃瘉鐮�
@@ -150,19 +159,18 @@
}
};
-const getCookie = () => {
- const tenantId = Cookies.get("tenantId");
- const username = Cookies.get('username');
- const password = Cookies.get('password');
- const rememberMe = Cookies.get('rememberMe');
+const getLoginData = () => {
+ const tenantId = localStorage.getItem('tenantId');
+ const username = localStorage.getItem('username');
+ const password = localStorage.getItem('password');
+ const rememberMe = localStorage.getItem('rememberMe');
loginForm.value = {
- tenantId: tenantId === undefined ? loginForm.value.tenantId : tenantId,
- username: username === undefined ? loginForm.value.username : username,
- password: password === undefined ? loginForm.value.password : (decrypt(password) as string),
- rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
- };
-}
-
+ tenantId: tenantId === null ? String(loginForm.value.tenantId) : tenantId,
+ username: username === null ? String(loginForm.value.username) : username,
+ password: password === null ? String(loginForm.value.password) : String(password),
+ rememberMe: rememberMe === null ? false : Boolean(rememberMe)
+ } as LoginData;
+};
/**
* 鑾峰彇绉熸埛鍒楄〃
@@ -176,27 +184,35 @@
loginForm.value.tenantId = tenantList.value[0].tenantId;
}
}
-}
+};
+
+//妫�娴嬬鎴烽�夋嫨妗嗙殑鍙樺寲
+watch(
+ () => loginForm.value.tenantId,
+ () => {
+ localStorage.setItem('tenantId', String(loginForm.value.tenantId));
+ }
+);
+
/**
* 绗笁鏂圭櫥褰�
* @param type
*/
const doSocialLogin = (type: string) => {
authBinding(type).then((res: any) => {
- if (res.code === 200) {
- window.location.href = res.msg;
- } else {
+ if (res.code === HttpStatus.SUCCESS) {
+ // 鑾峰彇鎺堟潈鍦板潃璺宠浆
+ window.location.href = res.data;
+ } else {
ElMessage.error(res.msg);
}
});
};
-
-
onMounted(() => {
getCode();
initTenantList();
- getCookie();
+ getLoginData();
});
</script>
@@ -206,7 +222,7 @@
justify-content: center;
align-items: center;
height: 100%;
- background-image: url("../assets/images/login-background.jpg");
+ background-image: url('../assets/images/login-background.jpg');
background-size: cover;
}
--
Gitblit v1.9.3