Merge branch 'main' into feat/inspector

pure-admin · Jun 6, 2024 · d3b4a55 · d3b4a55
2 parents e1f385f + a75cf83
commit d3b4a55
Show file tree

Hide file tree

Showing 25 changed files with 527 additions and 234 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,6 +1,7 @@
 {
  "recommendations": [
  "christian-kohler.path-intellisense",
+ "warmthsea.vscode-custom-code-color",
  "vscode-icons-team.vscode-icons",
  "davidanson.vscode-markdownlint",
  "ms-azuretools.vscode-docker",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -31,17 +31,33 @@
  "i18n-ally.keystyle": "nested",
  "i18n-ally.sortKeys": true,
  "i18n-ally.namespace": true,
- "i18n-ally.enabledParsers": ["yaml", "js"],
+ "i18n-ally.enabledParsers": [
+ "yaml",
+ "js"
+ ],
  "i18n-ally.sourceLanguage": "en",
  "i18n-ally.displayLanguage": "zh-CN",
- "i18n-ally.enabledFrameworks": ["vue"],
- "iconify.excludes": ["el"],
+ "i18n-ally.enabledFrameworks": [
+ "vue"
+ ],
+ "iconify.excludes": [
+ "el"
+ ],
  "vsmqtt.brokerProfiles": [
  {
  "name": "broker.emqx.io",
  "host": "broker.emqx.io/mqtt",
  "port": 1883,
  "clientId": "vsmqtt_client_db34"
  }
- ]
-}
+ ],
+ "vscodeCustomCodeColor.highlightValue": [
+ "v-loading",
+ "v-auth",
+ "v-copy",
+ "v-longpress",
+ "v-optimize",
+ "v-ripple"
+ ],
+ "vscodeCustomCodeColor.highlightValueColor": "#b392f0",
+}
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/README.en-US.md b/README.en-US.md
@@ -10,11 +10,9 @@
 
 `vue-pure-admin` is an open source, free and out-of-the-box middle and backend management system template. Completely adopts `ECMAScript` module (`ESM`) specifications to write and organize code, using the latest `Vue3`, `Vite`, `Element-Plus`, `TypeScript`, `Pinia`, `Tailwindcss` and other mainstream technologies develop
 
-## Sponsors
+## R&D philosophy
 
-<a class="logo" href="https://ai-tools.cn/resume/start" target="_blank" rel="sponsored noopener">
- <img src="./public/sponsors/aitools.svg" alt="aitools">
-</a>
+Seek innovation in stability and see the future in technology
 
 ## Thin version (offering non-internationalized and internationalized versions)
 
@@ -184,6 +182,7 @@ Thank you very much for your in-depth understanding of the source code and your
 | [WitMiao](https:/WitMiao) | [code](https:/pure-admin/vue-pure-admin/commits?author=WitMiao) |
 | [QFifteen](https:/QFifteen) | [code](https:/pure-admin/vue-pure-admin/commits?author=QFifteen) |
 | [edgexie](https:/edgexie) | [code](https:/pure-admin/vue-pure-admin/commits?author=edgexie) |
+| [way-jm](https:/way-jm) | [code](https:/pure-admin/vue-pure-admin/commits?author=way-jm) |
 
 ## Git Contribution submission specification
 

diff --git a/README.md b/README.md
@@ -11,11 +11,9 @@
 `vue-pure-admin` 是一款开源免费且开箱即用的中后台管理系统模版。完全采用 `ECMAScript` 模块（`ESM`）规范来编写和组织代码，使用了最新的 `Vue3`、
 `Vite`、`Element-Plus`、`TypeScript`、`Pinia`、`Tailwindcss` 等主流技术开发
 
-## 赞助商
+## 研发理念
 
-<a class="logo" href="https://ai-tools.cn/resume/start" target="_blank" rel="sponsored noopener">
- <img src="./public/sponsors/aitools.svg" alt="aitools">
-</a>
+稳定中求创新，技术中见未来
 
 ## 精简版本（实际项目开发请用精简版本，提供 `非国际化` 、`国际化` 两个版本选择）
 
@@ -189,6 +187,7 @@ docker run -dp 8080:80 --name pure-admin vue-pure-admin
 | [WitMiao](https:/WitMiao) | [代码](https:/pure-admin/vue-pure-admin/commits?author=WitMiao) |
 | [QFifteen](https:/QFifteen) | [代码](https:/pure-admin/vue-pure-admin/commits?author=QFifteen) |
 | [edgexie](https:/edgexie) | [代码](https:/pure-admin/vue-pure-admin/commits?author=edgexie) |
+| [way-jm](https:/way-jm) | [代码](https:/pure-admin/vue-pure-admin/commits?author=way-jm) |
 
 ## `Git` 贡献提交规范
 

