From 2d639c8f48b0280637efacd1513d92d168a76299 Mon Sep 17 00:00:00 2001
From: xiaoxian521 <1923740402@qq.com>
Date: Tue, 25 Oct 2022 13:07:18 +0800
Subject: [PATCH] release: update `3.6.0`

---
 CHANGELOG.en_US.md       | 26 ++++++++++++++++++++++++++
 CHANGELOG.md             | 26 ++++++++++++++++++++++++++
 CHANGELOG.zh_CN.md       | 26 ++++++++++++++++++++++++++
 package.json             |  2 +-
 public/serverConfig.json |  2 +-
 5 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.en_US.md b/CHANGELOG.en_US.md
index 7976c028e..d2292c31e 100644
--- a/CHANGELOG.en_US.md
+++ b/CHANGELOG.en_US.md
@@ -1,3 +1,29 @@
+# 3.6.0 (2022-10-25)
+
+### 🎫 Feat
+
+- Add file download `demo`
+- Add typewriter component `demo`
+- Added `json` editor `demo`
+
+### ✔️ refactor
+
+- Refactor the permission module, adopt the most commonly used `RBAC` (Role-Based Access List): role-based permission control (User -> Role -> Permission), and update the page permission and button permission `demo` example, button Permissions support three operation modes (judging permissions in component mode, judging permissions in function mode, and judging permissions in instruction mode)
+
+### 🐞 Bug fixes
+
+- Fixed the theme not being emptied when clearing the cache and returning to the login page
+- Fix `menu` display problem in production environment in `horizontal` mode
+- Fixed the problem that the `mix` mixed mode navigation might not be displayed in the left menu of the production environment
+- After the `token` expires, calling the refresh `token` interface will cause an infinite loop
+
+### 🍏 Perf
+
+- Removed uncommon `@apply` from `tailwind.css`
+- Replace `//` comments with `/** */`, which is more friendly to the editor's intellisense
+- Optimize the login enter event
+- Simplified some functions, eliminated useless functions, and optimized page loading speed
+
 # 3.5.0 (2022-9-10)
 
 ### 🎫 Feat
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7976c028e..d2292c31e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+# 3.6.0 (2022-10-25)
+
+### 🎫 Feat
+
+- Add file download `demo`
+- Add typewriter component `demo`
+- Added `json` editor `demo`
+
+### ✔️ refactor
+
+- Refactor the permission module, adopt the most commonly used `RBAC` (Role-Based Access List): role-based permission control (User -> Role -> Permission), and update the page permission and button permission `demo` example, button Permissions support three operation modes (judging permissions in component mode, judging permissions in function mode, and judging permissions in instruction mode)
+
+### 🐞 Bug fixes
+
+- Fixed the theme not being emptied when clearing the cache and returning to the login page
+- Fix `menu` display problem in production environment in `horizontal` mode
+- Fixed the problem that the `mix` mixed mode navigation might not be displayed in the left menu of the production environment
+- After the `token` expires, calling the refresh `token` interface will cause an infinite loop
+
+### 🍏 Perf
+
+- Removed uncommon `@apply` from `tailwind.css`
+- Replace `//` comments with `/** */`, which is more friendly to the editor's intellisense
+- Optimize the login enter event
+- Simplified some functions, eliminated useless functions, and optimized page loading speed
+
 # 3.5.0 (2022-9-10)
 
 ### 🎫 Feat
diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index ecb61a812..88a1da7f7 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -1,3 +1,29 @@
+# 3.6.0 (2022-10-25)
+
+### 🎫 Feat
+
+- 添加文件下载`demo`
+- 添加打字机组件`demo`
+- 添加`json`编辑器`demo`
+
+### ✔️ refactor
+
+- 重构权限模块，采用目前最常用的`RBAC`（Role-Based Access List）: 基于角色的权限控制（ 用户 -> 角色 -> 权限 ），并更新页面权限和按钮权限`demo`示例，按钮权限支持三种操作模式（组件方式判断权限、函数方式判断权限、指令方式判断权限）
+
+### 🐞 Bug fixes
+
+- 修复清空缓存并返回登录页时未清空主题
+- 修复`horizontal`模式下`menu`在生产环境显示问题
+- 修复`mix`混合模式导航在生产环境左侧菜单一定机率不显示的问题
+- `token`过期后调用刷新`token`接口会无限循环的问题
+
+### 🍏 Perf
+
+- 从`tailwind.css`中移除不常用的`@apply`
+- 使用`/** */`替换`//`注释，对编辑器的智能提示更友好
+- 优化登录回车事件
+- 简化了一些函数，剔除了无用函数，优化了页面加载速度
+
 # 3.5.0 (2022-9-10)
 
 ### 🎫 Feat
diff --git a/package.json b/package.json
index af2fd9818..f25a4eb18 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-pure-admin",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "private": true,
   "scripts": {
     "dev": "NODE_OPTIONS=--max-old-space-size=4096 vite",
diff --git a/public/serverConfig.json b/public/serverConfig.json
index 9b940e9e2..e10150b11 100644
--- a/public/serverConfig.json
+++ b/public/serverConfig.json
@@ -1,5 +1,5 @@
 {
-  "Version": "3.5.0",
+  "Version": "3.6.0",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,