From f9cda2e8c0eb173fab17db84852fe411294d0e63 Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: Mon, 28 Jun 2021 00:22:34 +0800
Subject: [PATCH] chore: release 2.5.2

---
 CHANGELOG.en_US.md                     | 12 +++++++
 CHANGELOG.zh_CN.md                     |  6 +++-
 package.json                           | 12 +++----
 src/router/helper/routeHelper.ts       |  2 --
 src/views/sys/login/Login.vue          | 26 +++++++--------
 src/views/sys/login/LoginFormTitle.vue |  2 +-
 tailwind.config.js                     |  6 ++--
 yarn.lock                              | 46 ++++++++++++++++----------
 8 files changed, 69 insertions(+), 43 deletions(-)

diff --git a/CHANGELOG.en_US.md b/CHANGELOG.en_US.md
index 5cd6c9c6..b6dd5969 100644
--- a/CHANGELOG.en_US.md
+++ b/CHANGELOG.en_US.md
@@ -1,3 +1,15 @@
+## 2.5.2(2021-06-27)
+
+### ⚡ Performance Improvements
+
+- **Icon** Remove the global registration of Icon components to prevent hot update issues under certain circumstances
+
+### ✨ Features
+
+- **Menu** Added `permissionMode=PermissionModeEnum.ROUTE_MAPPING` mode
+  - The project is changed to this mode by default, and the original menu file is deleted
+  - If you have written the menu before, you can change to `PermissionModeEnum.ROLE` mode
+
 ## 2.5.1(2021-06-26)
 
 ### ⚡ Performance Improvements
diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index febf6f3b..e1ac555b 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -1,4 +1,4 @@
-## Wip
+## 2.5.2(2021-06-27)
 
 ### ⚡ Performance Improvements
 
@@ -10,6 +10,10 @@
   - 项目默认改为该模式，删除原有菜单文件
   - 如果之前已经写好了菜单，可以更改为`PermissionModeEnum.ROLE`模式即可
 
+### 🐛 Bug Fixes
+
+- **Drawer** 修复`visible`状态异常
+
 ## 2.5.1(2021-06-26)
 
 ### ⚡ Performance Improvements
diff --git a/package.json b/package.json
index 02f85a04..e9a4e4ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vben-admin",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "author": {
     "name": "vben",
     "email": "anncwb@126.com",
@@ -38,7 +38,7 @@
     "@logicflow/core": "^0.5.0",
     "@logicflow/extension": "^0.5.0",
     "@vueuse/core": "^5.0.3",
-    "@zxcvbn-ts/core": "^0.3.0",
+    "@zxcvbn-ts/core": "^1.0.0-beta.0",
     "ant-design-vue": "2.2.0-beta.6",
     "axios": "^0.21.1",
     "codemirror": "^5.62.0",
@@ -60,13 +60,13 @@
     "vue-i18n": "9.1.6",
     "vue-json-pretty": "^2.0.2",
     "vue-router": "^4.0.10",
-    "vue-types": "^3.0.2",
+    "vue-types": "^4.0.0",
     "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^12.1.4",
     "@commitlint/config-conventional": "^12.1.4",
-    "@iconify/json": "^1.1.360",
+    "@iconify/json": "^1.1.361",
     "@purge-icons/generated": "^0.7.0",
     "@types/codemirror": "^5.60.1",
     "@types/crypto-js": "^4.0.1",
@@ -76,7 +76,7 @@
     "@types/jest": "^26.0.23",
     "@types/lodash-es": "^4.17.4",
     "@types/mockjs": "^1.0.3",
-    "@types/node": "^15.12.4",
+    "@types/node": "^15.12.5",
     "@types/nprogress": "^0.2.0",
     "@types/qrcode": "^1.4.0",
     "@types/qs": "^6.9.6",
@@ -110,7 +110,7 @@
     "lint-staged": "^11.0.0",
     "npm-run-all": "^4.1.5",
     "postcss": "^8.3.5",
-    "prettier": "^2.3.1",
+    "prettier": "^2.3.2",
     "pretty-quick": "^3.1.1",
     "rimraf": "^3.0.2",
     "rollup-plugin-visualizer": "5.5.0",
