Skip to content

Commit 51e9dfc

Browse files
xiaoxian521xiaoxian521
committed
Merge branch 'main' into pages
2 parents fe7d67a + 185a5b7 commit 51e9dfc

File tree

22 files changed

+2340
-2312
lines changed

22 files changed

+2340
-2312
lines changed

‎.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v22.14.0
1+
v22.17.0

‎CHANGELOG.en_US.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
### ✔️Refactor
3333

34-
- Upgrade `vite` to `v6` version, upgrade `sass` to the latest version, reconstruct the theme writing method, and deprecate [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme) , click to view [Related optimization point details](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115). For users who have the [Max version](https://pure-admin.cn/pages/max/), it is strongly recommended to upgrade. Subsequent Max version users will enjoy a more modern, beautiful and highly customized theme color
34+
- Upgrade `vite` to `v6` version, upgrade `sass` to the latest version, reconstruct the theme writing method, and deprecate [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme) , click to view [Related optimization point details](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115). For users who have the [Max version](https://pure-admin.cn/pages/service/#max-%E7%89%88%E6%9C%AC), it is strongly recommended to upgrade. Subsequent Max version users will enjoy a more modern, beautiful and highly customized theme color
3535
- Use [code-inspector-plugin](https://www.npmjs.com/package/code-inspector-plugin) to replace [vite-plugin-vue-inspector](https://www.npmjs.com/package/vite-plugin-vue-inspector)
3636

3737
### 🎫Feat

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
### ✔️Refactor
3333

34-
- Upgrade `vite` to `v6` version, upgrade `sass` to the latest version, reconstruct the theme writing method, and deprecate [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme) , click to view [Related optimization point details](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115). For users who have the [Max version](https://pure-admin.cn/pages/max/), it is strongly recommended to upgrade. Subsequent Max version users will enjoy a more modern, beautiful and highly customized theme color
34+
- Upgrade `vite` to `v6` version, upgrade `sass` to the latest version, reconstruct the theme writing method, and deprecate [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme) , click to view [Related optimization point details](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115). For users who have the [Max version](https://pure-admin.cn/pages/service/#max-%E7%89%88%E6%9C%AC), it is strongly recommended to upgrade. Subsequent Max version users will enjoy a more modern, beautiful and highly customized theme color
3535
- Use [code-inspector-plugin](https://www.npmjs.com/package/code-inspector-plugin) to replace [vite-plugin-vue-inspector](https://www.npmjs.com/package/vite-plugin-vue-inspector)
3636

3737
### 🎫Feat

‎CHANGELOG.zh_CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
### ✔️ Refactor
3333

34-
- 升级`vite`至`v6`版本，升级`sass`至最新版，重构主题写法，弃用 [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme)，点击查看 [相关优化点细节](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115)。对于拥有 [Max版本](https://pure-admin.cn/pages/max/) 的用户平台强烈建议升级，后续`Max版本用户`会享有一套更现代、美观且自定义程度高的主题色
34+
- 升级`vite`至`v6`版本，升级`sass`至最新版，重构主题写法，弃用 [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme)，点击查看 [相关优化点细节](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115)。对于拥有 [Max版本](https://pure-admin.cn/pages/service/#max-%E7%89%88%E6%9C%AC) 的用户平台强烈建议升级，后续`Max版本用户`会享有一套更现代、美观且自定义程度高的主题色
3535
- 使用 [code-inspector-plugin](https://www.npmjs.com/package/code-inspector-plugin) 替换 [vite-plugin-vue-inspector](https://www.npmjs.com/package/vite-plugin-vue-inspector)
3636

3737
### 🎫 Feat

‎README.en-US.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,10 @@ The simplified version is based on the shelf extracted from [vue-pure-admin](htt
3131
[Click me to view vue-pure-admin documentation](https://pure-admin.cn/)
3232
[Click me to view @pureadmin/utils documentation](https://pure-admin-utils.netlify.app)
3333

34-
## Quality service, software outsourcing, sponsorship support
34+
## Premium service
3535

3636
[Click me for details](https://pure-admin.cn/pages/service/)
3737

38-
## `js` version
39-
40-
[Click me to view js version](https://pure-admin.cn/pages/js/)
41-
42-
## `max` version
43-
44-
[Click me to view the max version](https://pure-admin.cn/pages/max/)
45-
4638
## Tauri
4739

4840
[Click Watch Tauri](https://github.com/pure-admin/tauri-pure-admin)
@@ -192,6 +184,7 @@ Thank you very much for your in-depth understanding of the source code and your
192184
| [edgexie](https://github.com/edgexie) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=edgexie) |
193185
| [way-jm](https://github.com/way-jm) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=way-jm) |
194186
| [simple-hui](https://github.com/simple-hui) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=simple-hui) |
187+
| [tinysimple](https://github.com/tinysimple) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=tinysimple) |
195188

196189
## Git Contribution submission specification
197190

‎README.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,10 @@
3232
[点我查看 vue-pure-admin 文档](https://pure-admin.cn/)
3333
[点我查看 @pureadmin/utils 文档](https://pure-admin-utils.netlify.app)
3434

35-
## 优质服务、软件外包、赞助支持
35+
## 高级服务
3636

3737
[点我查看详情](https://pure-admin.cn/pages/service/)
3838

39-
## `js` 版本
40-
41-
[点我查看 js 版本](https://pure-admin.cn/pages/js/)
42-
43-
## `max` 版本
44-
45-
[点我查看 max 版本](https://pure-admin.cn/pages/max/)
46-
4739
## `Tauri` 版本
4840

4941
[点我查看 Tauri 版本](https://github.com/pure-admin/tauri-pure-admin)
@@ -193,6 +185,7 @@ docker run -dp 8080:80 --name pure-admin vue-pure-admin
193185
| [edgexie](https://github.com/edgexie) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=edgexie) |
194186
| [way-jm](https://github.com/way-jm) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=way-jm) |
195187
| [simple-hui](https://github.com/simple-hui) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=simple-hui) |
188+
| [tinysimple](https://github.com/tinysimple) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=tinysimple) |
196189

197190
## `Git` 贡献提交规范
198191

‎package.json

Lines changed: 61 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -48,134 +48,134 @@
4848
},
4949
"dependencies": {
5050
"@amap/amap-jsapi-loader": "^1.0.1",
51-
"@howdyjs/mouse-menu": "^2.1.6",
51+
"@howdyjs/mouse-menu": "^2.1.7",
5252
"@infectoone/vue-ganttastic": "^2.3.2",
5353
"@logicflow/core": "^1.2.28",
5454
"@logicflow/extension": "^1.2.28",
5555
"@pureadmin/descriptions": "^1.2.1",
5656
"@pureadmin/table": "^3.2.1",
57-
"@pureadmin/utils": "^2.6.0",
57+
"@pureadmin/utils": "^2.6.2",
5858
"@vue-flow/background": "^1.3.2",
59-
"@vue-flow/core": "^1.42.5",
60-
"@vueuse/core": "^13.1.0",
59+
"@vue-flow/core": "^1.45.0",
60+
"@vueuse/core": "^13.5.0",
6161
"@vueuse/motion": "^3.0.3",
6262
"@wangeditor/editor": "^5.1.23",
6363
"@wangeditor/editor-for-vue": "^5.1.12",
6464
"@zxcvbn-ts/core": "^3.0.4",
6565
"animate.css": "^4.1.1",
66-
"axios": "^1.8.4",
66+
"axios": "^1.11.0",
6767
"china-area-data": "^5.0.1",
6868
"codemirror": "^5.65.19",
6969
"codemirror-editor-vue3": "^2.8.0",
7070
"cropperjs": "^1.6.2",
7171
"dayjs": "^1.11.13",
72-
"deep-chat": "^2.1.1",
72+
"deep-chat": "^2.2.2",
7373
"echarts": "^5.6.0",
7474
"el-table-infinite-scroll": "^3.0.6",
75-
"element-plus": "^2.9.7",
75+
"element-plus": "^2.10.4",
7676
"highlight.js": "^11.11.1",
7777
"intro.js": "^7.2.0",
7878
"js-cookie": "^3.0.5",
79-
"jsbarcode": "^3.11.6",
79+
"jsbarcode": "^3.12.1",
8080
"localforage": "^1.10.0",
8181
"mint-filter": "^4.0.3",
8282
"mitt": "^3.0.1",
8383
"mqtt": "4.3.7",
8484
"nprogress": "^0.2.0",
8585
"path-browserify": "^1.0.1",
86-
"pinia": "^3.0.2",
86+
"pinia": "^3.0.3",
8787
"pinyin-pro": "^3.26.0",
88-
"plus-pro-components": "^0.1.22",
88+
"plus-pro-components": "^0.1.26",
8989
"qrcode": "^1.5.4",
9090
"qs": "^6.14.0",
9191
"responsive-storage": "^2.2.0",
9292
"sortablejs": "^1.15.6",
93-
"swiper": "^11.2.6",
93+
"swiper": "^11.2.10",
9494
"typeit": "^8.8.7",
9595
"v-contextmenu": "^3.2.0",
9696
"v3-infinite-loading": "^1.3.2",
97-
"vditor": "^3.11.0",
97+
"vditor": "^3.11.1",
9898
"version-rocket": "^1.7.4",
99-
"vue": "^3.5.13",
100-
"vue-i18n": "^11.1.3",
101-
"vue-json-pretty": "^2.4.0",
102-
"vue-pdf-embed": "^2.1.2",
103-
"vue-router": "^4.5.0",
104-
"vue-tippy": "^6.7.0",
99+
"vue": "^3.5.18",
100+
"vue-i18n": "^11.1.11",
101+
"vue-json-pretty": "^2.5.0",
102+
"vue-pdf-embed": "^2.1.3",
103+
"vue-router": "^4.5.1",
104+
"vue-tippy": "^6.7.1",
105105
"vue-types": "^6.0.0",
106106
"vue-virtual-scroller": "2.0.0-beta.8",
107-
"vue-waterfall-plugin-next": "^2.6.5",
108-
"vue3-danmaku": "^1.6.1",
107+
"vue-waterfall-plugin-next": "^2.6.7",
108+
"vue3-danmaku": "^1.6.6",
109109
"vue3-puzzle-vcode": "^1.1.7",
110110
"vuedraggable": "^4.1.0",
111111
"vxe-table": "4.6.25",
112-
"wavesurfer.js": "^7.9.4",
113-
"xgplayer": "^3.0.21",
112+
"wavesurfer.js": "^7.10.1",
113+
"xgplayer": "^3.0.22",
114114
"xlsx": "^0.18.5"
115115
},
116116
"devDependencies": {
117-
"@commitlint/cli": "^19.8.0",
118-
"@commitlint/config-conventional": "^19.8.0",
119-
"@commitlint/types": "^19.8.0",
120-
"@eslint/js": "^9.24.0",
121-
"@faker-js/faker": "^9.7.0",
122-
"@iconify/json": "^2.2.329",
117+
"@commitlint/cli": "^19.8.1",
118+
"@commitlint/config-conventional": "^19.8.1",
119+
"@commitlint/types": "^19.8.1",
120+
"@eslint/js": "^9.31.0",
121+
"@faker-js/faker": "^9.9.0",
122+
"@iconify/json": "^2.2.362",
123123
"@iconify/vue": "4.2.0",
124-
"@intlify/unplugin-vue-i18n": "^6.0.5",
125-
"@tailwindcss/vite": "^4.1.4",
126-
"@types/codemirror": "^5.60.15",
127-
"@types/dagre": "^0.7.52",
124+
"@intlify/unplugin-vue-i18n": "^6.0.8",
125+
"@tailwindcss/vite": "^4.1.11",
126+
"@types/codemirror": "^5.60.16",
127+
"@types/dagre": "^0.7.53",
128128
"@types/intro.js": "^5.1.5",
129129
"@types/js-cookie": "^3.0.6",
130-
"@types/node": "^20.17.30",
130+
"@types/node": "^20.19.9",
131131
"@types/nprogress": "^0.2.3",
132132
"@types/path-browserify": "^1.0.3",
133133
"@types/qrcode": "^1.5.5",
134-
"@types/qs": "^6.9.18",
134+
"@types/qs": "^6.14.0",
135135
"@types/sortablejs": "^1.15.8",
136-
"@vitejs/plugin-vue": "^5.2.3",
137-
"@vitejs/plugin-vue-jsx": "^4.1.2",
136+
"@vitejs/plugin-vue": "^6.0.0",
137+
"@vitejs/plugin-vue-jsx": "^5.0.1",
138138
"boxen": "^8.0.1",
139-
"code-inspector-plugin": "^0.20.9",
140-
"cssnano": "^7.0.6",
139+
"code-inspector-plugin": "^0.20.17",
140+
"cssnano": "^7.1.0",
141141
"dagre": "^0.8.5",
142-
"eslint": "^9.24.0",
143-
"eslint-config-prettier": "^10.1.2",
144-
"eslint-plugin-prettier": "^5.2.6",
145-
"eslint-plugin-vue": "^10.0.0",
142+
"eslint": "^9.31.0",
143+
"eslint-config-prettier": "^10.1.8",
144+
"eslint-plugin-prettier": "^5.5.3",
145+
"eslint-plugin-vue": "^10.3.0",
146146
"gradient-string": "^3.0.0",
147147
"husky": "^9.1.7",
148-
"lint-staged": "^15.5.1",
149-
"postcss": "^8.5.3",
148+
"lint-staged": "^16.1.2",
149+
"postcss": "^8.5.6",
150150
"postcss-html": "^1.8.0",
151151
"postcss-load-config": "^6.0.1",
152152
"postcss-scss": "^4.0.9",
153-
"prettier": "^3.5.3",
153+
"prettier": "^3.6.2",
154154
"rimraf": "^6.0.1",
155-
"rollup-plugin-visualizer": "^5.14.0",
156-
"sass": "^1.86.3",
157-
"stylelint": "^16.18.0",
158-
"stylelint-config-recess-order": "^6.0.0",
159-
"stylelint-config-recommended-vue": "^1.6.0",
155+
"rollup-plugin-visualizer": "^6.0.3",
156+
"sass": "^1.89.2",
157+
"stylelint": "^16.22.0",
158+
"stylelint-config-recess-order": "^7.1.0",
159+
"stylelint-config-recommended-vue": "^1.6.1",
160160
"stylelint-config-standard-scss": "^14.0.0",
161161
"stylelint-prettier": "^5.0.3",
162-
"svgo": "^3.3.2",
163-
"tailwindcss": "^4.1.4",
162+
"svgo": "^4.0.0",
163+
"tailwindcss": "^4.1.11",
164164
"typescript": "^5.8.3",
165-
"typescript-eslint": "^8.30.1",
165+
"typescript-eslint": "^8.38.0",
166166
"unplugin-icons": "^22.1.0",
167-
"vite": "^6.3.2",
167+
"vite": "^7.0.5",
168168
"vite-plugin-cdn-import": "^1.0.1",
169169
"vite-plugin-compression": "^0.5.1",
170170
"vite-plugin-fake-server": "^2.2.0",
171171
"vite-plugin-remove-console": "^2.2.0",
172172
"vite-plugin-router-warn": "^1.0.0",
173173
"vite-svg-loader": "^5.1.0",
174-
"vue-eslint-parser": "^10.1.3",
175-
"vue-tsc": "^2.2.8"
174+
"vue-eslint-parser": "^10.2.0",
175+
"vue-tsc": "^3.0.3"
176176
},
177177
"engines": {
178-
"node": "^18.18.0 || ^20.9.0 || >=22.0.0",
178+
"node": "^20.19.0 || >=22.12.0",
179179
"pnpm": ">=9"
180180
},
181181
"pnpm": {
@@ -200,6 +200,10 @@
200200
"esbuild",
201201
"typeit",
202202
"vue-demi"
203+
],
204+
"ignoredBuiltDependencies": [
205+
"@tailwindcss/oxide",
206+
"vue3-danmaku"
203207
]
204208
}
205209
}

0 commit comments

Comments
 (0)