Skip to content

Q
qr-consistency-vue3
Commit dcd1194d authored by 刘怀志's avatar 刘怀志
Browse files
Options

增加代码格式检查配置3

parent 1a35fcb2
Show whitespace changes
Inline Side-by-side
Showing with 137 additions and 76 deletions
.prettierrc 0 → 100644
View file @ dcd1194d
{
"experimentalTernaries": false,
"printWidth": 80,
"tabWidth": 2,
"useTabs": false,
"semi": false,
"singleQuote": true,
"quoteProps": "as-needed",
"jsxSingleQuote": false,
"trailingComma": "all",
"bracketSpacing": true,
"bracketSameLine": false,
"arrowParens": "always",
"rangeStart": 0,
"proseWrap": "preserve",
"htmlWhitespaceSensitivity": "css",
"vueIndentScriptAndStyle": false,
"endOfLine": "lf",
"embeddedLanguageFormatting": "auto",
"singleAttributePerLine": false,
"plugins": []
}
\ No newline at end of file
eslint.config.js
View file @ dcd1194d
import { defineConfig } from "eslint/config"; import { defineConfig } from "eslint/config";
import globals from "globals"; import globals from "globals";
import pluginVue from "eslint-plugin-vue"; import pluginVue from "eslint-plugin-vue";
import json from "@eslint/json";
import css from "@eslint/css";
import eslintConfigPrettier from 'eslint-config-prettier';
export default defineConfig([ export default defineConfig([
{ files: ["**/*.{js,mjs,cjs,vue}"], languageOptions: { globals: globals.browser } }, { files: ["**/*.{js,mjs,cjs,vue}"], languageOptions: { globals: globals.browser } },
pluginVue.configs["flat/essential"], pluginVue.configs["flat/recommended"],
{ files: ["**/*.json"], plugins: { json }, language: "json/json" },
{ files: ["**/*.css"], plugins: { css }, language: "css/css" },
eslintConfigPrettier
]); ]);
\ No newline at end of file
package.json
View file @ dcd1194d
...@@ -37,6 +37,11 @@ ...@@ -37,6 +37,11 @@
"vuedraggable": "4.1.0" "vuedraggable": "4.1.0"
}, },
"devDependencies": { "devDependencies": {
"eslint-config-prettier": "^10.1.1",
"prettier": "^3.5.3",
"@eslint/css": "^0.6.0",
"@eslint/js": "^9.24.0",
"@eslint/json": "^0.11.0",
"@vitejs/plugin-vue": "5.0.5", "@vitejs/plugin-vue": "5.0.5",
"eslint": "^9.24.0", "eslint": "^9.24.0",
"eslint-plugin-vue": "^10.0.0", "eslint-plugin-vue": "^10.0.0",
......
src/views/login.vue
View file @ dcd1194d
<template> <template>
<div class="login"> <div class="login">
<el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form"> <el-form
ref="loginRef"
:model="loginForm"
:rules="loginRules"
class="login-form"
>
<h3 class="title">{{ title }}</h3> <h3 class="title">{{ title }}</h3>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input <el-input
...@@ -10,7 +15,9 @@ ...@@ -10,7 +15,9 @@
auto-complete="off" auto-complete="off"
placeholder="账号" placeholder="账号"
> >
<template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template> <template #prefix
><svg-icon icon-class="user" class="el-input__icon input-icon"
/></template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="password"> <el-form-item prop="password">
...@@ -22,10 +29,12 @@ ...@@ -22,10 +29,12 @@
placeholder="密码" placeholder="密码"
@keyup.enter="handleLogin" @keyup.enter="handleLogin"
> >
<template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template> <template #prefix
><svg-icon icon-class="password" class="el-input__icon input-icon"
/></template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="code" v-if="captchaEnabled"> <el-form-item v-if="captchaEnabled" prop="code">
<el-input <el-input
v-model="loginForm.code" v-model="loginForm.code"
size="large" size="large"
...@@ -34,26 +43,34 @@ ...@@ -34,26 +43,34 @@
style="width: 63%" style="width: 63%"
@keyup.enter="handleLogin" @keyup.enter="handleLogin"
> >
<template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template> <template #prefix
><svg-icon icon-class="validCode" class="el-input__icon input-icon"
/></template>
</el-input> </el-input>
<div class="login-code"> <div class="login-code">
<img :src="codeUrl" @click="getCode" class="login-code-img"/> <img :src="codeUrl" class="login-code-img" @click="getCode" />
</div> </div>
</el-form-item> </el-form-item>
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox> <el-checkbox
<el-form-item style="width:100%;"> v-model="loginForm.rememberMe"
style="margin: 0px 0px 25px 0px"
>记住密码</el-checkbox
>
<el-form-item style="width: 100%">
<el-button <el-button
:loading="loading" :loading="loading"
size="large" size="large"
type="primary" type="primary"
style="width:100%;" style="width: 100%"
@click.prevent="handleLogin" @click.prevent="handleLogin"
> >
<span v-if="!loading">登 录</span> <span v-if="!loading">登 录</span>
<span v-else>登 录 中...</span> <span v-else>登 录 中...</span>
</el-button> </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> <router-link class="link-type" :to="'/register'"
>立即注册</router-link
>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -65,111 +82,122 @@ ...@@ -65,111 +82,122 @@
</template> </template>
<script setup> <script setup>
import { getCodeImg } from "@/api/login"; import { getCodeImg } from '@/api/login'
import Cookies from "js-cookie"; import Cookies from 'js-cookie'
import { encrypt, decrypt } from "@/utils/jsencrypt"; import { encrypt, decrypt } from '@/utils/jsencrypt'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
const title = import.meta.env.VITE_APP_TITLE; const title = import.meta.env.VITE_APP_TITLE
const userStore = useUserStore(); const userStore = useUserStore()
const route = useRoute(); const route = useRoute()
const router = useRouter(); const router = useRouter()
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance()
const loginForm = ref({ const loginForm = ref({
username: "admin", username: 'admin',
password: "admin123", password: 'admin123',
rememberMe: false, rememberMe: false,
code: "", code: '',
uuid: "" uuid: '',
}); })
const loginRules = { const loginRules = {
username: [{ required: true, trigger: "blur", message: "请输入您的账号" }], username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
password: [{ required: true, trigger: "blur", message: "请输入您的密码" }], password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }],
code: [{ required: true, trigger: "change", message: "请输入验证码" }] code: [{ required: true, trigger: 'change', message: '请输入验证码' }],
}; }
const codeUrl = ref(""); const codeUrl = ref('')
const loading = ref(false); const loading = ref(false)
// 验证码开关 // 验证码开关
const captchaEnabled = ref(true); const captchaEnabled = ref(true)
// 注册开关 // 注册开关
const register = ref(false); const register = ref(false)
const redirect = ref(undefined); const redirect = ref(undefined)
watch(route, (newRoute) => { watch(
redirect.value = newRoute.query && newRoute.query.redirect; route,
}, { immediate: true }); (newRoute) => {
redirect.value = newRoute.query && newRoute.query.redirect
},
{ immediate: true },
)
function handleLogin() { function handleLogin() {
proxy.$refs.loginRef.validate(valid => { proxy.$refs.loginRef.validate((valid) => {
if (valid) { if (valid) {
loading.value = true; loading.value = true
// 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码 // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
if (loginForm.value.rememberMe) { if (loginForm.value.rememberMe) {
Cookies.set("username", loginForm.value.username, { expires: 30 }); Cookies.set('username', loginForm.value.username, { expires: 30 })
Cookies.set("password", encrypt(loginForm.value.password), { expires: 30 }); Cookies.set('password', encrypt(loginForm.value.password), {
Cookies.set("rememberMe", loginForm.value.rememberMe, { expires: 30 }); expires: 30,
})
Cookies.set('rememberMe', loginForm.value.rememberMe, { expires: 30 })
} else { } else {
// 否则移除 // 否则移除
Cookies.remove("username"); Cookies.remove('username')
Cookies.remove("password"); Cookies.remove('password')
Cookies.remove("rememberMe"); Cookies.remove('rememberMe')
} }
// 调用action的登录方法 // 调用action的登录方法
userStore.login(loginForm.value).then(() => { userStore
const query = route.query; .login(loginForm.value)
.then(() => {
const query = route.query
const otherQueryParams = Object.keys(query).reduce((acc, cur) => { const otherQueryParams = Object.keys(query).reduce((acc, cur) => {
if (cur !== "redirect") { if (cur !== 'redirect') {
acc[cur] = query[cur]; acc[cur] = query[cur]
} }
return acc; return acc
}, {}); }, {})
router.push({ path: redirect.value || "/", query: otherQueryParams }); router.push({ path: redirect.value || '/', query: otherQueryParams })
}).catch(() => { })
loading.value = false; .catch(() => {
loading.value = false
// 重新获取验证码 // 重新获取验证码
if (captchaEnabled.value) { if (captchaEnabled.value) {
getCode(); getCode()
} }
}); })
} }
}); })
} }
function getCode() { function getCode() {
getCodeImg().then(res => { getCodeImg().then((res) => {
captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled; captchaEnabled.value =
res.captchaEnabled === undefined ? true : res.captchaEnabled
if (captchaEnabled.value) { if (captchaEnabled.value) {
codeUrl.value = "data:image/gif;base64," + res.img; codeUrl.value = 'data:image/gif;base64,' + res.img
loginForm.value.uuid = res.uuid; loginForm.value.uuid = res.uuid
} }
}); })
} }
function getCookie() { function getCookie() {
const username = Cookies.get("username"); const username = Cookies.get('username1')
const password = Cookies.get("password"); const password = Cookies.get('password')
const rememberMe = Cookies.get("rememberMe"); const rememberMe = Cookies.get('rememberMe')
loginForm.value = { loginForm.value = {
username: username === undefined ? loginForm.value.username : username, username: username === undefined ? loginForm.value.username : username,
password: password === undefined ? loginForm.value.password : decrypt(password), password:
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe) password === undefined ? loginForm.value.password : decrypt(password),
}; rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
}
} }
getCode(); getCode()
getCookie(); getCookie()
</script> </script>
<style lang='scss' scoped> <style lang="scss" scoped>
.login { .login {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: 100%; height: 100%;
background-image: url("../assets/images/login-background.jpg"); background-image: url('../assets/images/login-background.jpg');
background-size: cover; background-size: cover;
} }
.title { .title {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment