From 89dbb8c9e8b5a4b280967d73cadbde8ad6b1dc20 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sun, 5 Nov 2023 23:14:56 +0800
Subject: [PATCH 1/6] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96.env=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                              | 3 +++
 src/components/DocAlert/index.vue | 2 +-
 src/views/Login/SocialLogin.vue   | 8 ++++----
 types/env.d.ts                    | 1 +
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.env b/.env
index 3c5303b5..86af972a 100644
--- a/.env
+++ b/.env
@@ -13,5 +13,8 @@ VITE_APP_TENANT_ENABLE=true
 # 验证码的开关
 VITE_APP_CAPTCHA_ENABLE=true
 
+# 文档地址的开关
+VITE_APP_DOCALERT_ENABLE=false
+
 # 百度统计
 VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc
diff --git a/src/components/DocAlert/index.vue b/src/components/DocAlert/index.vue
index 3a3feab7..0073266c 100644
--- a/src/components/DocAlert/index.vue
+++ b/src/components/DocAlert/index.vue
@@ -22,7 +22,7 @@ const goToUrl = () => {
 
 /** 是否开启 */
 const getEnable = () => {
-  return import.meta.env.VITE_APP_TENANT_ENABLE === 'true'
+  return import.meta.env.VITE_APP_DOCALERT_ENABLE !== 'false'
 }
 </script>
 <style scoped>
diff --git a/src/views/Login/SocialLogin.vue b/src/views/Login/SocialLogin.vue
index 6bbfc1df..1eb9293c 100644
--- a/src/views/Login/SocialLogin.vue
+++ b/src/views/Login/SocialLogin.vue
@@ -193,8 +193,8 @@ const LoginRules = {
 }
 const loginData = reactive({
   isShowPassword: false,
-  captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE,
-  tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE,
+  captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE !== 'false',
+  tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false',
   loginForm: {
     tenantName: '芋道源码',
     username: 'admin',
@@ -207,7 +207,7 @@ const loginData = reactive({
 // 获取验证码
 const getCode = async () => {
   // 情况一，未开启：则直接登录
-  if (loginData.captchaEnable === 'false') {
+  if (loginData.captchaEnable) {
     await handleLogin({})
   } else {
     // 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录
@@ -217,7 +217,7 @@ const getCode = async () => {
 }
 //获取租户ID
 const getTenantId = async () => {
-  if (loginData.tenantEnable === 'true') {
+  if (loginData.tenantEnable) {
     const res = await LoginApi.getTenantIdByName(loginData.loginForm.tenantName)
     authUtil.setTenantId(res)
   }
diff --git a/types/env.d.ts b/types/env.d.ts
index e5861e32..baf58957 100644
--- a/types/env.d.ts
+++ b/types/env.d.ts
@@ -14,6 +14,7 @@ interface ImportMetaEnv {
   readonly VITE_DEV: string
   readonly VITE_APP_CAPTCHA_ENABLE: string
   readonly VITE_APP_TENANT_ENABLE: string
+  readonly VITE_APP_DOCALERT_ENABLE: string
   readonly VITE_BASE_URL: string
   readonly VITE_UPLOAD_URL: string
   readonly VITE_API_BASEPATH: string

From 530107eba74dabeb6d66bf272f8241906fe67079 Mon Sep 17 00:00:00 2001
From: AKING <2734339436@qq.com>
Date: Mon, 22 Jan 2024 01:40:08 +0000
Subject: [PATCH 2/6] =?UTF-8?q?update=20src/types/descriptions.d.ts.=20?=
 =?UTF-8?q?=E6=AD=A4=E5=A4=84=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=98=A0=E5=B0=84=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B9=E4=BE=BF?=
 =?UTF-8?q?=E5=9C=A8description=E5=9C=A8=E5=B1=95=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E5=87=8F=E5=B0=91slot=E7=9A=84=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E4=BD=BF=E7=94=A8=E6=96=B9=E5=BC=8F=E5=A6=82=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

// 确认人 confirmUser
  {
    label: '确认人',
    field: 'confirmUser',
    minWidth: 120,
    isForm: false,
    isDetail: true,
    detail: {
      mappedField: 'confirmUserName'
    }
  },

Signed-off-by: AKING <2734339436@qq.com>
---
 src/types/descriptions.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/types/descriptions.d.ts b/src/types/descriptions.d.ts
index 35c0b81b..af6d68c0 100644
--- a/src/types/descriptions.d.ts
+++ b/src/types/descriptions.d.ts
@@ -2,6 +2,7 @@ export interface DescriptionsSchema {
   span?: number // 占多少分
   field: string // 字段名
   label?: string // label名
+  mappedField?: string // 字段映射
   width?: string | number
   minWidth?: string | number
   align?: 'left' | 'center' | 'right'

From 24062c7a3b8fa5a424471889d4d2cd0b2ab64211 Mon Sep 17 00:00:00 2001
From: AKING <2734339436@qq.com>
Date: Mon, 22 Jan 2024 01:41:37 +0000
Subject: [PATCH 3/6] =?UTF-8?q?update=20src/components/Descriptions/src/De?=
 =?UTF-8?q?scriptions.vue.=20=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=82=B9=E6=B7=BB=E5=8A=A0=EF=BC=8C=E5=B7=B2?=
 =?UTF-8?q?=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: AKING <2734339436@qq.com>
---
 src/components/Descriptions/src/Descriptions.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue
index 06e1096a..184d95c4 100644
--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
@@ -129,7 +129,11 @@ const toggleClick = () => {
               <slot v-else-if="item.dictType">
                 <DictTag :type="item.dictType" :value="data[item.field] + ''" />
               </slot>
-              <slot v-else :name="item.field" :row="data">{{ data[item.field] }}</slot>
+              <slot v-else :name="item.field" :row="data">
+                {{
+                    item.mappedField ? data[item.mappedField] : data[item.field]
+                }}
+              </slot>
             </template>
           </ElDescriptionsItem>
         </ElDescriptions>

From 024d08555b5d0168d9eb29168e970bb2f38d2829 Mon Sep 17 00:00:00 2001
From: AKING <2734339436@qq.com>
Date: Wed, 24 Jan 2024 02:44:33 +0000
Subject: [PATCH 4/6] =?UTF-8?q?update=20src/permission.ts.=20=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E4=BA=86=E8=B7=B3=E8=BD=AC=E4=B8=8D=E5=B8=A6=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: AKING <2734339436@qq.com>
---
 src/permission.ts | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/permission.ts b/src/permission.ts
index 0698dc88..d538303b 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -12,6 +12,40 @@ import { usePermissionStoreWithOut } from '@/store/modules/permission'
 const { start, done } = useNProgress()
 
 const { loadStart, loadDone } = usePageLoading()
+
+const parseURL = (
+  url: string | null | undefined
+): { basePath: string; paramsObject: { [key: string]: string } } => {
+  // 如果输入为 null 或 undefined，返回空字符串和空对象
+  if (url == null) {
+    return { basePath: '', paramsObject: {} }
+  }
+
+  // 找到问号 (?) 的位置，它之前是基础路径，之后是查询参数
+  const questionMarkIndex = url.indexOf('?')
+  let basePath = url
+  const paramsObject: { [key: string]: string } = {}
+
+  // 如果找到了问号，说明有查询参数
+  if (questionMarkIndex !== -1) {
+    // 获取 basePath
+    basePath = url.substring(0, questionMarkIndex)
+
+    // 从 URL 中获取查询字符串部分
+    const queryString = url.substring(questionMarkIndex + 1)
+
+    // 使用 URLSearchParams 遍历参数
+    const searchParams = new URLSearchParams(queryString)
+    searchParams.forEach((value, key) => {
+      // 封装进 paramsObject 对象
+      paramsObject[key] = value
+    })
+  }
+
+  // 返回 basePath 和 paramsObject
+  return { basePath, paramsObject }
+}
+
 // 路由不重定向白名单
 const whiteList = [
   '/login',
@@ -47,8 +81,10 @@ router.beforeEach(async (to, from, next) => {
           router.addRoute(route as unknown as RouteRecordRaw) // 动态添加可访问路由表
         })
         const redirectPath = from.query.redirect || to.path
+        // 修复跳转时不带参数的问题
         const redirect = decodeURIComponent(redirectPath as string)
-        const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect }
+        const { basePath, paramsObject: query } = parseURL(redirect)
+        const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect, query }
         next(nextData)
       } else {
         next()

From a0ce1f3a5b5ed2cbd5a99788b9c5d7791bd03f4a Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 26 Jan 2024 21:53:59 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=94=A5=202.0.0=20=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c521cafe..9bcd5c65 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yudao-ui-admin-vue3",
-  "version": "1.8.3-snapshot",
+  "version": "2.0.0-snapshot",
   "description": "基于vue3、vite4、element-plus、typesScript",
   "author": "xingyu",
   "private": false,

From 8d532dfc3ac0624b6bd1eb98fbeb7aabd42172ca Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 17 Feb 2024 11:50:30 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E2=9C=A8=20=E9=BB=98=E8=AE=A4=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E6=96=87=E6=A1=A3=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env b/.env
index 86af972a..424b022b 100644
--- a/.env
+++ b/.env
@@ -14,7 +14,7 @@ VITE_APP_TENANT_ENABLE=true
 VITE_APP_CAPTCHA_ENABLE=true
 
 # 文档地址的开关
-VITE_APP_DOCALERT_ENABLE=false
+VITE_APP_DOCALERT_ENABLE=true
 
 # 百度统计
 VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc