Merge branch 'main' into pages

.nvmrc

@@ -1 +1 @@
-v22.17.0
+v22.17.1

CHANGELOG.en_US.md

@@ -1,3 +1,20 @@
+# 6.1.0 (2025-07-31)
+
+### ✔️ Refactor
+
+- Upgrade to `vite7`, update dependencies, and related compatibility processing
+
+### 🐞 Bug fixes
+
+- Fixed a flickering issue in the `ReSegmented` segmented controller component when switching between light and dark styles
+- Fixed an issue where `resetRouter` did not clear all routing data
+- Fixed an issue where closing the left tab in the tabs window did not work properly
+
+### 🍏 Perf
+
+- Optimized navigation styles
+- Upgraded `@pureadmin/table` to be compatible with all `el-table` APIs in the latest `element-plus` version.
+
 # 6.0.0 (2025-04-10)
 
 ### ✔️ Refactor

CHANGELOG.md

@@ -1,3 +1,20 @@
+# 6.1.0 (2025-07-31)
+
+### ✔️ Refactor
+
+- Upgrade to `vite7`, update dependencies, and related compatibility processing
+
+### 🐞 Bug fixes
+
+- Fixed a flickering issue in the `ReSegmented` segmented controller component when switching between light and dark styles
+- Fixed an issue where `resetRouter` did not clear all routing data
+- Fixed an issue where closing the left tab in the tabs window did not work properly
+
+### 🍏 Perf
+
+- Optimized navigation styles
+- Upgraded `@pureadmin/table` to be compatible with all `el-table` APIs in the latest `element-plus` version.
+
 # 6.0.0 (2025-04-10)
 
 ### ✔️ Refactor

CHANGELOG.zh_CN.md

@@ -1,3 +1,20 @@
+# 6.1.0 (2025-07-31)
+
+### ✔️ Refactor
+
+- 升级至`vite7`，更新依赖，相关兼容处理
+
+### 🐞 Bug fixes
+
+- 修复`ReSegmented`分段控制器组件在浅色和深色整体风格切换时的闪烁问题
+- 修复`resetRouter`未清空全部路由数据问题
+- 修复标签页-关闭左侧标签页关闭异常问题
+
+### 🍏 Perf
+
+- 优化导航样式
+- 升级`@pureadmin/table`兼容最新版`element-plus`的`el-table`的所有`API`
+
 # 6.0.0 (2025-04-10)
 
 ### ✔️ Refactor

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-pure-admin",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -53,11 +53,11 @@
     "@logicflow/core": "^1.2.28",
     "@logicflow/extension": "^1.2.28",
     "@pureadmin/descriptions": "^1.2.1",
-    "@pureadmin/table": "^3.2.1",
+    "@pureadmin/table": "^3.3.0",
     "@pureadmin/utils": "^2.6.2",
     "@vue-flow/background": "^1.3.2",
     "@vue-flow/core": "^1.45.0",
-    "@vueuse/core": "^13.5.0",
+    "@vueuse/core": "^13.6.0",
     "@vueuse/motion": "^3.0.3",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
@@ -117,9 +117,9 @@
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
     "@commitlint/types": "^19.8.1",
-    "@eslint/js": "^9.31.0",
+    "@eslint/js": "^9.32.0",
     "@faker-js/faker": "^9.9.0",
-    "@iconify/json": "^2.2.362",
+    "@iconify/json": "^2.2.364",
     "@iconify/vue": "4.2.0",
     "@intlify/unplugin-vue-i18n": "^6.0.8",
     "@tailwindcss/vite": "^4.1.11",
@@ -133,13 +133,13 @@
     "@types/qrcode": "^1.5.5",
     "@types/qs": "^6.14.0",
     "@types/sortablejs": "^1.15.8",
-    "@vitejs/plugin-vue": "^6.0.0",
+    "@vitejs/plugin-vue": "^6.0.1",
     "@vitejs/plugin-vue-jsx": "^5.0.1",
     "boxen": "^8.0.1",
-    "code-inspector-plugin": "^0.20.17",
+    "code-inspector-plugin": "^1.0.3",
     "cssnano": "^7.1.0",
     "dagre": "^0.8.5",
-    "eslint": "^9.31.0",
+    "eslint": "^9.32.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.3",
     "eslint-plugin-vue": "^10.3.0",
@@ -154,7 +154,7 @@
     "rimraf": "^6.0.1",
     "rollup-plugin-visualizer": "^6.0.3",
     "sass": "^1.89.2",
-    "stylelint": "^16.22.0",
+    "stylelint": "^16.23.0",
     "stylelint-config-recess-order": "^7.1.0",
     "stylelint-config-recommended-vue": "^1.6.1",
     "stylelint-config-standard-scss": "^14.0.0",
@@ -163,8 +163,8 @@
     "tailwindcss": "^4.1.11",
     "typescript": "^5.8.3",
     "typescript-eslint": "^8.38.0",
-    "unplugin-icons": "^22.1.0",
-    "vite": "^7.0.5",
+    "unplugin-icons": "^22.2.0",
+    "vite": "^7.0.6",
     "vite-plugin-cdn-import": "^1.0.1",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-fake-server": "^2.2.0",
@@ -172,7 +172,7 @@
     "vite-plugin-router-warn": "^1.0.0",
     "vite-svg-loader": "^5.1.0",
     "vue-eslint-parser": "^10.2.0",
-    "vue-tsc": "^3.0.3"
+    "vue-tsc": "^3.0.4"
   },
   "engines": {
     "node": "^20.19.0 || >=22.12.0",

public/platform-config.json

@@ -1,5 +1,5 @@
 {
-  "Version": "6.0.0",
+  "Version": "6.1.0",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,