yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

!311 修复DocAlert无法配置是否启用的问题 

Merge pull request !311 from dhb52/master
pull/375/MERGE
芋道源码 2024-02-17 03:45:58 +00:00 committed by Gitee
parent 6fd8856735 e106fb73b6
commit a451c0b7c8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env
View File

@ -13,5 +13,8 @@ VITE_APP_TENANT_ENABLE=true
# 验证码的开关 # 验证码的开关
VITE_APP_CAPTCHA_ENABLE=true VITE_APP_CAPTCHA_ENABLE=true
# 文档地址的开关
VITE_APP_DOCALERT_ENABLE=false
# 百度统计 # 百度统计
VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc

2
src/components/DocAlert/index.vue
View File

@ -22,7 +22,7 @@ const goToUrl = () => {
/** 是否开启 */ /** 是否开启 */
const getEnable = () => { const getEnable = () => {
return import.meta.env.VITE_APP_TENANT_ENABLE === 'true' return import.meta.env.VITE_APP_DOCALERT_ENABLE !== 'false'
} }
</script> </script>
<style scoped> <style scoped>

8
src/views/Login/SocialLogin.vue
View File

@ -193,8 +193,8 @@ const LoginRules = {
} }
const loginData = reactive({ const loginData = reactive({
isShowPassword: false, isShowPassword: false,
captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE, captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE !== 'false',
tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE, tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false',
loginForm: { loginForm: {
tenantName: '芋道源码', tenantName: '芋道源码',
username: 'admin', username: 'admin',
@ -207,7 +207,7 @@ const loginData = reactive({
// 获取验证码 // 获取验证码
const getCode = async () => { const getCode = async () => {
// 情况一，未开启：则直接登录 // 情况一，未开启：则直接登录
if (loginData.captchaEnable === 'false') { if (loginData.captchaEnable) {
await handleLogin({}) await handleLogin({})
} else { } else {
// 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录 // 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录
@ -217,7 +217,7 @@ const getCode = async () => {
} }
//获取租户ID //获取租户ID
const getTenantId = async () => { const getTenantId = async () => {
if (loginData.tenantEnable === 'true') { if (loginData.tenantEnable) {
const res = await LoginApi.getTenantIdByName(loginData.loginForm.tenantName) const res = await LoginApi.getTenantIdByName(loginData.loginForm.tenantName)
authUtil.setTenantId(res) authUtil.setTenantId(res)
} }

1
types/env.d.ts vendored
View File

@ -14,6 +14,7 @@ interface ImportMetaEnv {
readonly VITE_DEV: string readonly VITE_DEV: string
readonly VITE_APP_CAPTCHA_ENABLE: string readonly VITE_APP_CAPTCHA_ENABLE: string
readonly VITE_APP_TENANT_ENABLE: string readonly VITE_APP_TENANT_ENABLE: string
readonly VITE_APP_DOCALERT_ENABLE: string
readonly VITE_BASE_URL: string readonly VITE_BASE_URL: string
readonly VITE_UPLOAD_URL: string readonly VITE_UPLOAD_URL: string
readonly VITE_API_BASEPATH: string readonly VITE_API_BASEPATH: string