diff --git a/.vscode/settings.json b/.vscode/settings.json index 0999fb9..f04721c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -58,7 +58,7 @@ "path-intellisense.mappings": { "@/": "${workspaceRoot}/src" }, - "prettier.enable": true, + "prettier.enable": false, "editor.formatOnSave": true, "editor.codeActionsOnSave": { "source.fixAll.eslint": true, @@ -159,7 +159,7 @@ "*.ts": "$(capture).test.ts, $(capture).test.tsx", "*.tsx": "$(capture).test.ts, $(capture).test.tsx", "*.env": "$(capture).env.*", - "package.json": "pnpm-lock.yaml,yarn.lock,LICENSE,README*,CHANGELOG*,CNAME,.gitattributes,.gitignore,prettier.config.js,stylelint.config.js,commitlint.config.js,.stylelintignore,.prettierignore,.gitpod.yml,.eslintrc.js,.eslintignore" + "package.json": ".hintrc,pnpm-lock.yaml,yarn.lock,LICENSE,README*,CHANGELOG*,CNAME,.gitattributes,.gitignore,prettier.config.js,stylelint.config.js,commitlint.config.js,.stylelintignore,.prettierignore,.gitpod.yml,.eslintrc.js,.eslintignore" }, "terminal.integrated.scrollback": 10000, "nuxt.isNuxtApp": false diff --git a/src/views/base/login/SSOForm.vue b/src/views/base/login/SSOForm.vue index 430c046..6057a03 100644 --- a/src/views/base/login/SSOForm.vue +++ b/src/views/base/login/SSOForm.vue @@ -3,7 +3,7 @@ import { onMounted, reactive, ref } from 'vue' import { useRoute } from 'vue-router' import { Button, Checkbox, Col, Form, Row } from 'ant-design-vue' -import { useFormValid } from './useLogin' +import { useFormValid, useLoginState } from './useLogin' import { useI18n } from '@/hooks/web/useI18n' import { useMessage } from '@/hooks/web/useMessage' @@ -17,6 +17,8 @@ const { query } = useRoute() const { notification, createErrorModal } = useMessage() const { prefixCls } = useDesign('login') +const { handleBackLogin } = useLoginState() + const formRef = ref() const loading = ref(false) @@ -189,7 +191,7 @@ onMounted(() => { -