diff --git a/src/router/helper/routeHelper.ts b/src/router/helper/routeHelper.ts
index 507f21a5..f37cc421 100644
--- a/src/router/helper/routeHelper.ts
+++ b/src/router/helper/routeHelper.ts
@@ -65,8 +65,6 @@ function dynamicImport(
 
 // Turn background objects into routing objects
 export function transformObjToRoute<T = AppRouteModule>(routeList: AppRouteModule[]): T[] {
-  console.log(routeList);
-
   routeList.forEach((route) => {
     const component = route.component as string;
     if (component) {
diff --git a/src/views/sys/login/Login.vue b/src/views/sys/login/Login.vue
index 2e147f6b..ab5b157c 100644
--- a/src/views/sys/login/Login.vue
+++ b/src/views/sys/login/Login.vue
@@ -1,7 +1,7 @@
 <template>
   <div :class="prefixCls" class="relative w-full h-full px-4">
     <AppLocalePicker
-      class="absolute top-4 right-4 enter-x text-white xl:text-gray-600"
+      class="absolute text-white top-4 right-4 enter-x xl:text-gray-600"
       :showText="false"
       v-if="!sessionTimeout && showLocale"
     />
@@ -13,7 +13,7 @@
 
     <div class="container relative h-full py-2 mx-auto sm:px-10">
       <div class="flex h-full">
-        <div class="hidden xl:flex xl:flex-col xl:w-6/12 min-h-full mr-4 pl-4">
+        <div class="hidden min-h-full pl-4 mr-4 xl:flex xl:flex-col xl:w-6/12">
           <AppLogo class="-enter-x" />
           <div class="my-auto">
             <img
@@ -22,33 +22,32 @@
               class="w-1/2 -mt-16 -enter-x"
             />
             <div class="mt-10 font-medium text-white -enter-x">
-              <span class="mt-4 text-3xl inline-block"> {{ t('sys.login.signInTitle') }}</span>
+              <span class="inline-block mt-4 text-3xl"> {{ t('sys.login.signInTitle') }}</span>
             </div>
-            <div class="mt-5 text-md text-white font-normal dark:text-gray-500 -enter-x">
+            <div class="mt-5 font-normal text-white text-md dark:text-gray-500 -enter-x">
               {{ t('sys.login.signInDesc') }}
             </div>
           </div>
         </div>
-        <div class="h-full xl:h-auto flex py-5 xl:py-0 xl:my-0 w-full xl:w-6/12">
+        <div class="flex w-full h-full py-5 xl:h-auto xl:py-0 xl:my-0 xl:w-6/12">
           <div
             :class="`${prefixCls}-form`"
             class="
-              my-auto
-              mx-auto
-              xl:ml-20 xl:bg-transparent
+              relative
+              w-full
               px-5
               py-8
-              sm:px-8
-              xl:p-4
+              mx-auto
+              my-auto
               rounded-md
               shadow-md
-              xl:shadow-none
-              w-full
+              xl:ml-16 xl:bg-transparent
+              sm:px-8
+              xl:p-4 xl:shadow-none
               sm:w-3/4
               lg:w-2/4
               xl:w-auto
               enter-x
-              relative
             "
           >
             <LoginForm />
@@ -144,6 +143,7 @@
   }
 
   .@{prefix-cls} {
+    min-height: 100%;
     overflow: hidden;
     @media (max-width: @screen-xl) {
       background-color: #293146;
diff --git a/src/views/sys/login/LoginFormTitle.vue b/src/views/sys/login/LoginFormTitle.vue
index d4a7b723..1c94c748 100644
--- a/src/views/sys/login/LoginFormTitle.vue
+++ b/src/views/sys/login/LoginFormTitle.vue
@@ -1,5 +1,5 @@
 <template>
-  <h2 class="font-bold text-2xl xl:text-3xl enter-x text-center xl:text-left mb-6">
+  <h2 class="mb-3 text-2xl font-bold text-center xl:text-3xl enter-x xl:text-left">
     {{ getFormTitle }}
   </h2>
 </template>
diff --git a/tailwind.config.js b/tailwind.config.js
index c5f57bac..cab15f14 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,4 +1,4 @@
-const { sky: color_sky } = require('tailwindcss/colors');
+const { sky: color_sky, ...colors } = require('tailwindcss/colors');
 
 module.exports = {
   mode: 'jit',
@@ -15,8 +15,8 @@ module.exports = {
       },
     },
     colors: {
-      //...colors,
-      lightBlue: color_sky,
+      ...colors,
+      sky: color_sky,
       primary: {
         DEFAULT: '#0960bd',
         // dark: primaryColorDark,
diff --git a/yarn.lock b/yarn.lock
index dd06b663..c3476f45 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1189,10 +1189,10 @@
   dependencies:
     cross-fetch "^3.0.6"
 
-"@iconify/json@^1.1.360":
-  version "1.1.360"
-  resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.360.tgz#e4ab624d914e7047d03adb7d17a3dac18302906f"
-  integrity sha512-kgKZ1nhznoD9w/tRq9mVpKO1d2/ymlTLHhJ/AGspMnSWDkjLYFPSatl4RXf0o0e1H+YWLvJcMd/sTCHTl7TucA==
+"@iconify/json@^1.1.361":
+  version "1.1.361"
+  resolved "https://registry.yarnpkg.com/@iconify/json/-/json-1.1.361.tgz#6222e7971467cc4a793c7e0bf2877b484827ae36"
+  integrity sha512-p7RMNFNI1YLFCJ0Ads6LOtJyLsheYM+XBSrhcTYxjuCmr2dv2j4DFp0Bh3HLwybtdPo3cA7Xo8Wqk8djvoVm/g==
 
 "@intlify/core-base@9.1.6":
   version "9.1.6"
@@ -1985,10 +1985,10 @@
   resolved "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz#6d327abaa4be34a74e421ed6409a0ae2f47f4c3d"
   integrity sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw==
 
-"@types/node@^15.12.4":
-  version "15.12.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz#e1cf817d70a1e118e81922c4ff6683ce9d422e26"
-  integrity sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA==
+"@types/node@^15.12.5":
+  version "15.12.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.5.tgz#9a78318a45d75c9523d2396131bd3cca54b2d185"
+  integrity sha512-se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -2498,10 +2498,10 @@
   dependencies:
     vue-demi "*"
 
-"@zxcvbn-ts/core@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.npmjs.org/@zxcvbn-ts/core/-/core-0.3.0.tgz#1a021afef29b97a5f8f72458de005fa149628e32"
-  integrity sha512-H1SOAoC7MbccN/CU9ENZHXwvwTwh6aRt88SOkGROAN9nT88o/qDPJ5B5bElRSbjKLfmmO1LqK2K4u2lUxjbQKQ==
+"@zxcvbn-ts/core@^1.0.0-beta.0":
+  version "1.0.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@zxcvbn-ts/core/-/core-1.0.0-beta.0.tgz#a616beacb83dbfe9174408ebabee746f3468b0ec"
+  integrity sha512-E2rHy2jrCDzJ62xqY5KteOHR+y7uPqL6FLUPVCDZmeYrAZRgB+CpO0QIQKLVrxwssx0YhApmE23eHmouce+OUA==
 
 JSONStream@^1.0.4:
   version "1.3.5"
@@ -6947,6 +6947,11 @@ is-plain-object@3.0.1:
   resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b"
   integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==
 
+is-plain-object@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -9600,10 +9605,10 @@ prettier@^1.16.4, prettier@^1.18.2:
   resolved "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
-prettier@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-2.3.1.tgz#76903c3f8c4449bc9ac597acefa24dc5ad4cbea6"
-  integrity sha512-p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA==
+prettier@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d"
+  integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==
 
 pretty-bytes@^5.3.0, pretty-bytes@^5.6.0:
   version "5.6.0"
@@ -12504,13 +12509,20 @@ vue-tsc@^0.2.0:
   dependencies:
     vscode-vue-languageservice "^0.25.22"
 
-vue-types@^3.0.0, vue-types@^3.0.2:
+vue-types@^3.0.0:
   version "3.0.2"
   resolved "https://registry.npmjs.org/vue-types/-/vue-types-3.0.2.tgz#ec16e05d412c038262fc1efa4ceb9647e7fb601d"
   integrity sha512-IwUC0Aq2zwaXqy74h4WCvFCUtoV0iSWr0snWnE9TnU18S66GAQyqQbRf2qfJtUuiFsBf6qp0MEwdonlwznlcrw==
   dependencies:
     is-plain-object "3.0.1"
 
+vue-types@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vue-types/-/vue-types-4.0.0.tgz#da13ccca0f979d3cfd076ce3a2b7050a9627ed5a"
+  integrity sha512-CGJ6br+FhK2OFgPzagVQxf6icQ63OVrOFjw+ekmb4bnTgn/FuKkjdlOqybOdq5aot7BF01yPoTczGD+fEMpKRw==
+  dependencies:
+    is-plain-object "5.0.0"
+
 vue@3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/vue/-/vue-3.1.2.tgz#647f8e3949a3d600771dca25d50225dc3e594c64"
-- 
GitLab