Merge remote-tracking branch 'origin/master'

package.json

@@ -48,6 +48,7 @@
   "devDependencies": {
     "@types/nprogress": "^0.2.0",
     "@types/path-browserify": "^1.0.0",
+    "@types/vue-ls": "^3.2.3",
     "@typescript-eslint/eslint-plugin": "^5.59.7",
     "@typescript-eslint/parser": "^5.59.6",
     "@vitejs/plugin-vue": "^4.2.3",

src/api/login/index.ts

@@ -6,9 +6,6 @@ import { AxiosPromise } from 'axios'
  * @param data
  */
 export function login(data: any): AxiosPromise {
-	// return Promise.resolve({
-	// 	username: 'admin'
-	// })
 	return request({
 		url: '/auth/login/system',
 		method: 'post',

src/components/registerGlobComp.ts

@@ -16,7 +16,21 @@ import Select from '@/components/Select/index.vue'
 import Chart from '@/components/Chart.vue'
 
 // you want register components
-const compList = [SvgIcon, InputNumber, InputNumberRange, DialogForm, FormConfig, SearchForm, LeTableColumnsPopover, DraggableNest, LeTable, NoData, Icon, Select, Chart]
+const compList = [
+	SvgIcon,
+	InputNumber,
+	InputNumberRange,
+	DialogForm,
+	FormConfig,
+	SearchForm,
+	LeTableColumnsPopover,
+	DraggableNest,
+	LeTable,
+	NoData,
+	Icon,
+	Select,
+	Chart
+]
 
 export function registerGlobComp(app: App) {
 	Object.entries(ElementPlusIconsVue).map(([key, component]) => {

src/utils/vueStorage.ts

@@ -1,5 +1,3 @@
-// eslint-disable-next-line
-// @ts-ignore
 import Storage from 'vue-ls'
 const options = {
 	namespace: 'vue3_admin_', // key prefix

src/views/login/index.vue

@@ -49,13 +49,10 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, reactive, ref, toRefs, watch, nextTick } from 'vue'
+import { reactive, ref, toRefs, watch, nextTick } from 'vue'
 
 // 组件依赖
-import { /*ElForm, ElInput,*/ ElMessage } from 'element-plus'
 import LangSelect from '@/components/LangSelect/index.vue'
-// 谷歌验证
-import GoogleVerifyDialog from './components/GoogleVerifyDialog.vue'
 
 // 状态管理依赖
 import useStore from '@/store'
@@ -68,7 +65,6 @@ const route = useRoute()
 
 const loginFormRef = ref(/*ElForm*/)
 const passwordRef = ref(/*ElInput*/)
-const captchaStatus = ref('ready') // ready loading complete
 
 const state = reactive({
 	loginForm: {
@@ -119,9 +115,6 @@ watch(
 		immediate: true
 	}
 )
-
-onMounted(() => {
-})
 </script>
 
 <style lang="scss">