Merge branch 'main' into pages

pure-admin · Jun 6, 2024 · 0697748 · 0697748
2 parents debd439 + 33a8983
commit 0697748
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/CHANGELOG.en_US.md b/CHANGELOG.en_US.md
@@ -1,3 +1,13 @@
+# 5.7.0 (2024-06-04)
+
+### 🎫 Feat
+
+- Add Google style tabs
+
+### 🐞 Bug fixes
+
+- Fixed the issue where the text exceeds and is not hidden after the menu is folded in Firefox browser
+
 # 5.6.0 (2024-05-14)
 
 ### ✔️ Refactor

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# 5.7.0 (2024-06-04)
+
+### 🎫 Feat
+
+- Add Google style tabs
+
+### 🐞 Bug fixes
+
+- Fixed the issue where the text exceeds and is not hidden after the menu is folded in Firefox browser
+
 # 5.6.0 (2024-05-14)
 
 ### ✔️ Refactor

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
@@ -1,3 +1,13 @@
+# 5.7.0 (2024-06-04)
+
+### 🎫 Feat
+
+- 添加谷歌风格的页签
+
+### 🐞 Bug fixes
+
+- 修复在火狐浏览器中菜单折叠后，文字超出未隐藏的问题
+
 # 5.6.0 (2024-05-14)
 
 ### ✔️ Refactor

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-pure-admin",
-  "version": "5.6.0",
+  "version": "5.7.0",
   "private": true,
   "type": "module",
   "scripts": {

diff --git a/public/platform-config.json b/public/platform-config.json
@@ -1,5 +1,5 @@
 {
-  "Version": "5.6.0",
+  "Version": "5.7.0",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,