diff --git a/locales/en.yaml b/locales/en.yaml
@@ -53,6 +53,8 @@ panel:
  pureTagsStyleSmartTip: Smart tags add fun and brilliance
  pureTagsStyleCard: Card
  pureTagsStyleCardTip: Card tags for efficient browsing
+ pureTagsStyleChrome: Chrome
+ pureTagsStyleChromeTip: Chrome style is classic and elegant
  pureInterfaceDisplay: Interface Display
  pureGreyModel: Grey Model
  pureWeakModel: Weak Model

diff --git a/locales/zh-CN.yaml b/locales/zh-CN.yaml
@@ -53,6 +53,8 @@ panel:
  pureTagsStyleSmartTip: 灵动标签，添趣生辉
  pureTagsStyleCard: 卡片
  pureTagsStyleCardTip: 卡片标签，高效浏览
+ pureTagsStyleChrome: 谷歌
+ pureTagsStyleChromeTip: 谷歌风格，经典美观
  pureInterfaceDisplay: 界面显示
  pureGreyModel: 灰色模式
  pureWeakModel: 色弱模式

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": {
@@ -56,9 +56,9 @@
  "@pureadmin/table": "^3.1.2",
  "@pureadmin/utils": "^2.4.7",
  "@vue-flow/background": "^1.3.0",
- "@vue-flow/core": "^1.33.8",
+ "@vue-flow/core": "^1.34.0",
  "@vueuse/core": "^10.10.0",
- "@vueuse/motion": "^2.1.0",
+ "@vueuse/motion": "^2.2.0",
  "@wangeditor/editor": "^5.1.23",
  "@wangeditor/editor-for-vue": "^5.1.12",
  "@zxcvbn-ts/core": "^3.0.4",
@@ -68,7 +68,7 @@
  "cropperjs": "^1.6.2",
  "dayjs": "^1.11.11",
  "echarts": "^5.5.0",
- "el-table-infinite-scroll": "^3.0.3",
+ "el-table-infinite-scroll": "^3.0.5",
  "element-plus": "^2.7.3",
  "intro.js": "^7.2.0",
  "js-cookie": "^3.0.5",
@@ -80,21 +80,21 @@
  "nprogress": "^0.2.0",
  "path": "^0.12.7",
  "pinia": "^2.1.7",
- "pinyin-pro": "^3.21.0",
- "plus-pro-components": "^0.1.6",
+ "pinyin-pro": "^3.21.1",
+ "plus-pro-components": "^0.1.7",
  "qrcode": "^1.5.3",
  "qs": "^6.12.1",
  "responsive-storage": "^2.2.0",
  "sortablejs": "^1.15.2",
- "swiper": "^11.1.3",
+ "swiper": "^11.1.4",
  "typeit": "^8.8.3",
  "v-contextmenu": "^3.2.0",
  "v3-infinite-loading": "^1.3.1",
  "version-rocket": "^1.7.1",
  "vue": "^3.4.27",
  "vue-i18n": "^9.13.1",
  "vue-json-pretty": "^2.4.0",
- "vue-pdf-embed": "^2.0.3",
+ "vue-pdf-embed": "^2.0.4",
  "vue-router": "^4.3.2",
  "vue-tippy": "^6.4.1",
  "vue-types": "^5.1.2",
@@ -123,7 +123,7 @@
  "@types/gradient-string": "^1.1.6",
  "@types/intro.js": "^5.1.5",
  "@types/js-cookie": "^3.0.6",
- "@types/node": "^20.12.12",
+ "@types/node": "^20.12.13",
  "@types/nprogress": "^0.2.3",
  "@types/qrcode": "^1.5.5",
  "@types/qs": "^6.9.15",
@@ -151,16 +151,16 @@
  "prettier": "^3.2.5",
  "rimraf": "^5.0.7",
  "rollup-plugin-visualizer": "^5.12.0",
- "sass": "^1.77.2",
- "stylelint": "^16.6.0",
+ "sass": "^1.77.4",
+ "stylelint": "^16.6.1",
  "stylelint-config-recess-order": "^5.0.1",
  "stylelint-config-recommended-vue": "^1.5.0",
  "stylelint-config-standard-scss": "^13.1.0",
  "stylelint-prettier": "^5.0.0",
  "svgo": "^3.3.2",
  "tailwindcss": "^3.4.3",
  "typescript": "^5.4.5",
- "vite": "^5.2.11",
+ "vite": "^5.2.12",
  "vite-plugin-cdn-import": "^1.0.1",
  "vite-plugin-compression": "^0.5.1",
  "vite-plugin-fake-server": "^2.1.1",