chore(完善框架): 完善框架

完善框架

src/layout/LayoutDefault.vue

@@ -3,8 +3,6 @@ import SideBar from './components/SideBar/index.vue'
 import HeaderBar from './components/HeaderBar/index.vue'
 import TabBar from './components/TabBar/index.vue'
 import Main from './components/Main/index.vue'
-
-defineOptions({ name: 'Layout' })
 </script>
 
 <template>

src/router/index.ts

@@ -39,7 +39,7 @@ export const constantRoutes: RouteRecordRaw[] = [
 			{
 				path: '/home',
 				component: () => import('@/views/main/home/index.vue'),
-				name: 'Home',
+				name: 'HomeIndex',
 				meta: {
 					title: '首页',
 					icon: 'icon-dashboard',

src/store/modules/base/app.ts

@@ -1,13 +1,13 @@
 import { resetRouter } from '@/router'
-import { setToken, clearToken } from '@/utils/auth'
+import { getToken, setToken, clearToken } from '@/utils/auth'
 import { resetHasRouteFlag } from '@/router/permission'
 import request from '@/request'
 import { AppStoreName } from '@/config/domain'
 import { IUserInfo } from '@/model/user'
 
 interface IState {
 	// token
-	token: string
+	token: string | null
 	// 用户信息
 	userInfo: Pick<IUserInfo, 'id' | 'userName' | 'nickName' | 'avatar' | 'gender'>
 	// 角色
@@ -18,13 +18,13 @@ interface IState {
 
 export const useAppStore = defineStore('app', {
 	state: (): IState => ({
-		token: '',
+		token: getToken(),
 		userInfo: {
 			id: '',
 			userName: '',
 			nickName: '',
 			avatar: '',
-			gender: 0
+			gender: 3
 		},
 		roles: [],
 		permissions: []

src/store/modules/base/route.ts

@@ -130,7 +130,7 @@ const storeSetup = () => {
 export const useRouteStore = defineStore('route', storeSetup, {
 	persist: {
 		key: `${AppStoreName}_ROUTE`,
-		paths: ['routes'],
+		paths: ['routes', 'asyncRoutes'],
 		storage: localStorage
 	}
 })

src/views/common/error/components/errorPage.vue

@@ -7,32 +7,30 @@ const props = withDefaults(defineProps<IProps>(), {
 	code: 403
 })
 
-const router = useRouter()
-
-const countDownTime = ref(5)
-let timer = ref()
-
 onMounted(() => {
 	onCountDownTime()
 })
 
 onBeforeUnmount(() => {
-	clearInterval(timer.value)
+	clearInterval(timer)
 })
 
 // 返回页面
+const router = useRouter()
 const back = () => {
 	router.replace({ path: '/' })
 }
 
 // 倒计时
+const countDownTime = ref(5)
+let timer: NodeJS.Timer
 const onCountDownTime = () => {
-	timer.value = setInterval(() => {
+	timer = setInterval(() => {
 		if (countDownTime.value) {
 			countDownTime.value--
 		} else {
 			back()
-			clearInterval(timer.value)
+			clearInterval(timer)
 		}
 	}, 1000)
 }

src/views/common/redirect/index.vue

@@ -5,10 +5,7 @@ const router = useRouter()
 const { params, query } = route
 const { path } = params
 
-router.replace({
-	path: '/' + path,
-	query,
-})
+router.replace({ path: `/${path}`, query })
 </script>
 
 <template>

src/views/public/login/components/cornerBottom.vue

@@ -32,6 +32,6 @@ interface Props {
 
 withDefaults(defineProps<Props>(), {
 	startColor: '#28aff0',
-	endColor: '#120fc4',
+	endColor: '#120fc4'
 })
 </script>

src/views/public/login/components/cornerTop.vue

@@ -26,8 +26,6 @@ interface Props {
 
 withDefaults(defineProps<Props>(), {
 	startColor: '#28aff0',
-	endColor: '#120fc4',
+	endColor: '#120fc4'
 })
 </script>
-
-<style scoped></style>

src/views/public/login/index.vue

@@ -6,6 +6,7 @@ import Cookies from 'js-cookie'
 import { useAppStore } from '@/store'
 import { useLoading, useDevice } from '@/hooks'
 import { SystemName, AppStoreName } from '@/config/domain'
+import * as Regexp from '@/utils/regexp'
 import LoginBg from './components/index.vue'
 import loginImg from '@/assets/images/login/login-img.svg'
 
@@ -22,7 +23,10 @@ const formData = reactive({
 })
 const formRules: FormInstance['rules'] = {
 	username: [{ required: true, message: '请输入账号' }],
-	password: [{ required: true, message: '请输入密码' }],
+	password: [
+		{ required: true, message: '请输入密码' },
+		{ match: Regexp.Code_6, message: '密码格式不正确' }
+	],
 	code: [{ required: true, message: '请输入验证码' }]
 }
 
@@ -57,8 +61,8 @@ const errorMessage = ref('')
 const formRef = ref<FormInstance>()
 const handleLogin = async () => {
 	try {
-		const flag = await formRef.value?.validate()
-		if (flag) return
+		const valid = await formRef.value?.validate()
+		if (valid) return
 
 		setLoading(true)
 		const params = window.$_.cloneDeep(formData)
@@ -73,7 +77,7 @@ const handleLogin = async () => {
 		})
 		Message.success('登录成功')
 	} catch (error) {
-		errorMessage.value = error as string
+		errorMessage.value = (error as Error).message
 		setTimeout(() => {
 			loadCaptcha()
 		}, 500)