Compare commits

..

3 Commits

Author SHA1 Message Date
xiaoxian521
069131a9c8 release: update 6.1.0 2025-07-31 12:07:32 +08:00
xiaoxian521
be4c4a00ec chore: update 2025-07-31 10:57:18 +08:00
xiaoxian521
9fcf54c360 chore: 升级@pureadmin/table兼容最新版element-plus 2025-07-30 16:54:55 +08:00
17 changed files with 583 additions and 540 deletions

3
.gitignore vendored
View File

@@ -1,9 +1,10 @@
node_modules node_modules
.DS_Store .DS_Store
dist
dist-ssr
*.local *.local
.eslintcache .eslintcache
report.html report.html
dist
vite.config.*.timestamp* vite.config.*.timestamp*
yarn.lock yarn.lock

8
.husky/commit-msg Executable file
View File

@@ -0,0 +1,8 @@
#!/bin/sh
# shellcheck source=./_/husky.sh
. "$(dirname "$0")/_/husky.sh"
PATH="/usr/local/bin:$PATH"
npx --no-install commitlint --edit "$1"

9
.husky/common.sh Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/sh
command_exists () {
command -v "$1" >/dev/null 2>&1
}
# Workaround for Windows 10, Git Bash and Pnpm
if command_exists winpty && test -t 1; then
exec < /dev/tty
fi

10
.husky/pre-commit Executable file
View File

@@ -0,0 +1,10 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
. "$(dirname "$0")/common.sh"
[ -n "$CI" ] && exit 0
PATH="/usr/local/bin:$PATH"
# Perform lint check on files in the staging area through .lintstagedrc configuration
pnpm exec lint-staged

2
.nvmrc
View File

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

View File

@@ -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) # 6.0.0 (2025-04-10)
### ✔️ Refactor ### ✔️ Refactor

View File

@@ -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) # 6.0.0 (2025-04-10)
### ✔️ Refactor ### ✔️ Refactor

View File

@@ -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) # 6.0.0 (2025-04-10)
### ✔️ Refactor ### ✔️ Refactor

View File

@@ -1,26 +1,18 @@
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
<head>
<head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="renderer" content="webkit" /> <meta name="renderer" content="webkit" />
<meta name="viewport" <meta
content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0" /> name="viewport"
content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0"
/>
<title>vue-pure-admin</title> <title>vue-pure-admin</title>
<link rel="icon" href="/favicon.ico" /> <link rel="icon" href="/favicon.ico" />
<script> </head>
var _hmt = _hmt || [];
(function () {
var hm = document.createElement("script")
hm.src = "https://hm.baidu.com/hm.js?d3824e75ef2bf6d851035f74ae1aec68"
var s = document.getElementsByTagName("script")[0]
s.parentNode.insertBefore(hm, s)
})();
</script>
</head>
<body> <body>
<div id="app"> <div id="app">
<style> <style>
html, html,
@@ -74,7 +66,6 @@
} }
@keyframes load-animation { @keyframes load-animation {
0%, 0%,
80%, 80%,
100% { 100% {
@@ -89,6 +80,5 @@
<div class="loader"></div> <div class="loader"></div>
</div> </div>
<script type="module" src="/src/main.ts"></script> <script type="module" src="/src/main.ts"></script>
</body> </body>
</html> </html>

View File

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

802
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -16,7 +16,6 @@ import en from "element-plus/es/locale/lang/en";
import zhCn from "element-plus/es/locale/lang/zh-cn"; import zhCn from "element-plus/es/locale/lang/zh-cn";
import plusEn from "plus-pro-components/es/locale/lang/en"; import plusEn from "plus-pro-components/es/locale/lang/en";
import plusZhCn from "plus-pro-components/es/locale/lang/zh-cn"; import plusZhCn from "plus-pro-components/es/locale/lang/zh-cn";
import { ElNotification } from "element-plus";
export default defineComponent({ export default defineComponent({
name: "app", name: "app",
@@ -54,21 +53,6 @@ export default defineComponent({
} }
); );
} }
},
mounted() {
ElNotification({
title: "高级服务",
duration: 0,
// @ts-expect-error
style: { width: "200px" },
position: "bottom-right",
dangerouslyUseHTMLString: true,
message: `
<a target='_blank' class='block text-base text-center border mt-2 rounded hover:text-[red]!' href='https://pure-admin.cn/pages/service/'>
点我查看
</a>
`
});
} }
}); });
</script> </script>

View File

@@ -8,7 +8,7 @@ const TITLE = getConfig("Title");
<footer <footer
class="layout-footer text-[rgba(0,0,0,0.6)] dark:text-[rgba(220,220,242,0.8)]" class="layout-footer text-[rgba(0,0,0,0.6)] dark:text-[rgba(220,220,242,0.8)]"
> >
Copyright © 2020-2025 Copyright © 2020-present
<a <a
class="hover:text-primary!" class="hover:text-primary!"
href="https://github.com/pure-admin" href="https://github.com/pure-admin"
@@ -16,23 +16,12 @@ const TITLE = getConfig("Title");
> >
&nbsp;{{ TITLE }} &nbsp;{{ TITLE }}
</a> </a>
<!-- <div class="ml-8">
<span>赞助商</span>
<a
class="hover:text-primary"
href="https://ai-tools.cn/resume/start"
target="_blank"
>
二猫 AI 简历
</a>
</div> -->
</footer> </footer>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
.layout-footer { .layout-footer {
display: flex; display: flex;
flex-wrap: wrap;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width: 100%; width: 100%;

View File

@@ -235,7 +235,6 @@
.is-active.submenu-title-noDropdown.outer-most > * { .is-active.submenu-title-noDropdown.outer-most > * {
z-index: 1; z-index: 1;
color: #fff; color: #fff;
background: transparent !important;
} }
.is-active.submenu-title-noDropdown.outer-most::before { .is-active.submenu-title-noDropdown.outer-most::before {

View File

@@ -336,9 +336,9 @@ watch(loginDay, value => {
</div> </div>
</div> </div>
<div <div
class="w-full flex-c flex-wrap absolute bottom-3 text-sm text-[rgba(0,0,0,0.6)] dark:text-[rgba(220,220,242,0.8)]" class="w-full flex-c absolute bottom-3 text-sm text-[rgba(0,0,0,0.6)] dark:text-[rgba(220,220,242,0.8)]"
> >
Copyright © 2020-2025 Copyright © 2020-present
<a <a
class="hover:text-primary!" class="hover:text-primary!"
href="https://github.com/pure-admin" href="https://github.com/pure-admin"
@@ -346,16 +346,6 @@ watch(loginDay, value => {
> >
&nbsp;{{ title }} &nbsp;{{ title }}
</a> </a>
<!-- <div class="ml-8">
<span>赞助商:</span>
<a
class="hover:text-primary"
href="https://ai-tools.cn/resume/start"
target="_blank"
>
二猫 AI 简历
</a>
</div> -->
</div> </div>
</div> </div>
</template> </template>